modwire 9.3.0__tar.gz → 10.0.0__tar.gz

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

@@ -291,7 +291,9 @@ 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_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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 9.3.0
+Version: 10.0.0
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT
@@ -154,6 +154,14 @@ Generic persistent-cache settings supplied by a caller.
 
 Caller-owned filesystem traversal policy with explicit exclusions and opt-in symlink following.
 
+## `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.0.0}/README.md

@@ -126,6 +126,14 @@ Generic persistent-cache settings supplied by a caller.
 
 Caller-owned filesystem traversal policy with explicit exclusions and opt-in symlink following.
 
+## `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.0.0}/src/modwire/application.py

@@ -29,6 +29,8 @@ 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_member_kind import SourceMemberKind
+from .shared.code.models.source_relation_kind import SourceRelationKind
 
 __all__ = [
     "CacheOptions",
@@ -48,6 +50,8 @@ __all__ = [
     "ModwireApplication",
     "QueryableCodeMap",
     "ScanPolicy",
+    "SourceMemberKind",
+    "SourceRelationKind",
 ]
 
 
@@ -227,6 +231,8 @@ class ModwireApplication:
                 CachedResult,
                 CacheOptions,
                 ScanPolicy,
+                SourceMemberKind,
+                SourceRelationKind,
                 ImplementationManifest,
                 ImplementationManifestDocument,
                 ManifestFormat,

{modwire-9.3.0 → modwire-10.0.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.0.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.0.0}/src/modwire/extraction/extractors/resources/typescript/script.js

@@ -229767,6 +229767,14 @@ function visibilityFromModifiers(node, fallback = 'public') {
     const name = typeof node.getName === 'function' ? node.getName() : '';
     return name.startsWith('#') ? 'private' : fallback;
 }
+function memberKindFromModifiers(node) {
+    return node.getModifiers().some(modifier => modifier.getKind() === ts_morph_1.SyntaxKind.StaticKeyword)
+        ? 'static'
+        : 'instance';
+}
+function declarationAnnotations(node) {
+    return node.getDecorators().map(decorator => decorator.getExpression().getText());
+}
 function isExported(node) {
     return Boolean((typeof node.hasExportKeyword === 'function' && node.hasExportKeyword())
         || (typeof node.isDefaultExport === 'function' && node.isDefaultExport()));
@@ -229902,6 +229910,7 @@ function sourceCallable(options) {
         kind: options.kind,
         visibility: options.visibility,
         visibility_intent: visibilityIntent(options.name, options.visibility),
+        declaration_annotations: [],
         line_start: lineNumberAt(options.lineStarts, options.startIndex),
         line_end: lineNumberAt(options.lineStarts, options.endIndex),
         line_count: lineSpan(options.lineStarts, options.startIndex, options.endIndex),
@@ -230162,10 +230171,27 @@ function collectExports(sourceFile, filePath, sourcesRoot) {
 function classDeclarationIsAbstract(classDeclaration) {
     return classDeclaration.getModifiers().some(modifier => modifier.getKind() === ts_morph_1.SyntaxKind.AbstractKeyword);
 }
-function classPropertyIsOptional(property) {
+function typeIncludesUndefined(typeNode) {
+    if (typeNode === undefined) {
+        return false;
+    }
+    if (typeNode.kind === ts_morph_1.SyntaxKind.UndefinedKeyword) {
+        return true;
+    }
+    if (ts_morph_1.ts.isUnionTypeNode(typeNode)) {
+        return typeNode.types.some(typeIncludesUndefined);
+    }
+    if (ts_morph_1.ts.isParenthesizedTypeNode(typeNode)) {
+        return typeIncludesUndefined(typeNode.type);
+    }
+    return false;
+}
+function propertyIsOptional(property) {
+    const typeNode = typeof property.getTypeNode === 'function' ? property.getTypeNode() : undefined;
+    const initializer = typeof property.getInitializer === 'function' ? property.getInitializer() : undefined;
     return Boolean((typeof property.hasQuestionToken === 'function' && property.hasQuestionToken())
-        || textOf(typeof property.getTypeNode === 'function' ? property.getTypeNode() : undefined).includes('undefined')
-        || textOf(property.getInitializer()).match(/^(undefined|null)$/));
+        || typeIncludesUndefined(typeNode?.compilerNode)
+        || textOf(initializer).match(/^(undefined|null)$/));
 }
 function sourceClassMethod(method, lineStarts, name = propertyNameText(method)) {
     const parameters = functionParameters(method);
@@ -230174,6 +230200,7 @@ function sourceClassMethod(method, lineStarts, name = propertyNameText(method))
         name,
         visibility,
         visibility_intent: visibilityIntent(name, visibility),
+        declaration_annotations: [],
         line_count: lineSpan(lineStarts, method.getStart(), endIndexForNode(method)),
         declared_args: parameters.length,
         optional_args: parameters.filter(parameter => parameter.has_default).length,
@@ -230192,13 +230219,26 @@ function collectClasses(sourceFile, lineStarts, sourceId) {
         });
         const properties = new Map();
         for (const property of classDeclaration.getProperties()) {
-            properties.set(propertyNameText(property), classPropertyIsOptional(property));
+            const propertyName = propertyNameText(property);
+            properties.set(propertyName, {
+                name: propertyName,
+                is_optional: propertyIsOptional(property),
+                annotation: textOf(property.getTypeNode()),
+                visibility: visibilityFromModifiers(property),
+                member_kind: memberKindFromModifiers(property),
+            });
         }
         for (const constructorDeclaration of classDeclaration.getConstructors()) {
             for (const parameter of constructorDeclaration.getParameters()) {
                 if (parameter.isParameterProperty()) {
                     const parameterName = singleBindingName(parameter.getNameNode()) || parameter.getNameNode().getText();
-                    properties.set(parameterName, parameter.isOptional() || parameter.getInitializer() !== undefined);
+                    properties.set(parameterName, {
+                        name: parameterName,
+                        is_optional: parameter.isOptional() || parameter.getInitializer() !== undefined,
+                        annotation: textOf(parameter.getTypeNode()),
+                        visibility: visibilityFromModifiers(parameter),
+                        member_kind: 'instance',
+                    });
                 }
             }
         }
@@ -230226,10 +230266,8 @@ function collectClasses(sourceFile, lineStarts, sourceId) {
             name,
             visibility,
             visibility_intent: visibilityIntent(name, visibility),
-            properties: Array.from(properties, ([propertyName, isOptional]) => ({
-                name: propertyName,
-                is_optional: Boolean(isOptional),
-            })),
+            declaration_annotations: declarationAnnotations(classDeclaration),
+            properties: Array.from(properties.values()),
             line_count: lineSpan(lineStarts, classDeclaration.getStart(), endIndexForNode(classDeclaration)),
         };
         if (classDeclarationIsAbstract(classDeclaration)) {
@@ -230279,7 +230317,10 @@ function collectInterfaces(sourceFile, lineStarts, sourceId) {
         const visibility = moduleVisibility(interfaceDeclaration);
         const properties = interfaceDeclaration.getProperties().map(property => ({
             name: propertyNameText(property),
-            is_optional: Boolean(typeof property.hasQuestionToken === 'function' && property.hasQuestionToken()),
+            is_optional: propertyIsOptional(property),
+            annotation: textOf(property.getTypeNode()),
+            visibility: 'public',
+            member_kind: 'instance',
         }));
         const methods = interfaceDeclaration.getMethods().map(method => sourceClassMethod(method, lineStarts));
         return {
@@ -230292,6 +230333,7 @@ function collectInterfaces(sourceFile, lineStarts, sourceId) {
             name: interfaceDeclaration.getName(),
             visibility,
             visibility_intent: visibilityIntent(interfaceDeclaration.getName(), visibility),
+            declaration_annotations: [],
             methods,
             properties,
             signatures: collectSignaturesFromMembers(interfaceDeclaration.getMembers(), lineStarts),
@@ -230306,7 +230348,10 @@ function collectTypes(sourceFile, lineStarts, sourceId) {
         const members = ts_morph_1.Node.isTypeLiteral(typeNode) ? typeNode.getMembers() : [];
         const properties = members.filter(member => ts_morph_1.Node.isPropertySignature(member)).map(property => ({
             name: propertyNameText(property),
-            is_optional: Boolean(typeof property.hasQuestionToken === 'function' && property.hasQuestionToken()),
+            is_optional: propertyIsOptional(property),
+            annotation: textOf(property.getTypeNode()),
+            visibility: 'public',
+            member_kind: 'instance',
         }));
         return {
             declaration_id: {
@@ -230318,6 +230363,7 @@ function collectTypes(sourceFile, lineStarts, sourceId) {
             name: typeAlias.getName(),
             visibility,
             visibility_intent: visibilityIntent(typeAlias.getName(), visibility),
+            declaration_annotations: [],
             properties,
             signatures: collectSignaturesFromMembers(members, lineStarts),
             line_count: lineSpan(lineStarts, typeAlias.getStart(), endIndexForNode(typeAlias)),
@@ -230394,6 +230440,7 @@ function collectFunctions(sourceFile, lineStarts, sourceId) {
             name,
             visibility,
             visibility_intent: visibilityIntent(name, visibility),
+            declaration_annotations: [],
             line_count: lineSpan(lineStarts, node.getStart(), endIndexForNode(node)),
             declared_args: parameters.length,
             optional_args: parameters.filter(parameter => parameter.has_default).length,

{modwire-9.3.0 → modwire-10.0.0}/src/modwire/extraction/extractors/resources/typescript/script.ts

@@ -136,6 +136,16 @@ function visibilityFromModifiers(node, fallback = 'public') {
     return name.startsWith('#') ? 'private' : fallback;
 }
 
+function memberKindFromModifiers(node) {
+    return node.getModifiers().some(modifier => modifier.getKind() === SyntaxKind.StaticKeyword)
+        ? 'static'
+        : 'instance';
+}
+
+function declarationAnnotations(node) {
+    return node.getDecorators().map(decorator => decorator.getExpression().getText());
+}
+
 function isExported(node) {
     return Boolean(
         (typeof node.hasExportKeyword === 'function' && node.hasExportKeyword())
@@ -287,6 +297,7 @@ function sourceCallable(options) {
         kind: options.kind,
         visibility: options.visibility,
         visibility_intent: visibilityIntent(options.name, options.visibility),
+        declaration_annotations: [],
         line_start: lineNumberAt(options.lineStarts, options.startIndex),
         line_end: lineNumberAt(options.lineStarts, options.endIndex),
         line_count: lineSpan(options.lineStarts, options.startIndex, options.endIndex),
@@ -575,11 +586,29 @@ function classDeclarationIsAbstract(classDeclaration) {
     return classDeclaration.getModifiers().some(modifier => modifier.getKind() === SyntaxKind.AbstractKeyword);
 }
 
-function classPropertyIsOptional(property) {
+function typeIncludesUndefined(typeNode) {
+    if (typeNode === undefined) {
+        return false;
+    }
+    if (typeNode.kind === SyntaxKind.UndefinedKeyword) {
+        return true;
+    }
+    if (ts.isUnionTypeNode(typeNode)) {
+        return typeNode.types.some(typeIncludesUndefined);
+    }
+    if (ts.isParenthesizedTypeNode(typeNode)) {
+        return typeIncludesUndefined(typeNode.type);
+    }
+    return false;
+}
+
+function propertyIsOptional(property) {
+    const typeNode = typeof property.getTypeNode === 'function' ? property.getTypeNode() : undefined;
+    const initializer = typeof property.getInitializer === 'function' ? property.getInitializer() : undefined;
     return Boolean(
         (typeof property.hasQuestionToken === 'function' && property.hasQuestionToken())
-        || textOf(typeof property.getTypeNode === 'function' ? property.getTypeNode() : undefined).includes('undefined')
-        || textOf(property.getInitializer()).match(/^(undefined|null)$/),
+        || typeIncludesUndefined(typeNode?.compilerNode)
+        || textOf(initializer).match(/^(undefined|null)$/),
     );
 }
 
@@ -590,6 +619,7 @@ function sourceClassMethod(method, lineStarts, name = propertyNameText(method))
         name,
         visibility,
         visibility_intent: visibilityIntent(name, visibility),
+        declaration_annotations: [],
         line_count: lineSpan(lineStarts, method.getStart(), endIndexForNode(method)),
         declared_args: parameters.length,
         optional_args: parameters.filter(parameter => parameter.has_default).length,
@@ -611,13 +641,26 @@ function collectClasses(sourceFile, lineStarts, sourceId) {
 
         const properties = new Map();
         for (const property of classDeclaration.getProperties()) {
-            properties.set(propertyNameText(property), classPropertyIsOptional(property));
+            const propertyName = propertyNameText(property);
+            properties.set(propertyName, {
+                name: propertyName,
+                is_optional: propertyIsOptional(property),
+                annotation: textOf(property.getTypeNode()),
+                visibility: visibilityFromModifiers(property),
+                member_kind: memberKindFromModifiers(property),
+            });
         }
         for (const constructorDeclaration of classDeclaration.getConstructors()) {
             for (const parameter of constructorDeclaration.getParameters()) {
                 if (parameter.isParameterProperty()) {
                     const parameterName = singleBindingName(parameter.getNameNode()) || parameter.getNameNode().getText();
-                    properties.set(parameterName, parameter.isOptional() || parameter.getInitializer() !== undefined);
+                    properties.set(parameterName, {
+                        name: parameterName,
+                        is_optional: parameter.isOptional() || parameter.getInitializer() !== undefined,
+                        annotation: textOf(parameter.getTypeNode()),
+                        visibility: visibilityFromModifiers(parameter),
+                        member_kind: 'instance',
+                    });
                 }
             }
         }
@@ -646,10 +689,8 @@ function collectClasses(sourceFile, lineStarts, sourceId) {
             name,
             visibility,
             visibility_intent: visibilityIntent(name, visibility),
-            properties: Array.from(properties, ([propertyName, isOptional]) => ({
-                name: propertyName,
-                is_optional: Boolean(isOptional),
-            })),
+            declaration_annotations: declarationAnnotations(classDeclaration),
+            properties: Array.from(properties.values()),
             line_count: lineSpan(lineStarts, classDeclaration.getStart(), endIndexForNode(classDeclaration)),
         };
 
@@ -700,7 +741,10 @@ function collectInterfaces(sourceFile, lineStarts, sourceId) {
         const visibility = moduleVisibility(interfaceDeclaration);
         const properties = interfaceDeclaration.getProperties().map(property => ({
             name: propertyNameText(property),
-            is_optional: Boolean(typeof property.hasQuestionToken === 'function' && property.hasQuestionToken()),
+            is_optional: propertyIsOptional(property),
+            annotation: textOf(property.getTypeNode()),
+            visibility: 'public',
+            member_kind: 'instance',
         }));
         const methods = interfaceDeclaration.getMethods().map(method => sourceClassMethod(method, lineStarts));
         return {
@@ -713,6 +757,7 @@ function collectInterfaces(sourceFile, lineStarts, sourceId) {
             name: interfaceDeclaration.getName(),
             visibility,
             visibility_intent: visibilityIntent(interfaceDeclaration.getName(), visibility),
+            declaration_annotations: [],
             methods,
             properties,
             signatures: collectSignaturesFromMembers(interfaceDeclaration.getMembers(), lineStarts),
@@ -728,7 +773,10 @@ function collectTypes(sourceFile, lineStarts, sourceId) {
         const members = Node.isTypeLiteral(typeNode) ? typeNode.getMembers() : [];
         const properties = members.filter(member => Node.isPropertySignature(member)).map(property => ({
             name: propertyNameText(property),
-            is_optional: Boolean(typeof property.hasQuestionToken === 'function' && property.hasQuestionToken()),
+            is_optional: propertyIsOptional(property),
+            annotation: textOf(property.getTypeNode()),
+            visibility: 'public',
+            member_kind: 'instance',
         }));
         return {
             declaration_id: {
@@ -740,6 +788,7 @@ function collectTypes(sourceFile, lineStarts, sourceId) {
             name: typeAlias.getName(),
             visibility,
             visibility_intent: visibilityIntent(typeAlias.getName(), visibility),
+            declaration_annotations: [],
             properties,
             signatures: collectSignaturesFromMembers(members, lineStarts),
             line_count: lineSpan(lineStarts, typeAlias.getStart(), endIndexForNode(typeAlias)),
@@ -821,6 +870,7 @@ function collectFunctions(sourceFile, lineStarts, sourceId) {
             name,
             visibility,
             visibility_intent: visibilityIntent(name, visibility),
+            declaration_annotations: [],
             line_count: lineSpan(lineStarts, node.getStart(), endIndexForNode(node)),
             declared_args: parameters.length,
             optional_args: parameters.filter(parameter => parameter.has_default).length,

{modwire-9.3.0 → modwire-10.0.0}/src/modwire/extraction/extractors/services/php_extractor.py

@@ -52,17 +52,23 @@ class PhpExtractor(SourceExtractor):
                 CapabilityCoverage(
                     capability=FactCapability.ANNOTATIONS,
                     status=CapabilityStatus.PARTIAL,
-                    explanation="Type annotations are extracted; PHP attributes are not yet emitted.",
+                    explanation=(
+                        "Class and interface attributes and declared type annotations are extracted; "
+                        "attributes on other declarations are not yet emitted."
+                    ),
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.MODIFIERS,
                     status=CapabilityStatus.PARTIAL,
-                    explanation="Visibility intent and callable kind are normalized.",
+                    explanation="Visibility intent, callable kind, and property member kind are normalized.",
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.ATTRIBUTES,
                     status=CapabilityStatus.SUPPORTED,
-                    explanation="Declared and promoted properties with optionality are extracted.",
+                    explanation=(
+                        "Declared and promoted property identity, exact declared type, visibility, optionality, "
+                        "and member kind are extracted."
+                    ),
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.INHERITANCE,

{modwire-9.3.0 → modwire-10.0.0}/src/modwire/extraction/extractors/services/python_extractor.py

@@ -54,19 +54,22 @@ class PythonExtractor(SourceExtractor):
                     capability=FactCapability.ANNOTATIONS,
                     status=CapabilityStatus.PARTIAL,
                     explanation=(
-                        "Callable decorators and type annotations are extracted; "
+                        "Class and callable decorators and declared type annotations are extracted; "
                         "arbitrary annotations are not evaluated."
                     ),
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.MODIFIERS,
                     status=CapabilityStatus.PARTIAL,
-                    explanation="Visibility intent and callable kind are normalized.",
+                    explanation="Visibility intent, callable kind, and class property member kind are normalized.",
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.ATTRIBUTES,
                     status=CapabilityStatus.SUPPORTED,
-                    explanation="Class properties and optionality are extracted.",
+                    explanation=(
+                        "Class property identity, exact declared type, visibility, optionality, and member kind "
+                        "are extracted."
+                    ),
                 ),
                 CapabilityCoverage(
                     capability=FactCapability.INHERITANCE,