@optave/codegraph 3.1.2 → 3.1.4

package/src/watcher.js

@@ -1,13 +1,13 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { readFileSafe } from './builder.js';
+import { rebuildFile } from './builder/incremental.js';
 import { appendChangeEvents, buildChangeEvent, diffSymbols } from './change-journal.js';
 import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
 import { closeDb, getNodeId as getNodeIdQuery, initSchema, openDb } from './db.js';
+import { DbError } from './errors.js';
 import { appendJournalEntries } from './journal.js';
-import { info, warn } from './logger.js';
-import { createParseTreeCache, getActiveEngine, parseFileIncremental } from './parser.js';
-import { resolveImportPath } from './resolve.js';
+import { info } from './logger.js';
+import { createParseTreeCache, getActiveEngine } from './parser.js';
 
 function shouldIgnore(filePath) {
   const parts = filePath.split(path.sep);
@@ -18,152 +18,10 @@ function isTrackedExt(filePath) {
   return EXTENSIONS.has(path.extname(filePath));
 }
 
-/**
- * Parse a single file and update the database incrementally.
- */
-async function updateFile(_db, rootDir, filePath, stmts, engineOpts, cache) {
-  const relPath = normalizePath(path.relative(rootDir, filePath));
-
-  const oldNodes = stmts.countNodes.get(relPath)?.c || 0;
-  const _oldEdges = stmts.countEdgesForFile.get(relPath)?.c || 0;
-  const oldSymbols = stmts.listSymbols.all(relPath);
-
-  stmts.deleteEdgesForFile.run(relPath);
-  stmts.deleteNodes.run(relPath);
-
-  if (!fs.existsSync(filePath)) {
-    if (cache) cache.remove(filePath);
-    const symbolDiff = diffSymbols(oldSymbols, []);
-    return {
-      file: relPath,
-      nodesAdded: 0,
-      nodesRemoved: oldNodes,
-      edgesAdded: 0,
-      deleted: true,
-      event: 'deleted',
-      symbolDiff,
-      nodesBefore: oldNodes,
-      nodesAfter: 0,
-    };
-  }
-
-  let code;
-  try {
-    code = readFileSafe(filePath);
-  } catch (err) {
-    warn(`Cannot read ${relPath}: ${err.message}`);
-    return null;
-  }
-
-  const symbols = await parseFileIncremental(cache, filePath, code, engineOpts);
-  if (!symbols) return null;
-
-  stmts.insertNode.run(relPath, 'file', relPath, 0, null);
-
-  for (const def of symbols.definitions) {
-    stmts.insertNode.run(def.name, def.kind, relPath, def.line, def.endLine || null);
-  }
-  for (const exp of symbols.exports) {
-    stmts.insertNode.run(exp.name, exp.kind, relPath, exp.line, null);
-  }
-
-  const newNodes = stmts.countNodes.get(relPath)?.c || 0;
-  const newSymbols = stmts.listSymbols.all(relPath);
-
-  let edgesAdded = 0;
-  const fileNodeRow = stmts.getNodeId.get(relPath, 'file', relPath, 0);
-  if (!fileNodeRow)
-    return { file: relPath, nodesAdded: newNodes, nodesRemoved: oldNodes, edgesAdded: 0 };
-  const fileNodeId = fileNodeRow.id;
-
-  // Load aliases for full import resolution
-  const aliases = { baseUrl: null, paths: {} };
-
-  for (const imp of symbols.imports) {
-    const resolvedPath = resolveImportPath(
-      path.join(rootDir, relPath),
-      imp.source,
-      rootDir,
-      aliases,
-    );
-    const targetRow = stmts.getNodeId.get(resolvedPath, 'file', resolvedPath, 0);
-    if (targetRow) {
-      const edgeKind = imp.reexport ? 'reexports' : imp.typeOnly ? 'imports-type' : 'imports';
-      stmts.insertEdge.run(fileNodeId, targetRow.id, edgeKind, 1.0, 0);
-      edgesAdded++;
-    }
-  }
-
-  const importedNames = new Map();
-  for (const imp of symbols.imports) {
-    const resolvedPath = resolveImportPath(
-      path.join(rootDir, relPath),
-      imp.source,
-      rootDir,
-      aliases,
-    );
-    for (const name of imp.names) {
-      importedNames.set(name.replace(/^\*\s+as\s+/, ''), resolvedPath);
-    }
-  }
-
-  for (const call of symbols.calls) {
-    let caller = null;
-    for (const def of symbols.definitions) {
-      if (def.line <= call.line) {
-        const row = stmts.getNodeId.get(def.name, def.kind, relPath, def.line);
-        if (row) caller = row;
-      }
-    }
-    if (!caller) caller = fileNodeRow;
-
-    const importedFrom = importedNames.get(call.name);
-    let targets;
-    if (importedFrom) {
-      targets = stmts.findNodeInFile.all(call.name, importedFrom);
-    }
-    if (!targets || targets.length === 0) {
-      targets = stmts.findNodeInFile.all(call.name, relPath);
-      if (targets.length === 0) {
-        targets = stmts.findNodeByName.all(call.name);
-      }
-    }
-
-    for (const t of targets) {
-      if (t.id !== caller.id) {
-        stmts.insertEdge.run(
-          caller.id,
-          t.id,
-          'calls',
-          importedFrom ? 1.0 : 0.5,
-          call.dynamic ? 1 : 0,
-        );
-        edgesAdded++;
-      }
-    }
-  }
-
-  const symbolDiff = diffSymbols(oldSymbols, newSymbols);
-  const event = oldNodes === 0 ? 'added' : 'modified';
-
-  return {
-    file: relPath,
-    nodesAdded: newNodes,
-    nodesRemoved: oldNodes,
-    edgesAdded,
-    deleted: false,
-    event,
-    symbolDiff,
-    nodesBefore: oldNodes,
-    nodesAfter: newNodes,
-  };
-}
-
 export async function watchProject(rootDir, opts = {}) {
   const dbPath = path.join(rootDir, '.codegraph', 'graph.db');
   if (!fs.existsSync(dbPath)) {
-    console.error('No graph.db found. Run `codegraph build` first.');
-    process.exit(1);
+    throw new DbError('No graph.db found. Run `codegraph build` first.', { file: dbPath });
   }
 
   const db = openDb(dbPath);
@@ -227,7 +85,9 @@ export async function watchProject(rootDir, opts = {}) {
 
     const results = [];
     for (const filePath of files) {
-      const result = await updateFile(db, rootDir, filePath, stmts, engineOpts, cache);
+      const result = await rebuildFile(db, rootDir, filePath, stmts, engineOpts, cache, {
+        diffSymbols,
+      });
       if (result) results.push(result);
     }
     const updates = results;