@lzehrung/codegraph-core 2.1.2 → 2.2.1

package/dist/native/execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/native/execution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AAIxB,wBAAgB,sCAAsC,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAIxF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,qBAAqB,GAAG,IAAI,CAS/G;AACD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,kBAAkB,GAAG,IAAI,CAE3B;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,KAAK,GAAE,kBAAkC,EACzC,KAAK,GAAE,gBAAyB,GAC/B,oBAAoB,CA0BtB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,EACxB,KAAK,GAAE,gBAAyB,GAC/B,oBAAoB,CAItB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,uBAAuB,CAiCzB;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,iBAAiB,GACvB,0BAA0B,CA4B5B;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,yBAAyB,CA2B3B"}
+{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/native/execution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gBAAgB,CAAC;AAKxB,wBAAgB,sCAAsC,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAIxF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,qBAAqB,GAAG,IAAI,CAS/G;AACD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,kBAAkB,GAAG,IAAI,CAE3B;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,KAAK,GAAE,kBAAkC,EACzC,KAAK,GAAE,gBAAyB,GAC/B,oBAAoB,CA0BtB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,EACxB,KAAK,GAAE,gBAAyB,GAC/B,oBAAoB,CAItB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,uBAAuB,CAiCzB;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,iBAAiB,GACvB,0BAA0B,CA4B5B;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,yBAAyB,CAiD3B;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,EACxB,IAAI,CAAC,EAAE,iBAAiB,GACvB,yBAAyB,CA+B3B"}

package/dist/native/execution.js

@@ -2,6 +2,7 @@ import { stringifyUnknown } from "../util/ast.js";
 import { errorMessage } from "../util/errors.js";
 import { getCachedNormalizedQuery, normalizeNativeQueryForSupport } from "./queries.js";
 import { loadBinding, resolveNativeBindingState, throwIfNativeRequiredUnavailable } from "./runtime.js";
+import { isColumnarSyntaxTree, nativeShapeMismatchMessage, REQUIRED_NATIVE_EXTRACTION_VERSION } from "./treeShape.js";
 export function isNativeDuplicateTokenizationAvailable(mode) {
     const state = resolveNativeBindingState(mode);
     throwIfNativeRequiredUnavailable(mode, state);
@@ -119,6 +120,57 @@ export function getNativeSingleQueryExecution(source, support, queryText, mode)
         };
     }
 }
+/**
+ * Runs the full query set and projects the syntax tree from one Tree-sitter parse.
+ * Prefer this over calling {@link getNativeQueryExecution} and
+ * {@link getNativeSyntaxTreeExecution} on the same source: each parses independently,
+ * so calling both parses the file twice for no benefit. This is what the native worker
+ * pool already uses (`extractLanguage`, one parse per file); this is the same call for
+ * callers that need both results outside a worker.
+ */
+export function getNativeExtractionExecution(source, support, mode) {
+    const state = resolveNativeBindingState(mode);
+    throwIfNativeRequiredUnavailable(mode, state);
+    if (!state.loaded) {
+        return { results: null, tree: null, ...unavailableNativeFailure(state) };
+    }
+    if (!state.supportedLanguageIds.has(support.id)) {
+        return { results: null, tree: null, fallbackReason: "unsupportedLanguage" };
+    }
+    if (typeof state.binding.extractLanguage !== "function") {
+        return {
+            results: null,
+            tree: null,
+            fallbackReason: "unavailable",
+            error: `@lzehrung/codegraph-native >= ${REQUIRED_NATIVE_EXTRACTION_VERSION} is required; ` +
+                "the installed native binary does not provide extractLanguage. Reinstall the native package.",
+        };
+    }
+    try {
+        const extraction = state.binding.extractLanguage(source, support.id, getCachedNormalizedQuery(support, "imports"), getCachedNormalizedQuery(support, "exports"), getCachedNormalizedQuery(support, "locals"), getCachedNormalizedQuery(support, "importBindings"));
+        const tree = extraction.syntaxTree ?? null;
+        // A missing tree is a tolerated state; a present-but-legacy tree means the installed
+        // native package predates the columnar projection and cannot be read here. Query
+        // results are unaffected by that mismatch, so they still come back.
+        if (tree !== null && !isColumnarSyntaxTree(tree)) {
+            return {
+                results: extraction.results,
+                tree: null,
+                fallbackReason: "unavailable",
+                error: nativeShapeMismatchMessage(),
+            };
+        }
+        return { results: extraction.results, tree };
+    }
+    catch (error) {
+        return {
+            results: null,
+            tree: null,
+            fallbackReason: "queryFailure",
+            error: errorMessage(error),
+        };
+    }
+}
 export function getNativeSyntaxTreeExecution(source, support, mode) {
     const state = resolveNativeBindingState(mode);
     throwIfNativeRequiredUnavailable(mode, state);
@@ -136,9 +188,13 @@ export function getNativeSyntaxTreeExecution(source, support, mode) {
         };
     }
     try {
-        return {
-            tree: state.binding.parseSyntaxTree(source, support.id),
-        };
+        const tree = state.binding.parseSyntaxTree(source, support.id) ?? null;
+        // A missing tree is a tolerated state; a present-but-legacy tree means the installed
+        // native package predates the columnar projection and cannot be read here.
+        if (tree !== null && !isColumnarSyntaxTree(tree)) {
+            return { tree: null, fallbackReason: "unavailable", error: nativeShapeMismatchMessage() };
+        }
+        return { tree };
     }
     catch (error) {
         return {

package/dist/native/execution.js.map

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

package/dist/native/projectedTree.d.ts

@@ -1,25 +1,37 @@
-import type { NativePoint, NativeSyntaxNode, NativeSyntaxTree } from "./treeSitterNative.js";
+import type { NativePoint, NativeSyntaxTree } from "./treeSitterNative.js";
 import { type ByteToStringIndexMap } from "./byteIndex.js";
 export type ProjectedPosition = {
     row: number;
     column: number;
 };
+/**
+ * Reads the native columnar projection (see `NativeSyntaxTree`) through the ordinary
+ * `SyntaxNodeLike` node API.
+ *
+ * Nodes are materialized lazily and memoized by id, so a walk that touches a handful
+ * of nodes allocates a handful of wrappers rather than one per node in the file, and
+ * repeated lookups of the same id return the same instance.
+ */
 export declare class ProjectedSyntaxTree {
     readonly source: string;
-    private readonly nodesById;
     /** Shared byte-offset -> UTF-16 string-index map; reuse this instead of rebuilding one. */
     readonly byteIndexMap: ByteToStringIndexMap;
     readonly rootNode: ProjectedSyntaxNode;
+    /** @internal Column storage; read through `ProjectedSyntaxNode`. */
+    readonly columns: NativeSyntaxTree;
+    private readonly nodes;
+    private fieldNameIds;
     constructor(source: string, tree: NativeSyntaxTree);
     nodeById(id: number): ProjectedSyntaxNode | undefined;
     stringIndexForByte(byteIndex: number): number;
     positionForPoint(point: NativePoint): ProjectedPosition;
+    /** @internal Resolve an interned field name, or `undefined` when the grammar never emits it. */
+    fieldNameId(fieldName: string): number | undefined;
 }
 export declare class ProjectedSyntaxNode {
     private readonly tree;
-    private readonly raw;
-    constructor(tree: ProjectedSyntaxTree, raw: NativeSyntaxNode);
-    get id(): number;
+    readonly id: number;
+    constructor(tree: ProjectedSyntaxTree, id: number);
     get type(): string;
     get startIndex(): number;
     get endIndex(): number;
@@ -34,5 +46,8 @@ export declare class ProjectedSyntaxNode {
     childForFieldName(fieldName: string): ProjectedSyntaxNode | null;
     descendantForIndex(startIndex: number, endIndex: number): ProjectedSyntaxNode;
     descendantForPosition(start: ProjectedPosition, end: ProjectedPosition): ProjectedSyntaxNode;
+    private collect;
+    /** Find the previous sibling in the parent's child list without materializing the siblings. */
+    private previousIn;
 }
 //# sourceMappingURL=projectedTree.d.ts.map

package/dist/native/projectedTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectedTree.d.ts","sourceRoot":"","sources":["../../src/native/projectedTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmC;IAC7D,2FAA2F;IAC3F,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;gBAE3B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;IAclD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAIrD,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI7C,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,iBAAiB;CAGxD;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;IAC3C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmB;gBAE3B,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,gBAAgB;IAK5D,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,aAAa,IAAI,iBAAiB,CAErC;IAED,IAAI,WAAW,IAAI,iBAAiB,CAEnC;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,mBAAmB,GAAG,IAAI,CAGvC;IAED,IAAI,aAAa,IAAI,mBAAmB,EAAE,CAKzC;IAED,IAAI,oBAAoB,IAAI,mBAAmB,GAAG,IAAI,CAOrD;IAED,IAAI,eAAe,IAAI,mBAAmB,GAAG,IAAI,CAUhD;IAED,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IAMhD,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IAMhE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB;IAS7E,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,GAAG,mBAAmB;CAQ7F"}
+{"version":3,"file":"projectedTree.d.ts","sourceRoot":"","sources":["../../src/native/projectedTree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,2FAA2F;IAC3F,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,oEAAoE;IACpE,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,YAAY,CAAkC;gBAE1C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;IAYlD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IASrD,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI7C,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,iBAAiB;IAIvD,gGAAgG;IAChG,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAMnD;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAER,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE,MAAM;IAKjD,IAAI,IAAI,IAAI,MAAM,CAGjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,aAAa,IAAI,iBAAiB,CAOrC;IAED,IAAI,WAAW,IAAI,iBAAiB,CAOnC;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,mBAAmB,GAAG,IAAI,CAIvC;IAED,IAAI,aAAa,IAAI,mBAAmB,EAAE,CAGzC;IAED,IAAI,oBAAoB,IAAI,mBAAmB,GAAG,IAAI,CAGrD;IAED,IAAI,eAAe,IAAI,mBAAmB,GAAG,IAAI,CAGhD;IAED,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IAQhD,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IAchE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB;IAS7E,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,GAAG,mBAAmB;IAS5F,OAAO,CAAC,OAAO;IAWf,+FAA+F;IAC/F,OAAO,CAAC,UAAU;CAYnB"}

package/dist/native/projectedTree.js

@@ -1,17 +1,26 @@
 import { buildByteToStringIndexMap, stringIndexForByte, stringPositionForBytePoint, } from "./byteIndex.js";
+/**
+ * Reads the native columnar projection (see `NativeSyntaxTree`) through the ordinary
+ * `SyntaxNodeLike` node API.
+ *
+ * Nodes are materialized lazily and memoized by id, so a walk that touches a handful
+ * of nodes allocates a handful of wrappers rather than one per node in the file, and
+ * repeated lookups of the same id return the same instance.
+ */
 export class ProjectedSyntaxTree {
     source;
-    nodesById;
     /** Shared byte-offset -> UTF-16 string-index map; reuse this instead of rebuilding one. */
     byteIndexMap;
     rootNode;
+    /** @internal Column storage; read through `ProjectedSyntaxNode`. */
+    columns;
+    nodes;
+    fieldNameIds;
     constructor(source, tree) {
         this.source = source;
         this.byteIndexMap = buildByteToStringIndexMap(source);
-        this.nodesById = new Map();
-        for (const node of tree.nodes) {
-            this.nodesById.set(node.id, new ProjectedSyntaxNode(this, node));
-        }
+        this.columns = tree;
+        this.nodes = new Array(tree.nodeCount);
         const rootNode = this.nodeById(tree.rootId);
         if (!rootNode) {
             throw new Error("Projected syntax tree is missing the root node");
@@ -19,7 +28,14 @@ export class ProjectedSyntaxTree {
         this.rootNode = rootNode;
     }
     nodeById(id) {
-        return this.nodesById.get(id);
+        if (id < 0 || id >= this.columns.nodeCount)
+            return undefined;
+        const existing = this.nodes[id];
+        if (existing)
+            return existing;
+        const created = new ProjectedSyntaxNode(this, id);
+        this.nodes[id] = created;
+        return created;
     }
     stringIndexForByte(byteIndex) {
         return stringIndexForByte(this.byteIndexMap, byteIndex);
@@ -27,80 +43,89 @@ export class ProjectedSyntaxTree {
     positionForPoint(point) {
         return stringPositionForBytePoint(this.byteIndexMap, point);
     }
+    /** @internal Resolve an interned field name, or `undefined` when the grammar never emits it. */
+    fieldNameId(fieldName) {
+        if (!this.fieldNameIds) {
+            this.fieldNameIds = new Map(this.columns.fieldNames.map((name, index) => [name, index]));
+        }
+        return this.fieldNameIds.get(fieldName);
+    }
 }
 export class ProjectedSyntaxNode {
     tree;
-    raw;
-    constructor(tree, raw) {
+    id;
+    constructor(tree, id) {
         this.tree = tree;
-        this.raw = raw;
-    }
-    get id() {
-        return this.raw.id;
+        this.id = id;
     }
     get type() {
-        return this.raw.nodeType;
+        const columns = this.tree.columns;
+        return columns.kinds[columns.kindIds[this.id]];
     }
     get startIndex() {
-        return this.tree.stringIndexForByte(this.raw.start.index);
+        return this.tree.stringIndexForByte(this.tree.columns.startIndex[this.id]);
     }
     get endIndex() {
-        return this.tree.stringIndexForByte(this.raw.end.index);
+        return this.tree.stringIndexForByte(this.tree.columns.endIndex[this.id]);
     }
     get startPosition() {
-        return this.tree.positionForPoint(this.raw.start);
+        const columns = this.tree.columns;
+        return this.tree.positionForPoint({
+            row: columns.startRow[this.id],
+            column: columns.startColumn[this.id],
+            index: columns.startIndex[this.id],
+        });
     }
     get endPosition() {
-        return this.tree.positionForPoint(this.raw.end);
+        const columns = this.tree.columns;
+        return this.tree.positionForPoint({
+            row: columns.endRow[this.id],
+            column: columns.endColumn[this.id],
+            index: columns.endIndex[this.id],
+        });
     }
     get text() {
         return this.tree.source.slice(this.startIndex, this.endIndex);
     }
     get parent() {
-        if (this.raw.parentId < 0)
+        const parentId = this.tree.columns.parentIds[this.id];
+        if (parentId < 0)
             return null;
-        return this.tree.nodeById(this.raw.parentId) ?? null;
+        return this.tree.nodeById(parentId) ?? null;
     }
     get namedChildren() {
-        return this.raw.namedChildIds.flatMap((id) => {
-            const child = this.tree.nodeById(id);
-            return child ? [child] : [];
-        });
+        const columns = this.tree.columns;
+        return this.collect(columns.namedChildIds, columns.namedChildOffsets);
     }
     get previousNamedSibling() {
-        const parent = this.parent;
-        if (!parent)
-            return null;
-        const siblings = parent.namedChildren;
-        const currentIndex = siblings.findIndex((node) => node.id === this.id);
-        if (currentIndex <= 0)
-            return null;
-        return siblings[currentIndex - 1] ?? null;
+        const columns = this.tree.columns;
+        return this.previousIn(columns.namedChildIds, columns.namedChildOffsets);
     }
     get previousSibling() {
-        const parent = this.parent;
-        if (!parent)
-            return null;
-        const siblings = parent.raw.childIds.flatMap((id) => {
-            const sibling = this.tree.nodeById(id);
-            return sibling ? [sibling] : [];
-        });
-        const currentIndex = siblings.findIndex((node) => node.id === this.id);
-        if (currentIndex <= 0)
-            return null;
-        return siblings[currentIndex - 1] ?? null;
+        const columns = this.tree.columns;
+        return this.previousIn(columns.childIds, columns.childOffsets);
     }
     child(index) {
-        const childId = this.raw.childIds[index];
-        if (childId === undefined)
+        const columns = this.tree.columns;
+        const start = columns.childOffsets[this.id];
+        const end = columns.childOffsets[this.id + 1];
+        if (index < 0 || index >= end - start)
             return null;
-        return this.tree.nodeById(childId) ?? null;
+        return this.tree.nodeById(columns.childIds[start + index]) ?? null;
     }
     childForFieldName(fieldName) {
-        const childIndex = this.raw.childFieldNames.findIndex((name) => name === fieldName);
-        if (childIndex < 0)
+        const fieldNameId = this.tree.fieldNameId(fieldName);
+        if (fieldNameId === undefined)
             return null;
-        return this.child(childIndex);
+        const columns = this.tree.columns;
+        const start = columns.childOffsets[this.id];
+        const end = columns.childOffsets[this.id + 1];
+        for (let slot = start; slot < end; slot += 1) {
+            if (columns.childFieldNameIds[slot] === fieldNameId) {
+                return this.tree.nodeById(columns.childIds[slot]) ?? null;
+            }
+        }
+        return null;
     }
     descendantForIndex(startIndex, endIndex) {
         for (const child of this.namedChildren) {
@@ -118,6 +143,33 @@ export class ProjectedSyntaxNode {
         }
         return this;
     }
+    collect(ids, offsets) {
+        const start = offsets[this.id];
+        const end = offsets[this.id + 1];
+        const out = [];
+        for (let slot = start; slot < end; slot += 1) {
+            const node = this.tree.nodeById(ids[slot]);
+            if (node)
+                out.push(node);
+        }
+        return out;
+    }
+    /** Find the previous sibling in the parent's child list without materializing the siblings. */
+    previousIn(ids, offsets) {
+        const parentId = this.tree.columns.parentIds[this.id];
+        if (parentId < 0)
+            return null;
+        const start = offsets[parentId];
+        const end = offsets[parentId + 1];
+        for (let slot = start; slot < end; slot += 1) {
+            if (ids[slot] !== this.id)
+                continue;
+            if (slot === start)
+                return null;
+            return this.tree.nodeById(ids[slot - 1]) ?? null;
+        }
+        return null;
+    }
 }
 function comparePosition(left, right) {
     if (left.row !== right.row) {

package/dist/native/projectedTree.js.map

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

package/dist/native/runtime.d.ts

@@ -1,14 +1,60 @@
-import type { NativeBindingOrigin, NativeBindingState, NativeRuntimeMode } from "./contracts.js";
+import type { NativeBindingOrigin, NativeBindingState, NativeRuntimeMode, NativeWorkerBindingHandoff } from "./contracts.js";
 export declare function __resetNativeTreeSitterBindingForTests(): void;
 export declare function isNativeTreeSitterDisabledByEnv(env?: NodeJS.ProcessEnv): boolean;
 export declare function normalizeNativeRuntimeMode(mode?: NativeRuntimeMode): NativeRuntimeMode;
 export declare function loadBinding(): NativeBindingState;
 export declare function resolveNativeBindingState(mode?: NativeRuntimeMode, env?: NodeJS.ProcessEnv): NativeBindingState;
+/**
+ * The binding-derived half of the runtime fingerprint: everything the serializer reads that a
+ * full addon load would otherwise be needed to obtain.
+ */
+export type NativeRuntimeIdentity = {
+    available: boolean;
+    supportedLanguageIds: string[];
+    origin: NativeBindingOrigin | undefined;
+    /** Cache-only deadline; omitted for identities obtained from a loaded binding. */
+    cacheIdentityRevalidateAt?: number | undefined;
+};
+/**
+ * Takes the binding-derived facts rather than a NativeBindingState, because the cache fast path
+ * below reconstructs those facts from a recorded identity and has no binding to hand.
+ */
+export declare function serializeNativeRuntimeFingerprint(requestedMode: NativeRuntimeMode, envDisabled: boolean, identity: NativeRuntimeIdentity): string;
+/**
+ * Rebuild the binding-derived half of the fingerprint from a recorded cache identity, without
+ * mapping the addon.
+ *
+ * Every caller of getNativeRuntimeFingerprint reaches it to decide whether an on-disk index is
+ * still valid, which is why a command that only reads a warm cache used to pay a full native
+ * load to prove it did not need one. A recorded identity supplies the two things the load was
+ * for - the supported language list and the binding origin - and stores the origin whole, so
+ * the string produced here is the same one a load produces.
+ *
+ * Returns undefined whenever anything is unproven: a workspace checkout (which resolves its own
+ * binary and never populates the cache), a platform without the runtime cache, an unresolvable
+ * platform package, or no identity record that still matches the files on disk.
+ */
+export type CachedRuntimeIdentityOptions = {
+    /** Injected in tests; the runtime cache exists only on Windows. */
+    platform?: NodeJS.Platform | undefined;
+    arch?: string | undefined;
+    localPackageRoot?: string | undefined;
+    resolveFn?: ((specifier: string) => string) | undefined;
+    cacheRoot?: string | undefined;
+    now?: number | undefined;
+};
+export declare function resolveCachedRuntimeIdentity(options?: CachedRuntimeIdentityOptions): NativeRuntimeIdentity | undefined;
 export declare function getNativeRuntimeFingerprint(mode?: NativeRuntimeMode, env?: NodeJS.ProcessEnv): string;
 export declare function isNativeTreeSitterAvailable(mode?: NativeRuntimeMode): boolean;
 export declare function getNativeTreeSitterLoadError(mode?: NativeRuntimeMode): unknown;
 export declare function getNativeBindingOrigin(): NativeBindingOrigin | undefined;
 export declare function getCurrentNativeBindingOrigin(): NativeBindingOrigin | undefined;
+/**
+ * The resolved addon path for a binding this process has already loaded, for handing to worker
+ * threads. Undefined unless a load succeeded, so a worker is never pointed at a path that did
+ * not work here.
+ */
+export declare function getNativeWorkerBindingHandoff(): NativeWorkerBindingHandoff | undefined;
 export declare function getNativeTreeSitterSupportedLanguageIds(mode?: NativeRuntimeMode): string[];
 export declare function isNativeRequiredUnavailableError(error: unknown): boolean;
 export declare function throwIfNativeRequiredUnavailable(mode: NativeRuntimeMode | undefined, state: NativeBindingState): void;

package/dist/native/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/native/runtime.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAiB,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAqBhH,wBAAgB,sCAAsC,IAAI,IAAI,CAG7D;AAED,wBAAgB,+BAA+B,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAO7F;AAED,wBAAgB,0BAA0B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,CAEtF;AAED,wBAAgB,WAAW,IAAI,kBAAkB,CAuBhD;AAED,wBAAgB,yBAAyB,CACvC,IAAI,CAAC,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,kBAAkB,CAepB;AA+BD,wBAAgB,2BAA2B,CAAC,IAAI,CAAC,EAAE,iBAAiB,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CA4BlH;AAED,wBAAgB,2BAA2B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAE7E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAG9E;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,GAAG,SAAS,CAExE;AAED,wBAAgB,6BAA6B,IAAI,mBAAmB,GAAG,SAAS,CAE/E;AAED,wBAAgB,uCAAuC,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAG1F;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAExE;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,iBAAiB,GAAG,SAAS,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAIrH;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,GAAG,SAAS,GAAG,IAAI,CAIvF;AAED,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAGtG"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/native/runtime.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAEV,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,gBAAgB,CAAC;AAsCxB,wBAAgB,sCAAsC,IAAI,IAAI,CAI7D;AAED,wBAAgB,+BAA+B,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAO7F;AAED,wBAAgB,0BAA0B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,CAEtF;AAED,wBAAgB,WAAW,IAAI,kBAAkB,CA2ChD;AAED,wBAAgB,yBAAyB,CACvC,IAAI,CAAC,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,kBAAkB,CAepB;AACD;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,MAAM,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACxC,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD,CAAC;AAqCF;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,qBAAqB,GAC9B,MAAM,CAuBR;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IACxD,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,OAAO,GAAE,4BAAiC,GACzC,qBAAqB,GAAG,SAAS,CA8CnC;AAED,wBAAgB,2BAA2B,CAAC,IAAI,CAAC,EAAE,iBAAiB,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAyDlH;AAED,wBAAgB,2BAA2B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAE7E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAG9E;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,GAAG,SAAS,CAExE;AAED,wBAAgB,6BAA6B,IAAI,mBAAmB,GAAG,SAAS,CAE/E;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,0BAA0B,GAAG,SAAS,CAKtF;AAED,wBAAgB,uCAAuC,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,MAAM,EAAE,CAG1F;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAExE;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,iBAAiB,GAAG,SAAS,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAIrH;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,GAAG,SAAS,GAAG,IAAI,CAIvF;AAED,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAGtG"}