modwire 11.0.0__tar.gz → 11.0.1__tar.gz

{modwire-11.0.0 → modwire-11.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 11.0.0
+Version: 11.0.1
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT

{modwire-11.0.0 → modwire-11.0.1}/src/modwire/extraction/extractors/application.py

@@ -40,9 +40,7 @@ class ExtractorsApplication:
         if language not in self.extractors:
             raise ValueError(f"Language is not supported: {language}")
         extractor = self.extractors[language]
-        identities = {
-            file_id: extractor.module_identities(source_file) for file_id, source_file in extraction.files.items()
-        }
+        identities = extractor.module_identities(extraction.files)
         files = self.dependency.resolve(extraction.files, identities)
         resolved = extraction.model_copy(update={"files": files})
         producer = CodeMapProducer(

{modwire-11.0.0 → modwire-11.0.1}/src/modwire/extraction/extractors/domain.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from ...shared.code.models.identity import ModuleId
+from ...shared.code.models.identity import FileId, ModuleId
 from ...shared.code.models.source_file import SourceFile
 from .models.batch_config import BatchConfig
 from .models.extractor_runtime import ExtractorRuntime
@@ -24,5 +24,5 @@ class SourceExtractor(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def module_identities(self, source_file: SourceFile) -> tuple[ModuleId, ...]:
+    def module_identities(self, files: dict[FileId, SourceFile]) -> dict[FileId, tuple[ModuleId, ...]]:
         raise NotImplementedError

{modwire-11.0.0 → modwire-11.0.1}/src/modwire/extraction/extractors/php/extractor.py

@@ -6,7 +6,7 @@ from ....shared.code.models.capability_coverage import CapabilityCoverage
 from ....shared.code.models.capability_status import CapabilityStatus
 from ....shared.code.models.extractor_descriptor import ExtractorDescriptor
 from ....shared.code.models.fact_capability import FactCapability
-from ....shared.code.models.identity import ModuleId
+from ....shared.code.models.identity import FileId, ModuleId
 from ....shared.code.models.source_file import SourceFile
 from ..domain import SourceExtractor
 from ..models.batch_config import BatchConfig
@@ -112,5 +112,5 @@ class PhpExtractor(SourceExtractor):
     def batch_config(self) -> BatchConfig:
         return BatchConfig(size=500, parallel_threshold=500, parallel_size=500, max_workers=16, output_format="jsonl")
 
-    def module_identities(self, source_file: SourceFile) -> tuple[ModuleId, ...]:
-        return (source_file.module_id,)
+    def module_identities(self, files: dict[FileId, SourceFile]) -> dict[FileId, tuple[ModuleId, ...]]:
+        return {file_id: (source_file.module_id,) for file_id, source_file in files.items()}

{modwire-11.0.0 → modwire-11.0.1}/src/modwire/extraction/extractors/python/extractor.py

@@ -7,7 +7,7 @@ from ....shared.code.models.capability_coverage import CapabilityCoverage
 from ....shared.code.models.capability_status import CapabilityStatus
 from ....shared.code.models.extractor_descriptor import ExtractorDescriptor
 from ....shared.code.models.fact_capability import FactCapability
-from ....shared.code.models.identity import ModuleId
+from ....shared.code.models.identity import FileId, ModuleId
 from ....shared.code.models.source_file import SourceFile
 from ..domain import SourceExtractor
 from ..models.batch_config import BatchConfig
@@ -140,9 +140,30 @@ class PythonExtractor(SourceExtractor):
     def batch_config(self) -> BatchConfig:
         return BatchConfig(size=500, output_format="json")
 
-    def module_identities(self, source_file: SourceFile) -> tuple[ModuleId, ...]:
-        module_id = source_file.module_id
-        value = str(module_id)
-        if value == "__init__" or not value.endswith("/__init__"):
-            return (module_id,)
-        return (module_id, ModuleId(value.rsplit("/", 1)[0]))
+    def module_identities(self, files: dict[FileId, SourceFile]) -> dict[FileId, tuple[ModuleId, ...]]:
+        package_modules = {
+            str(source_file.module_id).removesuffix("/__init__")
+            for source_file in files.values()
+            if str(source_file.module_id).endswith("/__init__")
+        }
+        identities: dict[FileId, tuple[ModuleId, ...]] = {}
+        for file_id, source_file in files.items():
+            module_id = source_file.module_id
+            value = str(module_id)
+            candidates = [module_id]
+            if value.endswith("/__init__"):
+                candidates.append(ModuleId(value.rsplit("/", 1)[0]))
+            parts = value.split("/")
+            package_start = len(parts) - 1
+            for index in range(len(parts) - 2, -1, -1):
+                if "/".join(parts[: index + 1]) not in package_modules:
+                    break
+                package_start = index
+            if package_start < len(parts) - 1:
+                import_parts = parts[package_start:]
+                if import_parts[-1] == "__init__":
+                    import_parts = import_parts[:-1]
+                if import_parts:
+                    candidates.append(ModuleId("/".join(import_parts)))
+            identities[file_id] = tuple(dict.fromkeys(candidates))
+        return identities

{modwire-11.0.0 → modwire-11.0.1}/src/modwire/extraction/extractors/typescript/extractor.py

@@ -6,7 +6,7 @@ from ....shared.code.models.capability_coverage import CapabilityCoverage
 from ....shared.code.models.capability_status import CapabilityStatus
 from ....shared.code.models.extractor_descriptor import ExtractorDescriptor
 from ....shared.code.models.fact_capability import FactCapability
-from ....shared.code.models.identity import ModuleId
+from ....shared.code.models.identity import FileId, ModuleId
 from ....shared.code.models.source_file import SourceFile
 from ..domain import SourceExtractor
 from ..models.batch_config import BatchConfig
@@ -112,5 +112,5 @@ class TypeScriptExtractor(SourceExtractor):
     def batch_config(self) -> BatchConfig:
         return BatchConfig(size=500, parallel_threshold=1000, parallel_size=500, max_workers=16, output_format="jsonl")
 
-    def module_identities(self, source_file: SourceFile) -> tuple[ModuleId, ...]:
-        return (source_file.module_id,)
+    def module_identities(self, files: dict[FileId, SourceFile]) -> dict[FileId, tuple[ModuleId, ...]]:
+        return {file_id: (source_file.module_id,) for file_id, source_file in files.items()}

{modwire-11.0.0 → modwire-11.0.1}/tests/extraction/dependency/test_02_invariants.py

@@ -128,6 +128,38 @@ from ..services.facade import WidgetsService
         assert edge.to_id == "example_first/example_package/example_value.py"
         assert result.tracked_dependency_edges().count() == 1
 
+    def test_repository_root_package_aliases_win_over_duplicate_module_suffixes(self) -> None:
+        result = self.extract(
+            {
+                "src/example/__init__.py": "",
+                "src/example/diagrams/__init__.py": "",
+                "src/example/diagrams/services/__init__.py": "",
+                "src/example/diagrams/services/facade.py": "class DiagramFacade:\n    pass\n",
+                "src/example/shared/__init__.py": "",
+                "src/example/shared/services/__init__.py": "",
+                "src/example/shared/services/facade.py": "class SharedFacade:\n    pass\n",
+                "src/example/projects/__init__.py": "",
+                "src/example/projects/consumer.py": (
+                    "from example.diagrams.services.facade import DiagramFacade\n"
+                    "from example.shared.services.facade import SharedFacade\n"
+                ),
+            }
+        )
+        edges = {
+            str(item.edge.specifier): (item.edge.resolution, item.edge.to_id)
+            for item in result.outgoing_dependencies("src/example/projects/consumer.py").all()
+        }
+        assert edges == {
+            "example.diagrams.services.facade": (
+                "resolved",
+                "src/example/diagrams/services/facade.py",
+            ),
+            "example.shared.services.facade": (
+                "resolved",
+                "src/example/shared/services/facade.py",
+            ),
+        }
+
     def test_genuinely_ambiguous_module_suffix_does_not_choose_an_arbitrary_target(self) -> None:
         result = self.extract(
             {