Docserver: Modify doc inlining so all relevant data is present in availability_finder.py

chrome/common/extensions/docs/server2/schema_util.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from collections import defaultdict, Mapping
 import traceback
 
 from third_party.json_schema_compiler import json_parse, idl_schema, idl_parser
 
 
@@ skipping 36 matching lines @@
       if '$ref' in node:
         refcounts[node['$ref']] += 1
       stack.extend(v for k, v in node.iteritems() if k not in ignore)
 
   for type_ in schema['types']:
     if not 'noinline_doc' in type_:
       if refcounts[type_['id']] == 1:
         type_['inline_doc'] = True
 
 
-def InlineDocs(schema):
+def InlineDocs(schema, retain_inlined_types):
   '''Replace '$ref's that refer to inline_docs with the json for those docs.
+  If |retain_inlined_types| is False, then the inlined nodes are removed
+  from the schema.
   '''
   types = schema.get('types')
   if types is None:
     return
 
   inline_docs = {}
   types_without_inline_doc = []
 
   # Gather the types with inline_doc.
   for type_ in types:
     if type_.get('inline_doc'):
       inline_docs[type_['id']] = type_
-      for k in ('description', 'id', 'inline_doc'):
-        type_.pop(k, None)
+      if not retain_inlined_types:
+        for k in ('description', 'id', 'inline_doc'):
+          type_.pop(k, None)
     else:
       types_without_inline_doc.append(type_)
-  schema['types'] = types_without_inline_doc
+  if not retain_inlined_types:
+    schema['types'] = types_without_inline_doc
 
   def apply_inline(node):
     if isinstance(node, list):
       for i in node:
         apply_inline(i)
     elif isinstance(node, Mapping):
       ref = node.get('$ref')
       if ref and ref in inline_docs:
         node.update(inline_docs[ref])
         del node['$ref']
       for k, v in node.iteritems():
         apply_inline(v)
 
   apply_inline(schema)
 
 
-def ProcessSchema(path, file_data, inline=False):
-  '''Parses |file_data| using a method determined by checking the extension of
-  the file at the given |path|. Then, trims 'nodoc' and if |inline| is given
-  and True, handles inlineable types from the parsed schema data.
+def ProcessSchema(path, file_data, retain_inlined_types=True):

[not at google - send to devlin, 2014/07/16 16:17:15]

Can this be default-False?

It looks like you'd just need to change the compiled_file_system instance to set
True and it'd work exactly the same... but is this really what you want? Like I
said I'd expect the naive caller to assume that a type doesn't appear
(effectively) twice, so *really* what you want is to add the
retain_inlined_types method to ForAPISchema.

*However* ForAPISchema is actually only used in 1 place, from
AvailabilityFinder, so perhaps you can just move that method in there and forget
about it on CompiledFileSystem entirely. Then you can explain whats going on in
AvailabliltyFinder.

+  '''Parses |file_data| using a method determined by checking the
+  extension of the file at the given |path|. Then, trims 'nodoc' and if
+  |retain_inlined_types| is given and False, removes inlineable types from
+  the parsed schema data.
   '''
   def trim_and_inline(schema, is_idl=False):
     '''Modifies an API schema in place by removing nodes that shouldn't be
     documented and inlining schema types that are only referenced once.
     '''
     if RemoveNoDocs(schema):
       # A return of True signifies that the entire schema should not be
       # documented. Otherwise, only nodes that request 'nodoc' are removed.
       return None
-    if inline:
-      if is_idl:
-        DetectInlineableTypes(schema)
-      InlineDocs(schema)
+    if is_idl:
+      DetectInlineableTypes(schema)
+    InlineDocs(schema, retain_inlined_types)
     return schema
 
   if path.endswith('.idl'):
     idl = idl_schema.IDLSchema(idl_parser.IDLParser().ParseData(file_data))
     # Wrap the result in a list so that it behaves like JSON API data.
     return [trim_and_inline(idl.process()[0], is_idl=True)]
 
   try:
     schemas = json_parse.Parse(file_data)
   except:
     raise ValueError('Cannot parse "%s" as JSON:\n%s' %
                      (path, traceback.format_exc()))
   for schema in schemas:
     # Schemas could consist of one API schema (data for a specific API file)
     # or multiple (data from extension_api.json).
     trim_and_inline(schema)
   return schemas