py2docfx 0.1.1.dev1633054__py3-none-any.whl → 0.1.1.dev1634453__py3-none-any.whl

py2docfx/docfx_yaml/build_finished.py

@@ -226,8 +226,8 @@ def build_finished(app, exception):
     # Order matters here, we need modules before lower level classes,
     # so that we can make sure to inject the TOC properly
     # put app.env.docfx_yaml_packages after app.env.docfx_yaml_modules to keep same TOC items order
-    for data_set in (app.env.docfx_yaml_modules,
-                     app.env.docfx_yaml_packages,
+    for data_set in (app.env.docfx_yaml_packages,
+                     app.env.docfx_yaml_modules,
                      app.env.docfx_yaml_classes,
                      app.env.docfx_yaml_functions):  # noqa
 
@@ -262,12 +262,28 @@ def build_finished(app, exception):
 
             build_nested_toc(toc_yaml, uid)
 
+    index_children = []
+    index_references = []
+
+    def form_index_references_and_children(yaml_data, index_children, index_references):
+        if yaml_data[0].get('type', None) in ['package', 'module']:
+            index_children.append(yaml_data[0].get('fullName', ''))
+            index_references.append({
+                'uid': yaml_data[0].get('fullName', ''),
+                'name': yaml_data[0].get('fullName', ''),
+                'fullname': yaml_data[0].get('fullName', ''),
+                'isExternal': False
+            })
+
     for data_set in (app.env.docfx_yaml_packages,
                      app.env.docfx_yaml_modules,
                      app.env.docfx_yaml_classes,
                      app.env.docfx_yaml_functions):  # noqa
 
         for uid, yaml_data in iter(sorted(data_set.items())):
+
+            form_index_references_and_children(yaml_data, index_children, index_references)
+
             # Output file
             if uid.lower() in file_name_set:
                 filename = uid + "(%s)" % app.env.docfx_info_uid_types[uid]
@@ -316,16 +332,6 @@ def build_finished(app, exception):
         )
 
     index_file = os.path.join(normalized_outdir, 'index.yml')
-    index_children = []
-    index_references = []
-    for item in toc_yaml:
-        index_children.append(item.get('name', ''))
-        index_references.append({
-            'uid': item.get('name', ''),
-            'name': item.get('name', ''),
-            'fullname': item.get('name', ''),
-            'isExternal': False
-        })
 
     index_obj = [{
         'uid': 'project-' + app.config.project,

{py2docfx-0.1.1.dev1633054.dist-info → py2docfx-0.1.1.dev1634453.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.1.dev1633054
+Version: 0.1.1.dev1634453
 Summary: A package built based on Sphinx which download source code package and generate yaml files supported by docfx.
 Author: Microsoft Corporation
 License: MIT License

{py2docfx-0.1.1.dev1633054.dist-info → py2docfx-0.1.1.dev1634453.dist-info}/RECORD

@@ -52,7 +52,7 @@ py2docfx/convert_prepare/tests/data/subpackage/azure-mgmt-containerservice/azure
 py2docfx/convert_prepare/tests/data/subpackage/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py2docfx/convert_prepare/tests/data/subpackage/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py2docfx/docfx_yaml/__init__.py,sha256=KCEizAXv-SXtrYhvFfLHdBWDhz51AA9uagaeTL-Itpo,100
-py2docfx/docfx_yaml/build_finished.py,sha256=kiVhZeAwomT03wHryDpE7NBvX2GEDbvmR49uPhNnBJQ,13909
+py2docfx/docfx_yaml/build_finished.py,sha256=kJemkgnh9NIzn4E8jcAIaP7vb7wcHzdLl7yWUjoZbi8,14218
 py2docfx/docfx_yaml/build_init.py,sha256=lAw-fnBVQbySfZ7Sut_NpFQUjnqLOmnGQrTBBH2RXcg,1860
 py2docfx/docfx_yaml/common.py,sha256=UN1MUmjUoN1QSFDR1Cm_bfRuHr6FQiOe5VQV6s8xzjc,6841
 py2docfx/docfx_yaml/convert_class.py,sha256=boKDaxnXbnLxja62UFXi3eChGDB_WBW6ouUUJgOhdpE,2098
@@ -118,7 +118,7 @@ py2docfx/docfx_yaml/tests/roots/test-writer-table/conf.py,sha256=avcbnIOV2mlGQwh
 py2docfx/docfx_yaml/tests/roots/test-writer-uri/code_with_uri.py,sha256=bzWTZpY2yf_By2bOSl1GFaY3BsZpkAvwQuGztlcHKkQ,537
 py2docfx/docfx_yaml/tests/roots/test-writer-uri/conf.py,sha256=avcbnIOV2mlGQwhMQJZC4W6UGRBRhnq1QBxjPWlySxQ,260
 py2docfx/docfx_yaml/tests/utils/test_utils.py,sha256=d0OYSUQ6NyoZx5mlLdNGGNhiNmmQhjVT4hQ6jY3VE_M,3383
-py2docfx-0.1.1.dev1633054.dist-info/METADATA,sha256=5Km1IOXue9xzG-3RHqHLmtjz-mSxO-KENvpQ25nttbc,601
-py2docfx-0.1.1.dev1633054.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-py2docfx-0.1.1.dev1633054.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.1.dev1633054.dist-info/RECORD,,
+py2docfx-0.1.1.dev1634453.dist-info/METADATA,sha256=XfpKGVTZ-8Ssk8irwITI0HQrO81zcqrTBB-oL5L1UgM,601
+py2docfx-0.1.1.dev1634453.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+py2docfx-0.1.1.dev1634453.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.1.dev1634453.dist-info/RECORD,,