modwire 9.3.0__tar.gz → 10.1.0__tar.gz

{modwire-9.3.0 → modwire-10.1.0}/.dev/modwire.egg-info/SOURCES.txt

@@ -291,7 +291,10 @@ src/modwire/shared/code/models/source_inheritance.py
 src/modwire/shared/code/models/source_interface.py
 src/modwire/shared/code/models/source_item_result.py
 src/modwire/shared/code/models/source_manifest.py
+src/modwire/shared/code/models/source_manifest_identity.py
+src/modwire/shared/code/models/source_member_kind.py
 src/modwire/shared/code/models/source_parameter.py
+src/modwire/shared/code/models/source_relation_kind.py
 src/modwire/shared/code/models/source_signature.py
 src/modwire/shared/code/models/source_symbol.py
 src/modwire/shared/code/models/source_type.py
@@ -313,6 +316,7 @@ tests/application/test_01_attacks.py
 tests/application/test_06_happy_path.py
 tests/application/test_07_cache.py
 tests/application/test_08_implementation_manifest.py
+tests/application/test_09_source_manifest_identity.py
 tests/architecture/__init__.py
 tests/architecture/base_test.py
 tests/architecture/boundaries/__init__.py

{modwire-9.3.0 → modwire-10.1.0}/.github/workflows/ci.yml

@@ -33,4 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
+        with:
+          node-version: "20"
       - run: make extractor-check

{modwire-9.3.0 → modwire-10.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 9.3.0
+Version: 10.1.0
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT
@@ -88,6 +88,10 @@ Return a queryable code map with content-addressed persistent reuse.
 
 Return a queryable code map and public outcomes for every applicable cache stage.
 
+### `source_manifest_identity`
+
+Observe the current canonical source-manifest identity without parsing source.
+
 ### `implementation_manifest`
 
 Publish a deterministic, provenance-bearing implementation manifest.
@@ -154,6 +158,18 @@ Generic persistent-cache settings supplied by a caller.
 
 Caller-owned filesystem traversal policy with explicit exclusions and opt-in symlink following.
 
+## `SourceManifestIdentity`
+
+Canonical identity of one observed source manifest.
+
+## `SourceMemberKind`
+
+Ownership kind for a declared class or type member.
+
+## `SourceRelationKind`
+
+Canonical relation kinds published by code maps and implementation manifests.
+
 ## `ImplementationManifest`
 
 A versioned, language-neutral statement of observed implementation facts and provenance.

{modwire-9.3.0 → modwire-10.1.0}/README.md

@@ -60,6 +60,10 @@ Return a queryable code map with content-addressed persistent reuse.
 
 Return a queryable code map and public outcomes for every applicable cache stage.
 
+### `source_manifest_identity`
+
+Observe the current canonical source-manifest identity without parsing source.
+
 ### `implementation_manifest`
 
 Publish a deterministic, provenance-bearing implementation manifest.
@@ -126,6 +130,18 @@ Generic persistent-cache settings supplied by a caller.
 
 Caller-owned filesystem traversal policy with explicit exclusions and opt-in symlink following.
 
+## `SourceManifestIdentity`
+
+Canonical identity of one observed source manifest.
+
+## `SourceMemberKind`
+
+Ownership kind for a declared class or type member.
+
+## `SourceRelationKind`
+
+Canonical relation kinds published by code maps and implementation manifests.
+
 ## `ImplementationManifest`
 
 A versioned, language-neutral statement of observed implementation facts and provenance.

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/application.py

@@ -29,6 +29,9 @@ from .shared.code.models.declaration_identity import DeclarationIdentity
 from .shared.code.models.fact_capability import FactCapability
 from .shared.code.models.queryable_code_map import QueryableCodeMap
 from .shared.code.models.scan_policy import ScanPolicy
+from .shared.code.models.source_manifest_identity import SourceManifestIdentity
+from .shared.code.models.source_member_kind import SourceMemberKind
+from .shared.code.models.source_relation_kind import SourceRelationKind
 
 __all__ = [
     "CacheOptions",
@@ -48,6 +51,9 @@ __all__ = [
     "ModwireApplication",
     "QueryableCodeMap",
     "ScanPolicy",
+    "SourceMemberKind",
+    "SourceManifestIdentity",
+    "SourceRelationKind",
 ]
 
 
@@ -185,6 +191,12 @@ class ModwireApplication:
         cached = self.generate_map_cached_with_diagnostics(language, root, policy, options)
         return CachedResult(value=QueryableCodeMap(code_map=cached.value), outcomes=cached.outcomes)
 
+    def source_manifest_identity(self, language: str, root: str, policy: ScanPolicy) -> SourceManifestIdentity:
+        """Observe the current canonical source-manifest identity without parsing source."""
+
+        request = self.extraction.request(language, str(root))
+        return self.cli.source_manifest_identity(request, policy)
+
     def implementation_manifest(self, code_map: CodeMap, format: ManifestFormat) -> ImplementationManifestDocument:
         """Publish a deterministic, provenance-bearing implementation manifest."""
 
@@ -227,6 +239,9 @@ class ModwireApplication:
                 CachedResult,
                 CacheOptions,
                 ScanPolicy,
+                SourceManifestIdentity,
+                SourceMemberKind,
+                SourceRelationKind,
                 ImplementationManifest,
                 ImplementationManifestDocument,
                 ManifestFormat,

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/cli/facade.py

@@ -13,6 +13,7 @@ from ..shared.code.models.code_map import CodeMap
 from ..shared.code.models.queryable_code_map import QueryableCodeMap
 from ..shared.code.models.scan_policy import ScanPolicy
 from ..shared.code.models.source_extraction import SourceExtraction
+from ..shared.code.models.source_manifest_identity import SourceManifestIdentity
 from .cache.application import CacheApplication
 from .cache.models.cache_options import CacheOptions
 from .cache.models.cache_plan import CachePlan
@@ -49,6 +50,9 @@ class CliFacade:
     def extract(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceExtraction:
         return self.pipeline.extract(request, policy)
 
+    def source_manifest_identity(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceManifestIdentity:
+        return self.pipeline.source_manifest_identity(request, policy)
+
     def has_source_files(self, request: ExtractionRequest, policy: ScanPolicy) -> bool:
         return self.pipeline.has_source_files(request, policy)
 

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/cli/pipeline/application.py

@@ -9,6 +9,7 @@ from ...architecture.report.models.report_node import ReportNode
 from ...extraction.extractors.models.extraction_request import ExtractionRequest
 from ...shared.code.models.scan_policy import ScanPolicy
 from ...shared.code.models.source_extraction import SourceExtraction
+from ...shared.code.models.source_manifest_identity import SourceManifestIdentity
 from .domain import ReportPipelineStep, SourceReader
 from .models.command_request import CommandRequest
 from .models.extractor_command_input import ExtractorCommandInput
@@ -37,6 +38,14 @@ class PipelineApplication:
         self.reader.ensure_available(request.runtime)
         return self.reader.extract_source(request, policy)
 
+    def source_manifest_identity(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceManifestIdentity:
+        self.reader.ensure_available(request.runtime)
+        manifest = self.reader.inventory(request, policy).manifest
+        return SourceManifestIdentity(
+            digest_algorithm=manifest.digest_algorithm,
+            digest=manifest.digest,
+        )
+
     def has_source_files(self, request: ExtractionRequest, policy: ScanPolicy) -> bool:
         self.reader.ensure_available(request.runtime)
         return self.reader.has_source_files(request, policy)

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/extraction/dependency/services/graph_builder.py

@@ -19,7 +19,7 @@ class DependencyGraphBuilder(GraphBuilder):
                 graph.add_edge(
                     file_path,
                     imported_reference.target_file_id,
-                    specifier=imported_reference.normalized_path,
+                    specifier=imported_reference.path,
                     resolution=imported_reference.resolution,
                 )
         return graph

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/extraction/extractors/resources/php/script.src.php

@@ -13,6 +13,7 @@ use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt;
 use PhpParser\ParserFactory;
+use PhpParser\PrettyPrinter\Standard;
 
 function line_count_for_content(string $content): int {
     return max(1, substr_count($content, "\n") + 1);
@@ -164,10 +165,72 @@ function member_visibility(Stmt\ClassMethod|Stmt\Property|Stmt\ClassConst $node)
     return 'public';
 }
 
+function parameter_visibility(Param $param): string {
+    if (($param->flags & Stmt\Class_::MODIFIER_PRIVATE) !== 0) {
+        return 'private';
+    }
+    if (($param->flags & Stmt\Class_::MODIFIER_PROTECTED) !== 0) {
+        return 'protected';
+    }
+    return 'public';
+}
+
+function type_annotation(Node|Name|string|null $type): string {
+    if ($type instanceof Node\NullableType) {
+        return '?' . type_annotation($type->type);
+    }
+    if ($type instanceof Node\UnionType) {
+        return implode('|', array_map(
+            fn (Node $item): string => $item instanceof Node\IntersectionType
+                ? '(' . type_annotation($item) . ')'
+                : type_annotation($item),
+            $type->types
+        ));
+    }
+    if ($type instanceof Node\IntersectionType) {
+        return implode('&', array_map(type_annotation(...), $type->types));
+    }
+    if ($type instanceof Name) {
+        return $type->toCodeString();
+    }
+    return node_name($type);
+}
+
+function type_is_optional(Node|Name|string|null $type): bool {
+    if ($type instanceof Node\NullableType) {
+        return true;
+    }
+    if ($type instanceof Node\UnionType) {
+        return in_array('null', array_map(fn (Node $item): string => strtolower(type_annotation($item)), $type->types), true);
+    }
+    return false;
+}
+
+function attribute_argument(Arg $argument): string {
+    $printer = new Standard();
+    $value = $printer->prettyPrintExpr($argument->value);
+    if ($argument->name !== null) {
+        return node_name($argument->name) . ': ' . $value;
+    }
+    return $argument->unpack ? '...' . $value : $value;
+}
+
+function declaration_annotations(Stmt\ClassLike $node): array {
+    $annotations = [];
+    foreach ($node->attrGroups as $group) {
+        foreach ($group->attrs as $attribute) {
+            $arguments = array_map(attribute_argument(...), $attribute->args);
+            $annotations[] = type_annotation($attribute->name)
+                . ($arguments === [] ? '' : '(' . implode(', ', $arguments) . ')');
+        }
+    }
+    return $annotations;
+}
+
 function parameter_definitions(array $params): array {
     return array_map(fn (Param $param): array => [
         'name' => var_name($param->var),
-        'annotation' => $param->type instanceof Node ? node_name($param->type) : '',
+        'annotation' => type_annotation($param->type),
         'kind' => $param->variadic ? 'variadic_positional' : 'positional',
         'has_default' => $param->default !== null || $param->variadic,
     ], $params);
@@ -220,6 +283,7 @@ function source_callable_entry(
         'kind' => $kind,
         'visibility' => $visibility,
         'visibility_intent' => visibility_intent($name, $visibility),
+        'declaration_annotations' => [],
         'line_start' => $node->getStartLine(),
         'line_end' => $node->getEndLine(),
         'line_count' => line_span($node),
@@ -320,11 +384,15 @@ function expression_target_name(string $expression): string {
     return trim($expression, '$\\');
 }
 
-function collect_imports(array $nodes): array {
+function source_text(Node $node, string $content): string {
+    return substr($content, $node->getStartFilePos(), $node->getEndFilePos() - $node->getStartFilePos() + 1);
+}
+
+function collect_imports(array $nodes, string $content): array {
     $imports = [];
     $statementId = 0;
 
-    walk_nodes($nodes, function (Node $node, array $parents) use (&$imports, &$statementId): void {
+    walk_nodes($nodes, function (Node $node, array $parents) use ($content, &$imports, &$statementId): void {
         if (!$node instanceof Stmt\Use_ && !$node instanceof Stmt\GroupUse) {
             return;
         }
@@ -333,9 +401,9 @@ function collect_imports(array $nodes): array {
         }
 
         $statementId++;
-        $prefix = $node instanceof Stmt\GroupUse ? node_name($node->prefix) . '\\' : '';
+        $prefix = $node instanceof Stmt\GroupUse ? source_text($node->prefix, $content) . '\\' : '';
         foreach ($node->uses as $use) {
-            $path = trim($prefix . node_name($use->name), '\\');
+            $path = $prefix . source_text($use->name, $content);
             $alias = $use->alias !== null ? node_name($use->alias) : '';
             $symbolName = imported_symbol_name($path);
             $imports[] = [
@@ -413,7 +481,11 @@ function collect_definitions(array $nodes, string $sourceId): array {
                     $properties[$propertyProperty->name->toString()] = [
                         'name' => $propertyProperty->name->toString(),
                         'is_optional' => $propertyProperty->default instanceof Expr\ConstFetch
-                            && strtolower(node_name($propertyProperty->default->name)) === 'null',
+                            && strtolower(node_name($propertyProperty->default->name)) === 'null'
+                            || type_is_optional($property->type),
+                        'annotation' => type_annotation($property->type),
+                        'visibility' => member_visibility($property),
+                        'member_kind' => $property->isStatic() ? 'static' : 'instance',
                     ];
                 }
             }
@@ -426,7 +498,10 @@ function collect_definitions(array $nodes, string $sourceId): array {
                         $propertyName = var_name($param->var);
                         $properties[$propertyName] = [
                             'name' => $propertyName,
-                            'is_optional' => $param->default !== null,
+                            'is_optional' => $param->default !== null || type_is_optional($param->type),
+                            'annotation' => type_annotation($param->type),
+                            'visibility' => parameter_visibility($param),
+                            'member_kind' => 'instance',
                         ];
                     }
                 }
@@ -441,6 +516,7 @@ function collect_definitions(array $nodes, string $sourceId): array {
                     'name' => $methodName,
                     'visibility' => member_visibility($method),
                     'visibility_intent' => visibility_intent($methodName, member_visibility($method)),
+                    'declaration_annotations' => [],
                     'line_count' => line_span($method),
                     'declared_args' => count($parameters),
                     'optional_args' => count(array_filter($parameters, fn (array $parameter): bool => $parameter['has_default'])),
@@ -460,6 +536,7 @@ function collect_definitions(array $nodes, string $sourceId): array {
                 'name' => $name,
                 'visibility' => class_visibility($node),
                 'visibility_intent' => visibility_intent($name, class_visibility($node)),
+                'declaration_annotations' => declaration_annotations($node),
                 'properties' => array_values($properties),
                 'line_count' => line_span($node),
             ];
@@ -502,6 +579,7 @@ function collect_definitions(array $nodes, string $sourceId): array {
                     'name' => $method->name->toString(),
                     'visibility' => 'public',
                     'visibility_intent' => visibility_intent($method->name->toString(), 'public'),
+                    'declaration_annotations' => [],
                     'line_count' => line_span($method),
                     'declared_args' => count($parameters),
                     'optional_args' => count(array_filter($parameters, fn (array $parameter): bool => $parameter['has_default'])),
@@ -512,6 +590,7 @@ function collect_definitions(array $nodes, string $sourceId): array {
                 'name' => $name,
                 'visibility' => 'public',
                 'visibility_intent' => visibility_intent($name, 'public'),
+                'declaration_annotations' => declaration_annotations($node),
                 'methods' => $methods,
                 'properties' => [],
                 'signatures' => [],
@@ -534,6 +613,7 @@ function collect_definitions(array $nodes, string $sourceId): array {
                 'name' => $name,
                 'visibility' => 'public',
                 'visibility_intent' => visibility_intent($name, 'public'),
+                'declaration_annotations' => [],
                 'line_count' => line_span($node),
                 'declared_args' => count($parameters),
                 'optional_args' => count(array_filter($parameters, fn (array $parameter): bool => $parameter['has_default'])),
@@ -794,7 +874,7 @@ function extract_file(string $path, ?string $sourceId = null, ?string $sourcesRo
     $graph = collect_values_and_callables($nodes, $resolvedSourceId);
 
     return [
-        'imports' => collect_imports($nodes),
+        'imports' => collect_imports($nodes, $content),
         'exports' => $definitions['exports'],
         'classes' => $definitions['classes'],
         'interfaces' => $definitions['interfaces'],

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/extraction/extractors/resources/typescript/build.py

@@ -12,7 +12,7 @@ class BuildAdapter:
         shutil.copytree(source, work, ignore=shutil.ignore_patterns("build.py", "__pycache__"))
         environment = dict(os.environ)
         environment["npm_config_cache"] = str(work.parent.parent / "cache/npm")
-        BuildAdapter.run(("npm", "ci"), cwd=work, environment=environment)
+        BuildAdapter.run(("npm", "ci", "--engine-strict"), cwd=work, environment=environment)
         BuildAdapter.run(("npm", "run", "check"), cwd=work, environment=environment)
         BuildAdapter.run(("npm", "run", "build"), cwd=work, environment=environment)
         if (work / "script.js").read_bytes() != (source / "script.js").read_bytes():

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/extraction/extractors/resources/typescript/package-lock.json

@@ -11,6 +11,9 @@
       "devDependencies": {
         "@types/node": "^24.0.7",
         "@vercel/ncc": "^0.38.3"
+      },
+      "engines": {
+        "node": "20 || >=22"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -89,15 +92,15 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
-      "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/braces": {

{modwire-9.3.0 → modwire-10.1.0}/src/modwire/extraction/extractors/resources/typescript/package.json

@@ -1,6 +1,9 @@
 {
   "private": true,
   "type": "commonjs",
+  "engines": {
+    "node": "20 || >=22"
+  },
   "scripts": {
     "build": "node build.mjs",
     "check": "tsc --noEmit"