@dreamtree-org/graphify 1.1.1 → 1.1.2

package/dist/index.cjs

@@ -1603,10 +1603,10 @@ async function extractRust(filePath, displayPath) {
         }
       }
     } else if (fn.type === "scoped_identifier") {
-      const path11 = fn.childForFieldName("path")?.text;
+      const path12 = fn.childForFieldName("path")?.text;
       const name = fn.childForFieldName("name")?.text;
-      if (path11 && name) {
-        const viaImport = importIndex.get(path11);
+      if (path12 && name) {
+        const viaImport = importIndex.get(path12);
         if (viaImport) {
           targetId = viaImport.id;
           confidence = "INFERRED";
@@ -2087,6 +2087,8 @@ function buildGraph(extractions) {
 }
 
 // src/resolve.ts
+var fs9 = __toESM(require("fs/promises"), 1);
+var path5 = __toESM(require("path"), 1);
 var CODE_EXTENSIONS2 = [
   ".ts",
   ".tsx",
@@ -2106,6 +2108,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);
@@ -2130,11 +2155,16 @@ function uniqueMatch(guessed, candidates, realIds) {
   if (matches.size !== 1) return null;
   return [...matches][0];
 }
-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 sep3 = node.id.indexOf("::");
       if (sep3 > 0) realFiles.add(node.id.slice(0, sep3));
@@ -2145,6 +2175,19 @@ function resolveCrossFileReferences(extractions) {
   }
   const remap = /* @__PURE__ */ new Map();
   const resolveId = (id) => {
+    if (id.startsWith("module:") && selfNames.length > 0) {
+      const cachedSelf = remap.get(id);
+      if (cachedSelf !== void 0) return cachedSelf;
+      const candidates = selfImportCandidates(id.slice("module:".length), selfNames);
+      if (candidates !== null) {
+        const resolved2 = uniqueMatch(id, candidates, realFiles);
+        if (resolved2 !== null) {
+          remap.set(id, resolved2);
+          return resolved2;
+        }
+      }
+      return null;
+    }
     if (isOpaque(id)) return null;
     const cached = remap.get(id);
     if (cached !== void 0) return cached;
@@ -2453,15 +2496,15 @@ function renderReport(graph, analysis, now = /* @__PURE__ */ new Date()) {
 
 // src/export.ts
 var import_node_module2 = require("module");
-var fs10 = __toESM(require("fs/promises"), 1);
-var path5 = __toESM(require("path"), 1);
+var fs11 = __toESM(require("fs/promises"), 1);
+var path6 = __toESM(require("path"), 1);
 
 // src/security.ts
 var import_node_crypto2 = require("crypto");
 var dns = __toESM(require("dns"), 1);
 var http = __toESM(require("http"), 1);
 var https = __toESM(require("https"), 1);
-var fs9 = __toESM(require("fs"), 1);
+var fs10 = __toESM(require("fs"), 1);
 var net = __toESM(require("net"), 1);
 var nodePath = __toESM(require("path"), 1);
 var MAX_FETCH_BYTES = 50 * 1024 * 1024;
@@ -2497,25 +2540,25 @@ function validateDsn(dsn) {
     }
   };
 }
-function validateGraphPath(path11, base) {
+function validateGraphPath(path12, base) {
   const baseDir = base ?? nodePath.join(process.cwd(), "graphify-out");
   let resolvedBase;
   try {
-    resolvedBase = fs9.realpathSync(baseDir);
+    resolvedBase = fs10.realpathSync(baseDir);
   } catch {
     throw new Error(`Base directory does not exist: ${baseDir}`);
   }
-  const candidate = nodePath.isAbsolute(path11) ? path11 : nodePath.join(resolvedBase, path11);
+  const candidate = nodePath.isAbsolute(path12) ? path12 : nodePath.join(resolvedBase, path12);
   const resolvedCandidate = nodePath.resolve(candidate);
   let realCandidate = resolvedCandidate;
   try {
-    realCandidate = fs9.realpathSync(resolvedCandidate);
+    realCandidate = fs10.realpathSync(resolvedCandidate);
   } catch {
   }
   const relative4 = nodePath.relative(resolvedBase, realCandidate);
   const escapes = relative4 === ".." || relative4.startsWith(`..${nodePath.sep}`) || nodePath.isAbsolute(relative4);
   if (escapes) {
-    throw new Error(`Path escapes graphify-out/: ${path11}`);
+    throw new Error(`Path escapes graphify-out/: ${path12}`);
   }
   return realCandidate;
 }
@@ -2532,10 +2575,10 @@ function escapeHtml(text) {
 var require3 = (0, import_node_module2.createRequire)(importMetaUrl);
 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 = [
@@ -2594,8 +2637,8 @@ community: ${communityLabel}` : ""}`,
 async function renderHtml(graph) {
   const { jsPath, cssPath } = resolveVisNetworkAssets();
   const [visJs, visCss] = await Promise.all([
-    fs10.readFile(jsPath, "utf-8"),
-    fs10.readFile(cssPath, "utf-8")
+    fs11.readFile(jsPath, "utf-8"),
+    fs11.readFile(cssPath, "utf-8")
   ]);
   const { nodes, edges } = buildVisNodesAndEdges(graph);
   const dataJson = safeInlineJson({ nodes, edges });
@@ -2635,17 +2678,17 @@ ${visJs}
 `;
 }
 async function exportGraph(graph, options, report) {
-  const outDir = path5.resolve(options.outDir);
-  await fs10.mkdir(outDir, { recursive: true });
+  const outDir = path6.resolve(options.outDir);
+  await fs11.mkdir(outDir, { recursive: true });
   const jsonPath = validateGraphPath("graph.json", outDir);
-  await fs10.writeFile(jsonPath, JSON.stringify(graph.toJSON(), null, 2), "utf-8");
+  await fs11.writeFile(jsonPath, JSON.stringify(graph.toJSON(), null, 2), "utf-8");
   if (options.html !== false) {
     const htmlPath = validateGraphPath("graph.html", outDir);
-    await fs10.writeFile(htmlPath, await renderHtml(graph), "utf-8");
+    await fs11.writeFile(htmlPath, await renderHtml(graph), "utf-8");
   }
   if (report !== void 0) {
     const reportPath = validateGraphPath("GRAPH_REPORT.md", outDir);
-    await fs10.writeFile(reportPath, report, "utf-8");
+    await fs11.writeFile(reportPath, report, "utf-8");
   }
   const notImplemented = [];
   if (options.svg) notImplemented.push("--svg");
@@ -2658,24 +2701,24 @@ async function exportGraph(graph, options, report) {
 }
 
 // src/pipeline.ts
-var fs12 = __toESM(require("fs/promises"), 1);
-var path7 = __toESM(require("path"), 1);
+var fs13 = __toESM(require("fs/promises"), 1);
+var path8 = __toESM(require("path"), 1);
 
 // src/extractionCache.ts
 var import_node_crypto3 = require("crypto");
-var fs11 = __toESM(require("fs/promises"), 1);
-var path6 = __toESM(require("path"), 1);
+var fs12 = __toESM(require("fs/promises"), 1);
+var path7 = __toESM(require("path"), 1);
 var ExtractionCache = class {
   dir;
   constructor(outDir) {
-    this.dir = path6.join(outDir, "cache");
+    this.dir = path7.join(outDir, "cache");
   }
   key(relFile, content) {
     return (0, import_node_crypto3.createHash)("sha256").update(relFile).update("\0").update(content).digest("hex");
   }
   async get(key) {
     try {
-      const raw = await fs11.readFile(path6.join(this.dir, `${key}.json`), "utf-8");
+      const raw = await fs12.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;
@@ -2684,8 +2727,8 @@ var ExtractionCache = class {
     }
   }
   async put(key, extraction) {
-    await fs11.mkdir(this.dir, { recursive: true });
-    await fs11.writeFile(path6.join(this.dir, `${key}.json`), JSON.stringify(extraction), "utf-8");
+    await fs12.mkdir(this.dir, { recursive: true });
+    await fs12.writeFile(path7.join(this.dir, `${key}.json`), JSON.stringify(extraction), "utf-8");
   }
 };
 
@@ -2693,21 +2736,21 @@ var ExtractionCache = class {
 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 fs12.readFile(path7.join(resolvedRoot, relFile)));
+      const key = cache.key(relFile, await fs13.readFile(path8.join(resolvedRoot, relFile)));
       let extraction = options.update ? await cache.get(key) : null;
       if (extraction) {
         cacheHits++;
@@ -2728,7 +2771,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).`
@@ -2760,12 +2805,12 @@ async function runPipeline(root, options = {}) {
 }
 
 // src/graphStore.ts
-var fs13 = __toESM(require("fs/promises"), 1);
-var path8 = __toESM(require("path"), 1);
+var fs14 = __toESM(require("fs/promises"), 1);
+var path9 = __toESM(require("path"), 1);
 var import_graphology3 = __toESM(require("graphology"), 1);
-async function loadGraph(outDir = path8.join(process.cwd(), "graphify-out")) {
+async function loadGraph(outDir = path9.join(process.cwd(), "graphify-out")) {
   const jsonPath = validateGraphPath("graph.json", outDir);
-  const raw = await fs13.readFile(jsonPath, "utf-8");
+  const raw = await fs14.readFile(jsonPath, "utf-8");
   const data = JSON.parse(raw);
   return import_graphology3.default.from(data);
 }
@@ -2989,25 +3034,25 @@ function shortestPath(graph, fromQuery, toQuery) {
   if (!visited.has(to.id)) {
     return { from, to, found: false, path: [], edges: [] };
   }
-  const path11 = [to.id];
+  const path12 = [to.id];
   let cursor = to.id;
   while (cursor !== from.id) {
     const prev = predecessor.get(cursor);
     if (!prev) break;
-    path11.unshift(prev);
+    path12.unshift(prev);
     cursor = prev;
   }
   const edges = [];
-  for (let i = 0; i < path11.length - 1; i++) {
-    const a = path11[i];
-    const b = path11[i + 1];
+  for (let i = 0; i < path12.length - 1; i++) {
+    const a = path12[i];
+    const b = path12[i + 1];
     const key = graph.edges(a, b)[0] ?? graph.edges(b, a)[0];
     if (key) {
       const attrs = graph.getEdgeAttributes(key);
       edges.push({ source: a, target: b, relation: String(attrs.relation), confidence: String(attrs.confidence) });
     }
   }
-  return { from, to, found: true, path: path11, edges };
+  return { from, to, found: true, path: path12, edges };
 }
 function explainNode(graph, query) {
   const match = resolveNode(graph, query);
@@ -3302,8 +3347,8 @@ async function addViewEdges(query, schema, viewNames, tableNames, edges) {
 
 // src/memory.ts
 var import_node_crypto4 = require("crypto");
-var fs14 = __toESM(require("fs/promises"), 1);
-var path9 = __toESM(require("path"), 1);
+var fs15 = __toESM(require("fs/promises"), 1);
+var path10 = __toESM(require("path"), 1);
 var OUTCOMES = /* @__PURE__ */ new Set(["useful", "dead_end", "corrected"]);
 var TYPES = /* @__PURE__ */ new Set(["query", "path", "explain", "affected"]);
 function validateResult(value) {
@@ -3321,25 +3366,25 @@ function validateResult(value) {
 }
 async function saveResult(entry, memoryDir, now = /* @__PURE__ */ new Date()) {
   validateResult(entry);
-  await fs14.mkdir(memoryDir, { recursive: true });
+  await fs15.mkdir(memoryDir, { recursive: true });
   const saved = { ...entry, savedAt: now.toISOString() };
   const hash = (0, import_node_crypto4.createHash)("sha256").update(JSON.stringify(saved)).digest("hex").slice(0, 8);
   const stamp = saved.savedAt.replace(/[:.]/g, "-");
-  const filePath = path9.join(memoryDir, `result-${stamp}-${hash}.json`);
-  await fs14.writeFile(filePath, JSON.stringify(saved, null, 2), "utf-8");
+  const filePath = path10.join(memoryDir, `result-${stamp}-${hash}.json`);
+  await fs15.writeFile(filePath, JSON.stringify(saved, null, 2), "utf-8");
   return filePath;
 }
 async function loadResults(memoryDir) {
   let files;
   try {
-    files = (await fs14.readdir(memoryDir)).filter((f) => f.startsWith("result-") && f.endsWith(".json"));
+    files = (await fs15.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 fs14.readFile(path9.join(memoryDir, file), "utf-8"));
+      const parsed = JSON.parse(await fs15.readFile(path10.join(memoryDir, file), "utf-8"));
       if (parsed.question && parsed.savedAt) results.push(parsed);
     } catch {
     }
@@ -3452,7 +3497,7 @@ function snippetRange(startLine, fileLineCount, entityStartsInFile, maxLines) {
   const hardEnd = nextStart !== void 0 ? nextStart - 1 : fileLineCount;
   return { start: startLine, end: Math.min(hardEnd, startLine + maxLines - 1) };
 }
-async function buildContextPack(graph, task, readFile13, options = {}) {
+async function buildContextPack(graph, task, readFile14, options = {}) {
   const tokenBudget = options.tokenBudget ?? DEFAULT_CONTEXT_BUDGET;
   const maxSnippetLines = options.maxSnippetLines ?? DEFAULT_MAX_SNIPPET_LINES;
   const ranked = rankForTask(graph, task, options.maxSeeds);
@@ -3473,7 +3518,7 @@ async function buildContextPack(graph, task, readFile13, options = {}) {
     if (cached !== void 0) return cached;
     let lines;
     try {
-      lines = (await readFile13(file)).split("\n");
+      lines = (await readFile14(file)).split("\n");
     } catch {
       lines = null;
     }
@@ -3561,8 +3606,8 @@ var TEST_FILE_PATTERNS = [
   /_spec\.rb$/,
   /_test\.rb$/
 ];
-function isTestFile(path11) {
-  return TEST_FILE_PATTERNS.some((p) => p.test(path11));
+function isTestFile(path12) {
+  return TEST_FILE_PATTERNS.some((p) => p.test(path12));
 }
 var TEST_REACH_DEPTH = 4;
 var TEST_REACH_LIMIT = 2e3;
@@ -3611,22 +3656,22 @@ function testsForChangedFiles(graph, changedFiles) {
 
 // src/diff.ts
 var import_node_child_process = require("child_process");
-var fs15 = __toESM(require("fs/promises"), 1);
+var fs16 = __toESM(require("fs/promises"), 1);
 var os = __toESM(require("os"), 1);
-var path10 = __toESM(require("path"), 1);
+var path11 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.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(path10.join(root, relFile), relFile));
+    extractions.push(await extract(path11.join(root, relFile), relFile));
   }
-  resolveCrossFileReferences(extractions);
+  resolveCrossFileReferences(extractions, { selfNames: await readSelfNames(root) });
   return buildGraph(extractions);
 }
 async function checkoutRev(repoRoot, rev) {
-  const dest = await fs15.mkdtemp(path10.join(os.tmpdir(), `graphify-review-${rev.replace(/[^a-zA-Z0-9]/g, "_")}-`));
+  const dest = await fs16.mkdtemp(path11.join(os.tmpdir(), `graphify-review-${rev.replace(/[^a-zA-Z0-9]/g, "_")}-`));
   const { stdout } = await execFileAsync(
     "git",
     ["-C", repoRoot, "archive", "--format=tar", rev],
@@ -3694,8 +3739,8 @@ async function reviewRevisions(repoRoot, base, head = "HEAD") {
     return diffGraphs(baseGraph, headGraph, base, head);
   } finally {
     await Promise.all([
-      fs15.rm(baseDir, { recursive: true, force: true }),
-      fs15.rm(headDir, { recursive: true, force: true })
+      fs16.rm(baseDir, { recursive: true, force: true }),
+      fs16.rm(headDir, { recursive: true, force: true })
     ]);
   }
 }