@colbymchenry/codegraph-darwin-x64 0.9.4 → 0.9.6

package/lib/dist/extraction/tree-sitter.js

@@ -48,6 +48,7 @@ const liquid_extractor_1 = require("./liquid-extractor");
 const svelte_extractor_1 = require("./svelte-extractor");
 const dfm_extractor_1 = require("./dfm-extractor");
 const vue_extractor_1 = require("./vue-extractor");
+const mybatis_extractor_1 = require("./mybatis-extractor");
 const frameworks_1 = require("../resolution/frameworks");
 // Re-export for backward compatibility
 var tree_sitter_helpers_2 = require("./tree-sitter-helpers");
@@ -56,6 +57,9 @@ Object.defineProperty(exports, "generateNodeId", { enumerable: true, get: functi
  * Extract the name from a node based on language
  */
 function extractName(node, source, extractor) {
+    const hookName = extractor.resolveName?.(node, source);
+    if (hookName)
+        return hookName;
     // Try field name first
     const nameNode = (0, tree_sitter_helpers_1.getChildByField)(node, extractor.nameField);
     if (nameNode) {
@@ -392,6 +396,20 @@ class TreeSitterExtractor {
         else if (nodeType === 'impl_item') {
             this.extractRustImplItem(node);
         }
+        // TypeScript interface members: property_signature (`foo: T`, `foo?: T`)
+        // and method_signature (`foo(arg: A): R`) both carry type annotations the
+        // interface walker would otherwise drop. Extract them as `references`
+        // edges from the interface so resolvers can wire callers/impact for
+        // types that only appear in interface members.
+        else if ((nodeType === 'property_signature' || nodeType === 'method_signature') &&
+            this.isInsideClassLikeNode() &&
+            this.TYPE_ANNOTATION_LANGUAGES.has(this.language)) {
+            const parentId = this.nodeStack[this.nodeStack.length - 1];
+            if (parentId) {
+                this.extractTypeAnnotations(node, parentId);
+            }
+            // don't skipChildren — nested signatures still need traversal
+        }
         // Visit children (unless the extract method already visited them)
         if (!skipChildren) {
             for (let i = 0; i < node.namedChildCount; i++) {
@@ -648,6 +666,11 @@ class TreeSitterExtractor {
             // in inline objects). These are ephemeral and create noise (e.g., Svelte context
             // objects: `ctx.set({ get view() { ... } })`).
             if (node.parent?.type === 'object' || node.parent?.type === 'object_expression') {
+                const body = this.extractor.resolveBody?.(node, this.extractor.bodyField)
+                    ?? (0, tree_sitter_helpers_1.getChildByField)(node, this.extractor.bodyField);
+                if (body) {
+                    this.visitFunctionBody(body, '');
+                }
                 return;
             }
             // Not inside a class-like node and no receiver type, treat as function
@@ -849,12 +872,13 @@ class TreeSitterExtractor {
         const docstring = (0, tree_sitter_helpers_1.getPrecedingDocstring)(node, this.source);
         const visibility = this.extractor.getVisibility?.(node);
         const isStatic = this.extractor.isStatic?.(node) ?? false;
-        // Property name is a direct identifier child
-        const nameNode = (0, tree_sitter_helpers_1.getChildByField)(node, 'name')
-            || node.namedChildren.find(c => c.type === 'identifier');
-        if (!nameNode)
+        const hookName = this.extractor.extractPropertyName?.(node, this.source);
+        const nameNode = hookName
+            ? null
+            : (0, tree_sitter_helpers_1.getChildByField)(node, 'name') || node.namedChildren.find(c => c.type === 'identifier');
+        const name = hookName ?? (nameNode ? (0, tree_sitter_helpers_1.getNodeText)(nameNode, this.source) : null);
+        if (!name)
             return;
-        const name = (0, tree_sitter_helpers_1.getNodeText)(nameNode, this.source);
         // Get property type from the type child (first named child that isn't modifier or identifier)
         const typeNode = node.namedChildren.find(c => c.type !== 'modifier' && c.type !== 'modifiers'
             && c.type !== 'identifier' && c.type !== 'accessor_list'
@@ -871,6 +895,10 @@ class TreeSitterExtractor {
         // decorator->target relationship for class properties too.
         if (propNode) {
             this.extractDecoratorsFor(node, propNode.id);
+            // Emit `references` edges from the property to types named in its
+            // type annotation (#381). The generic walker handles TS-style
+            // `type_annotation` children; the C# branch walks the `type` field.
+            this.extractTypeAnnotations(node, propNode.id);
         }
     }
     /**
@@ -943,8 +971,15 @@ class TreeSitterExtractor {
                 });
                 // Java/Kotlin annotations / TS field decorators sit on the
                 // outer field_declaration, not on the individual declarator.
-                if (fieldNode)
+                if (fieldNode) {
                     this.extractDecoratorsFor(node, fieldNode.id);
+                    // Same as properties: emit `references` to the field's annotated
+                    // type. The outer `field_declaration` is the right scope to
+                    // search from — C# carries the `type` inside `variable_declaration`
+                    // and the language-aware path in `extractTypeAnnotations` descends
+                    // into that wrapper (#381).
+                    this.extractTypeAnnotations(node, fieldNode.id);
+                }
             }
         }
         else {
@@ -1012,6 +1047,11 @@ class TreeSitterExtractor {
                         if (varNode) {
                             this.extractVariableTypeAnnotation(child, varNode.id);
                         }
+                        if (valueNode &&
+                            valueNode.type !== 'object' &&
+                            valueNode.type !== 'object_expression') {
+                            this.visitFunctionBody(valueNode, '');
+                        }
                         // Exported const object-of-functions: `export const actions =
                         // { default: async () => {} }` (SvelteKit form actions / handler maps
                         // / route tables). Extract each function-valued property as a function
@@ -1217,8 +1257,87 @@ class TreeSitterExtractor {
             const value = (0, tree_sitter_helpers_1.getChildByField)(node, 'value');
             if (value) {
                 this.extractTypeRefsFromSubtree(value, typeAliasNode.id);
+                // `type X = { foo: T; bar(): T }` — make the members first-class
+                // property/method nodes under the type alias so `recorder.stop()`
+                // can attach the call edge to `RecorderHandle.stop` instead of
+                // an unrelated class method picked by path-proximity (#359).
+                if (this.language === 'typescript' || this.language === 'tsx') {
+                    this.extractTsTypeAliasMembers(value, typeAliasNode);
+                }
+            }
+        }
+        return false;
+    }
+    /**
+     * Surface the members of a TypeScript `type X = { ... }` (or intersection
+     * thereof) as `property` / `method` nodes under the type-alias node. Only
+     * walks the immediate object_type / intersection operands so anonymous
+     * nested object types inside generic arguments (`Promise<{ ok: true }>`)
+     * don't produce phantom members.
+     */
+    extractTsTypeAliasMembers(value, typeAliasNode) {
+        const objectTypes = [];
+        if (value.type === 'object_type') {
+            objectTypes.push(value);
+        }
+        else if (value.type === 'intersection_type') {
+            for (let i = 0; i < value.namedChildCount; i++) {
+                const op = value.namedChild(i);
+                if (op && op.type === 'object_type')
+                    objectTypes.push(op);
+            }
+        }
+        else {
+            return;
+        }
+        this.nodeStack.push(typeAliasNode.id);
+        for (const objType of objectTypes) {
+            for (let i = 0; i < objType.namedChildCount; i++) {
+                const child = objType.namedChild(i);
+                if (!child)
+                    continue;
+                if (child.type !== 'property_signature' && child.type !== 'method_signature')
+                    continue;
+                const nameNode = (0, tree_sitter_helpers_1.getChildByField)(child, 'name');
+                const memberName = nameNode ? (0, tree_sitter_helpers_1.getNodeText)(nameNode, this.source) : '';
+                if (!memberName)
+                    continue;
+                // `foo: () => T` and `foo(): T` are functionally a method on the
+                // type contract. Treat the property_signature with a function-typed
+                // annotation as a method too so call sites can resolve to it.
+                const memberKind = child.type === 'method_signature'
+                    ? 'method'
+                    : this.isTsFunctionTypedProperty(child) ? 'method' : 'property';
+                const docstring = (0, tree_sitter_helpers_1.getPrecedingDocstring)(child, this.source);
+                const signature = (0, tree_sitter_helpers_1.getNodeText)(child, this.source);
+                this.createNode(memberKind, memberName, child, {
+                    docstring,
+                    signature,
+                    qualifiedName: `${typeAliasNode.name}::${memberName}`,
+                });
+                // Emit `references` edges from the type alias to types named in the
+                // member's signature, matching the interface-member behavior added in
+                // #432. We attach refs to the type-alias parent (consistent with
+                // interface property_signature treatment).
+                this.extractTypeAnnotations(child, typeAliasNode.id);
             }
         }
+        this.nodeStack.pop();
+    }
+    /**
+     * `foo: () => T` → property_signature whose type_annotation contains a
+     * `function_type`. Treat that as a method-shaped contract member, since
+     * the call site `obj.foo()` has identical semantics to `bar(): T`.
+     */
+    isTsFunctionTypedProperty(propertySignature) {
+        const typeAnno = (0, tree_sitter_helpers_1.getChildByField)(propertySignature, 'type');
+        if (!typeAnno)
+            return false;
+        for (let i = 0; i < typeAnno.namedChildCount; i++) {
+            const inner = typeAnno.namedChild(i);
+            if (inner && inner.type === 'function_type')
+                return true;
+        }
         return false;
     }
     // extractExportedVariables removed — the walker now descends into
@@ -1369,7 +1488,25 @@ class TreeSitterExtractor {
         if (nameField && objectField && (node.type === 'method_invocation' || node.type === 'member_call_expression' || node.type === 'scoped_call_expression')) {
             // Method call with explicit receiver: receiver.method() / $receiver->method() / ClassName::method()
             const methodName = (0, tree_sitter_helpers_1.getNodeText)(nameField, this.source);
-            let receiverName = (0, tree_sitter_helpers_1.getNodeText)(objectField, this.source);
+            // Java `this.userbo.toLogin2()` parses as method_invocation(object=field_access(this, userbo)).
+            // Without unwrapping, receiverName is `this.userbo` and the name-matcher's
+            // single-dot receiver regex fails. Pull out the immediate field after `this.`
+            // so the receiver is the field name (`userbo`), which the resolver can then
+            // look up in the enclosing class's field declarations.
+            let receiverName;
+            if (objectField.type === 'field_access') {
+                const inner = (0, tree_sitter_helpers_1.getChildByField)(objectField, 'object');
+                const fld = (0, tree_sitter_helpers_1.getChildByField)(objectField, 'field');
+                if (inner && fld && (inner.type === 'this' || inner.type === 'this_expression')) {
+                    receiverName = (0, tree_sitter_helpers_1.getNodeText)(fld, this.source);
+                }
+                else {
+                    receiverName = (0, tree_sitter_helpers_1.getNodeText)(objectField, this.source);
+                }
+            }
+            else {
+                receiverName = (0, tree_sitter_helpers_1.getNodeText)(objectField, this.source);
+            }
             // Strip PHP $ prefix from variable names
             receiverName = receiverName.replace(/^\$/, '');
             if (methodName) {
@@ -1383,13 +1520,51 @@ class TreeSitterExtractor {
                 }
             }
         }
+        else if (node.type === 'message_expression') {
+            // ObjC message expressions emit one `method` field child per selector
+            // keyword: `[obj a:1 b:2 c:3]` has three `method=identifier` siblings.
+            // Joining them with `:` reconstructs the full selector and matches the
+            // multi-part selector names produced by the ObjC method_definition
+            // extractor (`extractObjcMethodName` in languages/objc.ts). Without this
+            // join, multi-keyword call sites only emitted the first keyword and never
+            // resolved to their target methods (e.g. `GET:parameters:headers:...` had
+            // zero callers despite obviously being called).
+            const methodKeywords = [];
+            for (let i = 0; i < node.namedChildCount; i++) {
+                if (node.fieldNameForNamedChild(i) === 'method') {
+                    const kw = node.namedChild(i);
+                    if (kw)
+                        methodKeywords.push((0, tree_sitter_helpers_1.getNodeText)(kw, this.source));
+                }
+            }
+            if (methodKeywords.length > 0) {
+                const methodName = methodKeywords.length === 1
+                    ? methodKeywords[0]
+                    : methodKeywords.map((k) => `${k}:`).join('');
+                const receiverField = (0, tree_sitter_helpers_1.getChildByField)(node, 'receiver');
+                const SKIP_RECEIVERS = new Set(['self', 'super']);
+                if (receiverField && receiverField.type !== 'message_expression') {
+                    const receiverName = (0, tree_sitter_helpers_1.getNodeText)(receiverField, this.source);
+                    if (receiverName && !SKIP_RECEIVERS.has(receiverName)) {
+                        calleeName = `${receiverName}.${methodName}`;
+                    }
+                    else {
+                        calleeName = methodName;
+                    }
+                }
+                else {
+                    calleeName = methodName;
+                }
+            }
+        }
         else {
             const func = (0, tree_sitter_helpers_1.getChildByField)(node, 'function') || node.namedChild(0);
             if (func) {
-                if (func.type === 'member_expression' || func.type === 'attribute' || func.type === 'selector_expression' || func.type === 'navigation_expression') {
+                if (func.type === 'member_expression' || func.type === 'attribute' || func.type === 'selector_expression' || func.type === 'navigation_expression' || func.type === 'field_expression') {
                     // Method call: obj.method() or obj.field.method()
                     // Go uses selector_expression with 'field', JS/TS uses member_expression with 'property'
                     // Kotlin uses navigation_expression with navigation_suffix > simple_identifier
+                    // C/C++ use field_expression for both `obj.method()` and `ptr->method()`
                     let property = (0, tree_sitter_helpers_1.getChildByField)(func, 'property') || (0, tree_sitter_helpers_1.getChildByField)(func, 'field');
                     if (!property) {
                         const child1 = func.namedChild(1);
@@ -1407,9 +1582,12 @@ class TreeSitterExtractor {
                         // This helps the resolver distinguish method calls from bare function calls
                         // (e.g., Python's console.print() vs builtin print())
                         // Skip self/this/cls as they don't aid resolution
-                        const receiver = (0, tree_sitter_helpers_1.getChildByField)(func, 'object') || (0, tree_sitter_helpers_1.getChildByField)(func, 'operand') || func.namedChild(0);
+                        const receiver = (0, tree_sitter_helpers_1.getChildByField)(func, 'object') ||
+                            (0, tree_sitter_helpers_1.getChildByField)(func, 'operand') ||
+                            (0, tree_sitter_helpers_1.getChildByField)(func, 'argument') ||
+                            func.namedChild(0);
                         const SKIP_RECEIVERS = new Set(['self', 'this', 'cls', 'super']);
-                        if (receiver && (receiver.type === 'identifier' || receiver.type === 'simple_identifier')) {
+                        if (receiver && (receiver.type === 'identifier' || receiver.type === 'simple_identifier' || receiver.type === 'field_identifier')) {
                             const receiverName = (0, tree_sitter_helpers_1.getNodeText)(receiver, this.source);
                             if (!SKIP_RECEIVERS.has(receiverName)) {
                                 calleeName = `${receiverName}.${methodName}`;
@@ -1691,6 +1869,42 @@ class TreeSitterExtractor {
      * Extract inheritance relationships
      */
     extractInheritance(node, classId) {
+        // Objective-C @interface MyClass : NSObject <ProtoA, ProtoB>
+        if (node.type === 'class_interface') {
+            const superclass = (0, tree_sitter_helpers_1.getChildByField)(node, 'superclass');
+            if (superclass) {
+                const name = (0, tree_sitter_helpers_1.getNodeText)(superclass, this.source);
+                this.unresolvedReferences.push({
+                    fromNodeId: classId,
+                    referenceName: name,
+                    referenceKind: 'extends',
+                    line: superclass.startPosition.row + 1,
+                    column: superclass.startPosition.column,
+                });
+            }
+            for (let j = 0; j < node.namedChildCount; j++) {
+                const argList = node.namedChild(j);
+                if (argList?.type !== 'parameterized_arguments')
+                    continue;
+                for (let k = 0; k < argList.namedChildCount; k++) {
+                    const typeName = argList.namedChild(k);
+                    if (!typeName)
+                        continue;
+                    const typeId = typeName.namedChildren.find((c) => c.type === 'type_identifier' || c.type === 'identifier');
+                    if (!typeId)
+                        continue;
+                    const protocolName = (0, tree_sitter_helpers_1.getNodeText)(typeId, this.source);
+                    this.unresolvedReferences.push({
+                        fromNodeId: classId,
+                        referenceName: protocolName,
+                        referenceKind: 'implements',
+                        line: typeId.startPosition.row + 1,
+                        column: typeId.startPosition.column,
+                    });
+                }
+            }
+            return;
+        }
         // Look for extends/implements clauses
         for (let i = 0; i < node.namedChildCount; i++) {
             const child = node.namedChild(i);
@@ -2006,6 +2220,16 @@ class TreeSitterExtractor {
             return;
         if (!this.TYPE_ANNOTATION_LANGUAGES.has(this.language))
             return;
+        // C# tree-sitter doesn't produce `type_identifier` leaves — it uses
+        // `identifier`, `predefined_type`, `qualified_name`, `generic_name`,
+        // etc. — so the generic walker below emits zero references for it.
+        // Dispatch to a C#-aware path that only walks type-position subtrees
+        // (the `type` field of a parameter/method/property/field), so
+        // parameter NAMES never accidentally surface as type refs (#381).
+        if (this.language === 'csharp') {
+            this.extractCsharpTypeRefs(node, nodeId);
+            return;
+        }
         // Extract parameter type annotations
         const params = (0, tree_sitter_helpers_1.getChildByField)(node, this.extractor.paramsField || 'parameters');
         if (params) {
@@ -2022,6 +2246,112 @@ class TreeSitterExtractor {
             this.extractTypeRefsFromSubtree(typeAnnotation, nodeId);
         }
     }
+    /**
+     * Extract C# type references from a node that owns a type position —
+     * a method/constructor declaration, a property declaration, or a
+     * field declaration (which wraps `variable_declaration → type`).
+     *
+     * Walks ONLY into known type fields, so parameter names like
+     * `request` in `Build(UserDto request)` are never mis-emitted as
+     * type references. Once inside a type subtree, `walkCsharpTypePosition`
+     * recognizes C#'s actual type-leaf node kinds (`identifier`,
+     * `qualified_name`, `generic_name`, `array_type`, `nullable_type`,
+     * `tuple_type`, …) — none of which are `type_identifier`. Closes #381.
+     */
+    extractCsharpTypeRefs(node, nodeId) {
+        // Return type / property type — the field is named `type`.
+        const directType = (0, tree_sitter_helpers_1.getChildByField)(node, 'type');
+        if (directType)
+            this.walkCsharpTypePosition(directType, nodeId);
+        // Field declarations wrap declarators in a `variable_declaration`
+        // whose `type` field carries the type. The outer `field_declaration`
+        // has no `type` field of its own, so the call above is a no-op here
+        // and we descend one level.
+        const varDecl = node.namedChildren.find((c) => c.type === 'variable_declaration');
+        if (varDecl) {
+            const vdType = (0, tree_sitter_helpers_1.getChildByField)(varDecl, 'type');
+            if (vdType)
+                this.walkCsharpTypePosition(vdType, nodeId);
+        }
+        // Method / constructor parameters. The field name on
+        // `method_declaration` is `parameters`; it points at a
+        // `parameter_list` whose `parameter` children each have their own
+        // `type` field. Walking ONLY the type field skips parameter NAMES,
+        // which would otherwise mis-emit as type references.
+        const params = (0, tree_sitter_helpers_1.getChildByField)(node, 'parameters');
+        if (params) {
+            for (let i = 0; i < params.namedChildCount; i++) {
+                const child = params.namedChild(i);
+                if (!child || child.type !== 'parameter')
+                    continue;
+                const paramType = (0, tree_sitter_helpers_1.getChildByField)(child, 'type');
+                if (paramType)
+                    this.walkCsharpTypePosition(paramType, nodeId);
+            }
+        }
+    }
+    /**
+     * Walk a C# subtree that is KNOWN to be in a type position
+     * (return type, parameter type, property type, field type, generic
+     * argument). Identifiers here are type names, not parameter names.
+     */
+    walkCsharpTypePosition(node, fromNodeId) {
+        // `predefined_type` is int/string/bool/etc. — never a project ref.
+        if (node.type === 'predefined_type')
+            return;
+        // Bare type name: `Foo` in `Foo bar`, or the `Foo` inside `List<Foo>`.
+        if (node.type === 'identifier') {
+            const name = (0, tree_sitter_helpers_1.getNodeText)(node, this.source);
+            if (name && !this.BUILTIN_TYPES.has(name)) {
+                this.unresolvedReferences.push({
+                    fromNodeId,
+                    referenceName: name,
+                    referenceKind: 'references',
+                    line: node.startPosition.row + 1,
+                    column: node.startPosition.column,
+                });
+            }
+            return;
+        }
+        // `Namespace.Foo` → the rightmost identifier is the type. Emit the
+        // full qualified name as the reference; the resolver can still match
+        // on the trailing simple name when needed.
+        if (node.type === 'qualified_name') {
+            const text = (0, tree_sitter_helpers_1.getNodeText)(node, this.source);
+            const last = text.split('.').pop() ?? text;
+            if (last && !this.BUILTIN_TYPES.has(last)) {
+                this.unresolvedReferences.push({
+                    fromNodeId,
+                    referenceName: last,
+                    referenceKind: 'references',
+                    line: node.startPosition.row + 1,
+                    column: node.startPosition.column,
+                });
+            }
+            return;
+        }
+        // `(int Code, Foo Payload)` — tuple element has BOTH a `type` and a
+        // `name` field; descending into all named children would mis-emit
+        // the element name (`Code`, `Payload`) as a type ref. Walk only the
+        // type field.
+        if (node.type === 'tuple_element') {
+            const t = (0, tree_sitter_helpers_1.getChildByField)(node, 'type');
+            if (t)
+                this.walkCsharpTypePosition(t, fromNodeId);
+            return;
+        }
+        // Composite type nodes — recurse into named children. Covers
+        // `generic_name` (head identifier + `type_argument_list`),
+        // `nullable_type`, `array_type`, `pointer_type`, `tuple_type`,
+        // `ref_type`, and any newer wrapping shapes the grammar adds.
+        // Identifiers reached here are all type-positional (parameter/field
+        // names are gated out before we descend).
+        for (let i = 0; i < node.namedChildCount; i++) {
+            const child = node.namedChild(i);
+            if (child)
+                this.walkCsharpTypePosition(child, fromNodeId);
+        }
+    }
     /**
      * Extract type references from a variable's type annotation.
      */
@@ -2458,10 +2788,17 @@ function extractFromSource(filePath, source, language, frameworkNames) {
         const extractor = new liquid_extractor_1.LiquidExtractor(filePath, source);
         result = extractor.extract();
     }
-    else if (detectedLanguage === 'yaml' || detectedLanguage === 'twig') {
-        // No symbol extraction — file is tracked at the file-record level only.
-        // Framework extractors (e.g. Drupal routing resolver) run below and may
-        // add route nodes / references for yaml files such as *.routing.yml.
+    else if (detectedLanguage === 'xml') {
+        // Custom extractor for MyBatis mapper XML. Non-mapper XML returns just a
+        // file node so the watcher tracks it without emitting symbols.
+        const extractor = new mybatis_extractor_1.MyBatisExtractor(filePath, source);
+        result = extractor.extract();
+    }
+    else if (detectedLanguage === 'yaml' || detectedLanguage === 'twig' || detectedLanguage === 'properties') {
+        // No symbol extraction at this stage — files are tracked at the file-record
+        // level only. Framework extractors (Drupal routing yml, Spring `@Value`
+        // resolution against application.yml/application.properties) run later and
+        // add per-file nodes/references when they apply.
         result = { nodes: [], edges: [], unresolvedReferences: [], errors: [], durationMs: 0 };
     }
     else if (detectedLanguage === 'pascal' &&