py2docfx 0.1.17.dev2139007__py3-none-any.whl → 0.1.17.dev2143539__py3-none-any.whl

py2docfx/docfx_yaml/miss_reference.py

@@ -29,7 +29,7 @@ def missing_reference(app, env, node, contnode):
             else:
                 fields = (module, node['py:class'], reftarget)
             
-            if not is_built_in_type(reftarget):
+            if not is_built_in_type(reftarget , node):
                 reftarget = '.'.join(
                     field for field in fields if field is not None)
 

py2docfx/docfx_yaml/parameter_utils.py

@@ -138,14 +138,19 @@ def is_typing(node_text: str, node) -> bool:
     # check if the node_text is a simple type name or has form of 'typing.TypeName'
     typing_prefix = 'typing.'
     check_typing_str = typing_prefix + node_text.strip()
-    if 'refid' in node.attributes:
-        is_shorten_type_name = check_shorten_type_name(node["refid"])
-        temp_str = node["refid"]
+
+    def check_shorten_name_and_typing_str(node, attr_str):
+        is_shorten_type_name = check_shorten_type_name(node[attr_str])
+        temp_str = node[attr_str]
         has_typing_in_node_attributes = check_typing_str == temp_str.strip()
+        return is_shorten_type_name, has_typing_in_node_attributes
+
+    if 'refid' in node.attributes:
+        is_shorten_type_name, has_typing_in_node_attributes = check_shorten_name_and_typing_str(node, 'refid')
     elif 'refuri' in node.attributes:
-        is_shorten_type_name = check_shorten_type_name(node["refuri"])
-        temp_str = node["refuri"]
-        has_typing_in_node_attributes = check_typing_str == temp_str.strip()
+        is_shorten_type_name, has_typing_in_node_attributes = check_shorten_name_and_typing_str(node, 'refuri')
+    elif 'reftarget' in node.attributes:
+        is_shorten_type_name, has_typing_in_node_attributes = check_shorten_name_and_typing_str(node, 'reftarget')
     else:
         has_typing_in_node_attributes = False
 
@@ -159,6 +164,13 @@ def is_typing(node_text: str, node) -> bool:
 def is_system_type(name: str) -> bool:
     return isclass(getattr(builtins, name, None))
 
+def is_complex_type(node_text: str) -> bool:
+    complex_type_chars = ['[', ']', '(', ')']
+    for char in complex_type_chars:
+        if char in node_text:
+            return True
+    return False
+
 def process_complex_type(type_string: str) -> str:
     # replace "or" with ","
     type_string = type_string.replace(" or ", ",")
@@ -212,7 +224,7 @@ def extract_types(ret_data, skip_index_set = [], description_index = None):
                     type_str += f'<xref:typing.{node_text}>'
                 else:
                     type_str += f'<xref:{node_text}>'
-            elif ('[' in node_text) or (']' in node_text) or ('(' in node_text) or (')' in node_text):
+            elif is_complex_type(node_text):
                 type_str += process_complex_type(node_text)
             else:
                 if 'refid' in node.attributes:

py2docfx/docfx_yaml/utils.py

@@ -47,5 +47,5 @@ def transform_node(app, node):
     writer.write(doc, destination)
     return destination.destination.decode('utf-8')
 
-def is_built_in_type(name: str) -> bool:
-    return parameter_utils.is_system_type(name) or parameter_utils.is_typing(name)
+def is_built_in_type(name: str, node) -> bool:
+    return parameter_utils.is_system_type(name) or parameter_utils.is_typing(name, node)

{py2docfx-0.1.17.dev2139007.dist-info → py2docfx-0.1.17.dev2143539.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2docfx
-Version: 0.1.17.dev2139007
+Version: 0.1.17.dev2143539
 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.17.dev2139007.dist-info → py2docfx-0.1.17.dev2143539.dist-info}/RECORD

@@ -66,14 +66,14 @@ py2docfx/docfx_yaml/convert_module.py,sha256=GptO1MRwaQ2Qbu724F0kCDDQQTZe7mWOtrO
 py2docfx/docfx_yaml/convert_package.py,sha256=Ep7PmvoLInDvY6OU5dveR6iVwyzGRkW3q6lX7yGJ0JE,2109
 py2docfx/docfx_yaml/directives.py,sha256=zVVuNM_6AU9G6sbqL1UAyHHgPe7bkBWbthXI-PO5ez0,879
 py2docfx/docfx_yaml/logger.py,sha256=gz416vqSqmsD91qLOCLAzomczlCfWqGXFJFRzLlVbJE,6503
-py2docfx/docfx_yaml/miss_reference.py,sha256=Btoj9wAvA4u_wU7JHH0Cei3910N8a7MS34OUqJvXAd4,2443
+py2docfx/docfx_yaml/miss_reference.py,sha256=NHoQtas0kvFsJXaR4fsk7kHjwV4aJobrr_Q30HaUc_I,2450
 py2docfx/docfx_yaml/nodes.py,sha256=tBDi35jLJArlobl07DKOkmH2qz7dudXLp_kTUfR_r2w,412
-py2docfx/docfx_yaml/parameter_utils.py,sha256=3qU_wf73Z24_FDxuTWD6IVWs9WQU0bJXSJ4Zyeg8_EQ,10417
+py2docfx/docfx_yaml/parameter_utils.py,sha256=04wQCtbS-G2hWM5UGkL22s10LZLUbqbh3RM9rWGOToI,10897
 py2docfx/docfx_yaml/process_doctree.py,sha256=RUbq2DkkKl-KjKiuQrZhuvi8Q_ZjUdW4oi6CTWpMkxc,17229
 py2docfx/docfx_yaml/return_type_utils.py,sha256=nmdCUOvwdYk2jF6RqmOvU6gjXmXUTPUeCqyHPdKZNUQ,7483
 py2docfx/docfx_yaml/settings.py,sha256=JQZNwFebczl-zn8Yk2taAGANRi-Hw8hywtDWxqXXFyQ,373
 py2docfx/docfx_yaml/translator.py,sha256=LSzNl4C-07bLbUZ5myfyWwh25cTNIIBih77Cp4tBWvo,25999
-py2docfx/docfx_yaml/utils.py,sha256=m5jC_qP2NKqzUx_z0zgZ-HAmxQdNTpJYKkL_F9vGeII,1555
+py2docfx/docfx_yaml/utils.py,sha256=sJ6aWF9wwIWIoZL6WWsd3FQD-zb3PWrJ5QTWP7PCarY,1567
 py2docfx/docfx_yaml/write_utils.py,sha256=q5qoYWw6GVDV8a3E8IxcSLWnN9sAer42VFRgadHBkgk,305
 py2docfx/docfx_yaml/writer.py,sha256=c_3s3KLbKJWRaafQgSK7P_8rs42RjB4nSBj9Mi4yA9g,35972
 py2docfx/docfx_yaml/yaml_builder.py,sha256=S3xty_ILxEUsw1J9VCwUkSLLYAUfQDm3fYbciv70gXc,2573
@@ -3913,7 +3913,7 @@ py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/convert.py,sha256=0wSJMU0m
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/pack.py,sha256=o3iwjfRHl7N9ul-M2kHbewLJZnqBLAWf0tzUCwoiTMw,3078
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/tags.py,sha256=Rv2ySVb8-qX3osKp3uJgxcIMXkjt43XUD0-zvC6KvnY,4775
 py2docfx/venv/venv1/Lib/site-packages/wheel/_commands/unpack.py,sha256=Y_J7ynxPSoFFTT7H0fMgbBlVErwyDGcObgme5MBuz58,1021
-py2docfx-0.1.17.dev2139007.dist-info/METADATA,sha256=RsOqcpYwQTZtjjnBmSM4bqLnhV0peDvCms4tNxFontc,548
-py2docfx-0.1.17.dev2139007.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-py2docfx-0.1.17.dev2139007.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.17.dev2139007.dist-info/RECORD,,
+py2docfx-0.1.17.dev2143539.dist-info/METADATA,sha256=FSXuDM4dVeQmWI9EWWOF7nTaNOL0eoqekS4jJHNB-TA,548
+py2docfx-0.1.17.dev2143539.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+py2docfx-0.1.17.dev2143539.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.17.dev2143539.dist-info/RECORD,,