@optave/codegraph 3.1.5 → 3.2.0

package/src/features/sequence.js

@@ -68,6 +68,148 @@ function buildAliases(files) {
   return aliases;
 }
 
+// ─── Helpers ─────────────────────────────────────────────────────────
+
+function findEntryNode(repo, name, opts) {
+  let matchNode = findMatchingNodes(repo, name, opts)[0] ?? null;
+  if (!matchNode) {
+    for (const prefix of FRAMEWORK_ENTRY_PREFIXES) {
+      matchNode = findMatchingNodes(repo, `${prefix}${name}`, opts)[0] ?? null;
+      if (matchNode) break;
+    }
+  }
+  return matchNode;
+}
+
+function bfsCallees(repo, matchNode, maxDepth, noTests) {
+  const visited = new Set([matchNode.id]);
+  let frontier = [matchNode.id];
+  const messages = [];
+  const fileSet = new Set([matchNode.file]);
+  const idToNode = new Map();
+  idToNode.set(matchNode.id, matchNode);
+  let truncated = false;
+
+  for (let d = 1; d <= maxDepth; d++) {
+    const nextFrontier = [];
+
+    for (const fid of frontier) {
+      const callees = repo.findCallees(fid);
+      const caller = idToNode.get(fid);
+
+      for (const c of callees) {
+        if (noTests && isTestFile(c.file)) continue;
+
+        fileSet.add(c.file);
+        messages.push({
+          from: caller.file,
+          to: c.file,
+          label: c.name,
+          type: 'call',
+          depth: d,
+        });
+
+        if (visited.has(c.id)) continue;
+
+        visited.add(c.id);
+        nextFrontier.push(c.id);
+        idToNode.set(c.id, c);
+      }
+    }
+
+    frontier = nextFrontier;
+    if (frontier.length === 0) break;
+
+    if (d === maxDepth && frontier.length > 0) {
+      const hasMoreCalls = frontier.some((fid) => repo.findCallees(fid).length > 0);
+      if (hasMoreCalls) truncated = true;
+    }
+  }
+
+  return { messages, fileSet, idToNode, truncated };
+}
+
+function annotateDataflow(repo, messages, idToNode) {
+  const hasTable = repo.hasDataflowTable();
+
+  if (!hasTable || !(repo instanceof SqliteRepository)) return;
+
+  const db = repo.db;
+  const nodeByNameFile = new Map();
+  for (const n of idToNode.values()) {
+    nodeByNameFile.set(`${n.name}|${n.file}`, n);
+  }
+
+  const getReturns = db.prepare(
+    `SELECT d.expression FROM dataflow d
+         WHERE d.source_id = ? AND d.kind = 'returns'`,
+  );
+  const getFlowsTo = db.prepare(
+    `SELECT d.expression FROM dataflow d
+         WHERE d.target_id = ? AND d.kind = 'flows_to'
+         ORDER BY d.param_index`,
+  );
+
+  const seenReturns = new Set();
+  for (const msg of [...messages]) {
+    if (msg.type !== 'call') continue;
+    const targetNode = nodeByNameFile.get(`${msg.label}|${msg.to}`);
+    if (!targetNode) continue;
+
+    const returnKey = `${msg.to}->${msg.from}:${msg.label}`;
+    if (seenReturns.has(returnKey)) continue;
+
+    const returns = getReturns.all(targetNode.id);
+
+    if (returns.length > 0) {
+      seenReturns.add(returnKey);
+      const expr = returns[0].expression || 'result';
+      messages.push({
+        from: msg.to,
+        to: msg.from,
+        label: expr,
+        type: 'return',
+        depth: msg.depth,
+      });
+    }
+  }
+
+  for (const msg of messages) {
+    if (msg.type !== 'call') continue;
+    const targetNode = nodeByNameFile.get(`${msg.label}|${msg.to}`);
+    if (!targetNode) continue;
+
+    const params = getFlowsTo.all(targetNode.id);
+
+    if (params.length > 0) {
+      const paramNames = params
+        .map((p) => p.expression)
+        .filter(Boolean)
+        .slice(0, 3);
+      if (paramNames.length > 0) {
+        msg.label = `${msg.label}(${paramNames.join(', ')})`;
+      }
+    }
+  }
+}
+
+function buildParticipants(fileSet, entryFile) {
+  const aliases = buildAliases([...fileSet]);
+  const participants = [...fileSet].map((file) => ({
+    id: aliases.get(file),
+    label: file.split('/').pop(),
+    file,
+  }));
+
+  participants.sort((a, b) => {
+    if (a.file === entryFile) return -1;
+    if (b.file === entryFile) return 1;
+    return a.file.localeCompare(b.file);
+  });
+
+  return { participants, aliases };
+}
+
 // ─── Core data function ──────────────────────────────────────────────
 
 /**
@@ -90,19 +232,8 @@ export function sequenceData(name, dbPath, opts = {}) {
   try {
     const maxDepth = opts.depth || 10;
     const noTests = opts.noTests || false;
-    const withDataflow = opts.dataflow || false;
-
-    // Phase 1: Direct LIKE match
-    let matchNode = findMatchingNodes(repo, name, opts)[0] ?? null;
-
-    // Phase 2: Prefix-stripped matching
-    if (!matchNode) {
-      for (const prefix of FRAMEWORK_ENTRY_PREFIXES) {
-        matchNode = findMatchingNodes(repo, `${prefix}${name}`, opts)[0] ?? null;
-        if (matchNode) break;
-      }
-    }
 
+    const matchNode = findEntryNode(repo, name, opts);
     if (!matchNode) {
       return {
         entry: null,
@@ -121,123 +252,17 @@ export function sequenceData(name, dbPath, opts = {}) {
       line: matchNode.line,
     };
 
-    // BFS forward — track edges, not just nodes
-    const visited = new Set([matchNode.id]);
-    let frontier = [matchNode.id];
-    const messages = [];
-    const fileSet = new Set([matchNode.file]);
-    const idToNode = new Map();
-    idToNode.set(matchNode.id, matchNode);
-    let truncated = false;
-
-    for (let d = 1; d <= maxDepth; d++) {
-      const nextFrontier = [];
-
-      for (const fid of frontier) {
-        const callees = repo.findCallees(fid);
-
-        const caller = idToNode.get(fid);
-
-        for (const c of callees) {
-          if (noTests && isTestFile(c.file)) continue;
-
-          // Always record the message (even for visited nodes — different caller path)
-          fileSet.add(c.file);
-          messages.push({
-            from: caller.file,
-            to: c.file,
-            label: c.name,
-            type: 'call',
-            depth: d,
-          });
-
-          if (visited.has(c.id)) continue;
-
-          visited.add(c.id);
-          nextFrontier.push(c.id);
-          idToNode.set(c.id, c);
-        }
-      }
-
-      frontier = nextFrontier;
-      if (frontier.length === 0) break;
-
-      if (d === maxDepth && frontier.length > 0) {
-        // Only mark truncated if at least one frontier node has further callees
-        const hasMoreCalls = frontier.some((fid) => repo.findCallees(fid).length > 0);
-        if (hasMoreCalls) truncated = true;
-      }
-    }
-
-    // Dataflow annotations: add return arrows
-    if (withDataflow && messages.length > 0) {
-      const hasTable = repo.hasDataflowTable();
-
-      if (hasTable && repo instanceof SqliteRepository) {
-        const db = repo.db;
-        // Build name|file lookup for O(1) target node access
-        const nodeByNameFile = new Map();
-        for (const n of idToNode.values()) {
-          nodeByNameFile.set(`${n.name}|${n.file}`, n);
-        }
-
-        const getReturns = db.prepare(
-          `SELECT d.expression FROM dataflow d
-         WHERE d.source_id = ? AND d.kind = 'returns'`,
-        );
-        const getFlowsTo = db.prepare(
-          `SELECT d.expression FROM dataflow d
-         WHERE d.target_id = ? AND d.kind = 'flows_to'
-         ORDER BY d.param_index`,
-        );
-
-        // For each called function, check if it has return edges
-        const seenReturns = new Set();
-        for (const msg of [...messages]) {
-          if (msg.type !== 'call') continue;
-          const targetNode = nodeByNameFile.get(`${msg.label}|${msg.to}`);
-          if (!targetNode) continue;
-
-          const returnKey = `${msg.to}->${msg.from}:${msg.label}`;
-          if (seenReturns.has(returnKey)) continue;
-
-          const returns = getReturns.all(targetNode.id);
-
-          if (returns.length > 0) {
-            seenReturns.add(returnKey);
-            const expr = returns[0].expression || 'result';
-            messages.push({
-              from: msg.to,
-              to: msg.from,
-              label: expr,
-              type: 'return',
-              depth: msg.depth,
-            });
-          }
-        }
+    const { messages, fileSet, idToNode, truncated } = bfsCallees(
+      repo,
+      matchNode,
+      maxDepth,
+      noTests,
+    );
 
-        // Annotate call messages with parameter names
-        for (const msg of messages) {
-          if (msg.type !== 'call') continue;
-          const targetNode = nodeByNameFile.get(`${msg.label}|${msg.to}`);
-          if (!targetNode) continue;
-
-          const params = getFlowsTo.all(targetNode.id);
-
-          if (params.length > 0) {
-            const paramNames = params
-              .map((p) => p.expression)
-              .filter(Boolean)
-              .slice(0, 3);
-            if (paramNames.length > 0) {
-              msg.label = `${msg.label}(${paramNames.join(', ')})`;
-            }
-          }
-        }
-      }
+    if (opts.dataflow && messages.length > 0) {
+      annotateDataflow(repo, messages, idToNode);
     }
 
-    // Sort messages by depth, then call before return
     messages.sort((a, b) => {
       if (a.depth !== b.depth) return a.depth - b.depth;
       if (a.type === 'call' && b.type === 'return') return -1;
@@ -245,22 +270,8 @@ export function sequenceData(name, dbPath, opts = {}) {
       return 0;
     });
 
-    // Build participant list from files
-    const aliases = buildAliases([...fileSet]);
-    const participants = [...fileSet].map((file) => ({
-      id: aliases.get(file),
-      label: file.split('/').pop(),
-      file,
-    }));
-
-    // Sort participants: entry file first, then alphabetically
-    participants.sort((a, b) => {
-      if (a.file === entry.file) return -1;
-      if (b.file === entry.file) return 1;
-      return a.file.localeCompare(b.file);
-    });
+    const { participants, aliases } = buildParticipants(fileSet, entry.file);
 
-    // Replace file paths with alias IDs in messages
     for (const msg of messages) {
       msg.from = aliases.get(msg.from);
       msg.to = aliases.get(msg.to);

package/src/features/shared/find-nodes.js

@@ -0,0 +1,31 @@
+import { buildFileConditionSQL } from '../../db/query-builder.js';
+import { isTestFile } from '../../infrastructure/test-filter.js';
+
+/**
+ * Look up node(s) by name with optional file/kind/noTests filtering.
+ *
+ * @param {object} db - open SQLite database handle
+ * @param {string} name - symbol name (partial LIKE match)
+ * @param {object} [opts] - { kind, file, noTests }
+ * @param {string[]} defaultKinds - fallback kinds when opts.kind is not set
+ * @returns {object[]} matching node rows
+ */
+export function findNodes(db, name, opts = {}, defaultKinds = []) {
+  const kinds = opts.kind ? [opts.kind] : defaultKinds;
+  if (kinds.length === 0) throw new Error('findNodes: no kinds specified');
+  const placeholders = kinds.map(() => '?').join(', ');
+  const params = [`%${name}%`, ...kinds];
+
+  const fc = buildFileConditionSQL(opts.file, 'file');
+  params.push(...fc.params);
+
+  const rows = db
+    .prepare(
+      `SELECT * FROM nodes
+       WHERE name LIKE ? AND kind IN (${placeholders})${fc.sql}
+       ORDER BY file, line`,
+    )
+    .all(...params);
+
+  return opts.noTests ? rows.filter((n) => !isTestFile(n.file)) : rows;
+}