@colbymchenry/codegraph 0.3.1 → 0.4.8

package/dist/extraction/tree-sitter.js

@@ -38,11 +38,12 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiquidExtractor = exports.TreeSitterExtractor = void 0;
+exports.SvelteExtractor = exports.LiquidExtractor = exports.TreeSitterExtractor = void 0;
 exports.generateNodeId = generateNodeId;
 exports.extractFromSource = extractFromSource;
 const crypto = __importStar(require("crypto"));
 const grammars_1 = require("./grammars");
+const sentry_1 = require("../sentry");
 /**
  * Generate a unique node ID
  *
@@ -110,8 +111,10 @@ const EXTRACTORS = {
         interfaceTypes: ['interface_declaration'],
         structTypes: [],
         enumTypes: ['enum_declaration'],
+        typeAliasTypes: ['type_alias_declaration'],
         importTypes: ['import_statement'],
         callTypes: ['call_expression'],
+        variableTypes: ['lexical_declaration', 'variable_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -142,13 +145,18 @@ const EXTRACTORS = {
             }
             return undefined;
         },
-        isExported: (node, source) => {
-            const parent = node.parent;
-            if (parent?.type === 'export_statement')
-                return true;
-            // Check for 'export' keyword before declaration
-            const text = source.substring(Math.max(0, node.startIndex - 10), node.startIndex);
-            return text.includes('export');
+        isExported: (node, _source) => {
+            // Walk the parent chain to find an export_statement ancestor.
+            // This correctly handles deeply nested nodes like arrow functions
+            // inside variable declarations: `export const X = () => { ... }`
+            // where the arrow_function is 3 levels deep under export_statement.
+            let current = node.parent;
+            while (current) {
+                if (current.type === 'export_statement')
+                    return true;
+                current = current.parent;
+            }
+            return false;
         },
         isAsync: (node) => {
             for (let i = 0; i < node.childCount; i++) {
@@ -166,6 +174,18 @@ const EXTRACTORS = {
             }
             return false;
         },
+        isConst: (node) => {
+            // For lexical_declaration, check if it's 'const' or 'let'
+            // For variable_declaration, it's always 'var'
+            if (node.type === 'lexical_declaration') {
+                for (let i = 0; i < node.childCount; i++) {
+                    const child = node.child(i);
+                    if (child?.type === 'const')
+                        return true;
+                }
+            }
+            return false;
+        },
     },
     javascript: {
         functionTypes: ['function_declaration', 'arrow_function', 'function_expression'],
@@ -174,8 +194,10 @@ const EXTRACTORS = {
         interfaceTypes: [],
         structTypes: [],
         enumTypes: [],
+        typeAliasTypes: [],
         importTypes: ['import_statement'],
         callTypes: ['call_expression'],
+        variableTypes: ['lexical_declaration', 'variable_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -183,12 +205,14 @@ const EXTRACTORS = {
             const params = getChildByField(node, 'parameters');
             return params ? getNodeText(params, source) : undefined;
         },
-        isExported: (node, source) => {
-            const parent = node.parent;
-            if (parent?.type === 'export_statement')
-                return true;
-            const text = source.substring(Math.max(0, node.startIndex - 10), node.startIndex);
-            return text.includes('export');
+        isExported: (node, _source) => {
+            let current = node.parent;
+            while (current) {
+                if (current.type === 'export_statement')
+                    return true;
+                current = current.parent;
+            }
+            return false;
         },
         isAsync: (node) => {
             for (let i = 0; i < node.childCount; i++) {
@@ -198,6 +222,16 @@ const EXTRACTORS = {
             }
             return false;
         },
+        isConst: (node) => {
+            if (node.type === 'lexical_declaration') {
+                for (let i = 0; i < node.childCount; i++) {
+                    const child = node.child(i);
+                    if (child?.type === 'const')
+                        return true;
+                }
+            }
+            return false;
+        },
     },
     python: {
         functionTypes: ['function_definition'],
@@ -206,8 +240,10 @@ const EXTRACTORS = {
         interfaceTypes: [],
         structTypes: [],
         enumTypes: [],
+        typeAliasTypes: [],
         importTypes: ['import_statement', 'import_from_statement'],
         callTypes: ['call'],
+        variableTypes: ['assignment'], // Python uses assignment for variable declarations
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -244,8 +280,10 @@ const EXTRACTORS = {
         interfaceTypes: ['interface_type'],
         structTypes: ['struct_type'],
         enumTypes: [],
+        typeAliasTypes: ['type_spec'], // Go type declarations
         importTypes: ['import_declaration'],
         callTypes: ['call_expression'],
+        variableTypes: ['var_declaration', 'short_var_declaration', 'const_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -269,8 +307,10 @@ const EXTRACTORS = {
         interfaceTypes: ['trait_item'],
         structTypes: ['struct_item'],
         enumTypes: ['enum_item'],
+        typeAliasTypes: ['type_item'], // Rust type aliases
         importTypes: ['use_declaration'],
         callTypes: ['call_expression'],
+        variableTypes: ['let_declaration', 'const_item', 'static_item'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -311,8 +351,10 @@ const EXTRACTORS = {
         interfaceTypes: ['interface_declaration'],
         structTypes: [],
         enumTypes: ['enum_declaration'],
+        typeAliasTypes: [],
         importTypes: ['import_declaration'],
         callTypes: ['method_invocation'],
+        variableTypes: ['local_variable_declaration', 'field_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -357,8 +399,10 @@ const EXTRACTORS = {
         interfaceTypes: [],
         structTypes: ['struct_specifier'],
         enumTypes: ['enum_specifier'],
+        typeAliasTypes: ['type_definition'], // typedef
         importTypes: ['preproc_include'],
         callTypes: ['call_expression'],
+        variableTypes: ['declaration'],
         nameField: 'declarator',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -370,8 +414,10 @@ const EXTRACTORS = {
         interfaceTypes: [],
         structTypes: ['struct_specifier'],
         enumTypes: ['enum_specifier'],
+        typeAliasTypes: ['type_definition', 'alias_declaration'], // typedef and using
         importTypes: ['preproc_include'],
         callTypes: ['call_expression'],
+        variableTypes: ['declaration'],
         nameField: 'declarator',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -402,8 +448,10 @@ const EXTRACTORS = {
         interfaceTypes: ['interface_declaration'],
         structTypes: ['struct_declaration'],
         enumTypes: ['enum_declaration'],
+        typeAliasTypes: [],
         importTypes: ['using_directive'],
         callTypes: ['invocation_expression'],
+        variableTypes: ['local_declaration_statement', 'field_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameter_list',
@@ -450,8 +498,10 @@ const EXTRACTORS = {
         interfaceTypes: ['interface_declaration'],
         structTypes: [],
         enumTypes: ['enum_declaration'],
+        typeAliasTypes: [],
         importTypes: ['namespace_use_declaration'],
         callTypes: ['function_call_expression', 'member_call_expression', 'scoped_call_expression'],
+        variableTypes: ['property_declaration', 'const_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -487,8 +537,10 @@ const EXTRACTORS = {
         interfaceTypes: [], // Ruby uses modules
         structTypes: [],
         enumTypes: [],
+        typeAliasTypes: [],
         importTypes: ['call'], // require/require_relative
         callTypes: ['call', 'method_call'],
+        variableTypes: ['assignment'], // Ruby uses assignment like Python
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameters',
@@ -520,8 +572,10 @@ const EXTRACTORS = {
         interfaceTypes: ['protocol_declaration'],
         structTypes: ['struct_declaration'],
         enumTypes: ['enum_declaration'],
+        typeAliasTypes: ['typealias_declaration'],
         importTypes: ['import_declaration'],
         callTypes: ['call_expression'],
+        variableTypes: ['property_declaration', 'constant_declaration'],
         nameField: 'name',
         bodyField: 'body',
         paramsField: 'parameter',
@@ -584,8 +638,10 @@ const EXTRACTORS = {
         interfaceTypes: ['class_declaration'], // Interfaces use class_declaration with 'interface' modifier
         structTypes: [], // Kotlin uses data classes
         enumTypes: ['class_declaration'], // Enums use class_declaration with 'enum' modifier
+        typeAliasTypes: ['type_alias'],
         importTypes: ['import_header'],
         callTypes: ['call_expression'],
+        variableTypes: ['property_declaration'],
         nameField: 'simple_identifier',
         bodyField: 'function_body',
         paramsField: 'function_value_parameters',
@@ -636,6 +692,80 @@ const EXTRACTORS = {
             return false;
         },
     },
+    dart: {
+        functionTypes: ['function_signature'],
+        classTypes: ['class_definition'],
+        methodTypes: ['method_signature'],
+        interfaceTypes: [],
+        structTypes: [],
+        enumTypes: ['enum_declaration'],
+        typeAliasTypes: ['type_alias'],
+        importTypes: ['import_or_export'],
+        callTypes: [], // Dart calls use identifier+selector, handled via function body traversal
+        variableTypes: [],
+        nameField: 'name',
+        bodyField: 'body', // class_definition uses 'body' field
+        paramsField: 'formal_parameter_list',
+        returnField: 'type',
+        getSignature: (node, source) => {
+            // For function_signature: extract params + return type
+            // For method_signature: delegate to inner function_signature
+            let sig = node;
+            if (node.type === 'method_signature') {
+                const inner = node.namedChildren.find((c) => c.type === 'function_signature' || c.type === 'getter_signature' || c.type === 'setter_signature');
+                if (inner)
+                    sig = inner;
+            }
+            const params = sig.namedChildren.find((c) => c.type === 'formal_parameter_list');
+            const retType = sig.namedChildren.find((c) => c.type === 'type_identifier' || c.type === 'void_type');
+            if (!params && !retType)
+                return undefined;
+            let result = '';
+            if (retType)
+                result += getNodeText(retType, source) + ' ';
+            if (params)
+                result += getNodeText(params, source);
+            return result.trim() || undefined;
+        },
+        getVisibility: (node) => {
+            // Dart convention: _ prefix means private, otherwise public
+            let nameNode = null;
+            if (node.type === 'method_signature') {
+                const inner = node.namedChildren.find((c) => c.type === 'function_signature' || c.type === 'getter_signature' || c.type === 'setter_signature');
+                if (inner)
+                    nameNode = inner.namedChildren.find((c) => c.type === 'identifier') || null;
+            }
+            else {
+                nameNode = node.childForFieldName('name');
+            }
+            if (nameNode && nameNode.text.startsWith('_'))
+                return 'private';
+            return 'public';
+        },
+        isAsync: (node) => {
+            // In Dart, 'async' is on the function_body (next sibling), not the signature
+            const nextSibling = node.nextNamedSibling;
+            if (nextSibling?.type === 'function_body') {
+                for (let i = 0; i < nextSibling.childCount; i++) {
+                    const child = nextSibling.child(i);
+                    if (child?.type === 'async')
+                        return true;
+                }
+            }
+            return false;
+        },
+        isStatic: (node) => {
+            // For method_signature, check for 'static' child
+            if (node.type === 'method_signature') {
+                for (let i = 0; i < node.childCount; i++) {
+                    const child = node.child(i);
+                    if (child?.type === 'static')
+                        return true;
+                }
+            }
+            return false;
+        },
+    },
 };
 // TSX and JSX use the same extractors as their base languages
 EXTRACTORS.tsx = EXTRACTORS.typescript;
@@ -654,6 +784,25 @@ function extractName(node, source, extractor) {
         }
         return getNodeText(nameNode, source);
     }
+    // For Dart method_signature, look inside inner signature types
+    if (node.type === 'method_signature') {
+        for (let i = 0; i < node.namedChildCount; i++) {
+            const child = node.namedChild(i);
+            if (child && (child.type === 'function_signature' ||
+                child.type === 'getter_signature' ||
+                child.type === 'setter_signature' ||
+                child.type === 'constructor_signature' ||
+                child.type === 'factory_constructor_signature')) {
+                // Find identifier inside the inner signature
+                for (let j = 0; j < child.namedChildCount; j++) {
+                    const inner = child.namedChild(j);
+                    if (inner?.type === 'identifier') {
+                        return getNodeText(inner, source);
+                    }
+                }
+            }
+        }
+    }
     // Fall back to first identifier child
     for (let i = 0; i < node.namedChildCount; i++) {
         const child = node.namedChild(i);
@@ -726,6 +875,7 @@ class TreeSitterExtractor {
             this.visitNode(this.tree.rootNode);
         }
         catch (error) {
+            (0, sentry_1.captureException)(error, { operation: 'tree-sitter-parse', filePath: this.filePath, language: this.language });
             this.errors.push({
                 message: `Parse error: ${error instanceof Error ? error.message : String(error)}`,
                 severity: 'error',
@@ -775,6 +925,11 @@ class TreeSitterExtractor {
             }
             skipChildren = true; // extractClass visits body children
         }
+        // Dart-specific: mixin and extension declarations treated as classes
+        else if (this.language === 'dart' && (nodeType === 'mixin_declaration' || nodeType === 'extension_declaration')) {
+            this.extractClass(node);
+            skipChildren = true;
+        }
         // Check for method declarations (only if not already handled by functionTypes)
         else if (this.extractor.methodTypes.includes(nodeType)) {
             this.extractMethod(node);
@@ -795,6 +950,22 @@ class TreeSitterExtractor {
             this.extractEnum(node);
             skipChildren = true; // extractEnum visits body children
         }
+        // Check for type alias declarations (e.g. `type X = ...` in TypeScript)
+        else if (this.extractor.typeAliasTypes.includes(nodeType)) {
+            this.extractTypeAlias(node);
+        }
+        // Check for variable declarations (const, let, var, etc.)
+        // Only extract top-level variables (not inside functions/methods)
+        else if (this.extractor.variableTypes.includes(nodeType) && this.nodeStack.length === 0) {
+            this.extractVariable(node);
+            skipChildren = true; // extractVariable handles children
+        }
+        // Check for export statements containing non-function variable declarations
+        // e.g. `export const X = create(...)`, `export const X = { ... }`
+        else if (nodeType === 'export_statement') {
+            this.extractExportedVariables(node);
+            // Don't skip children — still need to visit inner nodes (functions, calls, etc.)
+        }
         // Check for imports
         else if (this.extractor.importTypes.includes(nodeType)) {
             this.extractImport(node);
@@ -879,7 +1050,21 @@ class TreeSitterExtractor {
     extractFunction(node) {
         if (!this.extractor)
             return;
-        const name = extractName(node, this.source, this.extractor);
+        let name = extractName(node, this.source, this.extractor);
+        // For arrow functions and function expressions assigned to variables,
+        // resolve the name from the parent variable_declarator.
+        // e.g. `export const useAuth = () => { ... }` — the arrow_function node
+        // has no `name` field; the name lives on the variable_declarator.
+        if (name === '<anonymous>' &&
+            (node.type === 'arrow_function' || node.type === 'function_expression')) {
+            const parent = node.parent;
+            if (parent?.type === 'variable_declarator') {
+                const varName = getChildByField(parent, 'name');
+                if (varName) {
+                    name = getNodeText(varName, this.source);
+                }
+            }
+        }
         if (name === '<anonymous>')
             return; // Skip anonymous functions
         const docstring = getPrecedingDocstring(node, this.source);
@@ -898,7 +1083,10 @@ class TreeSitterExtractor {
         });
         // Push to stack and visit body
         this.nodeStack.push(funcNode.id);
-        const body = getChildByField(node, this.extractor.bodyField);
+        // Dart: function_body is a next sibling of function_signature, not a child
+        const body = this.language === 'dart'
+            ? node.nextNamedSibling?.type === 'function_body' ? node.nextNamedSibling : null
+            : getChildByField(node, this.extractor.bodyField);
         if (body) {
             this.visitFunctionBody(body, funcNode.id);
         }
@@ -923,7 +1111,13 @@ class TreeSitterExtractor {
         this.extractInheritance(node, classNode.id);
         // Push to stack and visit body
         this.nodeStack.push(classNode.id);
-        const body = getChildByField(node, this.extractor.bodyField) || node;
+        let body = getChildByField(node, this.extractor.bodyField);
+        // Dart: mixin_declaration uses class_body, extension uses extension_body
+        if (!body && this.language === 'dart') {
+            body = node.namedChildren.find((c) => c.type === 'class_body' || c.type === 'extension_body') || null;
+        }
+        if (!body)
+            body = node;
         // Visit all children for methods and properties
         for (let i = 0; i < body.namedChildCount; i++) {
             const child = body.namedChild(i);
@@ -961,7 +1155,10 @@ class TreeSitterExtractor {
         });
         // Push to stack and visit body
         this.nodeStack.push(methodNode.id);
-        const body = getChildByField(node, this.extractor.bodyField);
+        // Dart: function_body is a next sibling of method_signature, not a child
+        const body = this.language === 'dart'
+            ? node.nextNamedSibling?.type === 'function_body' ? node.nextNamedSibling : null
+            : getChildByField(node, this.extractor.bodyField);
         if (body) {
             this.visitFunctionBody(body, methodNode.id);
         }
@@ -1027,37 +1224,532 @@ class TreeSitterExtractor {
             isExported,
         });
     }
+    /**
+     * Extract a variable declaration (const, let, var, etc.)
+     *
+     * Extracts top-level and module-level variable declarations.
+     * Captures the variable name and first 100 chars of initializer in signature for searchability.
+     */
+    extractVariable(node) {
+        if (!this.extractor)
+            return;
+        // Different languages have different variable declaration structures
+        // TypeScript/JavaScript: lexical_declaration contains variable_declarator children
+        // Python: assignment has left (identifier) and right (value)
+        // Go: var_declaration, short_var_declaration, const_declaration
+        const isConst = this.extractor.isConst?.(node) ?? false;
+        const kind = isConst ? 'constant' : 'variable';
+        const docstring = getPrecedingDocstring(node, this.source);
+        const isExported = this.extractor.isExported?.(node, this.source) ?? false;
+        // Extract variable declarators based on language
+        if (this.language === 'typescript' || this.language === 'javascript' ||
+            this.language === 'tsx' || this.language === 'jsx') {
+            // Handle lexical_declaration and variable_declaration
+            // These contain one or more variable_declarator children
+            for (let i = 0; i < node.namedChildCount; i++) {
+                const child = node.namedChild(i);
+                if (child?.type === 'variable_declarator') {
+                    const nameNode = getChildByField(child, 'name');
+                    const valueNode = getChildByField(child, 'value');
+                    if (nameNode) {
+                        const name = getNodeText(nameNode, this.source);
+                        // Arrow functions / function expressions: extract as function instead of variable
+                        if (valueNode && (valueNode.type === 'arrow_function' || valueNode.type === 'function_expression')) {
+                            this.extractFunction(valueNode);
+                            continue;
+                        }
+                        // Capture first 100 chars of initializer for context (stored in signature for searchability)
+                        const initValue = valueNode ? getNodeText(valueNode, this.source).slice(0, 100) : undefined;
+                        const initSignature = initValue ? `= ${initValue}${initValue.length >= 100 ? '...' : ''}` : undefined;
+                        this.createNode(kind, name, child, {
+                            docstring,
+                            signature: initSignature,
+                            isExported,
+                        });
+                    }
+                }
+            }
+        }
+        else if (this.language === 'python' || this.language === 'ruby') {
+            // Python/Ruby assignment: left = right
+            const left = getChildByField(node, 'left') || node.namedChild(0);
+            const right = getChildByField(node, 'right') || node.namedChild(1);
+            if (left && left.type === 'identifier') {
+                const name = getNodeText(left, this.source);
+                // Skip if name starts with lowercase and looks like a function call result
+                // Python constants are usually UPPER_CASE
+                const initValue = right ? getNodeText(right, this.source).slice(0, 100) : undefined;
+                const initSignature = initValue ? `= ${initValue}${initValue.length >= 100 ? '...' : ''}` : undefined;
+                this.createNode(kind, name, node, {
+                    docstring,
+                    signature: initSignature,
+                });
+            }
+        }
+        else if (this.language === 'go') {
+            // Go: var_declaration, short_var_declaration, const_declaration
+            // These can have multiple identifiers on the left
+            const specs = node.namedChildren.filter(c => c.type === 'var_spec' || c.type === 'const_spec');
+            for (const spec of specs) {
+                const nameNode = spec.namedChild(0);
+                if (nameNode && nameNode.type === 'identifier') {
+                    const name = getNodeText(nameNode, this.source);
+                    const valueNode = spec.namedChildCount > 1 ? spec.namedChild(spec.namedChildCount - 1) : null;
+                    const initValue = valueNode ? getNodeText(valueNode, this.source).slice(0, 100) : undefined;
+                    const initSignature = initValue ? `= ${initValue}${initValue.length >= 100 ? '...' : ''}` : undefined;
+                    this.createNode(node.type === 'const_declaration' ? 'constant' : 'variable', name, spec, {
+                        docstring,
+                        signature: initSignature,
+                    });
+                }
+            }
+            // Handle short_var_declaration (:=)
+            if (node.type === 'short_var_declaration') {
+                const left = getChildByField(node, 'left');
+                const right = getChildByField(node, 'right');
+                if (left) {
+                    // Can be expression_list with multiple identifiers
+                    const identifiers = left.type === 'expression_list'
+                        ? left.namedChildren.filter(c => c.type === 'identifier')
+                        : [left];
+                    for (const id of identifiers) {
+                        const name = getNodeText(id, this.source);
+                        const initValue = right ? getNodeText(right, this.source).slice(0, 100) : undefined;
+                        const initSignature = initValue ? `= ${initValue}${initValue.length >= 100 ? '...' : ''}` : undefined;
+                        this.createNode('variable', name, node, {
+                            docstring,
+                            signature: initSignature,
+                        });
+                    }
+                }
+            }
+        }
+        else {
+            // Generic fallback for other languages
+            // Try to find identifier children
+            for (let i = 0; i < node.namedChildCount; i++) {
+                const child = node.namedChild(i);
+                if (child?.type === 'identifier' || child?.type === 'variable_declarator') {
+                    const name = child.type === 'identifier'
+                        ? getNodeText(child, this.source)
+                        : extractName(child, this.source, this.extractor);
+                    if (name && name !== '<anonymous>') {
+                        this.createNode(kind, name, child, {
+                            docstring,
+                            isExported,
+                        });
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Extract a type alias (e.g. `export type X = ...` in TypeScript)
+     */
+    extractTypeAlias(node) {
+        if (!this.extractor)
+            return;
+        const name = extractName(node, this.source, this.extractor);
+        if (name === '<anonymous>')
+            return;
+        const docstring = getPrecedingDocstring(node, this.source);
+        const isExported = this.extractor.isExported?.(node, this.source);
+        this.createNode('type_alias', name, node, {
+            docstring,
+            isExported,
+        });
+    }
+    /**
+     * Extract an exported variable declaration that isn't a function.
+     * Handles patterns like:
+     *   export const X = create(...)
+     *   export const X = { ... }
+     *   export const X = [...]
+     *   export const X = "value"
+     *
+     * This is called for `export_statement` nodes that contain a
+     * `lexical_declaration` with `variable_declarator` children whose
+     * values are NOT already handled by functionTypes (arrow_function,
+     * function_expression).
+     */
+    extractExportedVariables(exportNode) {
+        if (!this.extractor)
+            return;
+        // Find the lexical_declaration or variable_declaration child
+        for (let i = 0; i < exportNode.namedChildCount; i++) {
+            const decl = exportNode.namedChild(i);
+            if (!decl || (decl.type !== 'lexical_declaration' && decl.type !== 'variable_declaration')) {
+                continue;
+            }
+            // Iterate over each variable_declarator in the declaration
+            for (let j = 0; j < decl.namedChildCount; j++) {
+                const declarator = decl.namedChild(j);
+                if (!declarator || declarator.type !== 'variable_declarator')
+                    continue;
+                const nameNode = getChildByField(declarator, 'name');
+                if (!nameNode)
+                    continue;
+                const name = getNodeText(nameNode, this.source);
+                // Skip if the value is a function type — those are already handled
+                // by extractFunction via the functionTypes dispatch
+                const value = getChildByField(declarator, 'value');
+                if (value) {
+                    const valueType = value.type;
+                    if (this.extractor.functionTypes.includes(valueType)) {
+                        continue; // Already handled by extractFunction
+                    }
+                }
+                const docstring = getPrecedingDocstring(exportNode, this.source);
+                this.createNode('variable', name, declarator, {
+                    docstring,
+                    isExported: true,
+                });
+            }
+        }
+    }
     /**
      * Extract an import
+     *
+     * Creates an import node with the full import statement stored in signature for searchability.
+     * Also creates unresolved references for resolution purposes.
      */
     extractImport(node) {
-        // Create an edge to track the import
-        // For now, we'll create unresolved references
-        const importText = getNodeText(node, this.source);
+        const importText = getNodeText(node, this.source).trim();
         // Extract module/package name based on language
         let moduleName = '';
-        if (this.language === 'typescript' || this.language === 'javascript') {
+        if (this.language === 'typescript' || this.language === 'javascript' ||
+            this.language === 'tsx' || this.language === 'jsx') {
             const source = getChildByField(node, 'source');
             if (source) {
                 moduleName = getNodeText(source, this.source).replace(/['"]/g, '');
             }
+            // Create import node with full statement as signature for searchability
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
         }
         else if (this.language === 'python') {
-            const module = getChildByField(node, 'module_name') || node.namedChild(0);
-            if (module) {
-                moduleName = getNodeText(module, this.source);
+            // Python has two import forms:
+            // 1. import_statement: import os, sys
+            // 2. import_from_statement: from os import path
+            if (node.type === 'import_from_statement') {
+                const moduleNode = getChildByField(node, 'module_name');
+                if (moduleNode) {
+                    moduleName = getNodeText(moduleNode, this.source);
+                }
+            }
+            else {
+                // import_statement - may have multiple modules
+                // Can be dotted_name (import os) or aliased_import (import numpy as np)
+                for (let i = 0; i < node.namedChildCount; i++) {
+                    const child = node.namedChild(i);
+                    if (child?.type === 'dotted_name') {
+                        const name = getNodeText(child, this.source);
+                        this.createNode('import', name, node, {
+                            signature: importText,
+                        });
+                    }
+                    else if (child?.type === 'aliased_import') {
+                        // Extract the module name from inside aliased_import
+                        const dottedName = child.namedChildren.find(c => c.type === 'dotted_name');
+                        if (dottedName) {
+                            const name = getNodeText(dottedName, this.source);
+                            this.createNode('import', name, node, {
+                                signature: importText,
+                            });
+                        }
+                    }
+                }
+                // Skip creating another node below if we handled import_statement
+                if (node.type === 'import_statement') {
+                    return;
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
             }
         }
         else if (this.language === 'go') {
-            const path = node.namedChild(0);
-            if (path) {
-                moduleName = getNodeText(path, this.source).replace(/['"]/g, '');
+            // Go imports can be single or grouped
+            // Single: import "fmt" - uses import_spec directly as child
+            // Grouped: import ( "fmt" \n "os" ) - uses import_spec_list containing import_spec children
+            // Helper function to extract path from import_spec
+            const extractFromSpec = (spec) => {
+                const stringLiteral = spec.namedChildren.find(c => c.type === 'interpreted_string_literal');
+                if (stringLiteral) {
+                    const path = getNodeText(stringLiteral, this.source).replace(/['"]/g, '');
+                    if (path) {
+                        this.createNode('import', path, spec, {
+                            signature: getNodeText(spec, this.source).trim(),
+                        });
+                    }
+                }
+            };
+            // Find import_spec_list for grouped imports
+            const importSpecList = node.namedChildren.find(c => c.type === 'import_spec_list');
+            if (importSpecList) {
+                // Grouped imports - iterate through import_spec children
+                const importSpecs = importSpecList.namedChildren.filter(c => c.type === 'import_spec');
+                for (const spec of importSpecs) {
+                    extractFromSpec(spec);
+                }
+            }
+            else {
+                // Single import: import "fmt" - import_spec is direct child
+                const importSpec = node.namedChildren.find(c => c.type === 'import_spec');
+                if (importSpec) {
+                    extractFromSpec(importSpec);
+                }
+            }
+            return; // Go handled completely above
+        }
+        else if (this.language === 'rust') {
+            // Rust use declarations
+            // use std::{ffi::OsStr, io}; -> scoped_use_list with identifier "std"
+            // use crate::error::Error;  -> scoped_identifier starting with "crate"
+            // use super::utils;         -> scoped_identifier starting with "super"
+            // Helper to get the root crate/module from a scoped path
+            const getRootModule = (scopedNode) => {
+                // Recursively find the leftmost identifier/crate/super/self
+                const firstChild = scopedNode.namedChild(0);
+                if (!firstChild)
+                    return getNodeText(scopedNode, this.source);
+                if (firstChild.type === 'identifier' ||
+                    firstChild.type === 'crate' ||
+                    firstChild.type === 'super' ||
+                    firstChild.type === 'self') {
+                    return getNodeText(firstChild, this.source);
+                }
+                else if (firstChild.type === 'scoped_identifier') {
+                    return getRootModule(firstChild);
+                }
+                return getNodeText(firstChild, this.source);
+            };
+            // Find the use argument (scoped_use_list or scoped_identifier)
+            const useArg = node.namedChildren.find(c => c.type === 'scoped_use_list' ||
+                c.type === 'scoped_identifier' ||
+                c.type === 'use_list' ||
+                c.type === 'identifier');
+            if (useArg) {
+                moduleName = getRootModule(useArg);
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
             }
+            return; // Rust handled completely above
+        }
+        else if (this.language === 'swift') {
+            // Swift imports: import Foundation, @testable import Alamofire
+            // AST structure: import_declaration -> identifier -> simple_identifier
+            const identifier = node.namedChildren.find(c => c.type === 'identifier');
+            if (identifier) {
+                moduleName = getNodeText(identifier, this.source);
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // Swift handled completely above
+        }
+        else if (this.language === 'kotlin') {
+            // Kotlin imports: import java.io.IOException, import x.y.Z as Alias, import x.y.*
+            // AST structure: import_header -> identifier (dotted path)
+            const identifier = node.namedChildren.find(c => c.type === 'identifier');
+            if (identifier) {
+                moduleName = getNodeText(identifier, this.source);
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // Kotlin handled completely above
+        }
+        else if (this.language === 'java') {
+            // Java imports: import java.util.List, import static x.Y.method, import x.y.*
+            // AST structure: import_declaration -> scoped_identifier (dotted path)
+            const scopedId = node.namedChildren.find(c => c.type === 'scoped_identifier');
+            if (scopedId) {
+                moduleName = getNodeText(scopedId, this.source);
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // Java handled completely above
+        }
+        else if (this.language === 'csharp') {
+            // C# using directives: using System, using System.Collections.Generic, using static X, using Alias = X
+            // AST structure: using_directive -> qualified_name (dotted) or identifier (simple)
+            // For alias imports: identifier = qualified_name - we want the qualified_name
+            const qualifiedName = node.namedChildren.find(c => c.type === 'qualified_name');
+            if (qualifiedName) {
+                moduleName = getNodeText(qualifiedName, this.source);
+            }
+            else {
+                // Simple namespace like "using System;" - get the first identifier
+                const identifier = node.namedChildren.find(c => c.type === 'identifier');
+                if (identifier) {
+                    moduleName = getNodeText(identifier, this.source);
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // C# handled completely above
+        }
+        else if (this.language === 'php') {
+            // PHP use declarations: use X\Y\Z, use X as Y, use function X\func, use X\{A, B}
+            // AST structure: namespace_use_declaration -> namespace_use_clause -> qualified_name or name
+            // Check for grouped imports first: use X\{A, B}
+            const namespacePrefix = node.namedChildren.find(c => c.type === 'namespace_name');
+            const useGroup = node.namedChildren.find(c => c.type === 'namespace_use_group');
+            if (namespacePrefix && useGroup) {
+                // Grouped import - create one import per item
+                const prefix = getNodeText(namespacePrefix, this.source);
+                const useClauses = useGroup.namedChildren.filter((c) => c.type === 'namespace_use_clause');
+                for (const clause of useClauses) {
+                    const name = clause.namedChildren.find((c) => c.type === 'name');
+                    if (name) {
+                        const fullPath = `${prefix}\\${getNodeText(name, this.source)}`;
+                        this.createNode('import', fullPath, node, {
+                            signature: importText,
+                        });
+                    }
+                }
+                return;
+            }
+            // Single import - find namespace_use_clause
+            const useClause = node.namedChildren.find(c => c.type === 'namespace_use_clause');
+            if (useClause) {
+                // Look for qualified_name (full path) or name (simple)
+                const qualifiedName = useClause.namedChildren.find((c) => c.type === 'qualified_name');
+                if (qualifiedName) {
+                    moduleName = getNodeText(qualifiedName, this.source);
+                }
+                else {
+                    const name = useClause.namedChildren.find((c) => c.type === 'name');
+                    if (name) {
+                        moduleName = getNodeText(name, this.source);
+                    }
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // PHP handled completely above
+        }
+        else if (this.language === 'ruby') {
+            // Ruby imports: require 'json', require_relative '../helper'
+            // AST structure: call -> identifier (require/require_relative) + argument_list -> string -> string_content
+            // Check if this is a require/require_relative call
+            const identifier = node.namedChildren.find(c => c.type === 'identifier');
+            if (!identifier)
+                return;
+            const methodName = getNodeText(identifier, this.source);
+            if (methodName !== 'require' && methodName !== 'require_relative') {
+                return; // Not an import, skip
+            }
+            // Find the argument (string)
+            const argList = node.namedChildren.find(c => c.type === 'argument_list');
+            if (argList) {
+                const stringNode = argList.namedChildren.find((c) => c.type === 'string');
+                if (stringNode) {
+                    // Get string_content (without quotes)
+                    const stringContent = stringNode.namedChildren.find((c) => c.type === 'string_content');
+                    if (stringContent) {
+                        moduleName = getNodeText(stringContent, this.source);
+                    }
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // Ruby handled completely above
+        }
+        else if (this.language === 'dart') {
+            // Dart imports: import 'dart:async'; import 'package:foo/bar.dart' as bar;
+            // AST: import_or_export -> library_import -> import_specification -> configurable_uri -> uri -> string_literal
+            const libraryImport = node.namedChildren.find(c => c.type === 'library_import');
+            if (libraryImport) {
+                const importSpec = libraryImport.namedChildren.find((c) => c.type === 'import_specification');
+                if (importSpec) {
+                    const configurableUri = importSpec.namedChildren.find((c) => c.type === 'configurable_uri');
+                    if (configurableUri) {
+                        const uri = configurableUri.namedChildren.find((c) => c.type === 'uri');
+                        if (uri) {
+                            const stringLiteral = uri.namedChildren.find((c) => c.type === 'string_literal');
+                            if (stringLiteral) {
+                                moduleName = getNodeText(stringLiteral, this.source).replace(/['"]/g, '');
+                            }
+                        }
+                    }
+                }
+            }
+            // Also handle exports: export 'src/foo.dart';
+            const libraryExport = node.namedChildren.find(c => c.type === 'library_export');
+            if (libraryExport) {
+                const configurableUri = libraryExport.namedChildren.find((c) => c.type === 'configurable_uri');
+                if (configurableUri) {
+                    const uri = configurableUri.namedChildren.find((c) => c.type === 'uri');
+                    if (uri) {
+                        const stringLiteral = uri.namedChildren.find((c) => c.type === 'string_literal');
+                        if (stringLiteral) {
+                            moduleName = getNodeText(stringLiteral, this.source).replace(/['"]/g, '');
+                        }
+                    }
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // Dart handled completely above
+        }
+        else if (this.language === 'c' || this.language === 'cpp') {
+            // C/C++ includes: #include <iostream>, #include "myheader.h"
+            // AST: preproc_include -> system_lib_string (<...>) or string_literal ("...")
+            // Check for system include: <path>
+            const systemLib = node.namedChildren.find(c => c.type === 'system_lib_string');
+            if (systemLib) {
+                // Remove angle brackets: <iostream> -> iostream
+                moduleName = getNodeText(systemLib, this.source).replace(/^<|>$/g, '');
+            }
+            else {
+                // Check for local include: "path"
+                const stringLiteral = node.namedChildren.find(c => c.type === 'string_literal');
+                if (stringLiteral) {
+                    const stringContent = stringLiteral.namedChildren.find((c) => c.type === 'string_content');
+                    if (stringContent) {
+                        moduleName = getNodeText(stringContent, this.source);
+                    }
+                }
+            }
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
+            return; // C/C++ handled completely above
         }
         else {
-            // Generic extraction
+            // Generic extraction for other languages
             moduleName = importText;
+            if (moduleName) {
+                this.createNode('import', moduleName, node, {
+                    signature: importText,
+                });
+            }
         }
+        // Keep unresolved reference creation for resolution purposes
+        // This is used to resolve imports to their target files/modules
         if (moduleName && this.nodeStack.length > 0) {
             const parentId = this.nodeStack[this.nodeStack.length - 1];
             if (parentId) {
@@ -1155,7 +1847,9 @@ class TreeSitterExtractor {
                 }
             }
             if (child.type === 'implements_clause' ||
-                child.type === 'class_interface_clause') {
+                child.type === 'class_interface_clause' ||
+                child.type === 'interfaces' // Dart
+            ) {
                 // Extract implemented interfaces
                 for (let j = 0; j < child.namedChildCount; j++) {
                     const iface = child.namedChild(j);
@@ -1213,6 +1907,7 @@ class LiquidExtractor {
             this.extractAssignments(fileNode.id);
         }
         catch (error) {
+            (0, sentry_1.captureException)(error, { operation: 'liquid-extraction', filePath: this.filePath });
             this.errors.push({
                 message: `Liquid extraction error: ${error instanceof Error ? error.message : String(error)}`,
                 severity: 'error',
@@ -1256,8 +1951,31 @@ class LiquidExtractor {
         const renderRegex = /\{%[-]?\s*(render|include)\s+['"]([^'"]+)['"]/g;
         let match;
         while ((match = renderRegex.exec(this.source)) !== null) {
-            const [, tagType, snippetName] = match;
+            const [fullMatch, tagType, snippetName] = match;
             const line = this.getLineNumber(match.index);
+            // Create an import node for searchability
+            const importNodeId = generateNodeId(this.filePath, 'import', snippetName, line);
+            const importNode = {
+                id: importNodeId,
+                kind: 'import',
+                name: snippetName,
+                qualifiedName: `${this.filePath}::import:${snippetName}`,
+                filePath: this.filePath,
+                language: 'liquid',
+                signature: fullMatch,
+                startLine: line,
+                endLine: line,
+                startColumn: match.index - this.getLineStart(line),
+                endColumn: match.index - this.getLineStart(line) + fullMatch.length,
+                updatedAt: Date.now(),
+            };
+            this.nodes.push(importNode);
+            // Add containment edge from file to import
+            this.edges.push({
+                source: fileNodeId,
+                target: importNodeId,
+                kind: 'contains',
+            });
             // Create a component node for the snippet reference
             const nodeId = generateNodeId(this.filePath, 'component', `${tagType}:${snippetName}`, line);
             const node = {
@@ -1270,7 +1988,7 @@ class LiquidExtractor {
                 startLine: line,
                 endLine: line,
                 startColumn: match.index - this.getLineStart(line),
-                endColumn: match.index - this.getLineStart(line) + match[0].length,
+                endColumn: match.index - this.getLineStart(line) + fullMatch.length,
                 updatedAt: Date.now(),
             };
             this.nodes.push(node);
@@ -1298,8 +2016,31 @@ class LiquidExtractor {
         const sectionRegex = /\{%[-]?\s*section\s+['"]([^'"]+)['"]/g;
         let match;
         while ((match = sectionRegex.exec(this.source)) !== null) {
-            const [, sectionName] = match;
+            const [fullMatch, sectionName] = match;
             const line = this.getLineNumber(match.index);
+            // Create an import node for searchability
+            const importNodeId = generateNodeId(this.filePath, 'import', sectionName, line);
+            const importNode = {
+                id: importNodeId,
+                kind: 'import',
+                name: sectionName,
+                qualifiedName: `${this.filePath}::import:${sectionName}`,
+                filePath: this.filePath,
+                language: 'liquid',
+                signature: fullMatch,
+                startLine: line,
+                endLine: line,
+                startColumn: match.index - this.getLineStart(line),
+                endColumn: match.index - this.getLineStart(line) + fullMatch.length,
+                updatedAt: Date.now(),
+            };
+            this.nodes.push(importNode);
+            // Add containment edge from file to import
+            this.edges.push({
+                source: fileNodeId,
+                target: importNodeId,
+                kind: 'contains',
+            });
             // Create a component node for the section reference
             const nodeId = generateNodeId(this.filePath, 'component', `section:${sectionName}`, line);
             const node = {
@@ -1312,7 +2053,7 @@ class LiquidExtractor {
                 startLine: line,
                 endLine: line,
                 startColumn: match.index - this.getLineStart(line),
-                endColumn: match.index - this.getLineStart(line) + match[0].length,
+                endColumn: match.index - this.getLineStart(line) + fullMatch.length,
                 updatedAt: Date.now(),
             };
             this.nodes.push(node);
@@ -1433,11 +2174,173 @@ class LiquidExtractor {
     }
 }
 exports.LiquidExtractor = LiquidExtractor;
+/**
+ * SvelteExtractor - Extracts code relationships from Svelte component files
+ *
+ * Svelte files are multi-language (script + template + style). Rather than
+ * parsing the full Svelte grammar, we extract the <script> block content
+ * and delegate it to the TypeScript/JavaScript TreeSitterExtractor.
+ *
+ * Every .svelte file produces a component node (Svelte components are always importable).
+ */
+class SvelteExtractor {
+    filePath;
+    source;
+    nodes = [];
+    edges = [];
+    unresolvedReferences = [];
+    errors = [];
+    constructor(filePath, source) {
+        this.filePath = filePath;
+        this.source = source;
+    }
+    /**
+     * Extract from Svelte source
+     */
+    extract() {
+        const startTime = Date.now();
+        try {
+            // Create component node for the .svelte file itself
+            const componentNode = this.createComponentNode();
+            // Extract and process script blocks
+            const scriptBlocks = this.extractScriptBlocks();
+            for (const block of scriptBlocks) {
+                this.processScriptBlock(block, componentNode.id);
+            }
+        }
+        catch (error) {
+            (0, sentry_1.captureException)(error, { operation: 'svelte-extraction', filePath: this.filePath });
+            this.errors.push({
+                message: `Svelte extraction error: ${error instanceof Error ? error.message : String(error)}`,
+                severity: 'error',
+            });
+        }
+        return {
+            nodes: this.nodes,
+            edges: this.edges,
+            unresolvedReferences: this.unresolvedReferences,
+            errors: this.errors,
+            durationMs: Date.now() - startTime,
+        };
+    }
+    /**
+     * Create a component node for the .svelte file
+     */
+    createComponentNode() {
+        const lines = this.source.split('\n');
+        const fileName = this.filePath.split(/[/\\]/).pop() || this.filePath;
+        const componentName = fileName.replace(/\.svelte$/, '');
+        const id = generateNodeId(this.filePath, 'component', componentName, 1);
+        const node = {
+            id,
+            kind: 'component',
+            name: componentName,
+            qualifiedName: `${this.filePath}::${componentName}`,
+            filePath: this.filePath,
+            language: 'svelte',
+            startLine: 1,
+            endLine: lines.length,
+            startColumn: 0,
+            endColumn: lines[lines.length - 1]?.length || 0,
+            isExported: true, // Svelte components are always importable
+            updatedAt: Date.now(),
+        };
+        this.nodes.push(node);
+        return node;
+    }
+    /**
+     * Extract <script> blocks from the Svelte source
+     */
+    extractScriptBlocks() {
+        const blocks = [];
+        const scriptRegex = /<script(\s[^>]*)?>(?<content>[\s\S]*?)<\/script>/g;
+        let match;
+        while ((match = scriptRegex.exec(this.source)) !== null) {
+            const attrs = match[1] || '';
+            const content = match.groups?.content || match[2] || '';
+            // Detect TypeScript from lang attribute
+            const isTypeScript = /lang\s*=\s*["'](ts|typescript)["']/.test(attrs);
+            // Detect module script
+            const isModule = /context\s*=\s*["']module["']/.test(attrs);
+            // Calculate start line of the script content (line after <script>)
+            const beforeScript = this.source.substring(0, match.index);
+            const scriptTagLine = (beforeScript.match(/\n/g) || []).length;
+            // The content starts on the line after the opening <script> tag
+            const openingTag = match[0].substring(0, match[0].indexOf('>') + 1);
+            const openingTagLines = (openingTag.match(/\n/g) || []).length;
+            const contentStartLine = scriptTagLine + openingTagLines + 1; // 0-indexed line
+            blocks.push({
+                content,
+                startLine: contentStartLine,
+                isModule,
+                isTypeScript,
+            });
+        }
+        return blocks;
+    }
+    /**
+     * Process a script block by delegating to TreeSitterExtractor
+     */
+    processScriptBlock(block, componentNodeId) {
+        const scriptLanguage = block.isTypeScript ? 'typescript' : 'javascript';
+        // Check if the script language parser is available
+        if (!(0, grammars_1.isLanguageSupported)(scriptLanguage)) {
+            this.errors.push({
+                message: `Parser for ${scriptLanguage} not available, cannot parse Svelte script block`,
+                severity: 'warning',
+            });
+            return;
+        }
+        // Delegate to TreeSitterExtractor
+        const extractor = new TreeSitterExtractor(this.filePath, block.content, scriptLanguage);
+        const result = extractor.extract();
+        // Offset line numbers from script block back to .svelte file positions
+        for (const node of result.nodes) {
+            node.startLine += block.startLine;
+            node.endLine += block.startLine;
+            node.language = 'svelte'; // Mark as svelte, not TS/JS
+            this.nodes.push(node);
+            // Add containment edge from component to this node
+            this.edges.push({
+                source: componentNodeId,
+                target: node.id,
+                kind: 'contains',
+            });
+        }
+        // Offset edges (they reference line numbers)
+        for (const edge of result.edges) {
+            if (edge.line) {
+                edge.line += block.startLine;
+            }
+            this.edges.push(edge);
+        }
+        // Offset unresolved references
+        for (const ref of result.unresolvedReferences) {
+            ref.line += block.startLine;
+            ref.filePath = this.filePath;
+            ref.language = 'svelte';
+            this.unresolvedReferences.push(ref);
+        }
+        // Carry over errors
+        for (const error of result.errors) {
+            if (error.line) {
+                error.line += block.startLine;
+            }
+            this.errors.push(error);
+        }
+    }
+}
+exports.SvelteExtractor = SvelteExtractor;
 /**
  * Extract nodes and edges from source code
  */
 function extractFromSource(filePath, source, language) {
     const detectedLanguage = language || (0, grammars_1.detectLanguage)(filePath);
+    // Use custom extractor for Svelte
+    if (detectedLanguage === 'svelte') {
+        const extractor = new SvelteExtractor(filePath, source);
+        return extractor.extract();
+    }
     // Use custom extractor for Liquid
     if (detectedLanguage === 'liquid') {
         const extractor = new LiquidExtractor(filePath, source);