@optave/codegraph 3.1.1 → 3.1.2

package/src/structure.js

@@ -1,9 +1,9 @@
 import path from 'node:path';
 import { normalizePath } from './constants.js';
-import { openReadonlyOrFail, testFilterSQL } from './db.js';
+import { getNodeId, openReadonlyOrFail, testFilterSQL } from './db.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 import { debug } from './logger.js';
 import { paginateResult } from './paginate.js';
-import { isTestFile } from './test-filter.js';
 
 // ─── Build-time: insert directory nodes, contains edges, and metrics ────
 
@@ -21,9 +21,12 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
   const insertNode = db.prepare(
     'INSERT OR IGNORE INTO nodes (name, kind, file, line, end_line) VALUES (?, ?, ?, ?, ?)',
   );
-  const getNodeId = db.prepare(
-    'SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?',
-  );
+  const getNodeIdStmt = {
+    get: (name, kind, file, line) => {
+      const id = getNodeId(db, name, kind, file, line);
+      return id != null ? { id } : undefined;
+    },
+  };
   const insertEdge = db.prepare(
     'INSERT INTO edges (source_id, target_id, kind, confidence, dynamic) VALUES (?, ?, ?, ?, ?)',
   );
@@ -56,12 +59,12 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
       }
       // Delete metrics for changed files
       for (const f of changedFiles) {
-        const fileRow = getNodeId.get(f, 'file', f, 0);
+        const fileRow = getNodeIdStmt.get(f, 'file', f, 0);
         if (fileRow) deleteMetricForNode.run(fileRow.id);
       }
       // Delete metrics for affected directories
       for (const dir of affectedDirs) {
-        const dirRow = getNodeId.get(dir, 'directory', dir, 0);
+        const dirRow = getNodeIdStmt.get(dir, 'directory', dir, 0);
         if (dirRow) deleteMetricForNode.run(dirRow.id);
       }
     })();
@@ -126,8 +129,8 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
       if (!dir || dir === '.') continue;
       // On incremental, skip dirs whose contains edges are intact
       if (affectedDirs && !affectedDirs.has(dir)) continue;
-      const dirRow = getNodeId.get(dir, 'directory', dir, 0);
-      const fileRow = getNodeId.get(relPath, 'file', relPath, 0);
+      const dirRow = getNodeIdStmt.get(dir, 'directory', dir, 0);
+      const fileRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
       if (dirRow && fileRow) {
         insertEdge.run(dirRow.id, fileRow.id, 'contains', 1.0, 0);
       }
@@ -138,8 +141,8 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
       if (!parent || parent === '.' || parent === dir) continue;
       // On incremental, skip parent dirs whose contains edges are intact
       if (affectedDirs && !affectedDirs.has(parent)) continue;
-      const parentRow = getNodeId.get(parent, 'directory', parent, 0);
-      const childRow = getNodeId.get(dir, 'directory', dir, 0);
+      const parentRow = getNodeIdStmt.get(parent, 'directory', parent, 0);
+      const childRow = getNodeIdStmt.get(dir, 'directory', dir, 0);
       if (parentRow && childRow) {
         insertEdge.run(parentRow.id, childRow.id, 'contains', 1.0, 0);
       }
@@ -169,7 +172,7 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
 
   const computeFileMetrics = db.transaction(() => {
     for (const [relPath, symbols] of fileSymbols) {
-      const fileRow = getNodeId.get(relPath, 'file', relPath, 0);
+      const fileRow = getNodeIdStmt.get(relPath, 'file', relPath, 0);
       if (!fileRow) continue;
 
       const lineCount = lineCountMap.get(relPath) || 0;
@@ -263,7 +266,7 @@ export function buildStructure(db, fileSymbols, _rootDir, lineCountMap, director
 
   const computeDirMetrics = db.transaction(() => {
     for (const [dir, files] of dirFiles) {
-      const dirRow = getNodeId.get(dir, 'directory', dir, 0);
+      const dirRow = getNodeIdStmt.get(dir, 'directory', dir, 0);
       if (!dirRow) continue;
 
       const fileCount = files.length;
@@ -640,68 +643,6 @@ export function moduleBoundariesData(customDbPath, opts = {}) {
   }
 }
 
-// ─── Formatters ───────────────────────────────────────────────────────
-
-export function formatStructure(data) {
-  if (data.count === 0) return 'No directory structure found. Run "codegraph build" first.';
-
-  const lines = [`\nProject structure (${data.count} directories):\n`];
-  for (const d of data.directories) {
-    const cohStr = d.cohesion !== null ? ` cohesion=${d.cohesion.toFixed(2)}` : '';
-    const depth = d.directory.split('/').length - 1;
-    const indent = '  '.repeat(depth);
-    lines.push(
-      `${indent}${d.directory}/  (${d.fileCount} files, ${d.symbolCount} symbols, <-${d.fanIn} ->${d.fanOut}${cohStr})`,
-    );
-    for (const f of d.files) {
-      lines.push(
-        `${indent}  ${path.basename(f.file)}  ${f.lineCount}L ${f.symbolCount}sym <-${f.fanIn} ->${f.fanOut}`,
-      );
-    }
-  }
-  if (data.warning) {
-    lines.push('');
-    lines.push(`⚠ ${data.warning}`);
-  }
-  return lines.join('\n');
-}
-
-export function formatHotspots(data) {
-  if (data.hotspots.length === 0) return 'No hotspots found. Run "codegraph build" first.';
-
-  const lines = [`\nHotspots by ${data.metric} (${data.level}-level, top ${data.limit}):\n`];
-  let rank = 1;
-  for (const h of data.hotspots) {
-    const extra =
-      h.kind === 'directory'
-        ? `${h.fileCount} files, cohesion=${h.cohesion !== null ? h.cohesion.toFixed(2) : 'n/a'}`
-        : `${h.lineCount || 0}L, ${h.symbolCount || 0} symbols`;
-    lines.push(
-      `  ${String(rank++).padStart(2)}. ${h.name}  <-${h.fanIn || 0} ->${h.fanOut || 0}  (${extra})`,
-    );
-  }
-  return lines.join('\n');
-}
-
-export function formatModuleBoundaries(data) {
-  if (data.count === 0) return `No modules found with cohesion >= ${data.threshold}.`;
-
-  const lines = [`\nModule boundaries (cohesion >= ${data.threshold}, ${data.count} modules):\n`];
-  for (const m of data.modules) {
-    lines.push(
-      `  ${m.directory}/  cohesion=${m.cohesion.toFixed(2)}  (${m.fileCount} files, ${m.symbolCount} symbols)`,
-    );
-    lines.push(`    Incoming: ${m.fanIn} edges    Outgoing: ${m.fanOut} edges`);
-    if (m.files.length > 0) {
-      lines.push(
-        `    Files: ${m.files.slice(0, 5).join(', ')}${m.files.length > 5 ? ` ... +${m.files.length - 5}` : ''}`,
-      );
-    }
-    lines.push('');
-  }
-  return lines.join('\n');
-}
-
 // ─── Helpers ──────────────────────────────────────────────────────────
 
 function getSortFn(sortBy) {

package/src/triage.js

@@ -1,8 +1,7 @@
 import { findNodesForTriage, openReadonlyOrFail } from './db.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 import { warn } from './logger.js';
 import { paginateResult } from './paginate.js';
-import { outputResult } from './result-formatter.js';
-import { isTestFile } from './test-filter.js';
 
 // ─── Constants ────────────────────────────────────────────────────────
 
@@ -172,58 +171,6 @@ export function triageData(customDbPath, opts = {}) {
   }
 }
 
-// ─── CLI Formatter ────────────────────────────────────────────────────
-
-/**
- * Print triage results to console.
- *
- * @param {string} [customDbPath]
- * @param {object} [opts]
- */
-export function triage(customDbPath, opts = {}) {
-  const data = triageData(customDbPath, opts);
-
-  if (outputResult(data, 'items', opts)) return;
-
-  if (data.items.length === 0) {
-    if (data.summary.total === 0) {
-      console.log('\nNo symbols found. Run "codegraph build" first.\n');
-    } else {
-      console.log('\nNo symbols match the given filters.\n');
-    }
-    return;
-  }
-
-  console.log('\n# Risk Audit Queue\n');
-
-  console.log(
-    `  ${'Symbol'.padEnd(35)} ${'File'.padEnd(28)} ${'Role'.padEnd(8)} ${'Score'.padStart(6)} ${'Fan-In'.padStart(7)} ${'Cog'.padStart(4)} ${'Churn'.padStart(6)} ${'MI'.padStart(5)}`,
-  );
-  console.log(
-    `  ${'─'.repeat(35)} ${'─'.repeat(28)} ${'─'.repeat(8)} ${'─'.repeat(6)} ${'─'.repeat(7)} ${'─'.repeat(4)} ${'─'.repeat(6)} ${'─'.repeat(5)}`,
-  );
-
-  for (const it of data.items) {
-    const name = it.name.length > 33 ? `${it.name.slice(0, 32)}…` : it.name;
-    const file = it.file.length > 26 ? `…${it.file.slice(-25)}` : it.file;
-    const role = (it.role || '-').padEnd(8);
-    const score = it.riskScore.toFixed(2).padStart(6);
-    const fanIn = String(it.fanIn).padStart(7);
-    const cog = String(it.cognitive).padStart(4);
-    const churn = String(it.churn).padStart(6);
-    const mi = it.maintainabilityIndex > 0 ? String(it.maintainabilityIndex).padStart(5) : '    -';
-    console.log(
-      `  ${name.padEnd(35)} ${file.padEnd(28)} ${role} ${score} ${fanIn} ${cog} ${churn} ${mi}`,
-    );
-  }
-
-  const s = data.summary;
-  console.log(
-    `\n  ${s.analyzed} symbols scored (of ${s.total} total) | avg: ${s.avgScore.toFixed(2)} | max: ${s.maxScore.toFixed(2)} | sort: ${opts.sort || 'risk'}`,
-  );
-  console.log();
-}
-
 // ─── Utilities ────────────────────────────────────────────────────────
 
 function round4(n) {

package/src/viewer.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import Graph from 'graphology';
 import louvain from 'graphology-communities-louvain';
-import { isTestFile } from './test-filter.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 
 const DEFAULT_MIN_CONFIDENCE = 0.5;
 

package/src/watcher.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { readFileSafe } from './builder.js';
 import { appendChangeEvents, buildChangeEvent, diffSymbols } from './change-journal.js';
 import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
-import { closeDb, initSchema, openDb } from './db.js';
+import { closeDb, getNodeId as getNodeIdQuery, initSchema, openDb } from './db.js';
 import { appendJournalEntries } from './journal.js';
 import { info, warn } from './logger.js';
 import { createParseTreeCache, getActiveEngine, parseFileIncremental } from './parser.js';
@@ -185,9 +185,12 @@ export async function watchProject(rootDir, opts = {}) {
     insertNode: db.prepare(
       'INSERT OR IGNORE INTO nodes (name, kind, file, line, end_line) VALUES (?, ?, ?, ?, ?)',
     ),
-    getNodeId: db.prepare(
-      'SELECT id FROM nodes WHERE name = ? AND kind = ? AND file = ? AND line = ?',
-    ),
+    getNodeId: {
+      get: (name, kind, file, line) => {
+        const id = getNodeIdQuery(db, name, kind, file, line);
+        return id != null ? { id } : undefined;
+      },
+    },
     insertEdge: db.prepare(
       'INSERT INTO edges (source_id, target_id, kind, confidence, dynamic) VALUES (?, ?, ?, ?, ?)',
     ),

package/src/db/repository.js

@@ -1,134 +0,0 @@
-import { EVERY_SYMBOL_KIND, VALID_ROLES } from '../kinds.js';
-import { NodeQuery } from './query-builder.js';
-
-/**
- * Find nodes matching a name pattern, with fan-in count.
- * Used by findMatchingNodes in queries.js.
- *
- * @param {object} db - Database instance
- * @param {string} namePattern - LIKE pattern (already wrapped with %)
- * @param {object} [opts]
- * @param {string[]} [opts.kinds] - Node kinds to match
- * @param {string} [opts.file] - File filter (partial match)
- * @returns {object[]}
- */
-export function findNodesWithFanIn(db, namePattern, opts = {}) {
-  const q = new NodeQuery()
-    .select('n.*, COALESCE(fi.cnt, 0) AS fan_in')
-    .withFanIn()
-    .where('n.name LIKE ?', namePattern);
-
-  if (opts.kinds) {
-    q.kinds(opts.kinds);
-  }
-  if (opts.file) {
-    q.fileFilter(opts.file);
-  }
-
-  return q.all(db);
-}
-
-/**
- * Fetch nodes for triage scoring: fan-in + complexity + churn.
- * Used by triageData in triage.js.
- *
- * @param {object} db
- * @param {object} [opts]
- * @returns {object[]}
- */
-export function findNodesForTriage(db, opts = {}) {
-  if (opts.kind && !EVERY_SYMBOL_KIND.includes(opts.kind)) {
-    throw new Error(`Invalid kind: ${opts.kind} (expected one of ${EVERY_SYMBOL_KIND.join(', ')})`);
-  }
-  if (opts.role && !VALID_ROLES.includes(opts.role)) {
-    throw new Error(`Invalid role: ${opts.role} (expected one of ${VALID_ROLES.join(', ')})`);
-  }
-
-  const kindsToUse = opts.kind ? [opts.kind] : ['function', 'method', 'class'];
-  const q = new NodeQuery()
-    .select(
-      `n.id, n.name, n.kind, n.file, n.line, n.end_line, n.role,
-              COALESCE(fi.cnt, 0) AS fan_in,
-              COALESCE(fc.cognitive, 0) AS cognitive,
-              COALESCE(fc.maintainability_index, 0) AS mi,
-              COALESCE(fc.cyclomatic, 0) AS cyclomatic,
-              COALESCE(fc.max_nesting, 0) AS max_nesting,
-              COALESCE(fcc.commit_count, 0) AS churn`,
-    )
-    .kinds(kindsToUse)
-    .withFanIn()
-    .withComplexity()
-    .withChurn()
-    .excludeTests(opts.noTests)
-    .fileFilter(opts.file)
-    .roleFilter(opts.role)
-    .orderBy('n.file, n.line');
-
-  return q.all(db);
-}
-
-/**
- * Shared query builder for function/method/class node listing.
- * @param {object} [opts]
- * @returns {NodeQuery}
- */
-function _functionNodeQuery(opts = {}) {
-  return new NodeQuery()
-    .select('name, kind, file, line, end_line, role')
-    .kinds(['function', 'method', 'class'])
-    .fileFilter(opts.file)
-    .nameLike(opts.pattern)
-    .excludeTests(opts.noTests)
-    .orderBy('file, line');
-}
-
-/**
- * List function/method/class nodes with basic info.
- * Used by listFunctionsData in queries.js.
- *
- * @param {object} db
- * @param {object} [opts]
- * @returns {object[]}
- */
-export function listFunctionNodes(db, opts = {}) {
-  return _functionNodeQuery(opts).all(db);
-}
-
-/**
- * Iterator version of listFunctionNodes for memory efficiency.
- * Used by iterListFunctions in queries.js.
- *
- * @param {object} db
- * @param {object} [opts]
- * @returns {IterableIterator}
- */
-export function iterateFunctionNodes(db, opts = {}) {
-  return _functionNodeQuery(opts).iterate(db);
-}
-
-/**
- * Count total nodes.
- * @param {object} db
- * @returns {number}
- */
-export function countNodes(db) {
-  return db.prepare('SELECT COUNT(*) AS cnt FROM nodes').get().cnt;
-}
-
-/**
- * Count total edges.
- * @param {object} db
- * @returns {number}
- */
-export function countEdges(db) {
-  return db.prepare('SELECT COUNT(*) AS cnt FROM edges').get().cnt;
-}
-
-/**
- * Count distinct files.
- * @param {object} db
- * @returns {number}
- */
-export function countFiles(db) {
-  return db.prepare('SELECT COUNT(DISTINCT file) AS cnt FROM nodes').get().cnt;
-}