typeshed_serializer should serialize correctly aliased symbols

Author: andreaguarino

python-frontend/typeshed_serializer/serializer/symbols.py

@@ -182,8 +182,8 @@ def to_proto(self) -> symbols_pb2.ParameterSymbol:
 
 
 class OverloadedFunctionSymbol:
-    def __init__(self, overloaded_func_def: mpn.OverloadedFuncDef):
-        self.name = overloaded_func_def.name
+    def __init__(self, overloaded_func_def: mpn.OverloadedFuncDef, name: str = None):
+        self.name = overloaded_func_def.name if name is None else name
         self.fullname = overloaded_func_def.fullname
         self.definitions = []
         for item in overloaded_func_def.items:
@@ -218,8 +218,8 @@ def to_proto(self) -> symbols_pb2.OverloadedFunctionSymbol:
 
 
 class FunctionSymbol:
-    def __init__(self, func_def: mpn.FuncDef, decorators=None):
-        self.name = func_def.name
+    def __init__(self, func_def: mpn.FuncDef, decorators=None, name: str = None):
+        self.name = func_def.name if name is None else name
         self.fullname = func_def.fullname
         self.return_type = extract_return_type(func_def)
         self.parameters = extract_parameters(func_def)
@@ -262,8 +262,8 @@ def to_proto(self) -> symbols_pb2.FunctionSymbol:
 
 
 class ClassSymbol:
-    def __init__(self, type_info: mpn.TypeInfo):
-        self.name = type_info.name
+    def __init__(self, type_info: mpn.TypeInfo, name: str = None):
+        self.name = type_info.name if name is None else name
         self.fullname = type_info.fullname
         self.super_classes = []
         self.methods = []
@@ -336,8 +336,8 @@ def __init__(self, name: str, fullname: str, is_imported_module=False, type_desc
         self.type = type_descriptor
 
     @classmethod
-    def from_var(cls, var: mpn.Var):
-        return cls(var.name, var.fullname, type_descriptor=TypeDescriptor(var.type) if var.type else None)
+    def from_var(cls, var: mpn.Var, name: str = None):
+        return cls(var.name if name is None else name, var.fullname, type_descriptor=TypeDescriptor(var.type) if var.type else None)
 
     def __eq__(self, other):
         return isinstance(other, VarSymbol) and self.to_proto() == other.to_proto()
@@ -363,13 +363,13 @@ def __init__(self, mypy_file: mpn.MypyFile):
             name = mypy_file.names.get(key)
             symbol_table_node = name.node
             if isinstance(symbol_table_node, mpn.FuncDef):
-                self.functions.append(FunctionSymbol(symbol_table_node))
+                self.functions.append(FunctionSymbol(symbol_table_node, name=key))
             if isinstance(symbol_table_node, mpn.OverloadedFuncDef):
-                self.overloaded_functions.append(OverloadedFunctionSymbol(symbol_table_node))
+                self.overloaded_functions.append(OverloadedFunctionSymbol(symbol_table_node, name=key))
             if isinstance(symbol_table_node, mpn.TypeInfo):
-                self.classes.append(ClassSymbol(symbol_table_node))
+                self.classes.append(ClassSymbol(symbol_table_node, name=key))
             if isinstance(symbol_table_node, mpn.Var) and symbol_table_node.name not in DEFAULT_EXPORTED_VARS:
-                self.vars.append(VarSymbol.from_var(symbol_table_node))
+                self.vars.append(VarSymbol.from_var(symbol_table_node, name=key))
             if isinstance(symbol_table_node, mpn.MypyFile):
                 module_name = symbol_table_node.fullname
                 if module_name != "builtins":

python-frontend/typeshed_serializer/tests/resources/fakemodule.pyi

@@ -1,5 +1,6 @@
 import sys
 from typing import overload
+from sys import flags as my_flags
 
 if sys.version_info >= (3, 8):
     class SomeClassUnique38:

python-frontend/typeshed_serializer/tests/test_symbols_merger.py

@@ -205,7 +205,7 @@ def test_actual_module_merge(fake_module_36_38):
     assert len(fakemodule_proto.overloaded_functions) == len(flattened_overloaded_funcs)
 
     all_vars = merged_fakemodule_module.vars
-    assert len(all_vars) == 6
+    assert len(all_vars) == 7
     common_var = all_vars['fakemodule.common_var']
     assert len(common_var) == 1
     assert common_var[0].valid_for == ["36", "38"]
@@ -327,3 +327,13 @@ def assert_abc_merged_module(merged_modules, expected_valid_for):
         assert f[0].valid_for == expected_valid_for
     assert len(abc_merged_symbol.overloaded_functions) == 0
 
+
+def test_alias(fake_module_36_38):
+    fake_module_36 = symbols.ModuleSymbol(fake_module_36_38[0])
+    fake_module_38 = symbols.ModuleSymbol(fake_module_36_38[1])
+    merged_modules = symbols_merger.merge_modules({"fakemodule"}, {"36": {"fakemodule": fake_module_36},
+                                                                   "38": {"fakemodule": fake_module_38}})
+    merged_fakemodule_module = merged_modules['fakemodule']
+    sys_flags = merged_fakemodule_module.vars["sys.flags"][0].var_symbol
+    assert sys_flags is not None
+    assert sys_flags.name == "my_flags"