gitnexus 1.6.6-rc.101 → 1.6.6-rc.103

package/dist/core/ingestion/export-detection.js

@@ -62,11 +62,6 @@ const CSHARP_DECL_TYPES = new Set([
     'struct_declaration',
     'enum_declaration',
     'record_declaration',
-    // tree-sitter-c-sharp absorbs 'record struct' and 'record class' into
-    // record_declaration — these two node types are listed defensively but
-    // never emitted by the grammar in practice (verified against ^0.23.1).
-    'record_struct_declaration',
-    'record_class_declaration',
     'delegate_declaration',
     'property_declaration',
     'field_declaration',

package/dist/core/ingestion/field-extractors/configs/dart.js

@@ -42,10 +42,7 @@ export const dartConfig = {
         // declaration > type_identifier (first named child usually)
         for (let i = 0; i < node.namedChildCount; i++) {
             const child = node.namedChild(i);
-            if (child &&
-                (child.type === 'type_identifier' ||
-                    child.type === 'generic_type' ||
-                    child.type === 'function_type')) {
+            if (child && (child.type === 'type_identifier' || child.type === 'function_type')) {
                 return extractSimpleTypeName(child) ?? child.text?.trim();
             }
         }

package/dist/core/ingestion/field-extractors/configs/php.js

@@ -46,8 +46,7 @@ export const phpConfig = {
                 child.type === 'named_type' ||
                 child.type === 'optional_type' ||
                 child.type === 'primitive_type' ||
-                child.type === 'intersection_type' ||
-                child.type === 'nullable_type') {
+                child.type === 'intersection_type') {
                 return extractSimpleTypeName(child) ?? child.text?.trim();
             }
         }

package/dist/core/ingestion/field-extractors/configs/swift.js

@@ -17,7 +17,7 @@ const SWIFT_VIS = new Set([
  */
 export const swiftConfig = {
     language: SupportedLanguages.Swift,
-    typeDeclarationNodes: ['class_declaration', 'struct_declaration', 'protocol_declaration'],
+    typeDeclarationNodes: ['class_declaration', 'protocol_declaration'],
     fieldNodeTypes: ['property_declaration'],
     bodyNodeTypes: ['class_body', 'protocol_body'],
     defaultVisibility: 'internal',

package/dist/core/ingestion/field-extractors/typescript.js

@@ -70,17 +70,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 }
             }
         }
-        // Check for modifier node (tree-sitter typescript may group these)
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                const modText = modifier?.text.trim();
-                if (modText && TypeScriptFieldExtractor.VISIBILITY_MODIFIERS.has(modText)) {
-                    return modText;
-                }
-            }
-        }
         // TypeScript class members are public by default
         return 'public';
     }
@@ -94,15 +83,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 return true;
             }
         }
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                if (modifier && modifier.text === 'static') {
-                    return true;
-                }
-            }
-        }
         return false;
     }
     /**
@@ -115,15 +95,6 @@ export class TypeScriptFieldExtractor extends BaseFieldExtractor {
                 return true;
             }
         }
-        const modifiers = node.childForFieldName('modifiers');
-        if (modifiers) {
-            for (let i = 0; i < modifiers.childCount; i++) {
-                const modifier = modifiers.child(i);
-                if (modifier && modifier.text === 'readonly') {
-                    return true;
-                }
-            }
-        }
         return false;
     }
     /**

package/dist/core/ingestion/languages/c/captures.js

@@ -14,9 +14,9 @@ export function emitCScopeCaptures(sourceText, filePath, cachedTree) {
     }
     const rawMatches = getCScopeQuery().matches(tree.rootNode);
     const out = [];
-    // Track ranges where typedef-struct/union was captured as @declaration.struct/union
-    // so we can suppress the duplicate @declaration.typedef match at the same range.
-    const structTypedefRanges = new Set();
+    // Track ranges where typedef-struct/union/enum was captured as its concrete
+    // type so we can suppress the duplicate @declaration.typedef match.
+    const concreteTypedefRanges = new Set();
     for (const m of rawMatches) {
         const grouped = {};
         for (const c of m.captures) {
@@ -39,18 +39,20 @@ export function emitCScopeCaptures(sourceText, filePath, cachedTree) {
                 }
             }
         }
-        // Track typedef-struct ranges to suppress duplicate typedef declarations
-        const structAnchor = grouped['@declaration.struct'] ?? grouped['@declaration.union'];
-        if (structAnchor !== undefined) {
-            const r = structAnchor.range;
-            structTypedefRanges.add(`${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`);
+        // Track typedef struct/union/enum ranges to suppress duplicate typedef declarations
+        const concreteTypeAnchor = grouped['@declaration.struct'] ??
+            grouped['@declaration.union'] ??
+            grouped['@declaration.enum'];
+        if (concreteTypeAnchor !== undefined) {
+            const r = concreteTypeAnchor.range;
+            concreteTypedefRanges.add(`${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`);
         }
-        // Suppress @declaration.typedef if the same range was already captured as struct/union
+        // Suppress @declaration.typedef if the same range was already captured as a concrete type.
         const typedefAnchor = grouped['@declaration.typedef'];
         if (typedefAnchor !== undefined) {
             const r = typedefAnchor.range;
             const key = `${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`;
-            if (structTypedefRanges.has(key))
+            if (concreteTypedefRanges.has(key))
                 continue;
         }
         // Enrich function declarations with arity metadata and detect static linkage

package/dist/core/ingestion/languages/c/query.js

@@ -40,6 +40,12 @@ const C_SCOPE_QUERY = `
 (enum_specifier
   name: (type_identifier) @declaration.name) @declaration.enum
 
+;; Declarations — enum (typedef enum { ... } Name)
+(type_definition
+  type: (enum_specifier
+    body: (enumerator_list))
+  declarator: (type_identifier) @declaration.name) @declaration.enum
+
 ;; Declarations — function definition
 (function_definition
   declarator: (function_declarator

package/dist/core/ingestion/languages/cpp/arity-metadata.js

@@ -23,7 +23,6 @@ export function computeCppDeclarationArity(node) {
             continue;
         if (child.type === 'parameter_declaration' ||
             child.type === 'optional_parameter_declaration' ||
-            child.type === 'variadic_parameter' ||
             child.type === 'variadic_parameter_declaration') {
             params.push(child);
         }
@@ -47,8 +46,7 @@ export function computeCppDeclarationArity(node) {
     // token in tree-sitter-cpp, detected via `hasEllipsis` above.
     // C++ parameter packs: `template<typename... Ts> void foo(Ts... args)` —
     // detected as `variadic_parameter_declaration`.
-    const isVariadic = hasEllipsis ||
-        params.some((p) => p.type === 'variadic_parameter' || p.type === 'variadic_parameter_declaration');
+    const isVariadic = hasEllipsis || params.some((p) => p.type === 'variadic_parameter_declaration');
     const optionalCount = params.filter((p) => p.type === 'optional_parameter_declaration').length;
     const requiredCount = params.filter((p) => p.type === 'parameter_declaration' ||
         // variadic_parameter_declaration with a name is a parameter pack — counts as one
@@ -57,11 +55,7 @@ export function computeCppDeclarationArity(node) {
     const types = [];
     const typeClasses = [];
     for (const p of params) {
-        if (p.type === 'variadic_parameter') {
-            types.push('...');
-            typeClasses.push(unknownTypeClass('...'));
-        }
-        else if (p.type === 'variadic_parameter_declaration') {
+        if (p.type === 'variadic_parameter_declaration') {
             // Parameter pack: treated as variadic
             types.push('...');
             typeClasses.push(unknownTypeClass('...'));

package/dist/core/ingestion/languages/cpp/captures.js

@@ -18,9 +18,9 @@ export function emitCppScopeCaptures(sourceText, filePath, cachedTree) {
     }
     const rawMatches = getCppScopeQuery().matches(tree.rootNode);
     const out = [];
-    // Track ranges where typedef-struct was captured as @declaration.struct
+    // Track ranges where typedef-struct/enum was captured as its concrete type
     // so we can suppress the duplicate @declaration.typedef match.
-    const structTypedefRanges = new Set();
+    const concreteTypedefRanges = new Set();
     for (const m of rawMatches) {
         const grouped = {};
         for (const c of m.captures) {
@@ -55,18 +55,20 @@ export function emitCppScopeCaptures(sourceText, filePath, cachedTree) {
                 }
             }
         }
-        // ── Track typedef-struct ranges ─────────────────────────────────
-        const structAnchor = grouped['@declaration.struct'] ?? grouped['@declaration.class'];
-        if (structAnchor !== undefined) {
-            const r = structAnchor.range;
-            structTypedefRanges.add(`${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`);
+        // ── Track concrete typedef ranges ───────────────────────────────
+        const concreteTypeAnchor = grouped['@declaration.struct'] ??
+            grouped['@declaration.class'] ??
+            grouped['@declaration.enum'];
+        if (concreteTypeAnchor !== undefined) {
+            const r = concreteTypeAnchor.range;
+            concreteTypedefRanges.add(`${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`);
         }
         // Suppress @declaration.typedef if the same range was already captured
         const typedefAnchor = grouped['@declaration.typedef'];
         if (typedefAnchor !== undefined) {
             const r = typedefAnchor.range;
             const key = `${r.startLine}:${r.startCol}:${r.endLine}:${r.endCol}`;
-            if (structTypedefRanges.has(key))
+            if (concreteTypedefRanges.has(key))
                 continue;
         }
         // ── Enrich function/method declarations with arity metadata ─────
@@ -1251,7 +1253,7 @@ function lookupAdlIdentifierType(identNode) {
                 inner = next;
                 continue;
             }
-            if (inner.type === 'reference_declarator' || inner.type === 'rvalue_reference_declarator') {
+            if (inner.type === 'reference_declarator') {
                 // reference_declarator has a single child (the inner declarator).
                 let next = null;
                 for (let j = 0; j < inner.namedChildCount; j++) {

package/dist/core/ingestion/languages/cpp/query.js

@@ -47,6 +47,12 @@ const CPP_SCOPE_QUERY = `
     (template_argument_list) @declaration.template-arguments)
   body: (field_declaration_list)) @declaration.struct
 
+;; Declarations — struct (typedef struct { ... } Name)
+(type_definition
+  type: (struct_specifier
+    body: (field_declaration_list))
+  declarator: (type_identifier) @declaration.name) @declaration.struct
+
 ;; ─── Declarations — class / struct inside template_declaration ───────
 (template_declaration
   (class_specifier
@@ -76,6 +82,12 @@ const CPP_SCOPE_QUERY = `
 (enum_specifier
   name: (type_identifier) @declaration.name) @declaration.enum
 
+;; ─── Declarations — enum (typedef enum { ... } Name) ─────────────────
+(type_definition
+  type: (enum_specifier
+    body: (enumerator_list))
+  declarator: (type_identifier) @declaration.name) @declaration.enum
+
 ;; ─── Declarations — enum constants ───────────────────────────────────
 (enumerator
   name: (identifier) @declaration.name) @declaration.const

package/dist/core/ingestion/languages/csharp/captures.js

@@ -242,7 +242,9 @@ function terminalTypeNameNode(node) {
         case 'qualified_name':
             return node.lastNamedChild;
         case 'generic_name':
-            return node.childForFieldName('name') ?? node.firstNamedChild;
+            // generic_name has no `name` field (verified by real parse, #1920); the
+            // base identifier is the first named child.
+            return node.firstNamedChild;
         default:
             return null;
     }

package/dist/core/ingestion/languages/java/captures.js

@@ -132,9 +132,12 @@ export function emitJavaScopeCaptures(sourceText, _filePath, cachedTree) {
                 findNodeAtRange(tree.rootNode, anchor.range, 'object_creation_expression');
             if (callNode !== null) {
                 const argList = callNode.childForFieldName('arguments');
+                // Exclude interleaved comments — tree-sitter-java emits `block_comment` /
+                // `line_comment` as named children of argument_list, which would inflate
+                // arity (and arity feeds call-processor symbol-ID generation). #1920
                 const args = argList === null
                     ? []
-                    : argList.namedChildren.filter((c) => c !== null && c.type !== 'comment');
+                    : argList.namedChildren.filter((c) => c !== null && c.type !== 'block_comment' && c.type !== 'line_comment');
                 grouped['@reference.arity'] = syntheticCapture('@reference.arity', callNode, String(args.length));
                 const argTypes = args.map((arg) => inferArgType(arg));
                 grouped['@reference.parameter-types'] = syntheticCapture('@reference.parameter-types', callNode, JSON.stringify(argTypes));

package/dist/core/ingestion/languages/php/import-decomposer.js

@@ -97,23 +97,7 @@ function parseUseClause(clause, qualifier) {
     const source = qualName.text.trim();
     if (source === '')
         return null;
-    // Strategy 1: explicit alias_clause wrapper (older grammar versions).
-    const aliasClause = findNamedChild(clause, 'alias_clause');
-    if (aliasClause !== null) {
-        // alias_clause: "as" name
-        const aliasName = findNamedChild(aliasClause, 'name') ?? aliasClause.firstNamedChild;
-        const alias = aliasName?.text.trim() ?? '';
-        if (alias === '')
-            return null;
-        return {
-            kind: 'alias',
-            source,
-            name: alias,
-            alias,
-            atNode: clause,
-        };
-    }
-    // Strategy 2: bare sibling `name` node after the qualified_name.
+    // Strategy: bare sibling `name` node after the qualified_name.
     // tree-sitter-php (≥ 0.22) emits `use Foo\Bar as Baz` as:
     //   namespace_use_clause
     //     qualified_name "Foo\Bar"
@@ -197,22 +181,7 @@ function parseInnerClause(clause, prefix, qualifier) {
     if (innerPath === '')
         return null;
     const source = prefix !== '' ? `${prefix}\\${innerPath}` : innerPath;
-    // Strategy 1: explicit alias_clause wrapper (older grammar versions).
-    const aliasClause = findNamedChild(clause, 'alias_clause');
-    if (aliasClause !== null) {
-        const aliasName = findNamedChild(aliasClause, 'name') ?? aliasClause.firstNamedChild;
-        const alias = aliasName?.text.trim() ?? '';
-        if (alias === '')
-            return null;
-        return {
-            kind: 'alias',
-            source,
-            name: alias,
-            alias,
-            atNode: clause,
-        };
-    }
-    // Strategy 2: bare sibling `name` node after the qualified_name (tree-sitter-php ≥ 0.22).
+    // Strategy: bare sibling `name` node after the qualified_name (tree-sitter-php ≥ 0.22).
     if (clause.namedChildCount >= 2) {
         const lastChild = clause.namedChild(clause.namedChildCount - 1);
         if (lastChild !== null && lastChild !== qualName && lastChild.type === 'name') {

package/dist/core/ingestion/languages/php/receiver-binding.js

@@ -24,6 +24,11 @@ const TYPE_DECL_NODE_TYPES = new Set([
     'interface_declaration',
     'trait_declaration',
     'enum_declaration',
+    // tree-sitter-php node for `new class {...}` (real node is `anonymous_class`,
+    // not `anonymous_class_declaration`). Included so the enclosing-type walk
+    // stops AT the anon class and the guard below skips it (otherwise a method in
+    // an anon class nested in a named class would mis-bind $this to the outer class).
+    'anonymous_class',
 ]);
 const FUNCTION_NODE_TYPES = new Set([
     'method_declaration',
@@ -94,7 +99,7 @@ export function synthesizePhpReceiverBinding(fnNode) {
     if (enclosingType === null)
         return [];
     // Anonymous class — skip (no stable name).
-    if (enclosingType.type === 'anonymous_class_declaration')
+    if (enclosingType.type === 'anonymous_class')
         return [];
     const enclosingName = typeName(enclosingType);
     if (enclosingName === null)
@@ -102,9 +107,8 @@ export function synthesizePhpReceiverBinding(fnNode) {
     // Anchor the synthesized captures to the method body (compound_statement)
     // so they land inside the function scope, not at the class scope.
     // For interface/abstract methods that have no body, skip.
-    const bodyNode = fnNode.childForFieldName('body') ??
-        // arrow_function: body is the expression after `=>`
-        fnNode.childForFieldName('return_value');
+    // tree-sitter-php arrow_function also exposes its expression via the `body` field.
+    const bodyNode = fnNode.childForFieldName('body');
     if (bodyNode === null)
         return [];
     const out = [];

package/dist/core/ingestion/languages/python/depends-references.js

@@ -27,7 +27,7 @@ export function synthesizeDependsReferences(fnNode) {
         if (param.type !== 'typed_default_parameter' && param.type !== 'default_parameter') {
             continue;
         }
-        const defaultValue = param.childForFieldName('value') ?? param.childForFieldName('default');
+        const defaultValue = param.childForFieldName('value');
         if (defaultValue === null)
             continue;
         const callNode = defaultValue.type === 'call' ? defaultValue : null;

package/dist/core/ingestion/languages/ruby/captures.js

@@ -148,7 +148,7 @@ export function emitRubyScopeCaptures(sourceText, _filePath, cachedTree) {
                         if (argList !== null) {
                             for (let ai = 0; ai < argList.namedChildCount; ai++) {
                                 const arg = argList.namedChild(ai);
-                                if (arg !== null && (arg.type === 'simple_symbol' || arg.type === 'symbol')) {
+                                if (arg !== null && arg.type === 'simple_symbol') {
                                     const propName = arg.text.replace(/^:/, '');
                                     out.push({
                                         '@import.statement': grouped['@reference.call.free'],
@@ -265,7 +265,7 @@ export function emitRubyScopeCaptures(sourceText, _filePath, cachedTree) {
                     if (argList !== null) {
                         for (let ai = 0; ai < argList.namedChildCount; ai++) {
                             const arg = argList.namedChild(ai);
-                            if (arg !== null && (arg.type === 'simple_symbol' || arg.type === 'symbol')) {
+                            if (arg !== null && arg.type === 'simple_symbol') {
                                 const propName = arg.text.replace(/^:/, '');
                                 out.push({
                                     '@type-binding.return': syntheticCapture('@type-binding.return', attrNode, text),

package/dist/core/ingestion/languages/rust/range-binding.js

@@ -233,11 +233,10 @@ function processStructDestructuring(root, parsed, scopeMap, moduleScope, allFiel
         for (const fieldNode of patternNode.namedChildren) {
             let fieldName;
             if (fieldNode.type === 'field_pattern') {
+                // shorthand `{ a }` and full `{ b: c }` are both field_pattern; the
+                // `name` field is shorthand_field_identifier or field_identifier.
                 fieldName = fieldNode.childForFieldName('name')?.text;
             }
-            else if (fieldNode.type === 'shorthand_field_pattern') {
-                fieldName = fieldNode.firstNamedChild?.text;
-            }
             if (fieldName === undefined)
                 continue;
             let fieldType = lookupFieldType(typeName, fieldName, parsed, scopeMap, moduleScope);

package/dist/core/ingestion/languages/typescript/receiver-binding.js

@@ -49,7 +49,6 @@ const TYPE_DECL_NODE_TYPES = new Set([
     'class_declaration',
     'abstract_class_declaration',
     'class',
-    'class_expression',
     'interface_declaration',
 ]);
 /** Scope function nodes that could be a class method body. */

package/dist/core/ingestion/method-extractors/configs/dart.js

@@ -8,7 +8,6 @@ import { extractSimpleTypeName } from '../../type-extractors/shared.js';
 /** Type node types that represent a return type in function/getter/setter signatures. */
 const TYPE_NODE_TYPES = new Set([
     'type_identifier',
-    'generic_type',
     'function_type',
     'nullable_type',
     'void_type',

package/dist/core/ingestion/method-extractors/configs/php.js

@@ -101,7 +101,6 @@ function extractPhpReturnType(node) {
         'named_type',
         'union_type',
         'optional_type',
-        'nullable_type',
         'intersection_type',
     ]);
     let astType;

package/dist/core/ingestion/parsing-processor.js

@@ -7,7 +7,7 @@ import { extractVueScript, isVueSetupTopLevel } from './vue-sfc-extractor.js';
 import { yieldToEventLoop } from './utils/event-loop.js';
 import { parseSourceSafe } from '../tree-sitter/safe-parse.js';
 import { isVerboseIngestionEnabled } from './utils/verbose.js';
-import { getDefinitionNodeFromCaptures, findEnclosingClassInfo, findObjectLiteralBindingInfo, getLabelFromCaptures, CLASS_CONTAINER_TYPES, } from './utils/ast-helpers.js';
+import { buildConcreteTypedefDefinitionRanges, getDefinitionNodeFromCaptures, findEnclosingClassInfo, findObjectLiteralBindingInfo, getLabelFromCaptures, isSuppressedConcreteTypedefDuplicate, CLASS_CONTAINER_TYPES, } from './utils/ast-helpers.js';
 import { detectFrameworkFromAST } from './framework-detection.js';
 import { buildTypeEnv } from './type-env.js';
 import { buildMethodProps, arityForIdFromInfo, typeTagForId, constTagForId, buildCollisionGroups, parameterShapeIdTag, } from './utils/method-props.js';
@@ -356,6 +356,7 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
             logger.warn({ queryError }, `Query error for ${file.path}:`);
             continue;
         }
+        const concreteTypedefRanges = buildConcreteTypedefDefinitionRanges(matches);
         // Build per-file type environment for FieldExtractor context (lightweight — skipped if no fieldExtractor).
         //
         // Note: this TypeEnv is intentionally NOT flushed into the BindingAccumulator.
@@ -375,6 +376,8 @@ const processParsingSequential = async (graph, files, symbolTable, astCache, sco
             match.captures.forEach((c) => {
                 captureMap[c.name] = c.node;
             });
+            if (isSuppressedConcreteTypedefDuplicate(captureMap, concreteTypedefRanges))
+                return;
             const definitionNodeForRange = getDefinitionNodeFromCaptures(captureMap);
             const definitionNode = getDefinitionNodeFromCaptures(captureMap);
             const defaultNodeLabel = getLabelFromCaptures(captureMap, provider);

package/dist/core/ingestion/tree-sitter-queries.d.ts

@@ -2,9 +2,9 @@ export declare const TYPESCRIPT_QUERIES = "\n(class_declaration\n  name: (type_i
 export declare const JAVASCRIPT_QUERIES = "\n(class_declaration\n  name: (identifier) @name) @definition.class\n\n(function_declaration\n  name: (identifier) @name) @definition.function\n\n(method_definition\n  name: (property_identifier) @name) @definition.method\n\n; ES2022 #private methods\n(method_definition\n  name: (private_property_identifier) @name) @definition.method\n\n(lexical_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (arrow_function))) @definition.function\n\n(lexical_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (function_expression))) @definition.function\n\n(export_statement\n  declaration: (lexical_declaration\n    (variable_declarator\n      name: (identifier) @name\n      value: (arrow_function)))) @definition.function\n\n(export_statement\n  declaration: (lexical_declaration\n    (variable_declarator\n      name: (identifier) @name\n      value: (function_expression)))) @definition.function\n\n; Object-property arrows / function expressions: `{ addItem: () => ... }`.\n; See TYPESCRIPT_QUERIES for rationale (issue #1166).\n(pair\n  key: (property_identifier) @name\n  value: (arrow_function)) @definition.function\n\n(pair\n  key: (property_identifier) @name\n  value: (function_expression)) @definition.function\n\n(pair\n  key: (string (string_fragment) @name)\n  value: (arrow_function)) @definition.function\n\n(pair\n  key: (string (string_fragment) @name)\n  value: (function_expression)) @definition.function\n\n; HOC-wrapped variable declarations: `const X = HOC((args) => { ... })`.\n; See TYPESCRIPT_QUERIES section above for the full rationale (issue #1166\n; follow-up \u2014 covers forwardRef / memo / useCallback / useMemo / observer\n; / debounce / user-defined HOC factories). Both `const` and `var` forms\n; are mirrored so JS code that uses `var` (or transpiler output) gets the\n; same attribution as the registry-primary path.\n(lexical_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (call_expression\n      arguments: (arguments\n        (arrow_function))))) @definition.function\n\n(lexical_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (call_expression\n      arguments: (arguments\n        (function_expression))))) @definition.function\n\n(export_statement\n  declaration: (lexical_declaration\n    (variable_declarator\n      name: (identifier) @name\n      value: (call_expression\n        arguments: (arguments\n          (arrow_function)))))) @definition.function\n\n(export_statement\n  declaration: (lexical_declaration\n    (variable_declarator\n      name: (identifier) @name\n      value: (call_expression\n        arguments: (arguments\n          (function_expression)))))) @definition.function\n\n; `var X = HOC(...)` parity with registry-primary.\n(variable_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (call_expression\n      arguments: (arguments\n        (arrow_function))))) @definition.function\n\n(variable_declaration\n  (variable_declarator\n    name: (identifier) @name\n    value: (call_expression\n      arguments: (arguments\n        (function_expression))))) @definition.function\n\n; Variable/constant declarations (non-function values).\n; Overlap with @definition.function patterns is handled by parse-worker dedup.\n(lexical_declaration\n  (variable_declarator\n    name: (identifier) @name)) @definition.const\n\n(export_statement\n  declaration: (lexical_declaration\n    (variable_declarator\n      name: (identifier) @name))) @definition.const\n\n; var declarations (mutable, function-scoped)\n(variable_declaration\n  (variable_declarator\n    name: (identifier) @name)) @definition.variable\n\n(import_statement\n  source: (string) @import.source) @import\n\n; Re-export statements: export { X } from './y'\n(export_statement\n  source: (string) @import.source) @import\n\n(call_expression\n  function: (identifier) @call.name) @call\n\n(call_expression\n  function: (member_expression\n    property: (property_identifier) @call.name)) @call\n\n; Constructor calls: new Foo()\n(new_expression\n  constructor: (identifier) @call.name) @call\n\n; Class fields \u2014 field_definition captures JS class fields (class User { address = ... })\n(field_definition\n  property: (property_identifier) @name) @definition.property\n\n; Heritage queries - class extends (JavaScript uses different AST than TypeScript)\n; In tree-sitter-javascript, class_heritage directly contains the parent identifier\n(class_declaration\n  name: (identifier) @heritage.class\n  (class_heritage\n    (identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (member_expression\n    object: (_) @assignment.receiver\n    property: (property_identifier) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: obj.field += value (compound assignment)\n(augmented_assignment_expression\n  left: (member_expression\n    object: (_) @assignment.receiver\n    property: (property_identifier) @assignment.property)\n  right: (_)) @assignment\n\n; HTTP consumers: fetch('/path'), axios.get('/path'), $.get('/path'), etc.\n(call_expression\n  function: (identifier) @_fetch_fn (#eq? @_fetch_fn \"fetch\")\n  arguments: (arguments\n    [(string (string_fragment) @route.url)\n     (template_string) @route.template_url])) @route.fetch\n\n; Custom fetch wrappers: apiFetch('/path'), fetchJSON('/api/data'), httpGet('/users'), etc.\n(call_expression\n  function: (identifier) @_wrapper_fn (#match? @_wrapper_fn \"^(api(Fetch|Get|Post|Put|Delete|Patch|Request)|fetch(API|JSON|Data|Endpoint|Resource|Url)|http(Fetch|Get|Post|Put|Delete|Patch|Request))$\")\n  arguments: (arguments\n    (string (string_fragment) @route.url))) @route.fetch\n\n; axios.get/post, $.get/post/ajax\n(call_expression\n  function: (member_expression\n    property: (property_identifier) @http_client.method)\n  arguments: (arguments\n    (string (string_fragment) @http_client.url))) @http_client\n\n; Express/Hono route registration\n(call_expression\n  function: (member_expression\n    property: (property_identifier) @express_route.method)\n  arguments: (arguments\n    (string (string_fragment) @express_route.path))) @express_route\n";
 export declare const PYTHON_QUERIES = "\n(class_definition\n  name: (identifier) @name) @definition.class\n\n(function_definition\n  name: (identifier) @name) @definition.function\n\n(import_statement\n  name: (dotted_name) @import.source) @import\n\n; import numpy as np  \u2192  aliased_import captures the module name so the\n; import path is resolved and named-binding extraction stores \"np\" \u2192 \"numpy\".\n(import_statement\n  name: (aliased_import\n    name: (dotted_name) @import.source)) @import\n\n(import_from_statement\n  module_name: (dotted_name) @import.source) @import\n\n(import_from_statement\n  module_name: (relative_import) @import.source) @import\n\n(call\n  function: (identifier) @call.name) @call\n\n(call\n  function: (attribute\n    attribute: (identifier) @call.name)) @call\n\n; Class attribute type annotations \u2014 PEP 526: address: Address or address: Address = Address()\n; Both bare annotations (address: Address) and annotated assignments (name: str = \"test\")\n; are parsed as (assignment left: ... type: ...) in tree-sitter-python.\n(expression_statement\n  (assignment\n    left: (identifier) @name\n    type: (type)) @definition.property)\n\n; Plain variable assignments without type annotation: x = 5, MAX_SIZE = 100\n; Overlap with @definition.property (typed) is handled by parse-worker dedup.\n(expression_statement\n  (assignment\n    left: (identifier) @name)) @definition.variable\n\n; Heritage queries - Python class inheritance\n(class_definition\n  name: (identifier) @heritage.class\n  superclasses: (argument_list\n    (identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment\n  left: (attribute\n    object: (_) @assignment.receiver\n    attribute: (identifier) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: obj.field += value (compound assignment)\n(augmented_assignment\n  left: (attribute\n    object: (_) @assignment.receiver\n    attribute: (identifier) @assignment.property)\n  right: (_)) @assignment\n\n; Python HTTP clients: requests.get('/path'), httpx.post('/path'), session.get('/path')\n(call\n  function: (attribute\n    attribute: (identifier) @http_client.method)\n  arguments: (argument_list\n    (string (string_content) @http_client.url))) @http_client\n\n; Python decorators: @app.route, @router.get, etc.\n(decorator\n  (call\n    function: (attribute\n      object: (identifier) @decorator.receiver\n      attribute: (identifier) @decorator.name)\n    arguments: (argument_list\n      (string (string_content) @decorator.arg)?))) @decorator\n";
 export declare const JAVA_QUERIES = "\n; Classes, Interfaces, Enums, Annotations\n(class_declaration name: (identifier) @name) @definition.class\n(interface_declaration name: (identifier) @name) @definition.interface\n(enum_declaration name: (identifier) @name) @definition.enum\n(annotation_type_declaration name: (identifier) @name) @definition.annotation\n\n; Methods & Constructors\n(method_declaration name: (identifier) @name) @definition.method\n(constructor_declaration name: (identifier) @name) @definition.constructor\n\n; Fields \u2014 typed field declarations inside class bodies\n(field_declaration\n  declarator: (variable_declarator\n    name: (identifier) @name)) @definition.property\n\n; Imports - capture any import declaration child as source\n(import_declaration (_) @import.source) @import\n\n; Calls\n(method_invocation name: (identifier) @call.name) @call\n(method_invocation object: (_) name: (identifier) @call.name) @call\n(method_reference) @call\n\n; Constructor calls: new Foo()\n(object_creation_expression type: (type_identifier) @call.name) @call\n\n; Local variable declarations inside method bodies\n(local_variable_declaration\n  declarator: (variable_declarator\n    name: (identifier) @name)) @definition.variable\n\n; Heritage - extends class\n(class_declaration name: (identifier) @heritage.class\n  (superclass (type_identifier) @heritage.extends)) @heritage\n\n; Heritage - implements interfaces\n(class_declaration name: (identifier) @heritage.class\n  (super_interfaces (type_list (type_identifier) @heritage.implements))) @heritage.impl\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_access\n    object: (_) @assignment.receiver\n    field: (identifier) @assignment.property)\n  right: (_)) @assignment\n";
-export declare const C_QUERIES = "\n; Functions (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n\n; Functions returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n\n; Functions returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n\n; Structs, Unions, Enums, Typedefs\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(union_specifier name: (type_identifier) @name) @definition.union\n(enum_specifier name: (type_identifier) @name) @definition.enum\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n\n; Variable declarations: int x = 5; or int x;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n";
+export declare const C_QUERIES = "\n; Functions (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n\n; Functions returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n\n; Functions returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n\n; Structs, Unions, Enums, Typedefs\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(type_definition\n  type: (struct_specifier\n    body: (field_declaration_list))\n  declarator: (type_identifier) @name) @definition.struct\n(union_specifier name: (type_identifier) @name) @definition.union\n(enum_specifier name: (type_identifier) @name) @definition.enum\n(type_definition\n  type: (enum_specifier\n    body: (enumerator_list))\n  declarator: (type_identifier) @name) @definition.enum\n(enumerator name: (identifier) @name) @definition.const\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n\n; Variable declarations: int x = 5; or int x;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n";
 export declare const GO_QUERIES = "\n; Functions & Methods\n(function_declaration name: (identifier) @name) @definition.function\n(method_declaration name: (field_identifier) @name) @definition.method\n\n; Types\n(type_declaration (type_spec name: (type_identifier) @name type: (struct_type))) @definition.struct\n(type_declaration (type_spec name: (type_identifier) @name type: (interface_type))) @definition.interface\n\n; Imports\n(import_declaration (import_spec path: (interpreted_string_literal) @import.source)) @import\n(import_declaration (import_spec_list (import_spec path: (interpreted_string_literal) @import.source))) @import\n\n; Struct fields \u2014 named field declarations inside struct types\n(field_declaration_list\n  (field_declaration\n    name: (field_identifier) @name) @definition.property)\n\n; Struct embedding (anonymous fields = inheritance)\n(type_declaration\n  (type_spec\n    name: (type_identifier) @heritage.class\n    type: (struct_type\n      (field_declaration_list\n        (field_declaration\n          type: (type_identifier) @heritage.extends))))) @definition.struct\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (selector_expression field: (field_identifier) @call.name)) @call\n\n; Const/var declarations\n(const_declaration (const_spec name: (identifier) @name)) @definition.const\n(var_declaration (var_spec name: (identifier) @name)) @definition.variable\n\n; Short variable declaration: x := 5\n(short_var_declaration left: (expression_list (identifier) @name)) @definition.variable\n\n; Struct literal construction: User{Name: \"Alice\"}\n(composite_literal type: (type_identifier) @call.name) @call\n\n; Write access: obj.field = value\n(assignment_statement\n  left: (expression_list\n    (selector_expression\n      operand: (_) @assignment.receiver\n      field: (field_identifier) @assignment.property))\n  right: (_)) @assignment\n\n; Write access: obj.field++ / obj.field--\n(inc_statement\n  (selector_expression\n    operand: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)) @assignment\n(dec_statement\n  (selector_expression\n    operand: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)) @assignment\n";
-export declare const CPP_QUERIES = "\n; Classes, Structs, Namespaces\n(class_specifier name: (type_identifier) @name) @definition.class\n(class_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.class\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(struct_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.struct\n(namespace_definition name: (namespace_identifier) @name) @definition.namespace\n(enum_specifier name: (type_identifier) @name) @definition.enum\n\n; Typedefs and unions (common in C-style headers and mixed C/C++ code)\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n(union_specifier name: (type_identifier) @name) @definition.union\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Functions & Methods (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (operator_name) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))) @definition.method\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (operator_name) @name))) @definition.method\n\n; Functions/methods returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Functions/methods returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))))) @definition.method\n\n; Functions/methods returning references (reference_declarator wraps function_declarator)\n(function_definition declarator: (reference_declarator (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (operator_name) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (operator_name) @name)))) @definition.method\n\n; Destructors (destructor_name is distinct from identifier in tree-sitter-cpp)\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (destructor_name) @name))) @definition.method\n\n; Function declarations / prototypes (common in headers)\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (function_declarator declarator: (operator_name) @name)) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(declaration declarator: (reference_declarator (function_declarator declarator: (operator_name) @name))) @definition.function\n\n; Class/struct data member fields (Address address; int count;)\n; Uses field_identifier to exclude method declarations (which use function_declarator)\n(field_declaration\n  declarator: (field_identifier) @name) @definition.property\n\n; Pointer member fields (Address* address;)\n(field_declaration\n  declarator: (pointer_declarator\n    declarator: (field_identifier) @name)) @definition.property\n\n; Reference member fields (Address& address;)\n(field_declaration\n  declarator: (reference_declarator\n    (field_identifier) @name)) @definition.property\n\n; Inline class method declarations (inside class body, no body: void save();)\n; tree-sitter-cpp uses field_identifier (not identifier) for names inside class bodies\n(field_declaration declarator: (function_declarator declarator: [(field_identifier) (identifier) (operator_name)] @name)) @definition.method\n\n; Inline class method declarations returning a pointer (User* lookup();)\n(field_declaration declarator: (pointer_declarator declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method declarations returning a reference (User& lookup();)\n(field_declaration declarator: (reference_declarator (function_declarator declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method\n\n; Inline class method definitions (inside class body, with body: void Foo() { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (function_declarator\n      declarator: [(field_identifier) (identifier) (operator_name) (destructor_name)] @name)) @definition.method)\n\n; Inline class methods returning a pointer type (User* lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (pointer_declarator\n      declarator: (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Inline class methods returning a reference type (User& lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (reference_declarator\n      (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Templates\n(template_declaration (class_specifier name: (type_identifier) @name)) @definition.template\n(template_declaration\n  (class_specifier\n    name: (template_type\n      (type_identifier) @name\n      (template_argument_list) @template-arguments))) @definition.template\n(template_declaration (function_definition declarator: (function_declarator declarator: (identifier) @name))) @definition.template\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (qualified_identifier name: (identifier) @call.name)) @call\n(call_expression function: (template_function name: (identifier) @call.name)) @call\n(binary_expression operator: \"+\" @call.name) @call\n(binary_expression operator: \"<<\" @call.name) @call\n\n; Constructor calls: new User()\n(new_expression type: (type_identifier) @call.name) @call\n\n; Variable declarations: int x = 5; or auto x = 5;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n\n; Heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (type_identifier) @heritage.extends)) @heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (access_specifier) (type_identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    argument: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n";
+export declare const CPP_QUERIES = "\n; Classes, Structs, Namespaces\n(class_specifier name: (type_identifier) @name) @definition.class\n(class_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.class\n(struct_specifier name: (type_identifier) @name) @definition.struct\n(struct_specifier\n  name: (template_type\n    (type_identifier) @name\n    (template_argument_list) @template-arguments)) @definition.struct\n(namespace_definition name: (namespace_identifier) @name) @definition.namespace\n(enum_specifier name: (type_identifier) @name) @definition.enum\n\n; Typedefs and unions (common in C-style headers and mixed C/C++ code)\n(type_definition\n  type: (struct_specifier\n    body: (field_declaration_list))\n  declarator: (type_identifier) @name) @definition.struct\n(type_definition\n  type: (enum_specifier\n    body: (enumerator_list))\n  declarator: (type_identifier) @name) @definition.enum\n(enumerator name: (identifier) @name) @definition.const\n(type_definition declarator: (type_identifier) @name) @definition.typedef\n(union_specifier name: (type_identifier) @name) @definition.union\n\n; Macros\n(preproc_function_def name: (identifier) @name) @definition.macro\n(preproc_def name: (identifier) @name) @definition.macro\n\n; Functions & Methods (direct declarator)\n(function_definition declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (operator_name) @name)) @definition.function\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))) @definition.method\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (operator_name) @name))) @definition.method\n\n; Functions/methods returning pointers (pointer_declarator wraps function_declarator)\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n\n; Functions/methods returning double pointers (nested pointer_declarator)\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name)))) @definition.function\n(function_definition declarator: (pointer_declarator declarator: (pointer_declarator declarator: (function_declarator declarator: (qualified_identifier name: (identifier) @name))))) @definition.method\n\n; Functions/methods returning references (reference_declarator wraps function_declarator)\n(function_definition declarator: (reference_declarator (function_declarator declarator: (identifier) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (operator_name) @name))) @definition.function\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (identifier) @name)))) @definition.method\n(function_definition declarator: (reference_declarator (function_declarator declarator: (qualified_identifier name: (operator_name) @name)))) @definition.method\n\n; Destructors (destructor_name is distinct from identifier in tree-sitter-cpp)\n(function_definition declarator: (function_declarator declarator: (qualified_identifier name: (destructor_name) @name))) @definition.method\n\n; Function declarations / prototypes (common in headers)\n(declaration declarator: (function_declarator declarator: (identifier) @name)) @definition.function\n(declaration declarator: (function_declarator declarator: (operator_name) @name)) @definition.function\n(declaration declarator: (pointer_declarator declarator: (function_declarator declarator: (identifier) @name))) @definition.function\n(declaration declarator: (reference_declarator (function_declarator declarator: (operator_name) @name))) @definition.function\n\n; Class/struct data member fields (Address address; int count;)\n; Uses field_identifier to exclude method declarations (which use function_declarator)\n(field_declaration\n  declarator: (field_identifier) @name) @definition.property\n\n; Pointer member fields (Address* address;)\n(field_declaration\n  declarator: (pointer_declarator\n    declarator: (field_identifier) @name)) @definition.property\n\n; Reference member fields (Address& address;)\n(field_declaration\n  declarator: (reference_declarator\n    (field_identifier) @name)) @definition.property\n\n; Inline class method declarations (inside class body, no body: void save();)\n; tree-sitter-cpp uses field_identifier (not identifier) for names inside class bodies\n(field_declaration declarator: (function_declarator declarator: [(field_identifier) (identifier) (operator_name)] @name)) @definition.method\n\n; Inline class method declarations returning a pointer (User* lookup();)\n(field_declaration declarator: (pointer_declarator declarator: (function_declarator declarator: [(field_identifier) (identifier)] @name))) @definition.method\n\n; Inline class method declarations returning a reference (User& lookup();)\n(field_declaration declarator: (reference_declarator (function_declarator declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method\n\n; Inline class method definitions (inside class body, with body: void Foo() { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (function_declarator\n      declarator: [(field_identifier) (identifier) (operator_name) (destructor_name)] @name)) @definition.method)\n\n; Inline class methods returning a pointer type (User* lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (pointer_declarator\n      declarator: (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Inline class methods returning a reference type (User& lookup(int id) { ... })\n(field_declaration_list\n  (function_definition\n    declarator: (reference_declarator\n      (function_declarator\n        declarator: [(field_identifier) (identifier) (operator_name)] @name))) @definition.method)\n\n; Templates\n(template_declaration (class_specifier name: (type_identifier) @name)) @definition.template\n(template_declaration\n  (class_specifier\n    name: (template_type\n      (type_identifier) @name\n      (template_argument_list) @template-arguments))) @definition.template\n(template_declaration (function_definition declarator: (function_declarator declarator: (identifier) @name))) @definition.template\n\n; Includes\n(preproc_include path: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (qualified_identifier name: (identifier) @call.name)) @call\n(call_expression function: (template_function name: (identifier) @call.name)) @call\n(binary_expression operator: \"+\" @call.name) @call\n(binary_expression operator: \"<<\" @call.name) @call\n\n; Constructor calls: new User()\n(new_expression type: (type_identifier) @call.name) @call\n\n; Variable declarations: int x = 5; or auto x = 5;\n(declaration\n  declarator: (init_declarator\n    declarator: (identifier) @name)) @definition.variable\n\n; Heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (type_identifier) @heritage.extends)) @heritage\n(class_specifier name: (type_identifier) @heritage.class\n  (base_class_clause (access_specifier) (type_identifier) @heritage.extends)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    argument: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n";
 export declare const CSHARP_QUERIES = "\n; Types\n(class_declaration name: (identifier) @name) @definition.class\n(interface_declaration name: (identifier) @name) @definition.interface\n(struct_declaration name: (identifier) @name) @definition.struct\n(enum_declaration name: (identifier) @name) @definition.enum\n(record_declaration name: (identifier) @name) @definition.record\n(delegate_declaration name: (identifier) @name) @definition.delegate\n\n; Namespaces (block form and C# 10+ file-scoped form)\n(namespace_declaration name: (identifier) @name) @definition.namespace\n(namespace_declaration name: (qualified_name) @name) @definition.namespace\n(file_scoped_namespace_declaration name: (identifier) @name) @definition.namespace\n(file_scoped_namespace_declaration name: (qualified_name) @name) @definition.namespace\n\n; Methods & Properties\n(method_declaration name: (identifier) @name) @definition.method\n(local_function_statement name: (identifier) @name) @definition.function\n(constructor_declaration name: (identifier) @name) @definition.constructor\n(property_declaration name: (identifier) @name) @definition.property\n\n; Primary constructors (C# 12): class User(string name, int age) { }\n(class_declaration name: (identifier) @name (parameter_list) @definition.constructor)\n(record_declaration name: (identifier) @name (parameter_list) @definition.constructor)\n\n; Using\n(using_directive (qualified_name) @import.source) @import\n(using_directive (identifier) @import.source) @import\n\n; Calls\n(invocation_expression function: (identifier) @call.name) @call\n(invocation_expression function: (member_access_expression name: (identifier) @call.name)) @call\n\n; Null-conditional method calls: user?.Save()\n; Parses as: invocation_expression \u2192 conditional_access_expression \u2192 member_binding_expression \u2192 identifier\n(invocation_expression\n  function: (conditional_access_expression\n    (member_binding_expression\n      (identifier) @call.name))) @call\n\n; Constructor calls: new Foo() and new Foo { Props }\n(object_creation_expression type: (identifier) @call.name) @call\n\n; Target-typed new (C# 9): User u = new(\"x\", 5)\n(variable_declaration type: (identifier) @call.name (variable_declarator (implicit_object_creation_expression) @call))\n\n; Local variable declarations\n(local_declaration_statement\n  (variable_declaration\n    (variable_declarator\n      (identifier) @name))) @definition.variable\n\n; Heritage\n(class_declaration name: (identifier) @heritage.class\n  (base_list (identifier) @heritage.extends)) @heritage\n(class_declaration name: (identifier) @heritage.class\n  (base_list (generic_name (identifier) @heritage.extends))) @heritage\n\n; Interface inheritance: interface IFoo : IBar / interface IFoo : IBar, IBaz\n; Without these patterns, interface-to-interface relationships are never\n; captured, so transitive \"class X implements IBar\" chains are broken.\n(interface_declaration name: (identifier) @heritage.class\n  (base_list (identifier) @heritage.extends)) @heritage\n(interface_declaration name: (identifier) @heritage.class\n  (base_list (generic_name (identifier) @heritage.extends))) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (member_access_expression\n    expression: (_) @assignment.receiver\n    name: (identifier) @assignment.property)\n  right: (_)) @assignment\n";
 export declare const RUST_QUERIES = "\n; Functions & Items\n(function_item name: (identifier) @name) @definition.function\n(function_signature_item name: (identifier) @name) @definition.function\n(struct_item name: (type_identifier) @name) @definition.struct\n(enum_item name: (type_identifier) @name) @definition.enum\n(trait_item name: (type_identifier) @name) @definition.trait\n(impl_item type: (type_identifier) @name !trait) @definition.impl\n(impl_item type: (generic_type type: (type_identifier) @name) !trait) @definition.impl\n(mod_item name: (identifier) @name) @definition.module\n\n; Type aliases, const, static, macros\n(type_item name: (type_identifier) @name) @definition.type\n(const_item name: (identifier) @name) @definition.const\n(static_item name: (identifier) @name) @definition.static\n(macro_definition name: (identifier) @name) @definition.macro\n\n; Use statements\n(use_declaration argument: (_) @import.source) @import\n\n; Calls\n(call_expression function: (identifier) @call.name) @call\n(call_expression function: (field_expression field: (field_identifier) @call.name)) @call\n(call_expression function: (scoped_identifier name: (identifier) @call.name)) @call\n(call_expression function: (generic_function function: (identifier) @call.name)) @call\n\n; Struct literal construction: User { name: value }\n(struct_expression name: (type_identifier) @call.name) @call\n\n; Struct fields \u2014 named field declarations inside struct bodies\n(field_declaration_list\n  (field_declaration\n    name: (field_identifier) @name) @definition.property)\n\n; Heritage (trait implementation) \u2014 all combinations of concrete/generic trait \u00D7 concrete/generic type\n(impl_item trait: (type_identifier) @heritage.trait type: (type_identifier) @heritage.class) @heritage\n(impl_item trait: (generic_type type: (type_identifier) @heritage.trait) type: (type_identifier) @heritage.class) @heritage\n(impl_item trait: (type_identifier) @heritage.trait type: (generic_type type: (type_identifier) @heritage.class)) @heritage\n(impl_item trait: (generic_type type: (type_identifier) @heritage.trait) type: (generic_type type: (type_identifier) @heritage.class)) @heritage\n\n; Write access: obj.field = value\n(assignment_expression\n  left: (field_expression\n    value: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: obj.field += value (compound assignment)\n(compound_assignment_expr\n  left: (field_expression\n    value: (_) @assignment.receiver\n    field: (field_identifier) @assignment.property)\n  right: (_)) @assignment\n";
 export declare const PHP_QUERIES = "\n; \u2500\u2500 Namespace \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(namespace_definition\n  name: (namespace_name) @name) @definition.namespace\n\n; \u2500\u2500 Classes \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @name) @definition.class\n\n; \u2500\u2500 Interfaces \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(interface_declaration\n  name: (name) @name) @definition.interface\n\n; \u2500\u2500 Traits \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(trait_declaration\n  name: (name) @name) @definition.trait\n\n; \u2500\u2500 Enums (PHP 8.1) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(enum_declaration\n  name: (name) @name) @definition.enum\n\n; \u2500\u2500 Top-level functions \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(function_definition\n  name: (name) @name) @definition.function\n\n; \u2500\u2500 Methods (including constructors) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(method_declaration\n  name: (name) @name) @definition.method\n\n; \u2500\u2500 Class properties (including Eloquent $fillable, $casts, etc.) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(property_declaration\n  (property_element\n    (variable_name\n      (name) @name))) @definition.property\n\n; Constructor property promotion (PHP 8.0+: public Address $address in __construct)\n(method_declaration\n  parameters: (formal_parameters\n    (property_promotion_parameter\n      name: (variable_name\n        (name) @name)))) @definition.property\n\n; \u2500\u2500 Imports: use statements \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; Simple: use App\\Models\\User;\n(namespace_use_declaration\n  (namespace_use_clause\n    (qualified_name) @import.source)) @import\n\n; \u2500\u2500 Function/method calls \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; Regular function call: foo()\n(function_call_expression\n  function: (name) @call.name) @call\n\n; Method call: $obj->method()\n(member_call_expression\n  name: (name) @call.name) @call\n\n; Nullsafe method call: $obj?->method()\n(nullsafe_member_call_expression\n  name: (name) @call.name) @call\n\n; Static call: Foo::bar() (php_only uses scoped_call_expression)\n(scoped_call_expression\n  name: (name) @call.name) @call\n\n; Constructor call: new User()\n(object_creation_expression (name) @call.name) @call\n\n; Const declarations at class scope\n(const_declaration\n  (const_element\n    (name) @name)) @definition.const\n\n; \u2500\u2500 Heritage: extends \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  (base_clause\n    [(name) (qualified_name)] @heritage.extends)) @heritage\n\n; \u2500\u2500 Heritage: implements \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  (class_interface_clause\n    [(name) (qualified_name)] @heritage.implements)) @heritage.impl\n\n; \u2500\u2500 Heritage: use trait (must capture enclosing class name) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n(class_declaration\n  name: (name) @heritage.class\n  body: (declaration_list\n    (use_declaration\n      [(name) (qualified_name)] @heritage.trait))) @heritage\n\n; \u2500\u2500 Heritage: trait uses another trait (transitive trait composition) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n; PHP allows a trait body to contain \"use OtherTrait;\". The trait-uses-trait\n; IMPLEMENTS edge is required by buildPhpMro to compute the full transitive\n; trait closure (depth 3+ chains).\n(trait_declaration\n  name: (name) @heritage.class\n  body: (declaration_list\n    (use_declaration\n      [(name) (qualified_name)] @heritage.trait))) @heritage\n\n; PHP HTTP consumers: file_get_contents('/path'), curl_init('/path')\n(function_call_expression\n  function: (name) @_php_http (#match? @_php_http \"^(file_get_contents|curl_init)$\")\n  arguments: (arguments\n    (argument (string (string_content) @http_client.url)))) @http_client\n\n; Write access: $obj->field = value\n(assignment_expression\n  left: (member_access_expression\n    object: (_) @assignment.receiver\n    name: (name) @assignment.property)\n  right: (_)) @assignment\n\n; Write access: ClassName::$field = value (static property)\n(assignment_expression\n  left: (scoped_property_access_expression\n    scope: (_) @assignment.receiver\n    name: (variable_name (name) @assignment.property))\n  right: (_)) @assignment\n";

package/dist/core/ingestion/tree-sitter-queries.js

@@ -601,8 +601,17 @@ export const C_QUERIES = `
 
 ; Structs, Unions, Enums, Typedefs
 (struct_specifier name: (type_identifier) @name) @definition.struct
+(type_definition
+  type: (struct_specifier
+    body: (field_declaration_list))
+  declarator: (type_identifier) @name) @definition.struct
 (union_specifier name: (type_identifier) @name) @definition.union
 (enum_specifier name: (type_identifier) @name) @definition.enum
+(type_definition
+  type: (enum_specifier
+    body: (enumerator_list))
+  declarator: (type_identifier) @name) @definition.enum
+(enumerator name: (identifier) @name) @definition.const
 (type_definition declarator: (type_identifier) @name) @definition.typedef
 
 ; Macros
@@ -698,6 +707,15 @@ export const CPP_QUERIES = `
 (enum_specifier name: (type_identifier) @name) @definition.enum
 
 ; Typedefs and unions (common in C-style headers and mixed C/C++ code)
+(type_definition
+  type: (struct_specifier
+    body: (field_declaration_list))
+  declarator: (type_identifier) @name) @definition.struct
+(type_definition
+  type: (enum_specifier
+    body: (enumerator_list))
+  declarator: (type_identifier) @name) @definition.enum
+(enumerator name: (identifier) @name) @definition.const
 (type_definition declarator: (type_identifier) @name) @definition.typedef
 (union_specifier name: (type_identifier) @name) @definition.union
 

package/dist/core/ingestion/type-env.js

@@ -35,7 +35,6 @@ const findTypeIdentifierChild = (node) => {
  *  Includes both multi-arm pattern-match branches AND if-statement bodies for null-check narrowing. */
 const NARROWING_BRANCH_TYPES = new Set([
     'when_entry', // Kotlin when
-    'switch_block_label', // Java switch (enhanced)
     'if_statement', // TS/JS, Java, C/C++
     'if_expression', // Kotlin (if is an expression)
     'statement_block', // TS/JS: { ... } body of if
@@ -796,7 +795,6 @@ export const buildTypeEnv = (tree, language, options) => {
                         (child.type === 'user_type' ||
                             child.type === 'type_identifier' ||
                             child.type === 'generic_type' ||
-                            child.type === 'parameterized_type' ||
                             child.type === 'nullable_type')) {
                         fallbackType = child;
                     }

package/dist/core/ingestion/type-extractors/c-cpp.js

@@ -111,13 +111,13 @@ const extractInitializer = (node, env, classNames) => {
             //   or: call_expression > function: template_function (unqualified)
             const templateFunc = func.type === 'template_function'
                 ? func
-                : func.type === 'qualified_identifier' || func.type === 'scoped_identifier'
+                : func.type === 'qualified_identifier'
                     ? (func.namedChildren.find((c) => c.type === 'template_function') ?? null)
                     : null;
             if (templateFunc) {
                 const nameNode = templateFunc.firstNamedChild;
                 if (nameNode) {
-                    const funcName = nameNode.type === 'qualified_identifier' || nameNode.type === 'scoped_identifier'
+                    const funcName = nameNode.type === 'qualified_identifier'
                         ? (nameNode.lastNamedChild?.text ?? '')
                         : nameNode.text;
                     if (SMART_PTR_FACTORIES.has(funcName)) {
@@ -185,7 +185,7 @@ const scanConstructorBinding = (node) => {
     const func = value.childForFieldName('function');
     if (!func)
         return undefined;
-    if (func.type === 'qualified_identifier' || func.type === 'scoped_identifier') {
+    if (func.type === 'qualified_identifier') {
         const last = func.lastNamedChild;
         if (!last)
             return undefined;
@@ -309,16 +309,14 @@ const extractCppElementTypeFromTypeNode = (typeNode, pos = 'last', depth = 0) =>
         if (args.length >= 1)
             return pos === 'first' ? args[0] : args[args.length - 1];
     }
-    // reference/pointer types: unwrap and recurse (vector<User>& → vector<User>)
-    if (typeNode.type === 'reference_type' ||
-        typeNode.type === 'pointer_type' ||
-        typeNode.type === 'type_descriptor') {
+    // type_descriptor wrapper: unwrap and recurse (vector<User>& → vector<User>)
+    if (typeNode.type === 'type_descriptor') {
         const inner = typeNode.lastNamedChild;
         if (inner)
             return extractCppElementTypeFromTypeNode(inner, pos, depth + 1);
     }
-    // qualified/scoped types: std::vector<User> → unwrap to template_type child
-    if (typeNode.type === 'qualified_identifier' || typeNode.type === 'scoped_type_identifier') {
+    // qualified types: std::vector<User> → unwrap to template_type child
+    if (typeNode.type === 'qualified_identifier') {
         const inner = typeNode.lastNamedChild;
         if (inner)
             return extractCppElementTypeFromTypeNode(inner, pos, depth + 1);
@@ -497,7 +495,7 @@ const detectCppConstructorType = (node, classNames) => {
     if (!nameNode)
         return undefined;
     let funcName;
-    if (nameNode.type === 'qualified_identifier' || nameNode.type === 'scoped_identifier') {
+    if (nameNode.type === 'qualified_identifier') {
         funcName = nameNode.lastNamedChild?.text ?? '';
     }
     else {

package/dist/core/ingestion/type-extractors/csharp.js

@@ -27,7 +27,7 @@ const extractDeclaration = (node, env) => {
         const child = node.namedChild(i);
         if (!child)
             continue;
-        if (!typeNode && child.type !== 'variable_declarator' && child.type !== 'equals_value_clause') {
+        if (!typeNode && child.type !== 'variable_declarator') {
             // First non-declarator child is the type (identifier, implicit_type, generic_name, etc.)
             typeNode = child;
         }
@@ -41,11 +41,9 @@ const extractDeclaration = (node, env) => {
     let typeName;
     if (typeNode.type === 'implicit_type' && typeNode.text === 'var') {
         // Try to infer from initializer: var x = new Foo()
-        // tree-sitter-c-sharp may put object_creation_expression as direct child
-        // or inside equals_value_clause depending on grammar version
+        // tree-sitter-c-sharp puts object_creation_expression as a direct child
         if (declarators.length === 1) {
-            const initializer = findChild(declarators[0], 'object_creation_expression') ??
-                findChild(declarators[0], 'equals_value_clause')?.firstNamedChild;
+            const initializer = findChild(declarators[0], 'object_creation_expression');
             if (initializer?.type === 'object_creation_expression') {
                 const ctorType = initializer.childForFieldName('type');
                 if (ctorType)
@@ -76,7 +74,7 @@ const extractParameter = (node, env) => {
         nameNode = node.childForFieldName('name');
     }
     else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     if (!nameNode || !typeNode)
@@ -113,17 +111,13 @@ const scanConstructorBinding = (node) => {
     const nameNode = declarator.childForFieldName('name') ?? declarator.firstNamedChild;
     if (!nameNode || nameNode.type !== 'identifier')
         return undefined;
-    // Find the initializer value: either inside equals_value_clause or as a direct child
+    // Find the initializer value as a direct child
     // (tree-sitter-c-sharp puts invocation_expression directly inside variable_declarator)
     let value = null;
     for (let i = 0; i < declarator.namedChildCount; i++) {
         const child = declarator.namedChild(i);
         if (!child)
             continue;
-        if (child.type === 'equals_value_clause') {
-            value = child.firstNamedChild;
-            break;
-        }
         if (child.type === 'invocation_expression' ||
             child.type === 'object_creation_expression' ||
             child.type === 'await_expression') {
@@ -462,18 +456,9 @@ const extractPendingAssignment = (node, scopeEnv) => {
         const lhs = nameNode.text;
         if (scopeEnv.has(lhs))
             continue;
-        // C# wraps value in equals_value_clause; fall back to last named child
-        let evc = null;
-        for (let j = 0; j < child.childCount; j++) {
-            if (child.child(j)?.type === 'equals_value_clause') {
-                evc = child.child(j);
-                break;
-            }
-        }
-        const valueNode = evc?.firstNamedChild ?? child.namedChild(child.namedChildCount - 1);
-        if (valueNode &&
-            valueNode !== nameNode &&
-            (valueNode.type === 'identifier' || valueNode.type === 'simple_identifier')) {
+        // C# variable_declarator holds the initializer value as a direct named child
+        const valueNode = child.namedChild(child.namedChildCount - 1);
+        if (valueNode && valueNode !== nameNode && valueNode.type === 'identifier') {
             return { kind: 'copy', lhs, rhs: valueNode.text };
         }
         // member_access_expression RHS → fieldAccess (a.Field)
@@ -487,7 +472,7 @@ const extractPendingAssignment = (node, scopeEnv) => {
         // invocation_expression RHS
         if (valueNode?.type === 'invocation_expression') {
             const funcNode = valueNode.firstNamedChild;
-            if (funcNode?.type === 'identifier_name' || funcNode?.type === 'identifier') {
+            if (funcNode?.type === 'identifier') {
                 return { kind: 'callResult', lhs, callee: funcNode.text };
             }
             // method call with receiver → methodCallResult: a.GetC()
@@ -504,7 +489,7 @@ const extractPendingAssignment = (node, scopeEnv) => {
             const inner = valueNode.firstNamedChild;
             if (inner?.type === 'invocation_expression') {
                 const funcNode = inner.firstNamedChild;
-                if (funcNode?.type === 'identifier_name' || funcNode?.type === 'identifier') {
+                if (funcNode?.type === 'identifier') {
                     return { kind: 'callResult', lhs, callee: funcNode.text };
                 }
                 if (funcNode?.type === 'member_access_expression') {
@@ -555,15 +540,14 @@ export const typeConfig = {
         const direct = node.childForFieldName('type');
         if (direct)
             return direct;
-        const wrapped = node.childForFieldName('declaration') ??
-            (() => {
-                for (let i = 0; i < node.namedChildCount; i++) {
-                    const c = node.namedChild(i);
-                    if (c?.type === 'variable_declaration')
-                        return c;
-                }
-                return null;
-            })();
+        const wrapped = (() => {
+            for (let i = 0; i < node.namedChildCount; i++) {
+                const c = node.namedChild(i);
+                if (c?.type === 'variable_declaration')
+                    return c;
+            }
+            return null;
+        })();
         return wrapped?.childForFieldName('type') ?? null;
     },
     forLoopNodeTypes: FOR_LOOP_NODE_TYPES,

package/dist/core/ingestion/type-extractors/go.js

@@ -131,16 +131,8 @@ const extractDeclaration = (node, env) => {
 };
 /** Go: parameter → name type */
 const extractParameter = (node, env) => {
-    let nameNode = null;
-    let typeNode = null;
-    if (node.type === 'parameter') {
-        nameNode = node.childForFieldName('name');
-        typeNode = node.childForFieldName('type');
-    }
-    else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
-        typeNode = node.childForFieldName('type');
-    }
+    const nameNode = node.childForFieldName('name');
+    const typeNode = node.childForFieldName('type');
     if (!nameNode || !typeNode)
         return;
     const varName = extractVarName(nameNode);

package/dist/core/ingestion/type-extractors/jvm.js

@@ -60,7 +60,7 @@ const extractJavaParameter = (node, env) => {
     }
     else {
         // Generic fallback
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     if (!nameNode || !typeNode)
@@ -359,9 +359,10 @@ const extractKotlinDeclaration = (node, env) => {
                 env.set(varName, typeName);
             return;
         }
-        // Fallback: try direct fields
-        const nameNode = node.childForFieldName('name') ?? findChild(node, 'simple_identifier');
-        const typeNode = node.childForFieldName('type') ?? findChild(node, 'user_type');
+        // Fallback: Kotlin property_declaration has no name/type fields (verified by
+        // real parse, #1920); the name/type are positional children.
+        const nameNode = findChild(node, 'simple_identifier');
+        const typeNode = findChild(node, 'user_type');
         if (!nameNode || !typeNode)
             return;
         const varName = extractVarName(nameNode);
@@ -393,7 +394,7 @@ const extractKotlinParameter = (node, env) => {
         nameNode = node.childForFieldName('name');
     }
     else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     // Fallback: Kotlin `parameter` nodes use positional children, not named fields

package/dist/core/ingestion/type-extractors/php.js

@@ -269,7 +269,7 @@ const extractParameter = (node, env) => {
         nameNode = node.childForFieldName('name');
     }
     else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     if (!nameNode || !typeNode)

package/dist/core/ingestion/type-extractors/python.js

@@ -59,7 +59,7 @@ const extractParameter = (node, env) => {
         typeNode = node.childForFieldName('type');
     }
     else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
         // Python typed_parameter: name is a positional child (identifier), not a named field
         if (!nameNode && node.type === 'typed_parameter') {

package/dist/core/ingestion/type-extractors/ruby.js

@@ -345,8 +345,8 @@ const extractPendingAssignment = (node, scopeEnv) => {
         return undefined;
     if (rhsNode.type === 'identifier')
         return { kind: 'copy', lhs: varName, rhs: rhsNode.text };
-    // call/method_call RHS — Ruby uses method calls for both field access and method calls
-    if (rhsNode.type === 'call' || rhsNode.type === 'method_call') {
+    // call RHS — Ruby uses method calls for both field access and method calls
+    if (rhsNode.type === 'call') {
         const methodNode = rhsNode.childForFieldName('method');
         const receiverNode = rhsNode.childForFieldName('receiver');
         if (!receiverNode && methodNode?.type === 'identifier') {

package/dist/core/ingestion/type-extractors/rust.js

@@ -266,16 +266,6 @@ const extractPendingAssignment = (node, scopeEnv) => {
             return { kind: 'callResult', lhs, callee: funcNode.text };
         }
     }
-    // method_call_expression RHS → methodCallResult (receiver.method())
-    if (unwrapped.type === 'method_call_expression') {
-        const obj = unwrapped.firstNamedChild;
-        if (obj?.type === 'identifier') {
-            const methodNode = unwrapped.childForFieldName('name') ?? unwrapped.namedChild(1);
-            if (methodNode?.type === 'field_identifier') {
-                return { kind: 'methodCallResult', lhs, receiver: obj.text, method: methodNode.text };
-            }
-        }
-    }
     return undefined;
 };
 /**
@@ -395,12 +385,6 @@ const extractRustElementTypeFromTypeNode = (typeNode, pos = 'last', depth = 0) =
         if (elemNode)
             return extractSimpleTypeName(elemNode);
     }
-    // slice_type: [User] — element is the first child
-    if (typeNode.type === 'slice_type') {
-        const elemNode = typeNode.firstNamedChild;
-        if (elemNode)
-            return extractSimpleTypeName(elemNode);
-    }
     return undefined;
 };
 /** Walk up from a for-loop to the enclosing function_item and search parameters

package/dist/core/ingestion/type-extractors/shared.d.ts

@@ -65,8 +65,8 @@ export declare const TYPED_PARAMETER_TYPES: Set<string>;
  * Note: Go slices/maps use slice_type/map_type, not generic_type — those are
  * NOT handled here. Use language-specific extractors for Go container types.
  *
- * @param typeNode A generic_type or parameterized_type AST node (or any node —
- *   returns [] for non-generic types).
+ * @param typeNode A generic_type / generic_name / user_type AST node (or any
+ *   node — returns [] for non-generic types).
  * @returns Array of resolved type argument names. Unresolvable arguments are omitted.
  */
 export declare const extractGenericTypeArgs: (typeNode: SyntaxNode, depth?: number) => string[];

package/dist/core/ingestion/type-extractors/shared.js

@@ -204,9 +204,7 @@ export const extractSimpleTypeName = (typeNode, depth = 0) => {
     }
     // Generic types: extract the base type (e.g., List<User> → List)
     // For nullable wrappers (Optional<User>, Option<User>), unwrap to inner type.
-    if (typeNode.type === 'generic_type' ||
-        typeNode.type === 'parameterized_type' ||
-        typeNode.type === 'generic_name') {
+    if (typeNode.type === 'generic_type' || typeNode.type === 'generic_name') {
         const base = typeNode.childForFieldName('name') ??
             typeNode.childForFieldName('type') ??
             typeNode.firstNamedChild;
@@ -348,17 +346,20 @@ export const TYPED_PARAMETER_TYPES = new Set([
  * Note: Go slices/maps use slice_type/map_type, not generic_type — those are
  * NOT handled here. Use language-specific extractors for Go container types.
  *
- * @param typeNode A generic_type or parameterized_type AST node (or any node —
- *   returns [] for non-generic types).
+ * @param typeNode A generic_type / generic_name / user_type AST node (or any
+ *   node — returns [] for non-generic types).
  * @returns Array of resolved type argument names. Unresolvable arguments are omitted.
  */
 export const extractGenericTypeArgs = (typeNode, depth = 0) => {
     if (depth > 50)
         return [];
-    // Unwrap wrapper nodes that may sit above the generic_type
+    // Unwrap pure wrapper nodes (which carry no type_arguments of their own) that
+    // may sit above the generic type. `user_type` is intentionally NOT unwrapped
+    // here: a Kotlin `user_type` can itself carry a `type_arguments` child
+    // (`List<User>` → user_type > [type_identifier, type_arguments]), so it is
+    // handled as a generic-bearing node below.
     if (typeNode.type === 'type_annotation' ||
         typeNode.type === 'type' ||
-        typeNode.type === 'user_type' ||
         typeNode.type === 'nullable_type' ||
         typeNode.type === 'optional_type') {
         const inner = typeNode.firstNamedChild;
@@ -366,10 +367,14 @@ export const extractGenericTypeArgs = (typeNode, depth = 0) => {
             return extractGenericTypeArgs(inner, depth + 1);
         return [];
     }
-    // Only process generic/parameterized type nodes (includes C#'s generic_name)
+    // Generic-bearing nodes hold their arguments in a `type_arguments` /
+    // `type_argument_list` child: generic_type (Java/TypeScript/Rust/Go),
+    // generic_name (C#), and Kotlin's user_type. Verified against the installed
+    // grammars by real parse (#1920). A user_type without its own type_arguments
+    // is unwrapped at the argsNode guard below.
     if (typeNode.type !== 'generic_type' &&
-        typeNode.type !== 'parameterized_type' &&
-        typeNode.type !== 'generic_name') {
+        typeNode.type !== 'generic_name' &&
+        typeNode.type !== 'user_type') {
         return [];
     }
     // Find the type_arguments / type_argument_list child
@@ -381,8 +386,17 @@ export const extractGenericTypeArgs = (typeNode, depth = 0) => {
             break;
         }
     }
-    if (!argsNode)
+    if (!argsNode) {
+        // A `user_type` without its own type_arguments wraps an inner type node
+        // (e.g. user_type > generic_type, or a plain user_type > type_identifier with
+        // no generics) — recurse into that child. generic_type / generic_name with no
+        // args simply have no type arguments to report.
+        if (typeNode.type === 'user_type') {
+            const inner = typeNode.firstNamedChild;
+            return inner ? extractGenericTypeArgs(inner, depth + 1) : [];
+        }
         return [];
+    }
     const result = [];
     for (let i = 0; i < argsNode.namedChildCount; i++) {
         let argNode = argsNode.namedChild(i);

package/dist/core/ingestion/type-extractors/swift.js

@@ -27,7 +27,7 @@ function swiftNavigationSuffixName(node) {
 /** Swift: let x: Foo = ... */
 const extractDeclaration = (node, env) => {
     // Swift property_declaration has pattern and type_annotation
-    const pattern = node.childForFieldName('pattern') ?? findChild(node, 'pattern');
+    const pattern = findChild(node, 'pattern');
     const typeAnnotation = node.childForFieldName('type') ?? findChild(node, 'type_annotation');
     if (!pattern || !typeAnnotation)
         return;
@@ -41,11 +41,11 @@ const extractParameter = (node, env) => {
     let nameNode = null;
     let typeNode = null;
     if (node.type === 'parameter') {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('internal_name');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     else {
-        nameNode = node.childForFieldName('name') ?? node.childForFieldName('pattern');
+        nameNode = node.childForFieldName('name');
         typeNode = node.childForFieldName('type');
     }
     if (!nameNode || !typeNode)
@@ -65,7 +65,7 @@ const extractInitializer = (node, env, classNames) => {
     if (node.childForFieldName('type') || findChild(node, 'type_annotation'))
         return;
     // Find pattern (variable name)
-    const pattern = node.childForFieldName('pattern') ?? findChild(node, 'pattern');
+    const pattern = findChild(node, 'pattern');
     if (!pattern)
         return;
     const varName = extractVarName(pattern) ?? pattern.text;
@@ -117,7 +117,7 @@ const scanConstructorBinding = (node) => {
         return undefined;
     if (hasTypeAnnotation(node))
         return undefined;
-    const pattern = node.childForFieldName('pattern') ?? findChild(node, 'pattern');
+    const pattern = findChild(node, 'pattern');
     if (!pattern)
         return undefined;
     const varName = pattern.text;

package/dist/core/ingestion/type-extractors/typescript.js

@@ -269,7 +269,7 @@ const findTsIterableElementType = (iterableName, startNode, pos = 'last') => {
     while (current) {
         if (TS_FUNCTION_NODE_TYPES.has(current.type)) {
             // Search function parameters
-            const paramsNode = current.childForFieldName('parameters') ?? current.childForFieldName('formal_parameters');
+            const paramsNode = current.childForFieldName('parameters');
             if (paramsNode) {
                 for (let i = 0; i < paramsNode.namedChildCount; i++) {
                     const param = paramsNode.namedChild(i);

package/dist/core/ingestion/utils/ast-helpers.d.ts

@@ -10,6 +10,14 @@ export type SyntaxNode = Parser.SyntaxNode;
 export declare const DEFINITION_CAPTURE_KEYS: readonly ["definition.function", "definition.class", "definition.interface", "definition.method", "definition.struct", "definition.enum", "definition.namespace", "definition.module", "definition.trait", "definition.impl", "definition.type", "definition.const", "definition.static", "definition.variable", "definition.typedef", "definition.macro", "definition.union", "definition.property", "definition.record", "definition.delegate", "definition.annotation", "definition.constructor", "definition.template"];
 /** Extract the definition node from a tree-sitter query capture map. */
 export declare const getDefinitionNodeFromCaptures: (captureMap: Record<string, SyntaxNode>) => SyntaxNode | null;
+type QueryMatchLike = {
+    captures: Array<{
+        name: string;
+        node: SyntaxNode;
+    }>;
+};
+export declare const buildConcreteTypedefDefinitionRanges: (matches: readonly QueryMatchLike[]) => Set<string>;
+export declare const isSuppressedConcreteTypedefDuplicate: (captureMap: Record<string, SyntaxNode>, concreteTypedefRanges: ReadonlySet<string>) => boolean;
 /**
  * Node types that represent function/method definitions across languages.
  * Used by parent-walk in call-processor, parse-worker, and type-env to detect
@@ -144,3 +152,4 @@ export declare function findNodeAtRange(root: SyntaxNode, range: Range, expected
  * Used by every language's scope-capture path (go/python/ruby/php/rust/csharp).
  */
 export declare function nodeIfType<T extends SyntaxNode>(node: T | undefined, ...types: readonly string[]): T | null;
+export {};

package/dist/core/ingestion/utils/ast-helpers.js

@@ -37,6 +37,32 @@ export const getDefinitionNodeFromCaptures = (captureMap) => {
     }
     return null;
 };
+const nodeRangeKey = (node) => `${node.startPosition.row}:${node.startPosition.column}:${node.endPosition.row}:${node.endPosition.column}`;
+const isConcreteTypedefCapture = (captureMap) => {
+    const definitionNode = getDefinitionNodeFromCaptures(captureMap);
+    return (definitionNode?.type === 'type_definition' &&
+        (captureMap['definition.struct'] !== undefined || captureMap['definition.enum'] !== undefined));
+};
+export const buildConcreteTypedefDefinitionRanges = (matches) => {
+    const ranges = new Set();
+    for (const match of matches) {
+        const captureMap = {};
+        for (const capture of match.captures) {
+            captureMap[capture.name] = capture.node;
+        }
+        const definitionNode = getDefinitionNodeFromCaptures(captureMap);
+        if (definitionNode && isConcreteTypedefCapture(captureMap)) {
+            ranges.add(nodeRangeKey(definitionNode));
+        }
+    }
+    return ranges;
+};
+export const isSuppressedConcreteTypedefDuplicate = (captureMap, concreteTypedefRanges) => {
+    const definitionNode = getDefinitionNodeFromCaptures(captureMap);
+    return (definitionNode?.type === 'type_definition' &&
+        captureMap['definition.typedef'] !== undefined &&
+        concreteTypedefRanges.has(nodeRangeKey(definitionNode)));
+};
 /**
  * Node types that represent function/method definitions across languages.
  * Used by parent-walk in call-processor, parse-worker, and type-env to detect

package/dist/core/ingestion/variable-extractors/configs/dart.js

@@ -1,6 +1,5 @@
 // gitnexus/src/core/ingestion/variable-extractors/configs/dart.ts
 import { SupportedLanguages } from '../../../../_shared/index.js';
-import { extractSimpleTypeName } from '../../type-extractors/shared.js';
 /**
  * Dart variable extraction config.
  *
@@ -43,14 +42,6 @@ function extractDartVarName(node) {
     return undefined;
 }
 function extractDartVarType(node) {
-    for (let i = 0; i < node.namedChildCount; i++) {
-        const child = node.namedChild(i);
-        if (child?.type === 'initialized_variable_definition') {
-            const typeNode = child.childForFieldName('type');
-            if (typeNode)
-                return extractSimpleTypeName(typeNode) ?? typeNode.text?.trim();
-        }
-    }
     // Look for type_identifier directly on the node
     for (let i = 0; i < node.namedChildCount; i++) {
         const child = node.namedChild(i);

package/dist/core/ingestion/workers/parse-worker.js

@@ -37,7 +37,7 @@ try {
 }
 catch { }
 import { getLanguageFromFilename } from '../../../_shared/index.js';
-import { FUNCTION_NODE_TYPES, getDefinitionNodeFromCaptures, findEnclosingClassInfo, findObjectLiteralBindingInfo, getLabelFromCaptures, genericFuncName, inferFunctionLabel, CLASS_CONTAINER_TYPES, } from '../utils/ast-helpers.js';
+import { buildConcreteTypedefDefinitionRanges, FUNCTION_NODE_TYPES, getDefinitionNodeFromCaptures, findEnclosingClassInfo, findObjectLiteralBindingInfo, getLabelFromCaptures, genericFuncName, inferFunctionLabel, isSuppressedConcreteTypedefDuplicate, CLASS_CONTAINER_TYPES, } from '../utils/ast-helpers.js';
 import { extractCallArgTypes } from '../utils/call-analysis.js';
 import { buildTypeEnv } from '../type-env.js';
 import { detectFrameworkFromAST } from '../framework-detection.js';
@@ -747,6 +747,7 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
             logger.warn(`Query execution failed for ${file.path}: ${err instanceof Error ? err.message : String(err)}`);
             continue;
         }
+        const concreteTypedefRanges = buildConcreteTypedefDefinitionRanges(matches);
         const provider = getProvider(language);
         // RFC #909 Ring 2: produce a `ParsedFile` for the new scope-based
         // resolution pipeline. No-op (returns undefined) for every language
@@ -838,6 +839,8 @@ const processFileGroup = (files, language, queryString, result, onFileProcessed)
             for (const c of match.captures) {
                 captureMap[c.name] = c.node;
             }
+            if (isSuppressedConcreteTypedefDuplicate(captureMap, concreteTypedefRanges))
+                continue;
             // Extract import paths before skipping
             if (captureMap['import'] && captureMap['import.source']) {
                 const rawImportPath = preprocessImportPath(captureMap['import.source'].text, captureMap['import'], provider);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.6-rc.101",
+  "version": "1.6.6-rc.103",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",