Fix and add test

Author: JukkaL

mypy/exportjson.py

@@ -58,6 +58,7 @@
     TypeType,
     TypeVarTupleType,
     TypeVarType,
+    UnboundType,
     UninhabitedType,
     UnionType,
     UnpackType,
@@ -357,6 +358,8 @@ def convert_type(typ: Type) -> JsonDict:
         return convert_parameters(typ)
     elif isinstance(typ, TypedDictType):
         return convert_typeddict_type(typ)
+    elif isinstance(typ, UnboundType):
+        return convert_unbound_type(typ)
     assert False, type(typ)
 
 
@@ -516,6 +519,16 @@ def convert_typeddict_type(self: TypedDictType) -> JsonDict:
     }
 
 
+def convert_unbound_type(self: UnboundType) -> JsonDict:
+    return {
+        ".class": "UnboundType",
+        "name": self.name,
+        "args": [convert_type(a) for a in self.args],
+        "expr": self.original_str_expr,
+        "expr_fallback": self.original_str_fallback,
+    }
+
+
 def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("path", nargs="+")

mypy/test/testexportjson.py

@@ -2,29 +2,29 @@
 
 from __future__ import annotations
 
-import os
 import json
+import os
 import re
-import pprint
 import sys
 
 from mypy import build
 from mypy.errors import CompileError
+from mypy.exportjson import convert_binary_cache_to_json
 from mypy.modulefinder import BuildSource
 from mypy.options import Options
 from mypy.test.config import test_temp_dir
 from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal
-from mypy.exportjson import convert_binary_cache_to_json
 
 
 class TypeExportSuite(DataSuite):
     required_out_section = True
     files = ["exportjson.test"]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
+        error = False
+        src = "\n".join(testcase.input)
         try:
-            src = "\n".join(testcase.input)
             options = Options()
             options.use_builtins_fixtures = True
             options.show_traceback = True
@@ -34,17 +34,23 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
             with open(fnam, "w") as f:
                 f.write(src)
             result = build.build(
-                sources=[BuildSource(fnam, "main")],
-                options=options,
-                alt_lib_path=test_temp_dir,
+                sources=[BuildSource(fnam, "main")], options=options, alt_lib_path=test_temp_dir
             )
             a = result.errors
+            error = bool(a)
 
             major, minor = sys.version_info[:2]
             cache_dir = os.path.join(".mypy_cache", f"{major}.{minor}")
 
             for module in result.files:
-                if module in ("builtins", "typing", "_typeshed"):
+                if module in (
+                    "builtins",
+                    "typing",
+                    "_typeshed",
+                    "__future__",
+                    "typing_extensions",
+                    "sys",
+                ):
                     continue
                 fnam = os.path.join(cache_dir, f"{module}.data.ff")
                 with open(fnam, "rb") as f:
@@ -54,11 +60,10 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
                         # We source file path is unpredictable, so filter it out
                         line = re.sub(r'"[^"]+\.pyi?"', "...", line)
                     a.append(line)
-                print(fnam)
         except CompileError as e:
             a = e.messages
-        assert_string_arrays_equal(
-            testcase.output,
-            a,
-            f"Invalid output ({testcase.file}, line {testcase.line})",
-        )
+            error = True
+        if error or "\n".join(testcase.output).strip() != "<not checked>":
+            assert_string_arrays_equal(
+                testcase.output, a, f"Invalid output ({testcase.file}, line {testcase.line})"
+            )

test-data/unit/exportjson.test

@@ -2,6 +2,9 @@
 --
 -- The tool is maintained on a best effort basis so we don't attempt to have
 -- full test coverage.
+--
+-- Some tests only ensure that *some* JSON is generated successfully. These
+-- have <not checked> as [out].
 
 [case testExportVar]
 x = 0
@@ -114,3 +117,20 @@ class C:
     "is_partial_stub_package": false,
     "future_import_flags": []
 }
+
+[case testExportDifferentTypes]
+from __future__ import annotations
+
+from typing import Callable, Any, Literal
+
+list_ann: list[int]
+any_ann: Any
+tuple_ann: tuple[int, str]
+union_ann: int | None
+callable_ann: Callable[[int], str]
+type_type_ann: type[int]
+literal_ann: Literal['x', 5, False]
+
+[builtins fixtures/tuple.pyi]
+[out]
+<not checked>