gitnexus 1.6.10-rc.48 → 1.6.10-rc.49

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

@@ -36,6 +36,7 @@ import { parseSourceSafe } from '../../../tree-sitter/safe-parse.js';
 import { encodeMarker } from '../../utils/heritage-marker.js';
 import { DART_BUILT_INS } from './built-ins.js';
 import { synthesizeCallableFlowCaptures } from '../../utils/callable-flow-captures.js';
+import { preprocessDartExtensionTypes } from './extension-type-preprocess.js';
 const FUNCTION_DECL_TAGS = [
     '@declaration.function',
     '@declaration.method',
@@ -70,14 +71,15 @@ function dartLexicalFunctionOwner(input) {
     return undefined;
 }
 export function emitDartScopeCaptures(sourceText, _filePath, cachedTree) {
+    const parseText = preprocessDartExtensionTypes(sourceText);
     let tree;
     if (cachedTree !== undefined && cachedTree !== null) {
         tree = cachedTree;
         recordCacheHit();
     }
     else {
-        tree = parseSourceSafe(getDartParser(), sourceText, undefined, {
-            bufferSize: getTreeSitterBufferSize(sourceText),
+        tree = parseSourceSafe(getDartParser(), parseText, undefined, {
+            bufferSize: getTreeSitterBufferSize(parseText),
         });
         recordCacheMiss();
     }
@@ -161,6 +163,10 @@ export function emitDartScopeCaptures(sourceText, _filePath, cachedTree) {
             emitHeritage(node, out);
             return;
         }
+        if (node.type === 'extension_declaration') {
+            emitExtensionImplementsHeritage(node, out);
+            return;
+        }
     });
     out.push(...synthesizeCallableFlowCaptures(root, DART_CALLABLE_CAPTURE_OPTIONS));
     return out;
@@ -475,6 +481,47 @@ function emitHeritage(classNode, out) {
         emitHeritageMarkers(interfaces, 'implements', className, out);
     }
 }
+function emitExtensionImplementsHeritage(extensionNode, out) {
+    const nameNode = extensionNode.childForFieldName('name');
+    if (nameNode === null)
+        return;
+    const bodyStart = extensionNode.text.indexOf('{');
+    const header = bodyStart === -1 ? extensionNode.text : extensionNode.text.slice(0, bodyStart);
+    const implementsIndex = header.indexOf('implements');
+    if (implementsIndex === -1)
+        return;
+    const className = nameNode.text;
+    const interfaces = header.slice(implementsIndex + 'implements'.length);
+    for (const rawInterface of splitTopLevelCommaList(interfaces)) {
+        const target = /^[ \t]*([A-Za-z_$][A-Za-z0-9_$]*)/.exec(rawInterface)?.[1];
+        if (target === undefined)
+            continue;
+        const payload = encodeMarker('heritage', ['implements', target, className]);
+        out.push({ '@import.heritage': syntheticCapture('@import.heritage', nameNode, payload) });
+    }
+}
+function splitTopLevelCommaList(text) {
+    const parts = [];
+    let start = 0;
+    let angleDepth = 0;
+    for (let i = 0; i < text.length; i++) {
+        const ch = text[i];
+        if (ch === '<') {
+            angleDepth++;
+            continue;
+        }
+        if (ch === '>' && angleDepth > 0) {
+            angleDepth--;
+            continue;
+        }
+        if (ch === ',' && angleDepth === 0) {
+            parts.push(text.slice(start, i));
+            start = i + 1;
+        }
+    }
+    parts.push(text.slice(start));
+    return parts;
+}
 function emitHeritageMarkers(container, kind, className, out) {
     for (let i = 0; i < container.namedChildCount; i++) {
         const c = container.namedChild(i);

package/dist/core/ingestion/languages/dart/extension-type-preprocess.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Rewrites Dart 3.3 `extension type Name(Type value)` headers into ordinary
+ * extension headers before tree-sitter sees the source. The vendored grammar
+ * currently recovers these declarations through an ERROR subtree, while the
+ * existing Dart ingestion path already handles `extension Name on Type`.
+ */
+export declare function preprocessDartExtensionTypes(sourceText: string): string;

package/dist/core/ingestion/languages/dart/extension-type-preprocess.js

@@ -0,0 +1,30 @@
+const DART_EXTENSION_TYPE_HEADER = /\b(extension)([ \t]+type[ \t]+(?:const[ \t]+)?)([A-Za-z_$][A-Za-z0-9_$]*)([ \t]*<[^()\r\n]*>)?([ \t]*)\(([^()\r\n]*)\)/g;
+function representationType(representation) {
+    const trimmed = representation.trim();
+    const match = /^(.*\S)\s+[A-Za-z_$][A-Za-z0-9_$]*$/.exec(trimmed);
+    const typeName = match?.[1]?.trim();
+    return typeName && typeName.length > 0 ? typeName : null;
+}
+/**
+ * Rewrites Dart 3.3 `extension type Name(Type value)` headers into ordinary
+ * extension headers before tree-sitter sees the source. The vendored grammar
+ * currently recovers these declarations through an ERROR subtree, while the
+ * existing Dart ingestion path already handles `extension Name on Type`.
+ */
+export function preprocessDartExtensionTypes(sourceText) {
+    return sourceText.replace(DART_EXTENSION_TYPE_HEADER, (match, extensionKeyword, extensionTypeGap, name, typeParameters, beforeRepresentation, representation) => {
+        const typeName = representationType(representation);
+        if (typeName === null)
+            return match;
+        const representationSpanLength = beforeRepresentation.length + representation.length + 2;
+        const rewrittenRepresentation = ` on ${typeName}`;
+        if (rewrittenRepresentation.length > representationSpanLength)
+            return match;
+        return (extensionKeyword +
+            ' '.repeat(extensionTypeGap.length) +
+            name +
+            (typeParameters ?? '') +
+            rewrittenRepresentation +
+            ' '.repeat(representationSpanLength - rewrittenRepresentation.length));
+    });
+}

package/dist/core/ingestion/languages/dart.js

@@ -29,6 +29,7 @@ import { createCallExtractor } from '../call-extractors/generic.js';
 import { dartCallConfig } from '../call-extractors/configs/dart.js';
 import { emitDartScopeCaptures, interpretDartImport, interpretDartTypeBinding, dartBindingScopeFor, dartImportOwningScope, dartReceiverBinding, dartMergeBindings, dartArityCompatibility, } from './dart/index.js';
 import { DART_BUILT_INS } from './dart/built-ins.js';
+import { preprocessDartExtensionTypes } from './dart/extension-type-preprocess.js';
 /**
  * Resolve the enclosing function from a `function_body` node by looking at its
  * previous sibling.  In Dart's tree-sitter grammar, function_signature and
@@ -100,6 +101,7 @@ export const dartProvider = defineLanguage({
         },
     ],
     treeSitterQueries: DART_QUERIES,
+    preprocessSource: preprocessDartExtensionTypes,
     typeConfig: dartConfig,
     exportChecker: dartExportChecker,
     importResolver: createImportResolver(dartImportConfig),

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

@@ -209,7 +209,7 @@ export const CONTAINER_TYPE_TO_LABEL = {
     record_declaration: 'Record',
     protocol_declaration: 'Interface',
     mixin_declaration: 'Mixin',
-    extension_declaration: 'Extension',
+    extension_declaration: 'Class',
     class: 'Class',
     // Ruby `module` declarations map to `Trait` so they participate in the
     // class-like type registry used by `lookupClassByName` / inheritance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.10-rc.48",
+  "version": "1.6.10-rc.49",
   "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",