wip - clean up tests, fix bugs

devdoomari3 · devdoomari3 · commit 74679ce09831 · 2018-11-06T10:42:24.000+09:00
diff --git a/py_codegen/plugins/typescript.py b/py_codegen/plugins/typescript.py
@@ -1,5 +1,5 @@
-from py_codegen.type_extractor.type_extractor import CollectType
+from py_codegen.type_extractor.type_extractor import TypeExtractor
 
-def extract_class_to_interfaces(collected_types: CollectType) -> str:
+def extract_class_to_interfaces(collected_types: TypeExtractor) -> str:
     interfaces = collected_types.classes
     return ''
diff --git a/py_codegen/type_extractor/__init__.py b/py_codegen/type_extractor/__init__.py
@@ -0,0 +1 @@
+from py_codegen.type_extractor.type_extractor import TypeExtractor
diff --git a/py_codegen/type_extractor/__tests__/test_func_with_arg_class.py b/py_codegen/type_extractor/__tests__/test_func_with_arg_class.py
@@ -1,8 +1,8 @@
-from py_codegen.type_extractor import CollectType
+from py_codegen.type_extractor import TypeExtractor
 
 
 def test_func_with_arg_class():
-    type_collector = CollectType()
+    type_collector = TypeExtractor()
 
     class ArgClass:
         arg1: str
@@ -11,10 +11,4 @@ class ArgClass:
     @type_collector.add_function(None)
     def func_with_arg_class(a: ArgClass) -> ArgClass:
         return a
-    classes_found = type_collector.classes.items()
-
-    import pdb;pdb.set_trace()
-    print('type_collector.classes', type_collector.classes)
-
-# if __name__ == '__main__':
-test_func_with_arg_class()
+    type_collector.classes.
diff --git a/py_codegen/type_extractor/__tests__/test_func_with_builtin_type_args.py b/py_codegen/type_extractor/__tests__/test_func_with_builtin_type_args.py
@@ -0,0 +1,13 @@
+from py_codegen.type_extractor import TypeExtractor
+
+
+def test_func_with_builtin_type_args():
+    type_collector = TypeExtractor()
+
+    @type_collector.add_function(None)
+    def func_with_builtin_args(a: int) -> int:
+        return a + 1
+    classes_found = type_collector.classes.items()
+
+    import pdb;pdb.set_trace()
+    print('type_collector.classes', type_collector.classes)
diff --git a/py_codegen/type_extractor/__tests__/test_func_with_nested_arg_class.py b/py_codegen/type_extractor/__tests__/test_func_with_nested_arg_class.py
@@ -1,8 +1,8 @@
-from py_codegen.type_extractor import CollectType
+from py_codegen.type_extractor import TypeExtractor
 
 
 def test_func_with_arg_class():
-    typeCollector = CollectType()
+    typeCollector = TypeExtractor()
     class ArgClass:
         arg1: str
         arg2: int
diff --git a/py_codegen/type_extractor/__tests__/test_various_classes.py b/py_codegen/type_extractor/__tests__/test_various_classes.py
@@ -1,8 +1,8 @@
-from py_codegen.type_extractor import CollectType
+from py_codegen.type_extractor import TypeExtractor
 
 
 def test_func_with_arg_class():
-    typeCollector = CollectType()
+    typeCollector = TypeExtractor()
     class ArgClass:
         arg1: str
         arg2: int
diff --git a/py_codegen/type_extractor/type_extractor.py b/py_codegen/type_extractor/type_extractor.py
@@ -9,12 +9,15 @@
 from .FunctionFound import FunctionFound
 
 def is_builtin(something):
-    return inspect.getmodule(something) is not builtins
+    return inspect.getmodule(something) is builtins
 
-class CollectType:
-    functions: Dict[str, FunctionFound] = dict()
+class TypeExtractor:
+    functions: Dict[str, FunctionFound]
+    classes: Dict[str, ClassFound]
 
-    classes: Dict[str, ClassFound] = dict()
+    def __init__(self):
+        self.functions = dict()
+        self.classes = dict()
 
     def add_function(self, options):
         def add_function_decoration(func: Callable):
@@ -29,21 +32,23 @@ def add_function_decoration(func: Callable):
                     function_found
                 )
             self.functions[function_found.name] = function_found
-            # import pdb; pdb.set_trace()
             return func
         return add_function_decoration
 
     def __process_params(self, params: OrderedDict):
-        processed_params = dict()
-        for key, value in params.items():
-            if inspect.isclass(value) and not is_builtin(value):
-                class_found = self.__to_class_found(value)
-                processed_params[key] = class_found
-            if inspect.isfunction(value):
-                function_found = self.__to_function_found(value)
-                processed_params[key] = function_found
-            print("key", key, " / value", value)
-        return processed_params
+        return {k: self.__process_param(v) for k, v in params.items()}
+
+    def __process_param(self, value):
+        if is_builtin(value):
+            return value
+        if inspect.isclass(value) and not is_builtin(value):
+            # self.add_class(None)(value)
+            class_found = self.__to_class_found(value)
+            self.__add_class_found(class_found)
+            return class_found
+        if inspect.isfunction(value) and not is_builtin(value):
+            function_found = self.__to_function_found(value)
+            return function_found
 
     def __to_class_found(self, _class):
         _data_class = dataclass(_class)
@@ -66,27 +71,25 @@ def __to_function_found(self, func: Callable) -> FunctionFound:
         module = inspect.getmodule(func)
         filename = module.__file__
         params = self.__process_params(argspec.annotations)
+        return_type = self.__process_param(signature.return_annotation)
         func_found = FunctionFound(
             name=func.__name__,
             filePath=filename,
             raw_params=argspec.annotations,
             params=params,
             doc=func.__doc__,
             func=func,
-            return_type=signature.return_annotation,
+            return_type=return_type,
         )
         return func_found
 
-    def __to_dictionary_key(self, obj):
-        module = inspect.getmodule(obj)
-        filename = module.__file__
-        return obj.__name + '::' + filename
+    def __add_class_found(self, class_found: ClassFound):
+        self.classes[class_found.name] = class_found
 
     def add_class(self, options):
         def add_class_decoration(_class):
+            if is_builtin(_class):
+                return
             class_found = self.__to_class_found(_class)
-            self.classes[self.__to_dictionary_key(_class)] = class_found
-            import pdb;pdb.set_trace()
+            self.__add_class_found(class_found)
         return add_class_decoration
-
-    # def get_classes(self):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from py_codegen.type_extractor.type_extractor import TypeExtractor`