@dreamtree-org/graphify 1.1.1 → 1.1.3

package/README.md

@@ -16,8 +16,12 @@ the right files. A graph fixes retrieval, but node lists alone still leave the a
 chase files. graphify closes the loop: its answers are **task-shaped** — actual code
 snippets, test lists, impact checklists, diffs — not just structure.
 
-Measured on this repository itself (`graphify benchmark`): answering through the graph uses
-**~8x fewer tokens** than reading the files each answer touches.
+Token savings depend on the shape of your repo: graph answers have a roughly fixed cost
+(they fill toward their token budget), so the win grows with how much code a naive file
+read would have pulled in. Measured with `graphify benchmark`: **up to ~8x** on this
+repository (~100 files, deep cross-file structure), closer to **~1.5x** on small,
+tightly-organized libraries — and on a trivial question in a tiny repo, reading the file
+directly can be cheaper. Run `graphify benchmark` on your own repo before quoting a number.
 
 ## Install
 

package/dist/{chunk-EW23BLJC.js → chunk-NS5HB65S.js}

@@ -1,7 +1,7 @@
 import {
   affectedBy,
   testsForNode
-} from "./chunk-YT7B6DOD.js";
+} from "./chunk-ZK3TA6FW.js";
 import {
   escapeHtml,
   sanitizeLabel,
@@ -1535,10 +1535,10 @@ async function extractRust(filePath, displayPath) {
         }
       }
     } else if (fn.type === "scoped_identifier") {
-      const path10 = fn.childForFieldName("path")?.text;
+      const path11 = fn.childForFieldName("path")?.text;
       const name = fn.childForFieldName("name")?.text;
-      if (path10 && name) {
-        const viaImport = importIndex.get(path10);
+      if (path11 && name) {
+        const viaImport = importIndex.get(path11);
         if (viaImport) {
           targetId = viaImport.id;
           confidence = "INFERRED";
@@ -1609,13 +1609,11 @@ async function extractTypeScript(filePath, displayPath) {
     });
   }
   function importTargetId(binding, property) {
-    if (!binding.ref.external) {
-      if (binding.kind === "named" && binding.importedName) {
-        return entityId(binding.ref.id, binding.importedName);
-      }
-      if (binding.kind === "namespace" && property) {
-        return entityId(binding.ref.id, property);
-      }
+    if (binding.kind === "named" && binding.importedName) {
+      return entityId(binding.ref.id, binding.importedName);
+    }
+    if (binding.kind === "namespace" && property) {
+      return entityId(binding.ref.id, property);
     }
     return binding.ref.id;
   }
@@ -1653,24 +1651,35 @@ async function extractTypeScript(filePath, displayPath) {
       }
     }
   }
+  function unwrapExpression(node) {
+    let current = node;
+    while (current.type === "as_expression" || current.type === "satisfies_expression" || current.type === "non_null_expression" || current.type === "parenthesized_expression") {
+      const inner = namedChildren(current)[0];
+      if (!inner) break;
+      current = inner;
+    }
+    return current;
+  }
   function handleTopLevelVariableFunctions(node) {
+    const isExported = node.parent?.type === "export_statement";
     for (const declarator of namedChildren(node)) {
       if (declarator.type !== "variable_declarator") continue;
       const value = declarator.childForFieldName("value");
       if (!value) continue;
-      if (value.type === "arrow_function" || value.type === "function_expression") {
+      const core = unwrapExpression(value);
+      if (core.type === "arrow_function" || core.type === "function_expression") {
         const name = declarator.childForFieldName("name")?.text;
         if (!name) continue;
         const id = entityId(sourceFile, name);
         builder.addNode({ id, label: `function ${name}`, sourceFile, sourceLocation: lineOf(declarator) });
         builder.addEdge({ source: fileId, target: id, relation: "contains", confidence: "EXTRACTED" });
         nameIndex.set(name, id);
-        functionNodeMap.set(value.id, id);
+        functionNodeMap.set(core.id, id);
         continue;
       }
-      if (value.type === "call_expression") {
-        const callee = value.childForFieldName("function");
-        const specifier = callee?.type === "identifier" && callee.text === "require" ? firstStringArgument(value) : null;
+      if (core.type === "call_expression") {
+        const callee = core.childForFieldName("function");
+        const specifier = callee?.type === "identifier" && callee.text === "require" ? firstStringArgument(core) : null;
         if (specifier) {
           const nameNode = declarator.childForFieldName("name");
           if (nameNode) {
@@ -1678,6 +1687,21 @@ async function extractTypeScript(filePath, displayPath) {
             addModuleNode(ref);
             registerRequireBinding(nameNode, ref);
           }
+          continue;
+        }
+      }
+      if (isExported) {
+        const name = declarator.childForFieldName("name")?.text;
+        if (!name) continue;
+        const id = entityId(sourceFile, name);
+        builder.addNode({ id, label: `const ${name}`, sourceFile, sourceLocation: lineOf(declarator) });
+        builder.addEdge({ source: fileId, target: id, relation: "contains", confidence: "EXTRACTED" });
+        nameIndex.set(name, id);
+        if (core.type === "identifier") {
+          const aliased = nameIndex.get(core.text);
+          if (aliased !== void 0 && aliased !== id) {
+            builder.addEdge({ source: id, target: aliased, relation: "references", confidence: "EXTRACTED" });
+          }
         }
       }
     }
@@ -2017,6 +2041,8 @@ function buildGraph(extractions) {
 }
 
 // src/resolve.ts
+import * as fs9 from "fs/promises";
+import * as path5 from "path";
 var CODE_EXTENSIONS2 = [
   ".ts",
   ".tsx",
@@ -2036,6 +2062,29 @@ var CODE_EXTENSIONS2 = [
 function isOpaque(id) {
   return id.startsWith("module:") || id.startsWith("external:") || id.startsWith("db:");
 }
+var SELF_IMPORT_STEMS = (subpath) => subpath === "" ? ["index", "src/index", "lib/index", "source/index", "src/main"] : [
+  subpath,
+  `src/${subpath}`,
+  `lib/${subpath}`,
+  `source/${subpath}`,
+  `${subpath}/index`,
+  `src/${subpath}/index`,
+  `lib/${subpath}/index`
+];
+function selfImportCandidates(spec, selfNames) {
+  const selfName = selfNames.find((n) => spec === n || spec.startsWith(`${n}/`));
+  if (selfName === void 0) return null;
+  const subpath = spec === selfName ? "" : spec.slice(selfName.length + 1);
+  return SELF_IMPORT_STEMS(subpath).flatMap((stem) => CODE_EXTENSIONS2.map((ext) => `${stem}${ext}`));
+}
+async function readSelfNames(root) {
+  try {
+    const pkg = JSON.parse(await fs9.readFile(path5.join(root, "package.json"), "utf-8"));
+    return typeof pkg.name === "string" && pkg.name.length > 0 ? [pkg.name] : [];
+  } catch {
+    return [];
+  }
+}
 function stripKnownExtension(p) {
   for (const ext of CODE_EXTENSIONS2) {
     if (p.endsWith(ext)) return p.slice(0, -ext.length);
@@ -2052,19 +2101,23 @@ function candidatePaths(guessed) {
   }
   return candidates.filter((c) => c !== guessed);
 }
-function uniqueMatch(guessed, candidates, realIds) {
+function uniqueMatch(candidates, real) {
   const matches = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
-    if (realIds.has(candidate)) matches.add(candidate);
+    if (real.has(candidate)) matches.add(candidate);
   }
-  if (matches.size !== 1) return null;
-  return [...matches][0];
+  return matches.size === 1 ? [...matches][0] : null;
 }
-function resolveCrossFileReferences(extractions) {
+function resolveCrossFileReferences(extractions, options = {}) {
+  const selfNames = options.selfNames ?? [];
   const realIds = /* @__PURE__ */ new Set();
   const realFiles = /* @__PURE__ */ new Set();
   for (const extraction of extractions) {
     for (const node of extraction.nodes) realIds.add(node.id);
+    const first = extraction.nodes[0];
+    if (first && first.id === first.sourceFile && !isOpaque(first.id)) {
+      realFiles.add(first.id);
+    }
     for (const node of extraction.nodes) {
       const sep2 = node.id.indexOf("::");
       if (sep2 > 0) realFiles.add(node.id.slice(0, sep2));
@@ -2074,7 +2127,24 @@ function resolveCrossFileReferences(extractions) {
     }
   }
   const remap = /* @__PURE__ */ new Map();
-  const resolveId = (id) => {
+  let resolvedEndpoints = 0;
+  const applyRemap = (resolveId) => {
+    for (const extraction of extractions) {
+      for (const edge of extraction.edges) {
+        const source = resolveId(edge.source);
+        if (source !== null) {
+          edge.source = source;
+          resolvedEndpoints++;
+        }
+        const target = resolveId(edge.target);
+        if (target !== null) {
+          edge.target = target;
+          resolvedEndpoints++;
+        }
+      }
+    }
+  };
+  const resolvePathId = (id) => {
     if (isOpaque(id)) return null;
     const cached = remap.get(id);
     if (cached !== void 0) return cached;
@@ -2084,30 +2154,77 @@ function resolveCrossFileReferences(extractions) {
       if (realIds.has(id)) return null;
       const guessedPath = id.slice(0, sep2);
       const name = id.slice(sep2);
-      const candidates = candidatePaths(guessedPath).map((p) => `${p}${name}`);
-      resolved = uniqueMatch(id, candidates, realIds);
+      resolved = uniqueMatch(candidatePaths(guessedPath).map((p) => `${p}${name}`), realIds);
     } else {
       if (realFiles.has(id)) return null;
-      resolved = uniqueMatch(id, candidatePaths(id), realFiles);
+      resolved = uniqueMatch(candidatePaths(id), realFiles);
     }
     if (resolved !== null) remap.set(id, resolved);
     return resolved;
   };
-  let resolvedEndpoints = 0;
+  applyRemap(resolvePathId);
+  const namedAlias = /* @__PURE__ */ new Map();
+  const starTargets = /* @__PURE__ */ new Map();
   for (const extraction of extractions) {
     for (const edge of extraction.edges) {
-      const source = resolveId(edge.source);
-      if (source !== null) {
-        edge.source = source;
-        resolvedEndpoints++;
-      }
-      const target = resolveId(edge.target);
-      if (target !== null) {
-        edge.target = target;
-        resolvedEndpoints++;
+      if (edge.relation !== "re_exports" || !realFiles.has(edge.source)) continue;
+      const sep2 = edge.target.lastIndexOf("::");
+      if (sep2 > 0 && realIds.has(edge.target)) {
+        namedAlias.set(`${edge.source}|${edge.target.slice(sep2 + 2)}`, edge.target);
+      } else if (sep2 < 0 && realFiles.has(edge.target)) {
+        const targets = starTargets.get(edge.source) ?? [];
+        targets.push(edge.target);
+        starTargets.set(edge.source, targets);
       }
     }
   }
+  const throughBarrel = (file, name) => {
+    const direct = `${file}::${name}`;
+    if (realIds.has(direct)) return direct;
+    const aliased = namedAlias.get(`${file}|${name}`);
+    if (aliased !== void 0) return aliased;
+    const viaStar = (starTargets.get(file) ?? []).map((sf) => `${sf}::${name}`).filter((id) => realIds.has(id));
+    return viaStar.length === 1 ? viaStar[0] : null;
+  };
+  const resolveBarrelId = (id) => {
+    const cached = remap.get(id);
+    if (cached !== void 0) return cached;
+    if (id.startsWith("module:")) {
+      const spec = id.slice("module:".length);
+      const sep3 = spec.indexOf("::");
+      const moduleSpec = sep3 > 0 ? spec.slice(0, sep3) : spec;
+      const name = sep3 > 0 ? spec.slice(sep3 + 2) : null;
+      const candidates = selfImportCandidates(moduleSpec, selfNames);
+      if (candidates === null) {
+        if (name === null) return null;
+        remap.set(id, `module:${moduleSpec}`);
+        return `module:${moduleSpec}`;
+      }
+      const file = uniqueMatch(candidates, realFiles);
+      let resolved = null;
+      if (file !== null) {
+        resolved = name !== null ? throughBarrel(file, name) ?? file : file;
+      } else if (name !== null) {
+        resolved = `module:${moduleSpec}`;
+      }
+      if (resolved !== null) remap.set(id, resolved);
+      return resolved;
+    }
+    const sep2 = id.indexOf("::");
+    if (sep2 > 0 && !realIds.has(id)) {
+      const guessedPath = id.slice(0, sep2);
+      const name = id.slice(sep2 + 2);
+      const files = [guessedPath, ...candidatePaths(guessedPath)].filter((f) => realFiles.has(f));
+      const resolvedSet = new Set(files.map((f) => throughBarrel(f, name)).filter((r) => r !== null));
+      if (resolvedSet.size === 1) {
+        const resolved = [...resolvedSet][0];
+        remap.set(id, resolved);
+        return resolved;
+      }
+    }
+    return null;
+  };
+  applyRemap(resolveBarrelId);
   let droppedPlaceholders = 0;
   for (const extraction of extractions) {
     const before = extraction.nodes.length;
@@ -2383,15 +2500,15 @@ function renderReport(graph, analysis, now = /* @__PURE__ */ new Date()) {
 
 // src/export.ts
 import { createRequire as createRequire2 } from "module";
-import * as fs9 from "fs/promises";
-import * as path5 from "path";
+import * as fs10 from "fs/promises";
+import * as path6 from "path";
 var require3 = createRequire2(import.meta.url);
 function resolveVisNetworkAssets() {
   const packageJsonPath = require3.resolve("vis-network/package.json");
-  const root = path5.dirname(packageJsonPath);
+  const root = path6.dirname(packageJsonPath);
   return {
-    jsPath: path5.join(root, "standalone", "umd", "vis-network.min.js"),
-    cssPath: path5.join(root, "styles", "vis-network.min.css")
+    jsPath: path6.join(root, "standalone", "umd", "vis-network.min.js"),
+    cssPath: path6.join(root, "styles", "vis-network.min.css")
   };
 }
 var COMMUNITY_PALETTE = [
@@ -2450,8 +2567,8 @@ community: ${communityLabel}` : ""}`,
 async function renderHtml(graph) {
   const { jsPath, cssPath } = resolveVisNetworkAssets();
   const [visJs, visCss] = await Promise.all([
-    fs9.readFile(jsPath, "utf-8"),
-    fs9.readFile(cssPath, "utf-8")
+    fs10.readFile(jsPath, "utf-8"),
+    fs10.readFile(cssPath, "utf-8")
   ]);
   const { nodes, edges } = buildVisNodesAndEdges(graph);
   const dataJson = safeInlineJson({ nodes, edges });
@@ -2491,17 +2608,17 @@ ${visJs}
 `;
 }
 async function exportGraph(graph, options, report) {
-  const outDir = path5.resolve(options.outDir);
-  await fs9.mkdir(outDir, { recursive: true });
+  const outDir = path6.resolve(options.outDir);
+  await fs10.mkdir(outDir, { recursive: true });
   const jsonPath = validateGraphPath("graph.json", outDir);
-  await fs9.writeFile(jsonPath, JSON.stringify(graph.toJSON(), null, 2), "utf-8");
+  await fs10.writeFile(jsonPath, JSON.stringify(graph.toJSON(), null, 2), "utf-8");
   if (options.html !== false) {
     const htmlPath = validateGraphPath("graph.html", outDir);
-    await fs9.writeFile(htmlPath, await renderHtml(graph), "utf-8");
+    await fs10.writeFile(htmlPath, await renderHtml(graph), "utf-8");
   }
   if (report !== void 0) {
     const reportPath = validateGraphPath("GRAPH_REPORT.md", outDir);
-    await fs9.writeFile(reportPath, report, "utf-8");
+    await fs10.writeFile(reportPath, report, "utf-8");
   }
   const notImplemented = [];
   if (options.svg) notImplemented.push("--svg");
@@ -2515,19 +2632,19 @@ async function exportGraph(graph, options, report) {
 
 // src/extractionCache.ts
 import { createHash as createHash2 } from "crypto";
-import * as fs10 from "fs/promises";
-import * as path6 from "path";
+import * as fs11 from "fs/promises";
+import * as path7 from "path";
 var ExtractionCache = class {
   dir;
   constructor(outDir) {
-    this.dir = path6.join(outDir, "cache");
+    this.dir = path7.join(outDir, "cache");
   }
   key(relFile, content) {
     return createHash2("sha256").update(relFile).update("\0").update(content).digest("hex");
   }
   async get(key) {
     try {
-      const raw = await fs10.readFile(path6.join(this.dir, `${key}.json`), "utf-8");
+      const raw = await fs11.readFile(path7.join(this.dir, `${key}.json`), "utf-8");
       const parsed = JSON.parse(raw);
       if (!Array.isArray(parsed.nodes) || !Array.isArray(parsed.edges)) return null;
       return parsed;
@@ -2536,32 +2653,32 @@ var ExtractionCache = class {
     }
   }
   async put(key, extraction) {
-    await fs10.mkdir(this.dir, { recursive: true });
-    await fs10.writeFile(path6.join(this.dir, `${key}.json`), JSON.stringify(extraction), "utf-8");
+    await fs11.mkdir(this.dir, { recursive: true });
+    await fs11.writeFile(path7.join(this.dir, `${key}.json`), JSON.stringify(extraction), "utf-8");
   }
 };
 
 // src/pipeline.ts
-import * as fs11 from "fs/promises";
-import * as path7 from "path";
+import * as fs12 from "fs/promises";
+import * as path8 from "path";
 async function runPipeline(root, options = {}) {
   const progress = options.onProgress ?? (() => {
   });
-  const resolvedRoot = path7.resolve(root);
+  const resolvedRoot = path8.resolve(root);
   progress(`Scanning ${resolvedRoot} ...`);
   const manifest = collectFiles(resolvedRoot);
   progress(
     `Found ${manifest.totalFiles} file(s) (${manifest.files.code.length} code, ${manifest.skippedSensitive.length} skipped as sensitive).`
   );
-  const outDir = options.outDir ?? path7.join(resolvedRoot, "graphify-out");
+  const outDir = options.outDir ?? path8.join(resolvedRoot, "graphify-out");
   const cache = new ExtractionCache(outDir);
   progress("Extracting...");
   const extractions = [];
   let cacheHits = 0;
   for (const relFile of manifest.files.code.sort((a, b) => a.localeCompare(b))) {
-    const filePath = path7.relative(process.cwd(), path7.join(resolvedRoot, relFile)) || relFile;
+    const filePath = path8.relative(process.cwd(), path8.join(resolvedRoot, relFile)) || relFile;
     try {
-      const key = cache.key(relFile, await fs11.readFile(path7.join(resolvedRoot, relFile)));
+      const key = cache.key(relFile, await fs12.readFile(path8.join(resolvedRoot, relFile)));
       let extraction = options.update ? await cache.get(key) : null;
       if (extraction) {
         cacheHits++;
@@ -2582,7 +2699,9 @@ async function runPipeline(root, options = {}) {
     extractions.push(...options.extraExtractions);
   }
   progress("Resolving cross-file references...");
-  const resolveStats = resolveCrossFileReferences(extractions);
+  const resolveStats = resolveCrossFileReferences(extractions, {
+    selfNames: await readSelfNames(resolvedRoot)
+  });
   if (resolveStats.resolvedEndpoints > 0) {
     progress(
       `  re-pointed ${resolveStats.resolvedEndpoints} guessed reference(s) at real nodes (${resolveStats.droppedPlaceholders} placeholder node(s) dropped).`
@@ -2671,8 +2790,8 @@ function mergeGraphs(entries) {
 
 // src/memory.ts
 import { createHash as createHash3 } from "crypto";
-import * as fs12 from "fs/promises";
-import * as path8 from "path";
+import * as fs13 from "fs/promises";
+import * as path9 from "path";
 var OUTCOMES = /* @__PURE__ */ new Set(["useful", "dead_end", "corrected"]);
 var TYPES = /* @__PURE__ */ new Set(["query", "path", "explain", "affected"]);
 function validateResult(value) {
@@ -2690,25 +2809,25 @@ function validateResult(value) {
 }
 async function saveResult(entry, memoryDir, now = /* @__PURE__ */ new Date()) {
   validateResult(entry);
-  await fs12.mkdir(memoryDir, { recursive: true });
+  await fs13.mkdir(memoryDir, { recursive: true });
   const saved = { ...entry, savedAt: now.toISOString() };
   const hash = createHash3("sha256").update(JSON.stringify(saved)).digest("hex").slice(0, 8);
   const stamp = saved.savedAt.replace(/[:.]/g, "-");
-  const filePath = path8.join(memoryDir, `result-${stamp}-${hash}.json`);
-  await fs12.writeFile(filePath, JSON.stringify(saved, null, 2), "utf-8");
+  const filePath = path9.join(memoryDir, `result-${stamp}-${hash}.json`);
+  await fs13.writeFile(filePath, JSON.stringify(saved, null, 2), "utf-8");
   return filePath;
 }
 async function loadResults(memoryDir) {
   let files;
   try {
-    files = (await fs12.readdir(memoryDir)).filter((f) => f.startsWith("result-") && f.endsWith(".json"));
+    files = (await fs13.readdir(memoryDir)).filter((f) => f.startsWith("result-") && f.endsWith(".json"));
   } catch {
     return [];
   }
   const results = [];
   for (const file of files.sort((a, b) => a.localeCompare(b))) {
     try {
-      const parsed = JSON.parse(await fs12.readFile(path8.join(memoryDir, file), "utf-8"));
+      const parsed = JSON.parse(await fs13.readFile(path9.join(memoryDir, file), "utf-8"));
       if (parsed.question && parsed.savedAt) results.push(parsed);
     } catch {
     }
@@ -2784,22 +2903,22 @@ function renderLessons(results, options = {}) {
 
 // src/diff.ts
 import { execFile } from "child_process";
-import * as fs13 from "fs/promises";
+import * as fs14 from "fs/promises";
 import * as os from "os";
-import * as path9 from "path";
+import * as path10 from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 async function graphForDirectory(root) {
   const manifest = collectFiles(root);
   const extractions = [];
   for (const relFile of manifest.files.code.sort((a, b) => a.localeCompare(b))) {
-    extractions.push(await extract(path9.join(root, relFile), relFile));
+    extractions.push(await extract(path10.join(root, relFile), relFile));
   }
-  resolveCrossFileReferences(extractions);
+  resolveCrossFileReferences(extractions, { selfNames: await readSelfNames(root) });
   return buildGraph(extractions);
 }
 async function checkoutRev(repoRoot, rev) {
-  const dest = await fs13.mkdtemp(path9.join(os.tmpdir(), `graphify-review-${rev.replace(/[^a-zA-Z0-9]/g, "_")}-`));
+  const dest = await fs14.mkdtemp(path10.join(os.tmpdir(), `graphify-review-${rev.replace(/[^a-zA-Z0-9]/g, "_")}-`));
   const { stdout } = await execFileAsync(
     "git",
     ["-C", repoRoot, "archive", "--format=tar", rev],
@@ -2867,8 +2986,8 @@ async function reviewRevisions(repoRoot, base, head = "HEAD") {
     return diffGraphs(baseGraph, headGraph, base, head);
   } finally {
     await Promise.all([
-      fs13.rm(baseDir, { recursive: true, force: true }),
-      fs13.rm(headDir, { recursive: true, force: true })
+      fs14.rm(baseDir, { recursive: true, force: true }),
+      fs14.rm(headDir, { recursive: true, force: true })
     ]);
   }
 }
@@ -3001,4 +3120,4 @@ export {
   validateRules,
   checkRules
 };
-//# sourceMappingURL=chunk-EW23BLJC.js.map
+//# sourceMappingURL=chunk-NS5HB65S.js.map