@optave/codegraph 3.1.5 → 3.3.0

package/src/domain/analysis/dependencies.js

@@ -46,6 +46,61 @@ export function fileDepsData(file, customDbPath, opts = {}) {
   }
 }
 
+/**
+ * BFS transitive caller traversal starting from `callers` of `nodeId`.
+ * Returns an object keyed by depth (2..depth) → array of caller descriptors.
+ */
+function buildTransitiveCallers(db, callers, nodeId, depth, noTests) {
+  const transitiveCallers = {};
+  if (depth <= 1) return transitiveCallers;
+
+  const visited = new Set([nodeId]);
+  let frontier = callers
+    .map((c) => {
+      const row = db
+        .prepare('SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?')
+        .get(c.name, c.kind, c.file, c.line);
+      return row ? { ...c, id: row.id } : null;
+    })
+    .filter(Boolean);
+
+  for (let d = 2; d <= depth; d++) {
+    const nextFrontier = [];
+    for (const f of frontier) {
+      if (visited.has(f.id)) continue;
+      visited.add(f.id);
+      const upstream = db
+        .prepare(`
+          SELECT n.name, n.kind, n.file, n.line
+          FROM edges e JOIN nodes n ON e.source_id = n.id
+          WHERE e.target_id = ? AND e.kind = 'calls'
+        `)
+        .all(f.id);
+      for (const u of upstream) {
+        if (noTests && isTestFile(u.file)) continue;
+        const uid = db
+          .prepare('SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?')
+          .get(u.name, u.kind, u.file, u.line)?.id;
+        if (uid && !visited.has(uid)) {
+          nextFrontier.push({ ...u, id: uid });
+        }
+      }
+    }
+    if (nextFrontier.length > 0) {
+      transitiveCallers[d] = nextFrontier.map((n) => ({
+        name: n.name,
+        kind: n.kind,
+        file: n.file,
+        line: n.line,
+      }));
+    }
+    frontier = nextFrontier;
+    if (frontier.length === 0) break;
+  }
+
+  return transitiveCallers;
+}
+
 export function fnDepsData(name, customDbPath, opts = {}) {
   const db = openReadonlyOrFail(customDbPath);
   try {
@@ -75,55 +130,7 @@ export function fnDepsData(name, customDbPath, opts = {}) {
       }
       if (noTests) callers = callers.filter((c) => !isTestFile(c.file));
 
-      // Transitive callers
-      const transitiveCallers = {};
-      if (depth > 1) {
-        const visited = new Set([node.id]);
-        let frontier = callers
-          .map((c) => {
-            const row = db
-              .prepare('SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?')
-              .get(c.name, c.kind, c.file, c.line);
-            return row ? { ...c, id: row.id } : null;
-          })
-          .filter(Boolean);
-
-        for (let d = 2; d <= depth; d++) {
-          const nextFrontier = [];
-          for (const f of frontier) {
-            if (visited.has(f.id)) continue;
-            visited.add(f.id);
-            const upstream = db
-              .prepare(`
-              SELECT n.name, n.kind, n.file, n.line
-              FROM edges e JOIN nodes n ON e.source_id = n.id
-              WHERE e.target_id = ? AND e.kind = 'calls'
-            `)
-              .all(f.id);
-            for (const u of upstream) {
-              if (noTests && isTestFile(u.file)) continue;
-              const uid = db
-                .prepare(
-                  'SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?',
-                )
-                .get(u.name, u.kind, u.file, u.line)?.id;
-              if (uid && !visited.has(uid)) {
-                nextFrontier.push({ ...u, id: uid });
-              }
-            }
-          }
-          if (nextFrontier.length > 0) {
-            transitiveCallers[d] = nextFrontier.map((n) => ({
-              name: n.name,
-              kind: n.kind,
-              file: n.file,
-              line: n.line,
-            }));
-          }
-          frontier = nextFrontier;
-          if (frontier.length === 0) break;
-        }
-      }
+      const transitiveCallers = buildTransitiveCallers(db, callers, node.id, depth, noTests);
 
       return {
         ...normalizeSymbol(node, db, hc),
@@ -151,37 +158,40 @@ export function fnDepsData(name, customDbPath, opts = {}) {
   }
 }
 
-export function pathData(from, to, customDbPath, opts = {}) {
-  const db = openReadonlyOrFail(customDbPath);
-  try {
-    const noTests = opts.noTests || false;
-    const maxDepth = opts.maxDepth || 10;
-    const edgeKinds = opts.edgeKinds || ['calls'];
-    const reverse = opts.reverse || false;
+/**
+ * Resolve from/to symbol names to node records.
+ * Returns { sourceNode, targetNode, fromCandidates, toCandidates } on success,
+ * or { earlyResult } when a caller-facing error/not-found response should be returned immediately.
+ */
+function resolveEndpoints(db, from, to, opts) {
+  const { noTests = false } = opts;
 
-    const fromNodes = findMatchingNodes(db, from, {
-      noTests,
-      file: opts.fromFile,
-      kind: opts.kind,
-    });
-    if (fromNodes.length === 0) {
-      return {
+  const fromNodes = findMatchingNodes(db, from, {
+    noTests,
+    file: opts.fromFile,
+    kind: opts.kind,
+  });
+  if (fromNodes.length === 0) {
+    return {
+      earlyResult: {
         from,
         to,
         found: false,
         error: `No symbol matching "${from}"`,
         fromCandidates: [],
         toCandidates: [],
-      };
-    }
+      },
+    };
+  }
 
-    const toNodes = findMatchingNodes(db, to, {
-      noTests,
-      file: opts.toFile,
-      kind: opts.kind,
-    });
-    if (toNodes.length === 0) {
-      return {
+  const toNodes = findMatchingNodes(db, to, {
+    noTests,
+    file: opts.toFile,
+    kind: opts.kind,
+  });
+  if (toNodes.length === 0) {
+    return {
+      earlyResult: {
         from,
         to,
         found: false,
@@ -190,18 +200,118 @@ export function pathData(from, to, customDbPath, opts = {}) {
           .slice(0, 5)
           .map((n) => ({ name: n.name, kind: n.kind, file: n.file, line: n.line })),
         toCandidates: [],
-      };
+      },
+    };
+  }
+
+  const fromCandidates = fromNodes
+    .slice(0, 5)
+    .map((n) => ({ name: n.name, kind: n.kind, file: n.file, line: n.line }));
+  const toCandidates = toNodes
+    .slice(0, 5)
+    .map((n) => ({ name: n.name, kind: n.kind, file: n.file, line: n.line }));
+
+  return {
+    sourceNode: fromNodes[0],
+    targetNode: toNodes[0],
+    fromCandidates,
+    toCandidates,
+  };
+}
+
+/**
+ * BFS from sourceId toward targetId.
+ * Returns { found, parent, alternateCount, foundDepth }.
+ * `parent` maps nodeId → { parentId, edgeKind }.
+ */
+function bfsShortestPath(db, sourceId, targetId, edgeKinds, reverse, maxDepth, noTests) {
+  const kindPlaceholders = edgeKinds.map(() => '?').join(', ');
+
+  // Forward: source_id → target_id (A calls... calls B)
+  // Reverse: target_id → source_id (B is called by... called by A)
+  const neighborQuery = reverse
+    ? `SELECT n.id, n.name, n.kind, n.file, n.line, e.kind AS edge_kind
+       FROM edges e JOIN nodes n ON e.source_id = n.id
+       WHERE e.target_id = ? AND e.kind IN (${kindPlaceholders})`
+    : `SELECT n.id, n.name, n.kind, n.file, n.line, e.kind AS edge_kind
+       FROM edges e JOIN nodes n ON e.target_id = n.id
+       WHERE e.source_id = ? AND e.kind IN (${kindPlaceholders})`;
+  const neighborStmt = db.prepare(neighborQuery);
+
+  const visited = new Set([sourceId]);
+  const parent = new Map();
+  let queue = [sourceId];
+  let found = false;
+  let alternateCount = 0;
+  let foundDepth = -1;
+
+  for (let depth = 1; depth <= maxDepth; depth++) {
+    const nextQueue = [];
+    for (const currentId of queue) {
+      const neighbors = neighborStmt.all(currentId, ...edgeKinds);
+      for (const n of neighbors) {
+        if (noTests && isTestFile(n.file)) continue;
+        if (n.id === targetId) {
+          if (!found) {
+            found = true;
+            foundDepth = depth;
+            parent.set(n.id, { parentId: currentId, edgeKind: n.edge_kind });
+          }
+          alternateCount++;
+          continue;
+        }
+        if (!visited.has(n.id)) {
+          visited.add(n.id);
+          parent.set(n.id, { parentId: currentId, edgeKind: n.edge_kind });
+          nextQueue.push(n.id);
+        }
+      }
     }
+    if (found) break;
+    queue = nextQueue;
+    if (queue.length === 0) break;
+  }
+
+  return { found, parent, alternateCount, foundDepth };
+}
+
+/**
+ * Walk the parent map from targetId back to sourceId and return an ordered
+ * array of node IDs source → target.
+ */
+function reconstructPath(db, pathIds, parent) {
+  const nodeCache = new Map();
+  const getNode = (id) => {
+    if (nodeCache.has(id)) return nodeCache.get(id);
+    const row = db.prepare('SELECT name, kind, file, line FROM nodes WHERE id = ?').get(id);
+    nodeCache.set(id, row);
+    return row;
+  };
+
+  return pathIds.map((id, idx) => {
+    const node = getNode(id);
+    const edgeKind = idx === 0 ? null : parent.get(id).edgeKind;
+    return { name: node.name, kind: node.kind, file: node.file, line: node.line, edgeKind };
+  });
+}
+
+export function pathData(from, to, customDbPath, opts = {}) {
+  const db = openReadonlyOrFail(customDbPath);
+  try {
+    const noTests = opts.noTests || false;
+    const maxDepth = opts.maxDepth || 10;
+    const edgeKinds = opts.edgeKinds || ['calls'];
+    const reverse = opts.reverse || false;
 
-    const sourceNode = fromNodes[0];
-    const targetNode = toNodes[0];
+    const resolved = resolveEndpoints(db, from, to, {
+      noTests,
+      fromFile: opts.fromFile,
+      toFile: opts.toFile,
+      kind: opts.kind,
+    });
+    if (resolved.earlyResult) return resolved.earlyResult;
 
-    const fromCandidates = fromNodes
-      .slice(0, 5)
-      .map((n) => ({ name: n.name, kind: n.kind, file: n.file, line: n.line }));
-    const toCandidates = toNodes
-      .slice(0, 5)
-      .map((n) => ({ name: n.name, kind: n.kind, file: n.file, line: n.line }));
+    const { sourceNode, targetNode, fromCandidates, toCandidates } = resolved;
 
     // Self-path
     if (sourceNode.id === targetNode.id) {
@@ -228,55 +338,12 @@ export function pathData(from, to, customDbPath, opts = {}) {
       };
     }
 
-    // Build edge kind filter
-    const kindPlaceholders = edgeKinds.map(() => '?').join(', ');
-
-    // BFS — direction depends on `reverse` flag
-    // Forward: source_id → target_id (A calls... calls B)
-    // Reverse: target_id → source_id (B is called by... called by A)
-    const neighborQuery = reverse
-      ? `SELECT n.id, n.name, n.kind, n.file, n.line, e.kind AS edge_kind
-         FROM edges e JOIN nodes n ON e.source_id = n.id
-         WHERE e.target_id = ? AND e.kind IN (${kindPlaceholders})`
-      : `SELECT n.id, n.name, n.kind, n.file, n.line, e.kind AS edge_kind
-         FROM edges e JOIN nodes n ON e.target_id = n.id
-         WHERE e.source_id = ? AND e.kind IN (${kindPlaceholders})`;
-    const neighborStmt = db.prepare(neighborQuery);
-
-    const visited = new Set([sourceNode.id]);
-    // parent map: nodeId → { parentId, edgeKind }
-    const parent = new Map();
-    let queue = [sourceNode.id];
-    let found = false;
-    let alternateCount = 0;
-    let foundDepth = -1;
-
-    for (let depth = 1; depth <= maxDepth; depth++) {
-      const nextQueue = [];
-      for (const currentId of queue) {
-        const neighbors = neighborStmt.all(currentId, ...edgeKinds);
-        for (const n of neighbors) {
-          if (noTests && isTestFile(n.file)) continue;
-          if (n.id === targetNode.id) {
-            if (!found) {
-              found = true;
-              foundDepth = depth;
-              parent.set(n.id, { parentId: currentId, edgeKind: n.edge_kind });
-            }
-            alternateCount++;
-            continue;
-          }
-          if (!visited.has(n.id)) {
-            visited.add(n.id);
-            parent.set(n.id, { parentId: currentId, edgeKind: n.edge_kind });
-            nextQueue.push(n.id);
-          }
-        }
-      }
-      if (found) break;
-      queue = nextQueue;
-      if (queue.length === 0) break;
-    }
+    const {
+      found,
+      parent,
+      alternateCount: rawAlternateCount,
+      foundDepth,
+    } = bfsShortestPath(db, sourceNode.id, targetNode.id, edgeKinds, reverse, maxDepth, noTests);
 
     if (!found) {
       return {
@@ -294,8 +361,8 @@ export function pathData(from, to, customDbPath, opts = {}) {
       };
     }
 
-    // alternateCount includes the one we kept; subtract 1 for "alternates"
-    alternateCount = Math.max(0, alternateCount - 1);
+    // rawAlternateCount includes the one we kept; subtract 1 for "alternates"
+    const alternateCount = Math.max(0, rawAlternateCount - 1);
 
     // Reconstruct path from target back to source
     const pathIds = [targetNode.id];
@@ -307,20 +374,7 @@ export function pathData(from, to, customDbPath, opts = {}) {
     }
     pathIds.reverse();
 
-    // Build path with node info
-    const nodeCache = new Map();
-    const getNode = (id) => {
-      if (nodeCache.has(id)) return nodeCache.get(id);
-      const row = db.prepare('SELECT name, kind, file, line FROM nodes WHERE id = ?').get(id);
-      nodeCache.set(id, row);
-      return row;
-    };
-
-    const resultPath = pathIds.map((id, idx) => {
-      const node = getNode(id);
-      const edgeKind = idx === 0 ? null : parent.get(id).edgeKind;
-      return { name: node.name, kind: node.kind, file: node.file, line: node.line, edgeKind };
-    });
+    const resultPath = reconstructPath(db, pathIds, parent);
 
     return {
       from,

package/src/domain/analysis/exports.js

@@ -6,6 +6,8 @@ import {
   findNodesByFile,
   openReadonlyOrFail,
 } from '../../db/index.js';
+import { loadConfig } from '../../infrastructure/config.js';
+import { debug } from '../../infrastructure/logger.js';
 import { isTestFile } from '../../infrastructure/test-filter.js';
 import {
   createFileLinesReader,
@@ -19,17 +21,30 @@ export function exportsData(file, customDbPath, opts = {}) {
   try {
     const noTests = opts.noTests || false;
 
+    const config = opts.config || loadConfig();
+    const displayOpts = config.display || {};
+
     const dbFilePath = findDbPath(customDbPath);
     const repoRoot = path.resolve(path.dirname(dbFilePath), '..');
 
     const getFileLines = createFileLinesReader(repoRoot);
 
     const unused = opts.unused || false;
-    const fileResults = exportsFileImpl(db, file, noTests, getFileLines, unused);
+    const fileResults = exportsFileImpl(db, file, noTests, getFileLines, unused, displayOpts);
 
     if (fileResults.length === 0) {
       return paginateResult(
-        { file, results: [], reexports: [], totalExported: 0, totalInternal: 0, totalUnused: 0 },
+        {
+          file,
+          results: [],
+          reexports: [],
+          reexportedSymbols: [],
+          totalExported: 0,
+          totalInternal: 0,
+          totalUnused: 0,
+          totalReexported: 0,
+          totalReexportedUnused: 0,
+        },
         'results',
         { limit: opts.limit, offset: opts.offset },
       );
@@ -41,17 +56,34 @@ export function exportsData(file, customDbPath, opts = {}) {
       file: first.file,
       results: first.results,
       reexports: first.reexports,
+      reexportedSymbols: first.reexportedSymbols,
       totalExported: first.totalExported,
       totalInternal: first.totalInternal,
       totalUnused: first.totalUnused,
+      totalReexported: first.totalReexported,
+      totalReexportedUnused: first.totalReexportedUnused,
     };
-    return paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
+    const paginated = paginateResult(base, 'results', { limit: opts.limit, offset: opts.offset });
+    // Paginate reexportedSymbols with the same limit/offset (match paginateResult behaviour)
+    if (opts.limit != null) {
+      const off = opts.offset || 0;
+      paginated.reexportedSymbols = paginated.reexportedSymbols.slice(off, off + opts.limit);
+      // Update _pagination.hasMore to account for reexportedSymbols (barrel-only files
+      // have empty results[], so hasMore would always be false without this)
+      if (paginated._pagination) {
+        const reexTotal = opts.unused ? base.totalReexportedUnused : base.totalReexported;
+        const resultsHasMore = paginated._pagination.hasMore;
+        const reexHasMore = off + opts.limit < reexTotal;
+        paginated._pagination.hasMore = resultsHasMore || reexHasMore;
+      }
+    }
+    return paginated;
   } finally {
     db.close();
   }
 }
 
-function exportsFileImpl(db, target, noTests, getFileLines, unused) {
+function exportsFileImpl(db, target, noTests, getFileLines, unused, displayOpts) {
   const fileNodes = findFileNodes(db, `%${target}%`);
   if (fileNodes.length === 0) return [];
 
@@ -60,8 +92,8 @@ function exportsFileImpl(db, target, noTests, getFileLines, unused) {
   try {
     db.prepare('SELECT exported FROM nodes LIMIT 0').raw();
     hasExportedCol = true;
-  } catch {
-    /* old DB without exported column */
+  } catch (e) {
+    debug(`exported column not available, using fallback: ${e.message}`);
   }
 
   return fileNodes.map((fn) => {
@@ -82,9 +114,7 @@ function exportsFileImpl(db, target, noTests, getFileLines, unused) {
     }
     const internalCount = symbols.length - exported.length;
 
-    const results = exported.map((s) => {
-      const fileLines = getFileLines(fn.file);
-
+    const buildSymbolResult = (s, fileLines) => {
       let consumers = db
         .prepare(
           `SELECT n.name, n.file, n.line FROM edges e JOIN nodes n ON e.source_id = n.id
@@ -99,12 +129,14 @@ function exportsFileImpl(db, target, noTests, getFileLines, unused) {
         line: s.line,
         endLine: s.end_line ?? null,
         role: s.role || null,
-        signature: fileLines ? extractSignature(fileLines, s.line) : null,
-        summary: fileLines ? extractSummary(fileLines, s.line) : null,
+        signature: fileLines ? extractSignature(fileLines, s.line, displayOpts) : null,
+        summary: fileLines ? extractSummary(fileLines, s.line, displayOpts) : null,
         consumers: consumers.map((c) => ({ name: c.name, file: c.file, line: c.line })),
         consumerCount: consumers.length,
       };
-    });
+    };
+
+    const results = exported.map((s) => buildSymbolResult(s, getFileLines(fn.file)));
 
     const totalUnused = results.filter((r) => r.consumerCount === 0).length;
 
@@ -117,18 +149,58 @@ function exportsFileImpl(db, target, noTests, getFileLines, unused) {
       .all(fn.id)
       .map((r) => ({ file: r.file }));
 
+    // For barrel files: gather symbols re-exported from target modules
+    const reexportTargets = db
+      .prepare(
+        `SELECT DISTINCT n.file FROM edges e JOIN nodes n ON e.target_id = n.id
+         WHERE e.source_id = ? AND e.kind = 'reexports'`,
+      )
+      .all(fn.id);
+
+    const reexportedSymbols = [];
+    for (const target of reexportTargets) {
+      let targetExported;
+      if (hasExportedCol) {
+        targetExported = db
+          .prepare(
+            "SELECT * FROM nodes WHERE file = ? AND kind != 'file' AND exported = 1 ORDER BY line",
+          )
+          .all(target.file);
+      } else {
+        // Fallback: same heuristic as direct exports — symbols called from other files
+        const targetSymbols = findNodesByFile(db, target.file);
+        const exportedIds = findCrossFileCallTargets(db, target.file);
+        targetExported = targetSymbols.filter((s) => exportedIds.has(s.id));
+      }
+      for (const s of targetExported) {
+        const fileLines = getFileLines(target.file);
+        reexportedSymbols.push({
+          ...buildSymbolResult(s, fileLines),
+          originFile: target.file,
+        });
+      }
+    }
+
     let filteredResults = results;
+    let filteredReexported = reexportedSymbols;
     if (unused) {
       filteredResults = results.filter((r) => r.consumerCount === 0);
+      filteredReexported = reexportedSymbols.filter((r) => r.consumerCount === 0);
     }
 
+    const totalReexported = reexportedSymbols.length;
+    const totalReexportedUnused = reexportedSymbols.filter((r) => r.consumerCount === 0).length;
+
     return {
       file: fn.file,
       results: filteredResults,
       reexports,
+      reexportedSymbols: filteredReexported,
       totalExported: exported.length,
       totalInternal: internalCount,
       totalUnused,
+      totalReexported,
+      totalReexportedUnused,
     };
   });
 }