fix: Stub generation testing and fixing of miscellaneous bugs

src/safeds_stubgen/stubs_generator/_generate_stubs.py

@@ -871,36 +871,65 @@
 
     def _get_shortest_public_reexport(self) -> str:
         module_qname = self.module.id.replace("/", ".")
-
+        module_name = self.module.name
         reexports = self.api.reexport_map
-        if self.module.name in reexports:
-            reexport_sources = reexports[self.module.name]
-        elif module_qname in reexports:
-            reexport_sources = reexports[module_qname]
-        else:
-            return module_qname
 
-        same_package_modules = []
-        other_package_modules = []
-        for reexport_source in reexport_sources:
-            if self.module.id.startswith(reexport_source.id):
-                same_package_modules.append(reexport_source)
-            else:
-                other_package_modules.append(reexport_source)
+        def _module_name_check(name: str, string: str) -> bool:
+            return (
+                string == name or
+                (f".{name}" in string and (string.endswith(f".{name}") or f"{name}." in string)) or
+                (f"{name}." in string and (string.startswith(f"{name}.") or f".{name}" in string))
+            )
+
+        keys = [reexport_key for reexport_key in reexports if _module_name_check(module_name, reexport_key)]
+
+        module_ids = set()
+        for key in keys:
+            for module in reexports[key]:
+                added_module_id = False
+
+                for qualified_import in module.qualified_imports:
+                    if _module_name_check(module_name, qualified_import.qualified_name):
+                        module_ids.add(module.id)
+                        added_module_id = True
+                        break
 
-        modules_to_check = same_package_modules if same_package_modules else other_package_modules
+                if added_module_id:
+                    continue
+
+                for wildcard_import in module.wildcard_imports:
+                    if _module_name_check(module_name, wildcard_import.module_name):
+                        module_ids.add(module.id)
+                        break
+
+        # Adjust all ids
+        package = self.api.package
+        fixed_module_ids_parts = [
+            [package, *module_id.split(f"{package}/", maxsplit=1)[-1].split("/")]
+            if not module_id.endswith(package) else [package]
+            for module_id in module_ids
+        ]
+
+        shortest_id = None
+        for fixed_module_id_parts in fixed_module_ids_parts:
+            if shortest_id is None or len(fixed_module_id_parts) < len(shortest_id):
+                internal_part = False
+                for part in fixed_module_id_parts:
+                    if is_internal(part):
+                        internal_part = True
+                        break
 
-        shortest_module_path: Module | None = None
-        for source_module in modules_to_check:
-            if shortest_module_path is None or len(shortest_module_path.id.split("/")) > len(
-                source_module.id.split("/"),
-            ):
-                shortest_module_path = source_module
+                if internal_part:
+                    continue
+
+                shortest_id = fixed_module_id_parts
 
-        if shortest_module_path is None:  # pragma: no cover
-            raise ValueError
+                if len(shortest_id) == 1:
+                    break
 
-        return shortest_module_path.id.replace("/", ".")
+        if shortest_id is None:
+            return module_qname
+        return ".".join(shortest_id)
 
 
 def _callable_type_name_generator() -> Generator:

tests/data/various_modules_package/__init__.py

@@ -8,6 +8,7 @@
 from ._reexport_module_4 import _two_times_reexported
 from ._reexport_module_4 import _two_times_reexported as two_times_reexported
 from .enum_module import _ReexportedEmptyEnum
+from file_creation._module_3 import Reexported
 
 __all__ = [
     "reex_1",
@@ -20,4 +21,5 @@
     "two_times_reexported",
     "FourthReexportClass",
     "_ReexportedEmptyEnum",
+    "Reexported",
 ]

tests/safeds_stubgen/api_analyzer/__snapshots__/test__get_api.ambr

@@ -6512,6 +6512,10 @@
       'alias': None,
       'qualified_name': 'enum_module._ReexportedEmptyEnum',
     }),
+    dict({
+      'alias': None,
+      'qualified_name': 'file_creation._module_3.Reexported',
+    }),
   ])
 # ---
 # name: test_imports[__init__ (wildcard_imports)]
@@ -6621,6 +6625,10 @@
         'alias': None,
         'qualified_name': 'enum_module._ReexportedEmptyEnum',
       }),
+      dict({
+        'alias': None,
+        'qualified_name': 'file_creation._module_3.Reexported',
+      }),
     ]),
     'wildcard_imports': list([
       dict({

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_module_3].sdsstub

@@ -1,4 +1,4 @@
-@PythonModule("tests.data.various_modules_package.file_creation._module_3")
-package tests.data.variousModulesPackage.fileCreation.Module3
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 class Reexported()

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_module_6].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package.file_creation._module_6")
-package tests.data.variousModulesPackage.fileCreation.Module6
+@PythonModule("various_modules_package.file_creation")
+package variousModulesPackage.fileCreation
 
 // TODO Result type information missing.
 @Pure

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexport_module_1].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package")
-package tests.data.variousModulesPackage
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 // TODO Result type information missing.
 @Pure

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexport_module_2].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package._reexport_module_2")
-package tests.data.variousModulesPackage.ReexportModule2
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 // TODO Result type information missing.
 @Pure

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexport_module_3].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package")
-package tests.data.variousModulesPackage
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 // TODO Result type information missing.
 @Pure

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexport_module_4].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package._reexport_module_4")
-package tests.data.variousModulesPackage.ReexportModule4
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 // TODO Result type information missing.
 @Pure

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexported_from_another_package].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package.file_creation")
-package tests.data.variousModulesPackage.fileCreation
+@PythonModule("various_modules_package.file_creation")
+package variousModulesPackage.fileCreation
 
 @Pure
 @PythonName("reexported_in_another_package_function")

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexported_from_another_package_2].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package.another_path._reexported_from_another_package_2")
-package tests.data.variousModulesPackage.anotherPath.ReexportedFromAnotherPackage2
+@PythonModule("various_modules_package.file_creation")
+package variousModulesPackage.fileCreation
 
 @Pure
 @PythonName("reexported_in_another_package_function2")

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[_reexported_from_another_package_3].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package.file_creation")
-package tests.data.variousModulesPackage.fileCreation
+@PythonModule("various_modules_package.file_creation")
+package variousModulesPackage.fileCreation
 
 @Pure
 @PythonName("reexported_in_another_package_function3")

tests/safeds_stubgen/stubs_generator/__snapshots__/test_generate_stubs/TestStubFileGeneration.test_stub_creation[enum_module].sdsstub

@@ -1,5 +1,5 @@
-@PythonModule("tests.data.various_modules_package.enum_module")
-package tests.data.variousModulesPackage.enumModule
+@PythonModule("various_modules_package")
+package variousModulesPackage
 
 enum _ReexportedEmptyEnum