[ts plugin] add typing.Mapping support

devdoomari3 · devdoomari3 · commit ebbe4d7dc66b · 2019-05-15T18:03:21.000+09:00
diff --git a/py_codegen/plugins/typescript/Converter.py b/py_codegen/plugins/typescript/Converter.py
@@ -17,6 +17,7 @@
 from py_codegen.type_extractor.nodes.FunctionFound import FunctionFound
 from py_codegen.type_extractor.nodes.ListFound import ListFound
 from py_codegen.type_extractor.nodes.LiteralFound import LiteralFound
+from py_codegen.type_extractor.nodes.MappingFound import MappingFound
 from py_codegen.type_extractor.nodes.NoneNode import NoneNode
 from py_codegen.type_extractor.nodes.TupleFound import TupleFound
 from py_codegen.type_extractor.nodes.TypeOR import TypeOR
@@ -78,8 +79,11 @@ def get_identifier(self, node: NodeType) -> str:
             return f"I{node.name}"
         if isinstance(node, TypeOR):
             return f"{self.get_identifier(node.a)} | {self.get_identifier(node.b)}"
+        # FIXME: need to handle type(key) == int / float / etc.
         if isinstance(node, DictFound):
             return f"{{ [id: string]: {self.get_identifier(node.value)} }}"
+        if isinstance(node, MappingFound):
+            return f"{{ [id: string]: {self.get_identifier(node.value)} }}"
         if isinstance(node, ListFound):
             return f"{self.get_identifier(node.typ)}[]"
         if isinstance(node, TupleFound):
diff --git a/py_codegen/plugins/typescript/__tests__/generate_ts_definitions.py b/py_codegen/plugins/typescript/__tests__/generate_ts_definitions.py
@@ -10,6 +10,7 @@
 from py_codegen.test_fixtures.func_return_none import func_return_nullable
 from py_codegen.test_fixtures.func_with_tuple import func_with_tuple
 from py_codegen.test_fixtures.func_with_literals import func_with_literals
+from py_codegen.test_fixtures.func_with_mapping import func_with_mapping
 
 from py_codegen.type_extractor.type_extractor import TypeExtractor
 
@@ -38,3 +39,4 @@ def __write_ts_definition__(name: str, definition_str: str):
 generate_and_write_ts_definition(func_return_nullable)
 generate_and_write_ts_definition(func_with_tuple)
 generate_and_write_ts_definition(func_with_literals)
+generate_and_write_ts_definition(func_with_mapping)
diff --git a/py_codegen/plugins/typescript/__tests__/ts_fixtures/func_with_mapping.d.ts b/py_codegen/plugins/typescript/__tests__/ts_fixtures/func_with_mapping.d.ts
@@ -0,0 +1,3 @@
+export function func_with_mapping(
+    	input: { [id: string]: number },
+): { [id: string]: string }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function func_with_mapping(`
	`2`	`+ input: { [id: string]: number },`
	`3`	`+): { [id: string]: string }`