@optave/codegraph 2.1.1-dev.3c12b64 → 2.2.1

package/src/structure.js

@@ -2,6 +2,7 @@ import path from 'node:path';
 import { normalizePath } from './constants.js';
 import { openReadonlyOrFail } from './db.js';
 import { debug } from './logger.js';
+import { isTestFile } from './queries.js';
 
 // ─── Build-time: insert directory nodes, contains edges, and metrics ────
 
@@ -233,6 +234,7 @@ export function structureData(customDbPath, opts = {}) {
   const filterDir = opts.directory || null;
   const maxDepth = opts.depth || null;
   const sortBy = opts.sort || 'files';
+  const noTests = opts.noTests || false;
 
   // Get all directory nodes with their metrics
   let dirs = db
@@ -263,7 +265,7 @@ export function structureData(customDbPath, opts = {}) {
 
   // Get file metrics for each directory
   const result = dirs.map((d) => {
-    const files = db
+    let files = db
       .prepare(`
         SELECT n.name, nm.line_count, nm.symbol_count, nm.import_count, nm.export_count, nm.fan_in, nm.fan_out
         FROM edges e
@@ -272,6 +274,7 @@ export function structureData(customDbPath, opts = {}) {
         WHERE e.source_id = ? AND e.kind = 'contains' AND n.kind = 'file'
       `)
       .all(d.id);
+    if (noTests) files = files.filter((f) => !isTestFile(f.name));
 
     const subdirs = db
       .prepare(`
@@ -282,14 +285,15 @@ export function structureData(customDbPath, opts = {}) {
       `)
       .all(d.id);
 
+    const fileCount = noTests ? files.length : d.file_count || 0;
     return {
       directory: d.name,
-      fileCount: d.file_count || 0,
+      fileCount,
       symbolCount: d.symbol_count || 0,
       fanIn: d.fan_in || 0,
       fanOut: d.fan_out || 0,
       cohesion: d.cohesion,
-      density: d.file_count > 0 ? (d.symbol_count || 0) / d.file_count : 0,
+      density: fileCount > 0 ? (d.symbol_count || 0) / fileCount : 0,
       files: files.map((f) => ({
         file: f.name,
         lineCount: f.line_count || 0,
@@ -315,30 +319,40 @@ export function hotspotsData(customDbPath, opts = {}) {
   const metric = opts.metric || 'fan-in';
   const level = opts.level || 'file';
   const limit = opts.limit || 10;
+  const noTests = opts.noTests || false;
 
   const kind = level === 'directory' ? 'directory' : 'file';
 
+  const testFilter =
+    noTests && kind === 'file'
+      ? `AND n.name NOT LIKE '%.test.%'
+         AND n.name NOT LIKE '%.spec.%'
+         AND n.name NOT LIKE '%__test__%'
+         AND n.name NOT LIKE '%__tests__%'
+         AND n.name NOT LIKE '%.stories.%'`
+      : '';
+
   const HOTSPOT_QUERIES = {
     'fan-in': db.prepare(`
       SELECT n.name, n.kind, nm.line_count, nm.symbol_count, nm.import_count, nm.export_count,
              nm.fan_in, nm.fan_out, nm.cohesion, nm.file_count
       FROM nodes n JOIN node_metrics nm ON n.id = nm.node_id
-      WHERE n.kind = ? ORDER BY nm.fan_in DESC NULLS LAST LIMIT ?`),
+      WHERE n.kind = ? ${testFilter} ORDER BY nm.fan_in DESC NULLS LAST LIMIT ?`),
     'fan-out': db.prepare(`
       SELECT n.name, n.kind, nm.line_count, nm.symbol_count, nm.import_count, nm.export_count,
              nm.fan_in, nm.fan_out, nm.cohesion, nm.file_count
       FROM nodes n JOIN node_metrics nm ON n.id = nm.node_id
-      WHERE n.kind = ? ORDER BY nm.fan_out DESC NULLS LAST LIMIT ?`),
+      WHERE n.kind = ? ${testFilter} ORDER BY nm.fan_out DESC NULLS LAST LIMIT ?`),
     density: db.prepare(`
       SELECT n.name, n.kind, nm.line_count, nm.symbol_count, nm.import_count, nm.export_count,
              nm.fan_in, nm.fan_out, nm.cohesion, nm.file_count
       FROM nodes n JOIN node_metrics nm ON n.id = nm.node_id
-      WHERE n.kind = ? ORDER BY nm.symbol_count DESC NULLS LAST LIMIT ?`),
+      WHERE n.kind = ? ${testFilter} ORDER BY nm.symbol_count DESC NULLS LAST LIMIT ?`),
     coupling: db.prepare(`
       SELECT n.name, n.kind, nm.line_count, nm.symbol_count, nm.import_count, nm.export_count,
              nm.fan_in, nm.fan_out, nm.cohesion, nm.file_count
       FROM nodes n JOIN node_metrics nm ON n.id = nm.node_id
-      WHERE n.kind = ? ORDER BY (COALESCE(nm.fan_in, 0) + COALESCE(nm.fan_out, 0)) DESC NULLS LAST LIMIT ?`),
+      WHERE n.kind = ? ${testFilter} ORDER BY (COALESCE(nm.fan_in, 0) + COALESCE(nm.fan_out, 0)) DESC NULLS LAST LIMIT ?`),
   };
 
   const stmt = HOTSPOT_QUERIES[metric] || HOTSPOT_QUERIES['fan-in'];

package/src/watcher.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
 import { initSchema, openDb } from './db.js';
+import { appendJournalEntries } from './journal.js';
 import { info, warn } from './logger.js';
 import { createParseTreeCache, getActiveEngine, parseFileIncremental } from './parser.js';
 import { resolveImportPath } from './resolve.js';
@@ -205,6 +206,19 @@ export async function watchProject(rootDir, opts = {}) {
     }
     const updates = results;
 
+    // Append processed files to journal for Tier 0 detection on next build
+    if (updates.length > 0) {
+      const entries = updates.map((r) => ({
+        file: r.file,
+        deleted: r.deleted || false,
+      }));
+      try {
+        appendJournalEntries(rootDir, entries);
+      } catch {
+        /* journal write failure is non-fatal */
+      }
+    }
+
     for (const r of updates) {
       const nodeDelta = r.nodesAdded - r.nodesRemoved;
       const nodeStr = nodeDelta >= 0 ? `+${nodeDelta}` : `${nodeDelta}`;
@@ -234,6 +248,17 @@ export async function watchProject(rootDir, opts = {}) {
   process.on('SIGINT', () => {
     console.log('\nStopping watcher...');
     watcher.close();
+    // Flush any pending file paths to journal before exit
+    if (pending.size > 0) {
+      const entries = [...pending].map((filePath) => ({
+        file: normalizePath(path.relative(rootDir, filePath)),
+      }));
+      try {
+        appendJournalEntries(rootDir, entries);
+      } catch {
+        /* best-effort */
+      }
+    }
     if (cache) cache.clear();
     db.close();
     process.exit(0);