@saluzi/codegraph 0.1.0 → 0.2.1

package/dist/extraction/languages/php.js

@@ -2,6 +2,74 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.phpExtractor = void 0;
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+// include / require (+ _once) expression node types. These carry the
+// file→file dependency in procedural PHP, where `include`/`require` — not
+// namespace `use` — is how a file pulls in another (issue #660).
+const PHP_INCLUDE_TYPES = new Set([
+    'include_expression',
+    'include_once_expression',
+    'require_expression',
+    'require_once_expression',
+]);
+/**
+ * Extract a static string-literal path from a PHP include/require expression.
+ *
+ * Returns null for dynamic forms (`include $var`, `require __DIR__ . '/x'`,
+ * interpolated strings) — they have no resolvable compile-time path, which
+ * matches the issue's "static string literals (the common case)" scope.
+ */
+function phpStaticIncludePath(node, source) {
+    // The path argument is the expression's first named child; the call-style
+    // form `require("x")` wraps it in a parenthesized_expression.
+    let arg = node.namedChild(0);
+    if (arg?.type === 'parenthesized_expression')
+        arg = arg.namedChild(0);
+    if (!arg || (arg.type !== 'string' && arg.type !== 'encapsed_string'))
+        return null;
+    // Pure literal only: any non-`string_content` child (interpolated variable,
+    // escape sequence, …) means the value isn't a static path.
+    const parts = arg.namedChildren;
+    if (parts.some((c) => c.type !== 'string_content'))
+        return null;
+    const content = parts.find((c) => c.type === 'string_content');
+    return content ? (0, tree_sitter_helpers_1.getNodeText)(content, source) : null;
+}
+/** PHP built-in return types that can't be a method receiver (so no class to chain on). */
+const PHP_NON_CLASS_RETURN = new Set([
+    'array', 'string', 'int', 'integer', 'float', 'double', 'bool', 'boolean',
+    'void', 'mixed', 'never', 'null', 'false', 'true', 'object', 'callable',
+    'iterable', 'resource',
+]);
+/**
+ * A method/function's declared return type, normalized to the class a chained
+ * `->method()` could be called on (issue #608). `self` / `static` / `$this` are
+ * kept as the marker `self` and resolved to the declaring class at resolution
+ * time; a concrete type returns its short name; primitives / unions / nullable
+ * non-class types return undefined.
+ */
+function extractPhpReturnType(node, source) {
+    let rt = (0, tree_sitter_helpers_1.getChildByField)(node, 'return_type');
+    if (!rt)
+        return undefined;
+    // Unwrap `?Type`. Union / intersection types are ambiguous — skip them.
+    if (rt.type === 'optional_type')
+        rt = rt.namedChild(0) ?? rt;
+    if (!rt || rt.type === 'primitive_type')
+        return undefined;
+    const nameNode = rt.type === 'named_type' ? (rt.namedChild(0) ?? rt) : rt;
+    const text = (0, tree_sitter_helpers_1.getNodeText)(nameNode, source).trim().replace(/^\\/, '');
+    if (!text)
+        return undefined;
+    const last = text.split('\\').pop() ?? text;
+    const lc = last.toLowerCase();
+    if (lc === 'self' || lc === 'static' || lc === 'this' || lc === '$this')
+        return 'self';
+    if (PHP_NON_CLASS_RETURN.has(lc))
+        return undefined;
+    if (!/^[A-Za-z_]\w*$/.test(last))
+        return undefined; // union/intersection/complex
+    return last;
+}
 exports.phpExtractor = {
     functionTypes: ['function_definition'],
     classTypes: ['class_declaration', 'trait_declaration'],
@@ -11,7 +79,7 @@ exports.phpExtractor = {
     enumTypes: ['enum_declaration'],
     enumMemberTypes: ['enum_case'],
     typeAliasTypes: [],
-    importTypes: ['namespace_use_declaration'],
+    importTypes: ['namespace_use_declaration', ...PHP_INCLUDE_TYPES],
     callTypes: ['function_call_expression', 'member_call_expression', 'scoped_call_expression'],
     variableTypes: ['const_declaration'],
     fieldTypes: ['property_declaration'],
@@ -19,6 +87,7 @@ exports.phpExtractor = {
     bodyField: 'body',
     paramsField: 'parameters',
     returnField: 'return_type',
+    getReturnType: extractPhpReturnType,
     classifyClassNode: (node) => {
         return node.type === 'trait_declaration' ? 'trait' : 'class';
     },
@@ -81,8 +150,28 @@ exports.phpExtractor = {
         }
         return false;
     },
+    // PHP `namespace Foo\Bar;` is file-level (like a Java/Kotlin package). Capturing
+    // it scopes every class under an `Foo\Bar::` qualified name, which is what makes
+    // `use` imports and same-named types (Laravel has 7+ `Factory` interfaces across
+    // namespaces) resolvable to the RIGHT definition instead of an arbitrary match.
+    packageTypes: ['namespace_definition'],
+    extractPackage: (node, source) => {
+        const nsName = node.namedChildren.find((c) => c.type === 'namespace_name');
+        // Skip braced `namespace Foo { … }` (has a body) — file-level only.
+        const hasBody = node.namedChildren.some((c) => c.type === 'compound_statement' || c.type === 'declaration_list');
+        if (!nsName || hasBody)
+            return null;
+        return (0, tree_sitter_helpers_1.getNodeText)(nsName, source);
+    },
     extractImport: (node, source) => {
         const importText = source.substring(node.startIndex, node.endIndex).trim();
+        // include / require (+ _once): emit a file→file dependency. The path is a
+        // static string literal in the common case; dynamic forms resolve to null
+        // and are skipped (no import node, no edge).
+        if (PHP_INCLUDE_TYPES.has(node.type)) {
+            const includePath = phpStaticIncludePath(node, source);
+            return includePath ? { moduleName: includePath, signature: importText } : null;
+        }
         // Check for grouped imports: use X\{A, B} - return null for core fallback
         const namespacePrefix = node.namedChildren.find((c) => c.type === 'namespace_name');
         const useGroup = node.namedChildren.find((c) => c.type === 'namespace_use_group');

package/dist/extraction/languages/php.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"php.js","sourceRoot":"","sources":["../../../src/extraction/languages/php.ts"],"names":[],"mappings":";;;AACA,gEAAsE;AAGtE,qEAAqE;AACrE,0EAA0E;AAC1E,iEAAiE;AACjE,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,oBAAoB;IACpB,yBAAyB;IACzB,oBAAoB;IACpB,yBAAyB;CAC1B,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,IAAgB,EAAE,MAAc;IAC5D,0EAA0E;IAC1E,8DAA8D;IAC9D,IAAI,GAAG,GAAsB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,GAAG,EAAE,IAAI,KAAK,0BAA0B;QAAE,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAiB,CAAC;QAAE,OAAO,IAAI,CAAC;IACnF,4EAA4E;IAC5E,2DAA2D;IAC3D,MAAM,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC;IAChC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5E,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC,CAAC,CAAC,IAAA,iCAAW,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED,2FAA2F;AAC3F,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IACnC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS;IACzE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IACvE,UAAU,EAAE,UAAU;CACvB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,IAAgB,EAAE,MAAc;IAC5D,IAAI,EAAE,GAAG,IAAA,qCAAe,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,IAAI,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAC1B,wEAAwE;IACxE,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe;QAAE,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,KAAK,gBAAgB;QAAE,OAAO,SAAS,CAAC;IAE1D,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,IAAI,GAAG,IAAA,iCAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC;IAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,OAAO;QAAE,OAAO,MAAM,CAAC;IACvF,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;QAAE,OAAO,SAAS,CAAC;IACnD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC,CAAC,6BAA6B;IACjF,OAAO,IAAI,CAAC;AACd,CAAC;AAEY,QAAA,YAAY,GAAsB;IAC7C,aAAa,EAAE,CAAC,qBAAqB,CAAC;IACtC,UAAU,EAAE,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACtD,WAAW,EAAE,CAAC,oBAAoB,CAAC;IACnC,cAAc,EAAE,CAAC,uBAAuB,CAAC;IACzC,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,CAAC,kBAAkB,CAAC;IAC/B,eAAe,EAAE,CAAC,WAAW,CAAC;IAC9B,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,CAAC,2BAA2B,EAAE,GAAG,iBAAiB,CAAC;IAChE,SAAS,EAAE,CAAC,0BAA0B,EAAE,wBAAwB,EAAE,wBAAwB,CAAC;IAC3F,aAAa,EAAE,CAAC,mBAAmB,CAAC;IACpC,UAAU,EAAE,CAAC,sBAAsB,CAAC;IACpC,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,aAAa;IAC1B,aAAa,EAAE,oBAAoB;IACnC,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,OAAO,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/D,CAAC;IACD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gBACxB,IAAI,IAAI,KAAK,QAAQ;oBAAE,OAAO,QAAQ,CAAC;gBACvC,IAAI,IAAI,KAAK,SAAS;oBAAE,OAAO,SAAS,CAAC;gBACzC,IAAI,IAAI,KAAK,WAAW;oBAAE,OAAO,WAAW,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC,CAAC,yBAAyB;IAC5C,CAAC;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,KAAK,EAAE,IAAI,KAAK,iBAAiB;gBAAE,OAAO,IAAI,CAAC;QACrD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACvB,2DAA2D;QAC3D,iGAAiG;QACjG,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACtC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;YAC/F,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;gBAC/E,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBACxB,MAAM,IAAI,GAAG,IAAA,iCAAW,EAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC/C,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,IAAI,CAAC,CAAC,UAAU;QACzB,CAAC;QAED,gEAAgE;QAChE,4EAA4E;QAC5E,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;YAC7G,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAChG,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC7B,MAAM,SAAS,GAAG,IAAA,iCAAW,EAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;oBACpD,GAAG,CAAC,sBAAsB,CAAC;wBACzB,UAAU,EAAE,QAAQ;wBACpB,aAAa,EAAE,SAAS;wBACxB,aAAa,EAAE,YAAY;wBAC3B,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC;wBAChC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;qBAClC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC,CAAC,UAAU;QACzB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IACD,iFAAiF;IACjF,iFAAiF;IACjF,iFAAiF;IACjF,gFAAgF;IAChF,YAAY,EAAE,CAAC,sBAAsB,CAAC;IACtC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;QACvF,oEAAoE;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAoB,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;QAC7H,IAAI,CAAC,MAAM,IAAI,OAAO;YAAE,OAAO,IAAI,CAAC;QACpC,OAAO,IAAA,iCAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QAE3E,0EAA0E;QAC1E,0EAA0E;QAC1E,6CAA6C;QAC7C,IAAI,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjF,CAAC;QAED,0EAA0E;QAC1E,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;QAChG,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC;QAC9F,IAAI,eAAe,IAAI,QAAQ,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,CAAC,0DAA0D;QACzE,CAAC;QAED,4CAA4C;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;QAChG,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;YACnG,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,EAAE,UAAU,EAAE,IAAA,iCAAW,EAAC,aAAa,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;YACnF,CAAC;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;YAChF,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,EAAE,UAAU,EAAE,IAAA,iCAAW,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;YAC1E,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC"}

package/dist/extraction/languages/python.d.ts

@@ -1,3 +1,3 @@
-import type { LanguageExtractor } from '../tree-sitter-types'
-export declare const pythonExtractor: LanguageExtractor
-//# sourceMappingURL=python.d.ts.map
+import type { LanguageExtractor } from '../tree-sitter-types';
+export declare const pythonExtractor: LanguageExtractor;
+//# sourceMappingURL=python.d.ts.map

package/dist/extraction/languages/python.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../src/extraction/languages/python.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,eAAO,MAAM,eAAe,EAAE,iBAiD7B,CAAC"}

package/dist/extraction/languages/python.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"python.js","sourceRoot":"","sources":["../../../src/extraction/languages/python.ts"],"names":[],"mappings":";;;AAAA,gEAAsE;AAGzD,QAAA,eAAe,GAAsB;IAChD,aAAa,EAAE,CAAC,qBAAqB,CAAC;IACtC,UAAU,EAAE,CAAC,kBAAkB,CAAC;IAChC,WAAW,EAAE,CAAC,qBAAqB,CAAC,EAAE,uCAAuC;IAC7E,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,EAAE;IACf,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,CAAC;IAC1D,SAAS,EAAE,CAAC,MAAM,CAAC;IACnB,aAAa,EAAE,CAAC,YAAY,CAAC,EAAE,mDAAmD;IAClF,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,IAAA,qCAAe,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,IAAA,qCAAe,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,IAAI,GAAG,GAAG,IAAA,iCAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,UAAU,EAAE,CAAC;YACf,GAAG,IAAI,MAAM,GAAG,IAAA,iCAAW,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC;QAClC,OAAO,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;IAChC,CAAC;IACD,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;QACjB,oCAAoC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACvC,IAAI,IAAI,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAuB,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;YACzD,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;YAC7G,CAAC;QACH,CAAC;QACD,4EAA4E;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC"}

package/dist/extraction/languages/r.d.ts

@@ -0,0 +1,3 @@
+import type { LanguageExtractor } from '../tree-sitter-types';
+export declare const rExtractor: LanguageExtractor;
+//# sourceMappingURL=r.d.ts.map

package/dist/extraction/languages/r.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"r.d.ts","sourceRoot":"","sources":["../../../src/extraction/languages/r.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAoB,MAAM,sBAAsB,CAAC;AAkKhF,eAAO,MAAM,UAAU,EAAE,iBAiJxB,CAAC"}

package/dist/extraction/languages/r.js

@@ -0,0 +1,314 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rExtractor = void 0;
+const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+/**
+ * R language extractor (#828).
+ *
+ * R has no declaration syntax — everything is an expression, so every symbol
+ * the graph needs arrives through the visitNode hook rather than node-type
+ * lists:
+ *
+ *   - functions:   `name <- function(x) …` / `name = function(x) …` parse as
+ *                  binary_operator(lhs: identifier, rhs: function_definition).
+ *                  (`function(x) … -> name` right-assign of a function does
+ *                  not survive the grammar's precedence — the `->` binds inside
+ *                  the body — and the style is rare; deliberate gap.)
+ *   - variables:   top-level assignments only (locals would bloat the graph);
+ *                  ALL_CAPS / dotted-caps names extract as constants.
+ *   - imports:     `library(x)` / `require(x)` / `requireNamespace("x")` are
+ *                  ordinary calls; `source("file.R")` references another file.
+ *                  All are claimed so no noise call-edge to `library` remains
+ *                  (same pattern as Lua's `require`).
+ *   - classes:     S4 `setClass("Name", …)`, R5 `setRefClass("Name", …)`, and
+ *                  R6 `R6Class("Name", public = list(m = function() …))` are
+ *                  calls too; the class node is named by the first string
+ *                  argument and `name = function` entries in its list() args
+ *                  extract as methods inside the class scope.
+ *   - S4 generics: `setGeneric("name", …)` / `setMethod("name", "Class", fn)`
+ *                  extract as functions named by the first string argument.
+ *
+ * Calls themselves go through the generic call extraction (`call` nodes with a
+ * `function` field). Namespaced `pkg::fn(…)` keeps its qualified text;
+ * `obj$method(…)` extracts under its full text (resolution of `$`-dispatch is
+ * a known gap — R's S3 dispatch is runtime by design).
+ */
+const ASSIGN_LEFT = new Set(['<-', '<<-', '=']);
+const ASSIGN_RIGHT = new Set(['->', '->>']);
+const IMPORT_FNS = new Set(['library', 'require', 'requireNamespace', 'loadNamespace']);
+const CLASS_FNS = new Set(['setClass', 'setRefClass', 'R6Class', 'ggproto']);
+const GENERIC_FNS = new Set(['setGeneric', 'setMethod']);
+/** ALL_CAPS or DOTTED.CAPS top-level assignment → constant. */
+const CONSTANT_NAME = /^[A-Z][A-Z0-9._]*$/;
+/** The call's callee name when it is a bare identifier or `pkg::fn` (→ `fn`). */
+function calleeName(call, source) {
+    const fn = (0, tree_sitter_helpers_1.getChildByField)(call, 'function');
+    if (!fn)
+        return null;
+    if (fn.type === 'identifier')
+        return (0, tree_sitter_helpers_1.getNodeText)(fn, source);
+    if (fn.type === 'namespace_operator') {
+        const rhs = (0, tree_sitter_helpers_1.getChildByField)(fn, 'rhs');
+        if (rhs)
+            return (0, tree_sitter_helpers_1.getNodeText)(rhs, source);
+    }
+    return null;
+}
+/** First positional argument's value node of a call. */
+function firstArgValue(call) {
+    const args = (0, tree_sitter_helpers_1.getChildByField)(call, 'arguments');
+    if (!args)
+        return null;
+    for (let i = 0; i < args.namedChildCount; i++) {
+        const arg = args.namedChild(i);
+        if (arg?.type !== 'argument')
+            continue;
+        return (0, tree_sitter_helpers_1.getChildByField)(arg, 'value');
+    }
+    return null;
+}
+/** Text of a string node's content, or an identifier's text. */
+function literalOrIdentifier(node, source) {
+    if (!node)
+        return null;
+    if (node.type === 'identifier')
+        return (0, tree_sitter_helpers_1.getNodeText)(node, source);
+    if (node.type === 'string') {
+        for (let i = 0; i < node.namedChildCount; i++) {
+            const c = node.namedChild(i);
+            if (c?.type === 'string_content')
+                return (0, tree_sitter_helpers_1.getNodeText)(c, source);
+        }
+        return ''; // empty string literal
+    }
+    return null;
+}
+/** Emit one `name = function(…)` argument entry as a method in the current scope. */
+function emitMethodArg(entry, ctx) {
+    const entryName = (0, tree_sitter_helpers_1.getChildByField)(entry, 'name');
+    const entryValue = (0, tree_sitter_helpers_1.getChildByField)(entry, 'value');
+    if (!entryName || entryValue?.type !== 'function_definition')
+        return;
+    const params = (0, tree_sitter_helpers_1.getChildByField)(entryValue, 'parameters');
+    const method = ctx.createNode('method', (0, tree_sitter_helpers_1.getNodeText)(entryName, ctx.source), entry, {
+        signature: params ? (0, tree_sitter_helpers_1.getNodeText)(params, ctx.source) : undefined,
+    });
+    const body = (0, tree_sitter_helpers_1.getChildByField)(entryValue, 'body');
+    if (method && body) {
+        ctx.pushScope(method.id);
+        ctx.visitNode(body); // hook-aware walk — see the function-assignment note below
+        ctx.popScope();
+    }
+}
+/**
+ * Extract a class call's methods. Two shapes:
+ *  - inside list() arguments — R5 `methods = list(deposit = function(x) …)`,
+ *    R6 `public = list(…)` / `private = list(…)`;
+ *  - DIRECT named function arguments — ggproto's style:
+ *    `ggproto("GeomPoint", Geom, draw_panel = function(…) …)`.
+ * Also records the parent class as an `extends` reference: ggproto's second
+ * positional identifier argument, R6's `inherit = Parent`, S4's
+ * `contains = "Parent"`.
+ */
+function extractClassMembers(classCall, classId, ctx) {
+    const args = (0, tree_sitter_helpers_1.getChildByField)(classCall, 'arguments');
+    if (!args)
+        return;
+    let positional = 0;
+    for (let i = 0; i < args.namedChildCount; i++) {
+        const arg = args.namedChild(i);
+        if (arg?.type !== 'argument')
+            continue;
+        const argName = (0, tree_sitter_helpers_1.getChildByField)(arg, 'name');
+        const value = (0, tree_sitter_helpers_1.getChildByField)(arg, 'value');
+        if (!argName) {
+            positional++;
+            // ggproto("Name", Parent, …) — the 2nd positional identifier is the parent.
+            if (positional === 2 && value?.type === 'identifier') {
+                ctx.addUnresolvedReference({
+                    fromNodeId: classId,
+                    referenceName: (0, tree_sitter_helpers_1.getNodeText)(value, ctx.source),
+                    referenceKind: 'extends',
+                    line: value.startPosition.row + 1,
+                    column: value.startPosition.column,
+                });
+            }
+            continue;
+        }
+        const argNameText = (0, tree_sitter_helpers_1.getNodeText)(argName, ctx.source);
+        // R6 `inherit = Parent` / S4 `contains = "Parent"`.
+        if ((argNameText === 'inherit' || argNameText === 'contains') && value) {
+            const parent = literalOrIdentifier(value, ctx.source);
+            if (parent) {
+                ctx.addUnresolvedReference({
+                    fromNodeId: classId,
+                    referenceName: parent,
+                    referenceKind: 'extends',
+                    line: value.startPosition.row + 1,
+                    column: value.startPosition.column,
+                });
+            }
+            continue;
+        }
+        // Direct named function argument (ggproto methods).
+        if (value?.type === 'function_definition') {
+            emitMethodArg(arg, ctx);
+            continue;
+        }
+        // list(…) of named function arguments (R5/R6 methods).
+        if (value?.type === 'call' && calleeName(value, ctx.source) === 'list') {
+            const listArgs = (0, tree_sitter_helpers_1.getChildByField)(value, 'arguments');
+            if (!listArgs)
+                continue;
+            for (let j = 0; j < listArgs.namedChildCount; j++) {
+                const entry = listArgs.namedChild(j);
+                if (entry?.type === 'argument')
+                    emitMethodArg(entry, ctx);
+            }
+        }
+    }
+}
+exports.rExtractor = {
+    functionTypes: [], // named functions are assignments — handled in visitNode
+    classTypes: [],
+    methodTypes: [],
+    interfaceTypes: [],
+    structTypes: [],
+    enumTypes: [],
+    typeAliasTypes: [],
+    importTypes: [], // library()/require()/source() are calls — handled in visitNode
+    callTypes: ['call'],
+    variableTypes: [], // top-level assignments — handled in visitNode
+    nameField: 'name',
+    bodyField: 'body',
+    paramsField: 'parameters',
+    visitNode: (node, ctx) => {
+        const source = ctx.source;
+        if (node.type === 'call') {
+            const fname = calleeName(node, source);
+            if (!fname)
+                return false;
+            // library(dplyr) / require(stats) / requireNamespace("jsonlite") —
+            // and source("helpers.R"), which references another file in the project.
+            if (IMPORT_FNS.has(fname) || fname === 'source') {
+                const mod = literalOrIdentifier(firstArgValue(node), source);
+                if (!mod)
+                    return true; // dynamic argument — nothing to record, still not a call edge
+                const imp = ctx.createNode('import', mod, node, {
+                    signature: (0, tree_sitter_helpers_1.getNodeText)(node, source).trim().slice(0, 100),
+                });
+                if (imp && ctx.nodeStack.length > 0) {
+                    const parentId = ctx.nodeStack[ctx.nodeStack.length - 1];
+                    if (parentId) {
+                        ctx.addUnresolvedReference({
+                            fromNodeId: parentId,
+                            referenceName: mod,
+                            referenceKind: 'imports',
+                            line: node.startPosition.row + 1,
+                            column: node.startPosition.column,
+                        });
+                    }
+                }
+                return true;
+            }
+            // setClass("Patient", …) / setRefClass("Account", …) / R6Class("Stack", …)
+            if (CLASS_FNS.has(fname)) {
+                const name = literalOrIdentifier(firstArgValue(node), source);
+                if (!name)
+                    return false;
+                const cls = ctx.createNode('class', name, node, {});
+                if (cls) {
+                    ctx.pushScope(cls.id);
+                    extractClassMembers(node, cls.id, ctx);
+                    ctx.popScope();
+                }
+                return true;
+            }
+            // setGeneric("describe", …) / setMethod("describe", "Patient", function(obj) …)
+            if (GENERIC_FNS.has(fname)) {
+                const name = literalOrIdentifier(firstArgValue(node), source);
+                if (!name)
+                    return false;
+                // The implementing function_definition, when present (setMethod always,
+                // setGeneric usually via the def= argument).
+                const args = (0, tree_sitter_helpers_1.getChildByField)(node, 'arguments');
+                let impl = null;
+                if (args) {
+                    for (let i = 0; i < args.namedChildCount; i++) {
+                        const v = args.namedChild(i)?.type === 'argument'
+                            ? (0, tree_sitter_helpers_1.getChildByField)(args.namedChild(i), 'value') : null;
+                        if (v?.type === 'function_definition') {
+                            impl = v;
+                            break;
+                        }
+                    }
+                }
+                const params = impl ? (0, tree_sitter_helpers_1.getChildByField)(impl, 'parameters') : null;
+                const fn = ctx.createNode('function', name, node, {
+                    signature: params ? (0, tree_sitter_helpers_1.getNodeText)(params, source) : undefined,
+                });
+                const body = impl ? (0, tree_sitter_helpers_1.getChildByField)(impl, 'body') : null;
+                if (fn && body) {
+                    ctx.pushScope(fn.id);
+                    ctx.visitNode(body); // hook-aware walk — see the function-assignment note below
+                    ctx.popScope();
+                }
+                return true;
+            }
+            return false; // ordinary call — generic extraction records the edge
+        }
+        if (node.type === 'binary_operator') {
+            const op = node.childForFieldName('operator')?.text;
+            if (!op)
+                return false;
+            const lhs = (0, tree_sitter_helpers_1.getChildByField)(node, 'lhs');
+            const rhs = (0, tree_sitter_helpers_1.getChildByField)(node, 'rhs');
+            // name <- function(…) / name = function(…)   (any scope — nested
+            // functions extract inside their enclosing function's scope). The body
+            // is walked through ctx.visitNode, NOT ctx.visitFunctionBody: the body
+            // walker doesn't consult this hook, and in R every nested definition is
+            // an assignment expression that only this hook can recognize. visitNode
+            // dispatches calls and the hook alike, with the function on the scope
+            // stack so attribution is right.
+            if (ASSIGN_LEFT.has(op) && lhs?.type === 'identifier' && rhs?.type === 'function_definition') {
+                const params = (0, tree_sitter_helpers_1.getChildByField)(rhs, 'parameters');
+                const fn = ctx.createNode('function', (0, tree_sitter_helpers_1.getNodeText)(lhs, source), node, {
+                    signature: params ? (0, tree_sitter_helpers_1.getNodeText)(params, source) : undefined,
+                });
+                const body = (0, tree_sitter_helpers_1.getChildByField)(rhs, 'body');
+                if (fn && body) {
+                    ctx.pushScope(fn.id);
+                    ctx.visitNode(body);
+                    ctx.popScope();
+                }
+                return true;
+            }
+            // Top-level value assignments → variable/constant. Locals are skipped
+            // deliberately (graph bloat); the initializer is still visited so its
+            // calls and nested definitions extract.
+            const topLevel = node.parent?.type === 'program';
+            if (topLevel && ASSIGN_LEFT.has(op) && lhs?.type === 'identifier' && rhs) {
+                // `Account <- setRefClass("Account", …)` is the CLASS definition idiom
+                // (same for R6Class / setClass / setGeneric) — the call hook makes the
+                // class/function node; a twin variable node would just be noise.
+                const rhsCallee = rhs.type === 'call' ? calleeName(rhs, source) : null;
+                if (!rhsCallee || (!CLASS_FNS.has(rhsCallee) && !GENERIC_FNS.has(rhsCallee))) {
+                    const name = (0, tree_sitter_helpers_1.getNodeText)(lhs, source);
+                    ctx.createNode(CONSTANT_NAME.test(name) ? 'constant' : 'variable', name, node, {});
+                }
+                ctx.visitNode(rhs);
+                return true;
+            }
+            // value -> name / value ->> name (right assign)
+            if (topLevel && ASSIGN_RIGHT.has(op) && rhs?.type === 'identifier' && lhs) {
+                const name = (0, tree_sitter_helpers_1.getNodeText)(rhs, source);
+                ctx.createNode(CONSTANT_NAME.test(name) ? 'constant' : 'variable', name, node, {});
+                ctx.visitNode(lhs);
+                return true;
+            }
+            return false;
+        }
+        return false;
+    },
+};
+//# sourceMappingURL=r.js.map

package/dist/extraction/languages/r.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"r.js","sourceRoot":"","sources":["../../../src/extraction/languages/r.ts"],"names":[],"mappings":"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"}

package/dist/extraction/languages/ruby.d.ts

@@ -1,3 +1,3 @@
-import type { LanguageExtractor } from '../tree-sitter-types'
-export declare const rubyExtractor: LanguageExtractor
-//# sourceMappingURL=ruby.d.ts.map
+import type { LanguageExtractor } from '../tree-sitter-types';
+export declare const rubyExtractor: LanguageExtractor;
+//# sourceMappingURL=ruby.d.ts.map

package/dist/extraction/languages/ruby.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ruby.d.ts","sourceRoot":"","sources":["../../../src/extraction/languages/ruby.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,eAAO,MAAM,aAAa,EAAE,iBA8I3B,CAAC"}

package/dist/extraction/languages/ruby.js

@@ -17,6 +17,41 @@ exports.rubyExtractor = {
     bodyField: 'body',
     paramsField: 'parameters',
     visitNode: (node, ctx) => {
+        // Ruby mixins: `include Mod`, `extend Mod`, `prepend Mod[, Other]` — the
+        // primary composition mechanism (ActiveSupport concerns, Comparable, …).
+        // These parse as a bare `call` to `include`/`extend`/`prepend` with the
+        // module(s) as constant arguments, so without special handling they'd be
+        // mis-extracted as a call to a method named "include" and the module would
+        // record no dependent — even though it's mixed into a class. Emit an
+        // `implements` edge (enclosing class/module → mixed-in module), so editing a
+        // concern surfaces every class that includes it.
+        if (node.type === 'call' && !node.childForFieldName('receiver')) {
+            const method = node.childForFieldName('method');
+            const mname = method?.text;
+            if (mname === 'include' || mname === 'extend' || mname === 'prepend') {
+                const parentId = ctx.nodeStack.length > 0 ? ctx.nodeStack[ctx.nodeStack.length - 1] : undefined;
+                const args = node.childForFieldName('arguments')
+                    ?? node.namedChildren.find((c) => c.type === 'argument_list');
+                if (parentId && args) {
+                    for (let i = 0; i < args.namedChildCount; i++) {
+                        const arg = args.namedChild(i);
+                        // `Mod` is `constant`, `Foo::Bar` is `scope_resolution`. Skip
+                        // `extend self` / dynamic args (`include foo()`).
+                        if (arg && (arg.type === 'constant' || arg.type === 'scope_resolution')) {
+                            ctx.addUnresolvedReference({
+                                fromNodeId: parentId,
+                                referenceName: (0, tree_sitter_helpers_1.getNodeText)(arg, ctx.source),
+                                referenceKind: 'implements',
+                                filePath: ctx.filePath,
+                                line: node.startPosition.row + 1,
+                                column: node.startPosition.column,
+                            });
+                        }
+                    }
+                    return true; // handled — don't also extract as a call to "include"
+                }
+            }
+        }
         if (node.type !== 'module')
             return false;
         const nameNode = node.childForFieldName('name');

package/dist/extraction/languages/ruby.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ruby.js","sourceRoot":"","sources":["../../../src/extraction/languages/ruby.ts"],"names":[],"mappings":"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"}

package/dist/extraction/languages/rust.d.ts

@@ -1,3 +1,3 @@
-import type { LanguageExtractor } from '../tree-sitter-types'
-export declare const rustExtractor: LanguageExtractor
-//# sourceMappingURL=rust.d.ts.map
+import type { LanguageExtractor } from '../tree-sitter-types';
+export declare const rustExtractor: LanguageExtractor;
+//# sourceMappingURL=rust.d.ts.map

package/dist/extraction/languages/rust.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rust.d.ts","sourceRoot":"","sources":["../../../src/extraction/languages/rust.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgC9D,eAAO,MAAM,aAAa,EAAE,iBAoH3B,CAAC"}

package/dist/extraction/languages/rust.js

@@ -2,10 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rustExtractor = void 0;
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
+/**
+ * A Rust function's declared return type, normalized to the bare type a chained
+ * `Foo::new().bar()` could be called on (the #645/#608 mechanism). Reads the
+ * `return_type` field: `-> Self` yields the marker `self` (resolved to the impl's
+ * own type at resolution time, like PHP's `self`/`static`); a concrete `-> Foo` /
+ * `-> FooBuilder` its name; a reference (`&Foo`) is unwrapped; generics are reduced
+ * to the base type (`Vec<Foo>` → `Vec`); primitives / unit / tuple yield undefined.
+ * Stdlib types that aren't in the graph simply fail the later existence check.
+ */
+function extractRustReturnType(node, source) {
+    let rt = (0, tree_sitter_helpers_1.getChildByField)(node, 'return_type');
+    if (!rt)
+        return undefined;
+    if (rt.type === 'reference_type') {
+        rt =
+            rt.namedChildren.find((c) => c.type === 'type_identifier' ||
+                c.type === 'scoped_type_identifier' ||
+                c.type === 'generic_type') ?? rt;
+    }
+    if (!rt || rt.type === 'primitive_type' || rt.type === 'unit_type' || rt.type === 'tuple_type') {
+        return undefined;
+    }
+    const text = (0, tree_sitter_helpers_1.getNodeText)(rt, source).trim().replace(/<[^>]*>/g, '');
+    const last = text.split('::').pop()?.trim();
+    if (!last || !/^[A-Za-z_]\w*$/.test(last))
+        return undefined;
+    return last === 'Self' ? 'self' : last;
+}
 exports.rustExtractor = {
-    functionTypes: ['function_item'],
+    // `function_signature_item` is a trait method DECLARATION (`fn render(&self);`,
+    // no body). Extracting it makes a trait's method set first-class, which
+    // impl-navigation and trait-dispatch synthesis need (a struct's method set is
+    // matched against the trait's).
+    functionTypes: ['function_item', 'function_signature_item'],
     classTypes: [], // Rust has impl blocks
-    methodTypes: ['function_item'], // Methods are functions in impl blocks
+    methodTypes: ['function_item', 'function_signature_item'],
     interfaceTypes: ['trait_item'],
     structTypes: ['struct_item'],
     enumTypes: ['enum_item'],
@@ -19,6 +51,7 @@ exports.rustExtractor = {
     bodyField: 'body',
     paramsField: 'parameters',
     returnField: 'return_type',
+    getReturnType: extractRustReturnType,
     getSignature: (node, source) => {
         const params = (0, tree_sitter_helpers_1.getChildByField)(node, 'parameters');
         const returnType = (0, tree_sitter_helpers_1.getChildByField)(node, 'return_type');