dsh-plugin-codegraph-tree-sitter 0.1.1 → 0.1.5

package/lib/resolve.d.ts

@@ -45,6 +45,9 @@ export interface GraphNode {
     readonly isExported: boolean;
     readonly isAsync: boolean;
     readonly isStatic: boolean;
+    /** Decorator names applied to this declaration — see `RawDefinition.decorators`. Empty for a file
+     * node and for every declaration this package does not currently extract decorators from. */
+    readonly decorators: readonly string[];
     readonly updatedAt: number;
 }
 /** One resolved graph edge. */

package/lib/resolve.js

@@ -99,6 +99,28 @@ function buildNameIndex(nodesByFile) {
     }
     return index;
 }
+/**
+ * A name index restricted to `class`/`interface` nodes, for `extends`/`implements` resolution.
+ * `extractHeritage` only ever names a base class or interface, never a function or variable — indexing
+ * only those kinds keeps a same-named function or module-level `const` (`packages/tree-sitter/src/
+ * languages.ts` extracts those now too) from ever winning a heritage reference by coincidence, tighter
+ * than `buildNameIndex`'s workspace-wide, any-kind index that call resolution already accepts.
+ */
+function buildTypeNameIndex(nodesByFile) {
+    const index = new Map();
+    for (const nodes of nodesByFile.values()) {
+        for (const node of nodes) {
+            if (node.kind !== 'class' && node.kind !== 'interface')
+                continue;
+            const existing = index.get(node.name);
+            if (existing === undefined)
+                index.set(node.name, [node]);
+            else
+                existing.push(node);
+        }
+    }
+    return index;
+}
 /** Resolve one file's raw imports against the indexed workspace. */
 function resolveImports(path, language, imports, indexed) {
     const byLocalName = new Map();
@@ -143,6 +165,7 @@ export function resolveWorkspace(files, now) {
             isExported: false,
             isAsync: false,
             isStatic: false,
+            decorators: [],
             updatedAt: now,
         };
         nodes.push(fileNode);
@@ -168,6 +191,7 @@ export function resolveWorkspace(files, now) {
                 isExported: def.isExported,
                 isAsync: def.isAsync,
                 isStatic: def.isStatic,
+                decorators: def.decorators,
                 updatedAt: now,
             });
         }
@@ -180,6 +204,7 @@ export function resolveWorkspace(files, now) {
         }
     }
     const nameIndex = buildNameIndex(nodesByFile);
+    const typeNameIndex = buildTypeNameIndex(nodesByFile);
     const unresolved = [];
     for (const file of files) {
         const bindings = resolveImports(file.path, file.language, file.extraction.imports, indexed);
@@ -190,7 +215,7 @@ export function resolveWorkspace(files, now) {
         const importedLocalNames = new Set(file.extraction.imports.map(binding => binding.localName));
         for (const call of file.extraction.calls) {
             const callerId = call.callerKey === null ? mustGet(fileNodeId, file.path) : mustGet(keyToId, call.callerKey);
-            const resolved = resolveCall(call.calleeName, bindings, nodesByFile, nameIndex);
+            const resolved = resolveName(call.calleeName, bindings, nodesByFile, nameIndex);
             if (resolved === undefined) {
                 const likelyExternal = call.isMemberCall || importedLocalNames.has(call.calleeName);
                 unresolved.push({ source: callerId, filePath: file.path, calleeName: call.calleeName, line: call.line, col: call.column, likelyExternal });
@@ -198,11 +223,27 @@ export function resolveWorkspace(files, now) {
             }
             edges.push({ source: callerId, target: resolved, kind: 'calls', line: call.line, col: call.column, provenance: 'tree-sitter' });
         }
+        // An unresolved `extends`/`implements` reference is dropped silently, not routed through
+        // `unresolved` — that array (and the `unresolvedCount`/`unresolvedLikelyInternalCount` split built
+        // on it) is a calibrated signal specifically about call-resolution gaps; folding in a different edge
+        // kind would change what that count measures.
+        for (const ref of file.extraction.heritage) {
+            const resolved = resolveName(ref.targetName, bindings, nodesByFile, typeNameIndex);
+            if (resolved === undefined)
+                continue;
+            edges.push({ source: mustGet(keyToId, ref.sourceKey), target: resolved, kind: ref.relation, provenance: 'tree-sitter' });
+        }
     }
     return { nodes, edges, unresolved };
 }
-/** Resolve one call's callee name to exactly one declaration, or `undefined` per rule 3. */
-function resolveCall(calleeName, bindings, nodesByFile, nameIndex) {
+/**
+ * Resolve a bare name to exactly one declaration, or `undefined` per rule 3 — shared by call
+ * resolution (against the workspace-wide, any-kind `nameIndex`) and `extends`/`implements` resolution
+ * (against the `class`/`interface`-only {@link buildTypeNameIndex}); the two-tier rule itself (an
+ * imported binding wins if unambiguous in its target file, else a workspace-wide-unique name wins) does
+ * not depend on which candidate pool the caller passes in.
+ */
+function resolveName(calleeName, bindings, nodesByFile, nameIndex) {
     const bound = bindings.byLocalName.get(calleeName);
     if (bound !== undefined) {
         const targetNodes = mustGet(nodesByFile, bound.targetFile);

package/lib/schema.js

@@ -75,10 +75,10 @@ export async function writeGraph(databasePath, input) {
                 .run(SCHEMA_VERSION, input.indexedAt, 'dsh-codegraph-tree-sitter');
             const insertNode = db.prepare(`INSERT INTO nodes
         (id, kind, name, qualified_name, file_path, language, start_line, end_line, start_column,
-         end_column, is_exported, is_async, is_static, updated_at)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+         end_column, is_exported, is_async, is_static, decorators, updated_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
             for (const node of input.nodes) {
-                insertNode.run(node.id, node.kind, node.name, node.qualifiedName, node.filePath, node.language, node.startLine, node.endLine, node.startColumn, node.endColumn, node.isExported ? 1 : 0, node.isAsync ? 1 : 0, node.isStatic ? 1 : 0, node.updatedAt);
+                insertNode.run(node.id, node.kind, node.name, node.qualifiedName, node.filePath, node.language, node.startLine, node.endLine, node.startColumn, node.endColumn, node.isExported ? 1 : 0, node.isAsync ? 1 : 0, node.isStatic ? 1 : 0, JSON.stringify(node.decorators), node.updatedAt);
             }
             const insertEdge = db.prepare('INSERT INTO edges (source, target, kind, line, col, provenance) VALUES (?, ?, ?, ?, ?, ?)');
             for (const edge of input.edges) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-codegraph-tree-sitter",
-  "version": "0.1.1",
+  "version": "0.1.5",
   "description": "Self-built code-graph indexer for DeepSeek Harness — parses a workspace with web-tree-sitter and writes schema version 4 to .codegraph/codegraph.db, the same on-disk format the codegraph CLI writes, so no external indexer is required",
   "keywords": [
     "dsh",
@@ -51,7 +51,7 @@
     "@deepseek-ai/schemastery": "^3.18.1",
     "tree-sitter-wasms": "^0.1.13",
     "web-tree-sitter": "^0.25.10",
-    "dsh-plugin-codegraph-service": "^0.1.1"
+    "dsh-plugin-codegraph-service": "^0.1.5"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.1",