@dreamtree-org/graphify 1.1.2 → 1.1.3

package/dist/index.cjs

@@ -1677,13 +1677,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;
   }
@@ -1721,24 +1719,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) {
@@ -1746,6 +1755,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" });
+          }
         }
       }
     }
@@ -2147,13 +2171,12 @@ 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, options = {}) {
   const selfNames = options.selfNames ?? [];
@@ -2174,20 +2197,24 @@ function resolveCrossFileReferences(extractions, options = {}) {
     }
   }
   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;
+  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++;
         }
       }
-      return null;
     }
+  };
+  const resolvePathId = (id) => {
     if (isOpaque(id)) return null;
     const cached = remap.get(id);
     if (cached !== void 0) return cached;
@@ -2197,30 +2224,77 @@ function resolveCrossFileReferences(extractions, options = {}) {
       if (realIds.has(id)) return null;
       const guessedPath = id.slice(0, sep3);
       const name = id.slice(sep3);
-      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 sep3 = edge.target.lastIndexOf("::");
+      if (sep3 > 0 && realIds.has(edge.target)) {
+        namedAlias.set(`${edge.source}|${edge.target.slice(sep3 + 2)}`, edge.target);
+      } else if (sep3 < 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 sep4 = spec.indexOf("::");
+      const moduleSpec = sep4 > 0 ? spec.slice(0, sep4) : spec;
+      const name = sep4 > 0 ? spec.slice(sep4 + 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 sep3 = id.indexOf("::");
+    if (sep3 > 0 && !realIds.has(id)) {
+      const guessedPath = id.slice(0, sep3);
+      const name = id.slice(sep3 + 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;
@@ -2918,7 +2992,10 @@ function scoreNodes(graph, query) {
     }
     if (score > 0) matches.push({ id, label, score });
   });
-  matches.sort((a, b) => b.score - a.score || a.id.localeCompare(b.id));
+  const placeholderRank = (id) => id.startsWith("module:") || id.startsWith("external:") ? 1 : 0;
+  matches.sort(
+    (a, b) => b.score - a.score || placeholderRank(a.id) - placeholderRank(b.id) || a.id.localeCompare(b.id)
+  );
   return matches;
 }
 function resolveNode(graph, query) {
@@ -3101,6 +3178,7 @@ function affectedBy(graph, nodeQuery, options = {}) {
   if (!target) return null;
   const maxDepth = options.maxDepth ?? DEFAULT_IMPACT_DEPTH;
   const limit = options.limit ?? DEFAULT_IMPACT_LIMIT;
+  const followed = options.relations ? new Set(options.relations) : DEPENDENCY_RELATIONS;
   const affected = [];
   const visited = /* @__PURE__ */ new Set([target.id]);
   let frontier = [target.id];
@@ -3111,7 +3189,7 @@ function affectedBy(graph, nodeQuery, options = {}) {
       graph.forEachInEdge(current, (_edge, edgeAttrs, source) => {
         if (visited.has(source)) return;
         const relation = edgeAttrs.relation;
-        if (!DEPENDENCY_RELATIONS.has(relation)) return;
+        if (!followed.has(relation)) return;
         const confidence = edgeAttrs.confidence;
         const existing = nextFrontier.get(source);
         if (existing && CONFIDENCE_RANK2[existing.via.confidence] >= CONFIDENCE_RANK2[confidence]) return;
@@ -3611,11 +3689,12 @@ function isTestFile(path12) {
 }
 var TEST_REACH_DEPTH = 4;
 var TEST_REACH_LIMIT = 2e3;
-function selectionFromImpact(graph, targetIds, targetLabel) {
+var USAGE_RELATIONS = ["calls", "inherits", "implements", "mixes_in", "embeds", "references"];
+function selectionFromImpact(graph, targetIds, targetLabel, relations) {
   const best = /* @__PURE__ */ new Map();
   let affectedNodeCount = 0;
   for (const id of targetIds) {
-    const impact = affectedBy(graph, id, { maxDepth: TEST_REACH_DEPTH, limit: TEST_REACH_LIMIT });
+    const impact = affectedBy(graph, id, { maxDepth: TEST_REACH_DEPTH, limit: TEST_REACH_LIMIT, relations });
     if (!impact) continue;
     affectedNodeCount += impact.affected.length;
     for (const node of impact.affected) {
@@ -3627,11 +3706,27 @@ function selectionFromImpact(graph, targetIds, targetLabel) {
     }
   }
   const testFiles = [...best.entries()].map(([file, info]) => ({ file, depth: info.depth, via: info.via })).sort((a, b) => a.depth - b.depth || a.file.localeCompare(b.file));
-  return { target: targetLabel, testFiles, affectedNodeCount };
+  return {
+    target: targetLabel,
+    testFiles,
+    affectedNodeCount,
+    precision: relations ? "usage" : "import-reachability"
+  };
+}
+function entityRootsOf(graph, id) {
+  if (id.includes("::")) return [id];
+  const roots = [];
+  graph.forEachOutEdge(id, (_edge, attrs, _source, target) => {
+    if (String(attrs.relation) === "contains") roots.push(target);
+  });
+  roots.sort((a, b) => a.localeCompare(b));
+  return roots.length > 0 ? roots : [id];
 }
 function testsForNode(graph, nodeQuery) {
   const match = resolveNode(graph, nodeQuery);
   if (!match) return null;
+  const precise = selectionFromImpact(graph, entityRootsOf(graph, match.id), match.id, USAGE_RELATIONS);
+  if (precise.testFiles.length > 0) return precise;
   return selectionFromImpact(graph, [match.id], match.id);
 }
 function testsForChangedFiles(graph, changedFiles) {
@@ -3644,7 +3739,12 @@ function testsForChangedFiles(graph, changedFiles) {
     }
     if (graph.hasNode(file)) fileIds.push(file);
   }
-  const selection = selectionFromImpact(graph, fileIds, changedFiles.join(", "));
+  const label = changedFiles.join(", ");
+  const preciseRoots = fileIds.flatMap((f) => entityRootsOf(graph, f));
+  let selection = selectionFromImpact(graph, preciseRoots, label, USAGE_RELATIONS);
+  if (selection.testFiles.length === 0) {
+    selection = selectionFromImpact(graph, fileIds, label);
+  }
   for (const [file, info] of selfSelected) {
     if (!selection.testFiles.some((t) => t.file === file)) {
       selection.testFiles.push({ file, depth: info.depth, via: info.via });