feat: Correct stubs for TypeVars

src/safeds_stubgen/api_analyzer/_api.py

@@ -16,7 +16,7 @@
         ResultDocstring,
     )
 
-    from ._types import AbstractType
+    from ._types import AbstractType, TypeVarType
 
 API_SCHEMA_VERSION = 1
 
@@ -237,6 +237,7 @@ class Function:
     is_static: bool
     is_class_method: bool
     is_property: bool
+    type_var_types: list[TypeVarType] = field(default_factory=list)
     results: list[Result] = field(default_factory=list)
     reexported_by: list[Module] = field(default_factory=list)
     parameters: list[Parameter] = field(default_factory=list)

src/safeds_stubgen/api_analyzer/_ast_visitor.py

@@ -50,6 +50,8 @@ def __init__(self, docstring_parser: AbstractDocstringParser, api: API, aliases:
         self.__declaration_stack: list[Module | Class | Function | Enum | list[Attribute | EnumInstance]] = []
         self.aliases = aliases
         self.mypy_file: mp_nodes.MypyFile | None = None
+        # We gather type var types used as a parameter type in a function
+        self.type_var_types: set[sds_types.TypeVarType] = set()
 
     def enter_moduledef(self, node: mp_nodes.MypyFile) -> None:
         self.mypy_file = node
@@ -229,11 +231,19 @@ def enter_funcdef(self, node: mp_nodes.FuncDef) -> None:
         # Get docstring
         docstring = self.docstring_parser.get_function_documentation(node)
 
-        # Function args
+        # Function args & TypeVar
         arguments: list[Parameter] = []
+        type_var_types: list[sds_types.TypeVarType] = []
+        # Reset the type_var_types list
+        self.type_var_types = set()
         if getattr(node, "arguments", None) is not None:
             arguments = self._parse_parameter_data(node, function_id)
 
+            if self.type_var_types:
+                type_var_types = list(self.type_var_types)
+                # Sort for the snapshot tests
+                type_var_types.sort(key=lambda x: x.name)
+
         # Create results
         results = self._parse_results(node, function_id)
 
@@ -252,6 +262,7 @@ def enter_funcdef(self, node: mp_nodes.FuncDef) -> None:
             results=results,
             reexported_by=reexported_by,
             parameters=arguments,
+            type_var_types=type_var_types,
         )
         self.__declaration_stack.append(function)
 
@@ -666,7 +677,7 @@ def _parse_parameter_data(self, node: mp_nodes.FuncDef, function_id: str) -> lis
         for argument in node.arguments:
             mypy_type = argument.variable.type
             type_annotation = argument.type_annotation
-            arg_type = None
+            arg_type: AbstractType | None = None
             default_value = None
             default_is_none = False
 
@@ -827,7 +838,9 @@ def mypy_type_to_abstract_type(
 
         # Special Cases
         elif isinstance(mypy_type, mp_types.TypeVarType):
-            return sds_types.TypeVarType(mypy_type.name)
+            type_var = sds_types.TypeVarType(mypy_type.name)
+            self.type_var_types.add(type_var)
+            return type_var
         elif isinstance(mypy_type, mp_types.CallableType):
             return sds_types.CallableType(
                 parameter_types=[self.mypy_type_to_abstract_type(arg_type) for arg_type in mypy_type.arg_types],

src/safeds_stubgen/stubs_generator/_generate_stubs.py

@@ -265,6 +265,10 @@ def _create_class_attribute_string(self, attributes: list[Attribute], inner_inde
             if attribute.type:
                 attribute_type = attribute.type.to_dict()
 
+                # Don't create TypeVar attributes
+                if attribute_type["kind"] == "TypeVarType":
+                    continue
+
             static_string = "static " if attribute.is_static else ""
 
             # Convert name to camelCase and add PythonName annotation
@@ -317,6 +321,13 @@ def _create_function_string(self, function: Function, indentations: str = "", is
             is_instance_method=not is_static and is_method,
         )
 
+        # TypeVar
+        type_var_info = ""
+        if function.type_var_types:
+            type_var_names = [type_var.name for type_var in function.type_var_types]
+            type_var_string = ", ".join(type_var_names)
+            type_var_info = f"<{type_var_string}>"
+
         # Convert function name to camelCase
         name = function.name
         camel_case_name = self._convert_snake_to_camel_case(name)
@@ -334,8 +345,8 @@ def _create_function_string(self, function: Function, indentations: str = "", is
             f"{self._create_todo_msg(indentations)}"
             f"{indentations}@Pure\n"
             f"{function_name_annotation}"
-            f"{indentations}{static}fun {camel_case_name}({func_params})"
-            f"{result_string}"
+            f"{indentations}{static}fun {camel_case_name}{type_var_info}"
+            f"({func_params}){result_string}"
         )
 
     def _create_property_function_string(self, function: Function, indentations: str = "") -> str:
@@ -621,9 +632,8 @@ def _create_type_string(self, type_data: dict | None) -> str:
                 else:
                     types.append(f"{literal_type}")
             return f"literal<{', '.join(types)}>"
-        # Todo See issue #63
         elif kind == "TypeVarType":
-            return ""
+            return type_data["name"]
 
         raise ValueError(f"Unexpected type: {kind}")  # pragma: no cover
 

tests/data/various_modules_package/attribute_module.py

@@ -1,4 +1,4 @@
-from typing import Optional, Final, Literal, TypeVar
+from typing import Optional, Final, Literal
 from tests.data.main_package.another_path.another_module import AnotherClass
 
 
@@ -66,7 +66,5 @@ def some_func() -> bool:
     attr_type_from_outside_package: AnotherClass
     attr_default_value_from_outside_package = AnotherClass
 
-    type_var = TypeVar("type_var")
-
     def __init__(self):
         self.init_attr: bool = False

tests/data/various_modules_package/function_module.py

@@ -1,4 +1,4 @@
-from typing import Callable, Optional, Literal, Any, TypeVar
+from typing import Callable, Optional, Literal, Any
 from tests.data.main_package.another_path.another_module import AnotherClass
 
 
@@ -187,10 +187,6 @@ def param_from_outside_the_package(param_type: AnotherClass, param_value=Another
 def result_from_outside_the_package() -> AnotherClass: ...
 
 
-_type_var = TypeVar("_type_var")
-def type_var_func(type_var_list: list[_type_var]) -> list[_type_var]: ...
-
-
 class FunctionModulePropertiesClass:
     @property
     def property_function(self): ...

tests/data/various_modules_package/type_var_module.py

@@ -0,0 +1,14 @@
+from typing import TypeVar
+
+
+class TypeVarClass:
+    type_var = TypeVar("type_var")
+
+
+_type_var = TypeVar("_type_var")
+def type_var_func(a: list[_type_var]) -> list[_type_var]: ...
+
+
+_type_var1 = TypeVar("_type_var1")
+_type_var2 = TypeVar("_type_var2")
+def multiple_type_var(a: _type_var1, b: _type_var2) -> list[_type_var1 | _type_var2]: ...

tests/safeds_stubgen/api_analyzer/__snapshots__/test__get_api.ambr

@@ -1021,21 +1021,6 @@
         'qname': 'builtins.int',
       }),
     }),
-    dict({
-      'docstring': dict({
-        'default_value': '',
-        'description': '',
-        'type': '',
-      }),
-      'id': 'various_modules_package/attribute_module/AttributesClassB/type_var',
-      'is_public': True,
-      'is_static': True,
-      'name': 'type_var',
-      'type': dict({
-        'kind': 'TypeVarType',
-        'name': 'type_var',
-      }),
-    }),
   ])
 # ---
 # name: test_class_attributes[ClassModuleNestedClassE]
@@ -1859,6 +1844,10 @@
     }),
   ])
 # ---
+# name: test_class_methods[TypeVarClass]
+  list([
+  ])
+# ---
 # name: test_class_methods[_ClassModulePrivateDoubleNestedClassF]
   list([
     dict({
@@ -3401,6 +3390,42 @@
     }),
   ])
 # ---
+# name: test_function_parameters[multiple_type_var]
+  list([
+    dict({
+      'assigned_by': 'POSITION_OR_NAME',
+      'default_value': None,
+      'docstring': dict({
+        'default_value': '',
+        'description': '',
+        'type': '',
+      }),
+      'id': 'various_modules_package/type_var_module/multiple_type_var/a',
+      'is_optional': False,
+      'name': 'a',
+      'type': dict({
+        'kind': 'TypeVarType',
+        'name': '_type_var1',
+      }),
+    }),
+    dict({
+      'assigned_by': 'POSITION_OR_NAME',
+      'default_value': None,
+      'docstring': dict({
+        'default_value': '',
+        'description': '',
+        'type': '',
+      }),
+      'id': 'various_modules_package/type_var_module/multiple_type_var/b',
+      'is_optional': False,
+      'name': 'b',
+      'type': dict({
+        'kind': 'TypeVarType',
+        'name': '_type_var2',
+      }),
+    }),
+  ])
+# ---
 # name: test_function_parameters[nested_class_function]
   list([
     dict({
@@ -4455,9 +4480,9 @@
         'description': '',
         'type': '',
       }),
-      'id': 'various_modules_package/function_module/type_var_func/type_var_list',
+      'id': 'various_modules_package/type_var_module/type_var_func/a',
       'is_optional': False,
-      'name': 'type_var_list',
+      'name': 'a',
       'type': dict({
         'kind': 'ListType',
         'types': list([
@@ -4978,6 +5003,36 @@
     }),
   ])
 # ---
+# name: test_function_results[multiple_type_var]
+  list([
+    dict({
+      'docstring': dict({
+        'description': '',
+        'type': '',
+      }),
+      'id': 'various_modules_package/type_var_module/multiple_type_var/result_1',
+      'name': 'result_1',
+      'type': dict({
+        'kind': 'ListType',
+        'types': list([
+          dict({
+            'kind': 'UnionType',
+            'types': list([
+              dict({
+                'kind': 'TypeVarType',
+                'name': '_type_var1',
+              }),
+              dict({
+                'kind': 'TypeVarType',
+                'name': '_type_var2',
+              }),
+            ]),
+          }),
+        ]),
+      }),
+    }),
+  ])
+# ---
 # name: test_function_results[nested_class_function]
   list([
     dict({
@@ -5212,7 +5267,7 @@
         'description': '',
         'type': '',
       }),
-      'id': 'various_modules_package/function_module/type_var_func/result_1',
+      'id': 'various_modules_package/type_var_module/type_var_func/result_1',
       'name': 'result_1',
       'type': dict({
         'kind': 'ListType',
@@ -6106,26 +6161,6 @@
         'various_modules_package/function_module/tuple_results/result_2',
       ]),
     }),
-    dict({
-      'docstring': dict({
-        'description': '',
-        'full_docstring': '',
-      }),
-      'id': 'various_modules_package/function_module/type_var_func',
-      'is_class_method': False,
-      'is_property': False,
-      'is_public': True,
-      'is_static': False,
-      'name': 'type_var_func',
-      'parameters': list([
-        'various_modules_package/function_module/type_var_func/type_var_list',
-      ]),
-      'reexported_by': list([
-      ]),
-      'results': list([
-        'various_modules_package/function_module/type_var_func/result_1',
-      ]),
-    }),
     dict({
       'docstring': dict({
         'description': '',

tests/safeds_stubgen/api_analyzer/test__get_api.py

@@ -107,6 +107,7 @@ def _get_specific_function_data(
 _import_module_name = "import_module"
 _abstract_module_name = "abstract_module"
 _infer_types_module_name = "infer_types_module"
+_type_var_module_name = "type_var_module"
 
 
 # ############################## Tests ############################## #
@@ -332,6 +333,7 @@ def test_global_functions(module_name: str, snapshot: SnapshotAssertion) -> None
         (_function_module_name, "FunctionModuleClassC", "plaintext"),
         (_function_module_name, "FunctionModulePropertiesClass", "plaintext"),
         (_infer_types_module_name, "InferMyTypes", "plaintext"),
+        (_type_var_module_name, "TypeVarClass", "plaintext"),
         ("_reexport_module_1", "ReexportClass", "plaintext"),
         (_abstract_module_name, "AbstractModuleClass", "plaintext"),
         (_docstring_module_name, "EpydocDocstringClass", "epydoc"),
@@ -349,6 +351,7 @@ def test_global_functions(module_name: str, snapshot: SnapshotAssertion) -> None
         "FunctionModuleClassC",
         "FunctionModulePropertiesClass",
         "InferMyTypes",
+        "TypeVarClass",
         "ReexportClass",
         "AbstractModuleClass",
         "EpydocDocstringClass",
@@ -390,7 +393,8 @@ def test_class_methods(module_name: str, class_name: str, docstring_style: str,
         ("args_type", _function_module_name, "", "plaintext"),
         ("callable_type", _function_module_name, "", "plaintext"),
         ("param_from_outside_the_package", _function_module_name, "", "plaintext"),
-        ("type_var_func", _function_module_name, "", "plaintext"),
+        ("type_var_func", _type_var_module_name, "", "plaintext"),
+        ("multiple_type_var", _type_var_module_name, "", "plaintext"),
         ("abstract_method_params", _abstract_module_name, "AbstractModuleClass", "plaintext"),
         ("abstract_static_method_params", _abstract_module_name, "AbstractModuleClass", "plaintext"),
         ("abstract_property_method", _abstract_module_name, "AbstractModuleClass", "plaintext"),
@@ -422,6 +426,7 @@ def test_class_methods(module_name: str, class_name: str, docstring_style: str,
         "callable_type",
         "param_from_outside_the_package",
         "type_var_func",
+        "multiple_type_var",
         "abstract_method_params",
         "abstract_static_method_params",
         "abstract_property_method",
@@ -480,7 +485,8 @@ def test_function_parameters(
         ("any_results", _function_module_name, "", "plaintext"),
         ("callable_type", _function_module_name, "", "plaintext"),
         ("result_from_outside_the_package", _function_module_name, "", "plaintext"),
-        ("type_var_func", _function_module_name, "", "plaintext"),
+        ("type_var_func", _type_var_module_name, "", "plaintext"),
+        ("multiple_type_var", _type_var_module_name, "", "plaintext"),
         ("instance_method", _function_module_name, "FunctionModuleClassB", "plaintext"),
         ("static_method_params", _function_module_name, "FunctionModuleClassB", "plaintext"),
         ("class_method_params", _function_module_name, "FunctionModuleClassB", "plaintext"),
@@ -521,6 +527,7 @@ def test_function_parameters(
         "callable_type",
         "result_from_outside_the_package",
         "type_var_func",
+        "multiple_type_var",
         "instance_method",
         "static_method_params",
         "class_method_params",

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/test_class_attribute_creation.sdsstub

@@ -93,9 +93,6 @@ class AttributesClassB() {
 	static attr attrTypeFromOutsidePackage: AnotherClass
 	@PythonName("attr_default_value_from_outside_package")
 	static attr attrDefaultValueFromOutsidePackage: () -> a: AnotherClass
-	// TODO Attribute has no type information.
-	@PythonName("type_var")
-	static attr typeVar
 	@PythonName("init_attr")
 	attr initAttr: Boolean