@optave/codegraph 3.0.4 → 3.1.1

package/src/branch-compare.js

@@ -12,7 +12,9 @@ import os from 'node:os';
 import path from 'node:path';
 import Database from 'better-sqlite3';
 import { buildGraph } from './builder.js';
-import { isTestFile, kindIcon } from './queries.js';
+import { kindIcon } from './queries.js';
+import { outputResult } from './result-formatter.js';
+import { isTestFile } from './test-filter.js';
 
 // ─── Git Helpers ────────────────────────────────────────────────────────
 
@@ -81,55 +83,57 @@ function makeSymbolKey(kind, file, name) {
 
 function loadSymbolsFromDb(dbPath, changedFiles, noTests) {
   const db = new Database(dbPath, { readonly: true });
-  const symbols = new Map();
+  try {
+    const symbols = new Map();
 
-  if (changedFiles.length === 0) {
-    db.close();
-    return symbols;
-  }
+    if (changedFiles.length === 0) {
+      return symbols;
+    }
 
-  // Query nodes in changed files
-  const placeholders = changedFiles.map(() => '?').join(', ');
-  const rows = db
-    .prepare(
-      `SELECT n.id, n.name, n.kind, n.file, n.line, n.end_line
-       FROM nodes n
-       WHERE n.file IN (${placeholders})
-         AND n.kind NOT IN ('file', 'directory')
-       ORDER BY n.file, n.line`,
-    )
-    .all(...changedFiles);
-
-  // Compute fan_in and fan_out for each node
-  const fanInStmt = db.prepare(
-    `SELECT COUNT(*) AS cnt FROM edges WHERE target_id = ? AND kind = 'calls'`,
-  );
-  const fanOutStmt = db.prepare(
-    `SELECT COUNT(*) AS cnt FROM edges WHERE source_id = ? AND kind = 'calls'`,
-  );
+    // Query nodes in changed files
+    const placeholders = changedFiles.map(() => '?').join(', ');
+    const rows = db
+      .prepare(
+        `SELECT n.id, n.name, n.kind, n.file, n.line, n.end_line
+         FROM nodes n
+         WHERE n.file IN (${placeholders})
+           AND n.kind NOT IN ('file', 'directory')
+         ORDER BY n.file, n.line`,
+      )
+      .all(...changedFiles);
+
+    // Compute fan_in and fan_out for each node
+    const fanInStmt = db.prepare(
+      `SELECT COUNT(*) AS cnt FROM edges WHERE target_id = ? AND kind = 'calls'`,
+    );
+    const fanOutStmt = db.prepare(
+      `SELECT COUNT(*) AS cnt FROM edges WHERE source_id = ? AND kind = 'calls'`,
+    );
 
-  for (const row of rows) {
-    if (noTests && isTestFile(row.file)) continue;
-
-    const lineCount = row.end_line ? row.end_line - row.line + 1 : 0;
-    const fanIn = fanInStmt.get(row.id).cnt;
-    const fanOut = fanOutStmt.get(row.id).cnt;
-    const key = makeSymbolKey(row.kind, row.file, row.name);
-
-    symbols.set(key, {
-      id: row.id,
-      name: row.name,
-      kind: row.kind,
-      file: row.file,
-      line: row.line,
-      lineCount,
-      fanIn,
-      fanOut,
-    });
-  }
+    for (const row of rows) {
+      if (noTests && isTestFile(row.file)) continue;
+
+      const lineCount = row.end_line ? row.end_line - row.line + 1 : 0;
+      const fanIn = fanInStmt.get(row.id).cnt;
+      const fanOut = fanOutStmt.get(row.id).cnt;
+      const key = makeSymbolKey(row.kind, row.file, row.name);
+
+      symbols.set(key, {
+        id: row.id,
+        name: row.name,
+        kind: row.kind,
+        file: row.file,
+        line: row.line,
+        lineCount,
+        fanIn,
+        fanOut,
+      });
+    }
 
-  db.close();
-  return symbols;
+    return symbols;
+  } finally {
+    db.close();
+  }
 }
 
 // ─── Caller BFS ─────────────────────────────────────────────────────────
@@ -138,40 +142,43 @@ function loadCallersFromDb(dbPath, nodeIds, maxDepth, noTests) {
   if (nodeIds.length === 0) return [];
 
   const db = new Database(dbPath, { readonly: true });
-  const allCallers = new Set();
-
-  for (const startId of nodeIds) {
-    const visited = new Set([startId]);
-    let frontier = [startId];
-
-    for (let d = 1; d <= maxDepth; d++) {
-      const nextFrontier = [];
-      for (const fid of frontier) {
-        const callers = db
-          .prepare(
-            `SELECT DISTINCT n.id, 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(fid);
-
-        for (const c of callers) {
-          if (!visited.has(c.id) && (!noTests || !isTestFile(c.file))) {
-            visited.add(c.id);
-            nextFrontier.push(c.id);
-            allCallers.add(
-              JSON.stringify({ name: c.name, kind: c.kind, file: c.file, line: c.line }),
-            );
+  try {
+    const allCallers = new Set();
+
+    for (const startId of nodeIds) {
+      const visited = new Set([startId]);
+      let frontier = [startId];
+
+      for (let d = 1; d <= maxDepth; d++) {
+        const nextFrontier = [];
+        for (const fid of frontier) {
+          const callers = db
+            .prepare(
+              `SELECT DISTINCT n.id, 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(fid);
+
+          for (const c of callers) {
+            if (!visited.has(c.id) && (!noTests || !isTestFile(c.file))) {
+              visited.add(c.id);
+              nextFrontier.push(c.id);
+              allCallers.add(
+                JSON.stringify({ name: c.name, kind: c.kind, file: c.file, line: c.line }),
+              );
+            }
           }
         }
+        frontier = nextFrontier;
+        if (frontier.length === 0) break;
       }
-      frontier = nextFrontier;
-      if (frontier.length === 0) break;
     }
-  }
 
-  db.close();
-  return [...allCallers].map((s) => JSON.parse(s));
+    return [...allCallers].map((s) => JSON.parse(s));
+  } finally {
+    db.close();
+  }
 }
 
 // ─── Symbol Comparison ──────────────────────────────────────────────────
@@ -554,10 +561,8 @@ function formatText(data) {
 export async function branchCompare(baseRef, targetRef, opts = {}) {
   const data = await branchCompareData(baseRef, targetRef, opts);
 
-  if (opts.json || opts.format === 'json') {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
+  if (opts.format === 'json') opts = { ...opts, json: true };
+  if (outputResult(data, null, opts)) return;
 
   if (opts.format === 'mermaid') {
     console.log(branchCompareMermaid(data));