@optave/codegraph 3.1.1 → 3.1.2

package/src/ast.js

@@ -9,12 +9,13 @@
 import path from 'node:path';
 import { AST_TYPE_MAPS } from './ast-analysis/rules/index.js';
 import { buildExtensionSet } from './ast-analysis/shared.js';
-import { openReadonlyOrFail } from './db.js';
+import { walkWithVisitors } from './ast-analysis/visitor.js';
+import { createAstStoreVisitor } from './ast-analysis/visitors/ast-store-visitor.js';
+import { bulkNodeIdsByFile, openReadonlyOrFail } from './db.js';
+import { outputResult } from './infrastructure/result-formatter.js';
 import { debug } from './logger.js';
 import { paginateResult } from './paginate.js';
 
-import { outputResult } from './result-formatter.js';
-
 // ─── Constants ────────────────────────────────────────────────────────
 
 export const AST_NODE_KINDS = ['call', 'new', 'string', 'regex', 'throw', 'await'];
@@ -28,9 +29,6 @@ const KIND_ICONS = {
   await: '\u22B3', // ⊳
 };
 
-/** Max length for the `text` column. */
-const TEXT_MAX = 200;
-
 /** tree-sitter node types that map to our AST node kinds — imported from rules. */
 const JS_TS_AST_TYPES = AST_TYPE_MAPS.get('javascript');
 
@@ -38,77 +36,8 @@ const JS_TS_AST_TYPES = AST_TYPE_MAPS.get('javascript');
 const WALK_EXTENSIONS = buildExtensionSet(AST_TYPE_MAPS);
 
 // ─── Helpers ──────────────────────────────────────────────────────────
-
-function truncate(s, max = TEXT_MAX) {
-  if (!s) return null;
-  return s.length <= max ? s : `${s.slice(0, max - 1)}\u2026`;
-}
-
-/**
- * Extract the constructor name from a `new_expression` node.
- * Handles `new Foo()`, `new a.Foo()`, `new Foo.Bar()`.
- */
-function extractNewName(node) {
-  for (let i = 0; i < node.childCount; i++) {
-    const child = node.child(i);
-    if (child.type === 'identifier') return child.text;
-    if (child.type === 'member_expression') {
-      // e.g. new a.Foo() → "a.Foo"
-      return child.text;
-    }
-  }
-  return node.text?.split('(')[0]?.replace('new ', '').trim() || '?';
-}
-
-/**
- * Extract the expression text from a throw/await node.
- */
-function extractExpressionText(node) {
-  // Skip keyword child, take the rest
-  for (let i = 0; i < node.childCount; i++) {
-    const child = node.child(i);
-    if (child.type !== 'throw' && child.type !== 'await') {
-      return truncate(child.text);
-    }
-  }
-  return truncate(node.text);
-}
-
-/**
- * Extract a meaningful name from throw/await nodes.
- * For throw: the constructor or expression type.
- * For await: the called function name.
- */
-function extractName(kind, node) {
-  if (kind === 'throw') {
-    // throw new Error(...) → "Error"; throw x → "x"
-    for (let i = 0; i < node.childCount; i++) {
-      const child = node.child(i);
-      if (child.type === 'new_expression') return extractNewName(child);
-      if (child.type === 'call_expression') {
-        const fn = child.childForFieldName('function');
-        return fn ? fn.text : child.text?.split('(')[0] || '?';
-      }
-      if (child.type === 'identifier') return child.text;
-    }
-    return truncate(node.text);
-  }
-  if (kind === 'await') {
-    // await fetch(...) → "fetch"; await this.foo() → "this.foo"
-    for (let i = 0; i < node.childCount; i++) {
-      const child = node.child(i);
-      if (child.type === 'call_expression') {
-        const fn = child.childForFieldName('function');
-        return fn ? fn.text : child.text?.split('(')[0] || '?';
-      }
-      if (child.type === 'identifier' || child.type === 'member_expression') {
-        return child.text;
-      }
-    }
-    return truncate(node.text);
-  }
-  return truncate(node.text);
-}
+// Node extraction helpers (extractNewName, extractName, etc.) moved to
+// ast-analysis/visitors/ast-store-visitor.js as part of the visitor framework.
 
 /**
  * Find the narrowest enclosing definition for a given line.
@@ -147,9 +76,6 @@ export async function buildAstNodes(db, fileSymbols, _rootDir, _engineOpts) {
     return;
   }
 
-  // Bulk-fetch all node IDs per file (replaces per-def getNodeId calls)
-  const bulkGetNodeIds = db.prepare('SELECT id, name, kind, line FROM nodes WHERE file = ?');
-
   const tx = db.transaction((rows) => {
     for (const r of rows) {
       insertStmt.run(r.file, r.line, r.kind, r.name, r.text, r.receiver, r.parentNodeId);
@@ -163,7 +89,7 @@ export async function buildAstNodes(db, fileSymbols, _rootDir, _engineOpts) {
 
     // Pre-load all node IDs for this file into a map (read-only, fast)
     const nodeIdMap = new Map();
-    for (const row of bulkGetNodeIds.all(relPath)) {
+    for (const row of bulkNodeIdsByFile(db, relPath)) {
       nodeIdMap.set(`${row.name}|${row.kind}|${row.line}`, row.id);
     }
 
@@ -228,66 +154,13 @@ export async function buildAstNodes(db, fileSymbols, _rootDir, _engineOpts) {
 
 /**
  * Walk a tree-sitter AST and collect new/throw/await/string/regex nodes.
+ * Delegates to the ast-store visitor via the unified walker.
  */
-function walkAst(node, defs, relPath, rows, nodeIdMap) {
-  const kind = JS_TS_AST_TYPES[node.type];
-  if (kind) {
-    // tree-sitter lines are 0-indexed, our DB uses 1-indexed
-    const line = node.startPosition.row + 1;
-
-    let name;
-    let text = null;
-
-    if (kind === 'new') {
-      name = extractNewName(node);
-      text = truncate(node.text);
-    } else if (kind === 'throw') {
-      name = extractName('throw', node);
-      text = extractExpressionText(node);
-    } else if (kind === 'await') {
-      name = extractName('await', node);
-      text = extractExpressionText(node);
-    } else if (kind === 'string') {
-      // Skip trivial strings (length < 2 after removing quotes)
-      const content = node.text?.replace(/^['"`]|['"`]$/g, '') || '';
-      if (content.length < 2) {
-        // Still recurse children
-        for (let i = 0; i < node.childCount; i++) {
-          walkAst(node.child(i), defs, relPath, rows, nodeIdMap);
-        }
-        return;
-      }
-      name = truncate(content, 100);
-      text = truncate(node.text);
-    } else if (kind === 'regex') {
-      name = node.text || '?';
-      text = truncate(node.text);
-    }
-
-    const parentDef = findParentDef(defs, line);
-    let parentNodeId = null;
-    if (parentDef) {
-      parentNodeId = nodeIdMap.get(`${parentDef.name}|${parentDef.kind}|${parentDef.line}`) || null;
-    }
-
-    rows.push({
-      file: relPath,
-      line,
-      kind,
-      name,
-      text,
-      receiver: null,
-      parentNodeId,
-    });
-
-    // Don't recurse into the children of matched nodes for new/throw/await
-    // (we already extracted what we need, and nested strings inside them are noise)
-    if (kind !== 'string' && kind !== 'regex') return;
-  }
-
-  for (let i = 0; i < node.childCount; i++) {
-    walkAst(node.child(i), defs, relPath, rows, nodeIdMap);
-  }
+function walkAst(rootNode, defs, relPath, rows, nodeIdMap) {
+  const visitor = createAstStoreVisitor(JS_TS_AST_TYPES, defs, relPath, nodeIdMap);
+  const results = walkWithVisitors(rootNode, [visitor], 'javascript');
+  const collected = results['ast-store'] || [];
+  rows.push(...collected);
 }
 
 // ─── Query ────────────────────────────────────────────────────────────

package/src/audit.js

@@ -9,10 +9,9 @@
 import path from 'node:path';
 import { loadConfig } from './config.js';
 import { openReadonlyOrFail } from './db.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 import { RULE_DEFS } from './manifesto.js';
-import { explainData, kindIcon } from './queries.js';
-import { outputResult } from './result-formatter.js';
-import { isTestFile } from './test-filter.js';
+import { explainData } from './queries.js';
 
 // ─── Threshold resolution ───────────────────────────────────────────
 
@@ -336,87 +335,3 @@ function defaultHealth() {
     thresholdBreaches: [],
   };
 }
-
-// ─── CLI formatter ──────────────────────────────────────────────────
-
-export function audit(target, customDbPath, opts = {}) {
-  const data = auditData(target, customDbPath, opts);
-
-  if (outputResult(data, null, opts)) return;
-
-  if (data.functions.length === 0) {
-    console.log(`No ${data.kind === 'file' ? 'file' : 'function/symbol'} matching "${target}"`);
-    return;
-  }
-
-  console.log(`\n# Audit: ${target} (${data.kind})`);
-  console.log(`  ${data.functions.length} function(s) analyzed\n`);
-
-  for (const fn of data.functions) {
-    const lineRange = fn.endLine ? `${fn.line}-${fn.endLine}` : `${fn.line}`;
-    const roleTag = fn.role ? ` [${fn.role}]` : '';
-    console.log(`## ${kindIcon(fn.kind)} ${fn.name} (${fn.kind})${roleTag}`);
-    console.log(`  ${fn.file}:${lineRange}${fn.lineCount ? ` (${fn.lineCount} lines)` : ''}`);
-    if (fn.summary) console.log(`  ${fn.summary}`);
-    if (fn.signature) {
-      if (fn.signature.params != null) console.log(`  Parameters: (${fn.signature.params})`);
-      if (fn.signature.returnType) console.log(`  Returns: ${fn.signature.returnType}`);
-    }
-
-    // Health metrics
-    if (fn.health.cognitive != null) {
-      console.log(`\n  Health:`);
-      console.log(
-        `    Cognitive: ${fn.health.cognitive}  Cyclomatic: ${fn.health.cyclomatic}  Nesting: ${fn.health.maxNesting}`,
-      );
-      console.log(`    MI: ${fn.health.maintainabilityIndex}`);
-      if (fn.health.halstead.volume) {
-        console.log(
-          `    Halstead: vol=${fn.health.halstead.volume} diff=${fn.health.halstead.difficulty} effort=${fn.health.halstead.effort} bugs=${fn.health.halstead.bugs}`,
-        );
-      }
-      if (fn.health.loc) {
-        console.log(
-          `    LOC: ${fn.health.loc}  SLOC: ${fn.health.sloc}  Comments: ${fn.health.commentLines}`,
-        );
-      }
-    }
-
-    // Threshold breaches
-    if (fn.health.thresholdBreaches.length > 0) {
-      console.log(`\n  Threshold Breaches:`);
-      for (const b of fn.health.thresholdBreaches) {
-        const icon = b.level === 'fail' ? 'FAIL' : 'WARN';
-        console.log(`    [${icon}] ${b.metric}: ${b.value} >= ${b.threshold}`);
-      }
-    }
-
-    // Impact
-    console.log(`\n  Impact: ${fn.impact.totalDependents} transitive dependent(s)`);
-    for (const [level, nodes] of Object.entries(fn.impact.levels)) {
-      console.log(`    Level ${level}: ${nodes.map((n) => n.name).join(', ')}`);
-    }
-
-    // Call edges
-    if (fn.callees.length > 0) {
-      console.log(`\n  Calls (${fn.callees.length}):`);
-      for (const c of fn.callees) {
-        console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
-      }
-    }
-    if (fn.callers.length > 0) {
-      console.log(`\n  Called by (${fn.callers.length}):`);
-      for (const c of fn.callers) {
-        console.log(`    ${kindIcon(c.kind)} ${c.name}  ${c.file}:${c.line}`);
-      }
-    }
-    if (fn.relatedTests.length > 0) {
-      console.log(`\n  Tests (${fn.relatedTests.length}):`);
-      for (const t of fn.relatedTests) {
-        console.log(`    ${t.file}`);
-      }
-    }
-
-    console.log();
-  }
-}

package/src/batch.js

@@ -83,14 +83,6 @@ export function batchData(command, targets, customDbPath, opts = {}) {
   return { command, total: targets.length, succeeded, failed, results };
 }
 
-/**
- * CLI wrapper — calls batchData and prints JSON to stdout.
- */
-export function batch(command, targets, customDbPath, opts = {}) {
-  const data = batchData(command, targets, customDbPath, opts);
-  console.log(JSON.stringify(data, null, 2));
-}
-
 /**
  * Expand comma-separated positional args into individual entries.
  * `['a,b', 'c']` → `['a', 'b', 'c']`.
@@ -161,20 +153,3 @@ export function multiBatchData(items, customDbPath, sharedOpts = {}) {
 
   return { mode: 'multi', total: items.length, succeeded, failed, results };
 }
-
-/**
- * CLI wrapper for batch-query — detects multi-command mode (objects with .command)
- * or falls back to single-command batchData (default: 'where').
- */
-export function batchQuery(targets, customDbPath, opts = {}) {
-  const { command: defaultCommand = 'where', ...rest } = opts;
-  const isMulti = targets.length > 0 && typeof targets[0] === 'object' && targets[0].command;
-
-  let data;
-  if (isMulti) {
-    data = multiBatchData(targets, customDbPath, rest);
-  } else {
-    data = batchData(defaultCommand, targets, customDbPath, rest);
-  }
-  console.log(JSON.stringify(data, null, 2));
-}

package/src/boundaries.js

@@ -1,5 +1,5 @@
+import { isTestFile } from './infrastructure/test-filter.js';
 import { debug } from './logger.js';
-import { isTestFile } from './test-filter.js';
 
 // ─── Glob-to-Regex ───────────────────────────────────────────────────
 

package/src/branch-compare.js

@@ -12,9 +12,8 @@ import os from 'node:os';
 import path from 'node:path';
 import Database from 'better-sqlite3';
 import { buildGraph } from './builder.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 import { kindIcon } from './queries.js';
-import { outputResult } from './result-formatter.js';
-import { isTestFile } from './test-filter.js';
 
 // ─── Git Helpers ────────────────────────────────────────────────────────
 
@@ -477,97 +476,3 @@ export function branchCompareMermaid(data) {
 
   return lines.join('\n');
 }
-
-// ─── Text Formatting ────────────────────────────────────────────────────
-
-function formatText(data) {
-  if (data.error) return `Error: ${data.error}`;
-
-  const lines = [];
-  const shortBase = data.baseSha.slice(0, 7);
-  const shortTarget = data.targetSha.slice(0, 7);
-
-  lines.push(`branch-compare: ${data.baseRef}..${data.targetRef}`);
-  lines.push(`  Base:   ${data.baseRef} (${shortBase})`);
-  lines.push(`  Target: ${data.targetRef} (${shortTarget})`);
-  lines.push(`  Files changed: ${data.changedFiles.length}`);
-
-  if (data.added.length > 0) {
-    lines.push('');
-    lines.push(`  + Added (${data.added.length} symbol${data.added.length !== 1 ? 's' : ''}):`);
-    for (const sym of data.added) {
-      lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
-    }
-  }
-
-  if (data.removed.length > 0) {
-    lines.push('');
-    lines.push(
-      `  - Removed (${data.removed.length} symbol${data.removed.length !== 1 ? 's' : ''}):`,
-    );
-    for (const sym of data.removed) {
-      lines.push(`    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.line}`);
-      if (sym.impact && sym.impact.length > 0) {
-        lines.push(
-          `      ^ ${sym.impact.length} transitive caller${sym.impact.length !== 1 ? 's' : ''} affected`,
-        );
-      }
-    }
-  }
-
-  if (data.changed.length > 0) {
-    lines.push('');
-    lines.push(
-      `  ~ Changed (${data.changed.length} symbol${data.changed.length !== 1 ? 's' : ''}):`,
-    );
-    for (const sym of data.changed) {
-      const parts = [];
-      if (sym.changes.lineCount !== 0) {
-        parts.push(`lines: ${sym.base.lineCount} -> ${sym.target.lineCount}`);
-      }
-      if (sym.changes.fanIn !== 0) {
-        parts.push(`fan_in: ${sym.base.fanIn} -> ${sym.target.fanIn}`);
-      }
-      if (sym.changes.fanOut !== 0) {
-        parts.push(`fan_out: ${sym.base.fanOut} -> ${sym.target.fanOut}`);
-      }
-      const detail = parts.length > 0 ? `  (${parts.join(', ')})` : '';
-      lines.push(
-        `    [${kindIcon(sym.kind)}] ${sym.name} -- ${sym.file}:${sym.base.line}${detail}`,
-      );
-      if (sym.impact && sym.impact.length > 0) {
-        lines.push(
-          `      ^ ${sym.impact.length} transitive caller${sym.impact.length !== 1 ? 's' : ''} affected`,
-        );
-      }
-    }
-  }
-
-  const s = data.summary;
-  lines.push('');
-  lines.push(
-    `  Summary: +${s.added} added, -${s.removed} removed, ~${s.changed} changed` +
-      ` -> ${s.totalImpacted} caller${s.totalImpacted !== 1 ? 's' : ''} impacted` +
-      (s.filesAffected > 0
-        ? ` across ${s.filesAffected} file${s.filesAffected !== 1 ? 's' : ''}`
-        : ''),
-  );
-
-  return lines.join('\n');
-}
-
-// ─── CLI Display Function ───────────────────────────────────────────────
-
-export async function branchCompare(baseRef, targetRef, opts = {}) {
-  const data = await branchCompareData(baseRef, targetRef, opts);
-
-  if (opts.format === 'json') opts = { ...opts, json: true };
-  if (outputResult(data, null, opts)) return;
-
-  if (opts.format === 'mermaid') {
-    console.log(branchCompareMermaid(data));
-    return;
-  }
-
-  console.log(formatText(data));
-}