@optave/codegraph 3.1.1 → 3.1.3

package/src/index.js

@@ -8,13 +8,11 @@
 // AST node queries
 export { AST_NODE_KINDS, astQuery, astQueryData } from './ast.js';
 // Audit (composite report)
-export { audit, auditData } from './audit.js';
+export { auditData } from './audit.js';
 // Batch querying
 export {
   BATCH_COMMANDS,
-  batch,
   batchData,
-  batchQuery,
   multiBatchData,
   splitTargets,
 } from './batch.js';
@@ -29,13 +27,12 @@ export {
   buildCFGData,
   buildFunctionCFG,
   CFG_RULES,
-  cfg,
   cfgData,
   cfgToDOT,
   cfgToMermaid,
 } from './cfg.js';
 // Check (CI validation predicates)
-export { check, checkData } from './check.js';
+export { checkData } from './check.js';
 // Co-change analysis
 export {
   analyzeCoChanges,
@@ -45,12 +42,23 @@ export {
   computeCoChanges,
   scanGitHistory,
 } from './cochange.js';
+export { audit } from './commands/audit.js';
+export { batch, batchQuery } from './commands/batch.js';
+export { cfg } from './commands/cfg.js';
+export { check } from './commands/check.js';
+export { communities } from './commands/communities.js';
+export { complexity } from './commands/complexity.js';
+export { dataflow } from './commands/dataflow.js';
+export { manifesto } from './commands/manifesto.js';
+export { owners } from './commands/owners.js';
+export { sequence } from './commands/sequence.js';
+export { formatHotspots, formatModuleBoundaries, formatStructure } from './commands/structure.js';
+export { triage } from './commands/triage.js';
 // Community detection
-export { communities, communitiesData, communitySummaryForStats } from './communities.js';
+export { communitiesData, communitySummaryForStats } from './communities.js';
 // Complexity metrics
 export {
   COMPLEXITY_RULES,
-  complexity,
   complexityData,
   computeFunctionComplexity,
   computeHalsteadMetrics,
@@ -69,7 +77,6 @@ export { findCycles, formatCycles } from './cycles.js';
 // Dataflow analysis
 export {
   buildDataflowEdges,
-  dataflow,
   dataflowData,
   dataflowImpactData,
   dataflowPathData,
@@ -123,18 +130,28 @@ export {
 } from './export.js';
 // Execution flow tracing
 export { entryPointType, flowData, listEntryPointsData } from './flow.js';
+// Result formatting
+export { outputResult } from './infrastructure/result-formatter.js';
+// Test file detection
+export { isTestFile, TEST_PATTERN } from './infrastructure/test-filter.js';
 // Logger
 export { setVerbose } from './logger.js';
 // Manifesto rule engine
-export { manifesto, manifestoData, RULE_DEFS } from './manifesto.js';
+export { manifestoData, RULE_DEFS } from './manifesto.js';
 // Native engine
 export { isNativeAvailable } from './native.js';
 // Ownership (CODEOWNERS)
-export { matchOwners, owners, ownersData, ownersForFiles, parseCodeowners } from './owners.js';
+export { matchOwners, ownersData, ownersForFiles, parseCodeowners } from './owners.js';
 // Pagination utilities
 export { MCP_DEFAULTS, MCP_MAX_LIMIT, paginate, paginateResult, printNdjson } from './paginate.js';
 // Unified parser API
-export { getActiveEngine, isWasmAvailable, parseFileAuto, parseFilesAuto } from './parser.js';
+export {
+  disposeParsers,
+  getActiveEngine,
+  isWasmAvailable,
+  parseFileAuto,
+  parseFilesAuto,
+} from './parser.js';
 // Query functions (data-returning)
 export {
   ALL_SYMBOL_KINDS,
@@ -198,10 +215,8 @@ export {
   saveRegistry,
   unregisterRepo,
 } from './registry.js';
-// Result formatting
-export { outputResult } from './result-formatter.js';
 // Sequence diagram generation
-export { sequence, sequenceData, sequenceToMermaid } from './sequence.js';
+export { sequenceData, sequenceToMermaid } from './sequence.js';
 // Snapshot management
 export {
   snapshotDelete,
@@ -216,17 +231,12 @@ export {
   buildStructure,
   classifyNodeRoles,
   FRAMEWORK_ENTRY_PREFIXES,
-  formatHotspots,
-  formatModuleBoundaries,
-  formatStructure,
   hotspotsData,
   moduleBoundariesData,
   structureData,
 } from './structure.js';
-// Test file detection
-export { isTestFile, TEST_PATTERN } from './test-filter.js';
 // Triage — composite risk audit
-export { triage, triageData } from './triage.js';
+export { triageData } from './triage.js';
 // Interactive HTML viewer
 export { generatePlotHTML, loadPlotConfig } from './viewer.js';
 // Watch mode

package/src/{result-formatter.js → infrastructure/result-formatter.js}

@@ -1,4 +1,4 @@
-import { printNdjson } from './paginate.js';
+import { printNdjson } from '../paginate.js';
 
 /**
  * Shared JSON / NDJSON output dispatch for CLI wrappers.

package/src/kinds.js

@@ -33,6 +33,7 @@ export const ALL_SYMBOL_KINDS = CORE_SYMBOL_KINDS;
 export const CORE_EDGE_KINDS = [
   'imports',
   'imports-type',
+  'dynamic-imports',
   'reexports',
   'calls',
   'extends',

package/src/manifesto.js

@@ -4,7 +4,6 @@ import { findCycles } from './cycles.js';
 import { openReadonlyOrFail } from './db.js';
 import { debug } from './logger.js';
 import { paginateResult } from './paginate.js';
-import { outputResult } from './result-formatter.js';
 
 // ─── Rule Definitions ─────────────────────────────────────────────────
 
@@ -428,78 +427,3 @@ export function manifestoData(customDbPath, opts = {}) {
     db.close();
   }
 }
-
-/**
- * CLI formatter — prints manifesto results and exits with code 1 on failure.
- */
-export function manifesto(customDbPath, opts = {}) {
-  const data = manifestoData(customDbPath, opts);
-
-  if (outputResult(data, 'violations', opts)) {
-    if (!data.passed) process.exit(1);
-    return;
-  }
-
-  console.log('\n# Manifesto Rules\n');
-
-  // Rules table
-  console.log(
-    `  ${'Rule'.padEnd(20)} ${'Level'.padEnd(10)} ${'Status'.padEnd(8)} ${'Warn'.padStart(6)} ${'Fail'.padStart(6)} ${'Violations'.padStart(11)}`,
-  );
-  console.log(
-    `  ${'─'.repeat(20)} ${'─'.repeat(10)} ${'─'.repeat(8)} ${'─'.repeat(6)} ${'─'.repeat(6)} ${'─'.repeat(11)}`,
-  );
-
-  for (const rule of data.rules) {
-    const warn = rule.thresholds.warn != null ? String(rule.thresholds.warn) : '—';
-    const fail = rule.thresholds.fail != null ? String(rule.thresholds.fail) : '—';
-    const statusIcon = rule.status === 'pass' ? 'pass' : rule.status === 'warn' ? 'WARN' : 'FAIL';
-    console.log(
-      `  ${rule.name.padEnd(20)} ${rule.level.padEnd(10)} ${statusIcon.padEnd(8)} ${warn.padStart(6)} ${fail.padStart(6)} ${String(rule.violationCount).padStart(11)}`,
-    );
-  }
-
-  // Summary
-  const s = data.summary;
-  console.log(
-    `\n  ${s.total} rules | ${s.passed} passed | ${s.warned} warned | ${s.failed} failed | ${s.violationCount} violations`,
-  );
-
-  // Violations detail
-  if (data.violations.length > 0) {
-    const failViolations = data.violations.filter((v) => v.level === 'fail');
-    const warnViolations = data.violations.filter((v) => v.level === 'warn');
-
-    if (failViolations.length > 0) {
-      console.log(`\n## Failures (${failViolations.length})\n`);
-      for (const v of failViolations.slice(0, 20)) {
-        const loc = v.line ? `${v.file}:${v.line}` : v.file;
-        console.log(
-          `  [FAIL] ${v.rule}: ${v.name} (${v.value}) at ${loc} — threshold ${v.threshold}`,
-        );
-      }
-      if (failViolations.length > 20) {
-        console.log(`  ... and ${failViolations.length - 20} more`);
-      }
-    }
-
-    if (warnViolations.length > 0) {
-      console.log(`\n## Warnings (${warnViolations.length})\n`);
-      for (const v of warnViolations.slice(0, 20)) {
-        const loc = v.line ? `${v.file}:${v.line}` : v.file;
-        console.log(
-          `  [WARN] ${v.rule}: ${v.name} (${v.value}) at ${loc} — threshold ${v.threshold}`,
-        );
-      }
-      if (warnViolations.length > 20) {
-        console.log(`  ... and ${warnViolations.length - 20} more`);
-      }
-    }
-  }
-
-  console.log();
-
-  if (!data.passed) {
-    process.exit(1);
-  }
-}

package/src/native.js

@@ -11,6 +11,7 @@ import os from 'node:os';
 
 let _cached; // undefined = not yet tried, null = failed, object = module
 let _loadError = null;
+const _require = createRequire(import.meta.url);
 
 /**
  * Detect whether the current Linux environment uses glibc or musl.
@@ -18,7 +19,7 @@ let _loadError = null;
  */
 function detectLibc() {
   try {
-    const { readdirSync } = require('node:fs');
+    const { readdirSync } = _require('node:fs');
     const files = readdirSync('/lib');
     if (files.some((f) => f.startsWith('ld-musl-') && f.endsWith('.so.1'))) {
       return 'musl';
@@ -38,6 +39,17 @@ const PLATFORM_PACKAGES = {
   'win32-x64': '@optave/codegraph-win32-x64-msvc',
 };
 
+/**
+ * Resolve the platform-specific npm package name for the native addon.
+ * Returns null if the current platform is not supported.
+ */
+function resolvePlatformPackage() {
+  const platform = os.platform();
+  const arch = os.arch();
+  const key = platform === 'linux' ? `${platform}-${arch}-${detectLibc()}` : `${platform}-${arch}`;
+  return PLATFORM_PACKAGES[key] || null;
+}
+
 /**
  * Try to load the native napi addon.
  * Returns the module on success, null on failure.
@@ -45,21 +57,16 @@ const PLATFORM_PACKAGES = {
 export function loadNative() {
   if (_cached !== undefined) return _cached;
 
-  const require = createRequire(import.meta.url);
-
-  const platform = os.platform();
-  const arch = os.arch();
-  const key = platform === 'linux' ? `${platform}-${arch}-${detectLibc()}` : `${platform}-${arch}`;
-  const pkg = PLATFORM_PACKAGES[key];
+  const pkg = resolvePlatformPackage();
   if (pkg) {
     try {
-      _cached = require(pkg);
+      _cached = _require(pkg);
       return _cached;
     } catch (err) {
       _loadError = err;
     }
   } else {
-    _loadError = new Error(`Unsupported platform: ${key}`);
+    _loadError = new Error(`Unsupported platform: ${os.platform()}-${os.arch()}`);
   }
 
   _cached = null;
@@ -73,6 +80,21 @@ export function isNativeAvailable() {
   return loadNative() !== null;
 }
 
+/**
+ * Read the version from the platform-specific npm package.json.
+ * Returns null if the package is not installed or has no version.
+ */
+export function getNativePackageVersion() {
+  const pkg = resolvePlatformPackage();
+  if (!pkg) return null;
+  try {
+    const pkgJson = _require(`${pkg}/package.json`);
+    return pkgJson.version || null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Return the native module or throw if not available.
  */

package/src/owners.js

@@ -1,8 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { findDbPath, openReadonlyOrFail } from './db.js';
-import { outputResult } from './result-formatter.js';
-import { isTestFile } from './test-filter.js';
+import { isTestFile } from './infrastructure/test-filter.js';
 
 // ─── CODEOWNERS Parsing ──────────────────────────────────────────────
 
@@ -303,57 +302,3 @@ export function ownersData(customDbPath, opts = {}) {
     db.close();
   }
 }
-
-// ─── CLI Display ─────────────────────────────────────────────────────
-
-/**
- * CLI display function for the `owners` command.
- * @param {string} [customDbPath]
- * @param {object} [opts]
- */
-export function owners(customDbPath, opts = {}) {
-  const data = ownersData(customDbPath, opts);
-  if (outputResult(data, null, opts)) return;
-
-  if (!data.codeownersFile) {
-    console.log('No CODEOWNERS file found.');
-    return;
-  }
-
-  console.log(`\nCODEOWNERS: ${data.codeownersFile}\n`);
-
-  const s = data.summary;
-  console.log(
-    `  Coverage: ${s.coveragePercent}% (${s.ownedFiles}/${s.totalFiles} files owned, ${s.ownerCount} owners)\n`,
-  );
-
-  if (s.byOwner.length > 0) {
-    console.log('  Owners:\n');
-    for (const o of s.byOwner) {
-      console.log(`    ${o.owner}  ${o.fileCount} files`);
-    }
-    console.log();
-  }
-
-  if (data.files.length > 0 && opts.owner) {
-    console.log(`  Files owned by ${opts.owner}:\n`);
-    for (const f of data.files) {
-      console.log(`    ${f.file}`);
-    }
-    console.log();
-  }
-
-  if (data.boundaries.length > 0) {
-    console.log(`  Cross-owner boundaries: ${data.boundaries.length} edges\n`);
-    const shown = data.boundaries.slice(0, 30);
-    for (const b of shown) {
-      const srcOwner = b.from.owners.join(', ') || '(unowned)';
-      const tgtOwner = b.to.owners.join(', ') || '(unowned)';
-      console.log(`    ${b.from.name} [${srcOwner}] -> ${b.to.name} [${tgtOwner}]`);
-    }
-    if (data.boundaries.length > 30) {
-      console.log(`    ... and ${data.boundaries.length - 30} more`);
-    }
-    console.log();
-  }
-}

package/src/parser.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Language, Parser, Query } from 'web-tree-sitter';
 import { warn } from './logger.js';
-import { getNative, loadNative } from './native.js';
+import { getNative, getNativePackageVersion, loadNative } from './native.js';
 
 // Re-export all extractors for backward compatibility
 export {
@@ -41,6 +41,9 @@ let _initialized = false;
 // Memoized parsers — avoids reloading WASM grammars on every createParsers() call
 let _cachedParsers = null;
 
+// Cached Language objects — WASM-backed, must be .delete()'d explicitly
+let _cachedLanguages = null;
+
 // Query cache for JS/TS/TSX extractors (populated during createParsers)
 const _queryCache = new Map();
 
@@ -77,12 +80,14 @@ export async function createParsers() {
   }
 
   const parsers = new Map();
+  const languages = new Map();
   for (const entry of LANGUAGE_REGISTRY) {
     try {
       const lang = await Language.load(grammarPath(entry.grammarFile));
       const parser = new Parser();
       parser.setLanguage(lang);
       parsers.set(entry.id, parser);
+      languages.set(entry.id, lang);
       // Compile and cache tree-sitter Query for JS/TS/TSX extractors
       if (entry.extractor === extractSymbols && !_queryCache.has(entry.id)) {
         const isTS = entry.id === 'typescript' || entry.id === 'tsx';
@@ -100,9 +105,47 @@ export async function createParsers() {
     }
   }
   _cachedParsers = parsers;
+  _cachedLanguages = languages;
   return parsers;
 }
 
+/**
+ * Dispose all cached WASM parsers and queries to free WASM linear memory.
+ * Call this between repeated builds in the same process (e.g. benchmarks)
+ * to prevent memory accumulation that can cause segfaults.
+ */
+export function disposeParsers() {
+  if (_cachedParsers) {
+    for (const [, parser] of _cachedParsers) {
+      if (parser && typeof parser.delete === 'function') {
+        try {
+          parser.delete();
+        } catch {}
+      }
+    }
+    _cachedParsers = null;
+  }
+  for (const [, query] of _queryCache) {
+    if (query && typeof query.delete === 'function') {
+      try {
+        query.delete();
+      } catch {}
+    }
+  }
+  _queryCache.clear();
+  if (_cachedLanguages) {
+    for (const [, lang] of _cachedLanguages) {
+      if (lang && typeof lang.delete === 'function') {
+        try {
+          lang.delete();
+        } catch {}
+      }
+    }
+    _cachedLanguages = null;
+  }
+  _initialized = false;
+}
+
 export function getParser(parsers, filePath) {
   const ext = path.extname(filePath);
   const entry = _extToLang.get(ext);
@@ -214,6 +257,7 @@ function patchNativeResult(r) {
       if (i.csharpUsing === undefined) i.csharpUsing = i.csharp_using;
       if (i.rubyRequire === undefined) i.rubyRequire = i.ruby_require;
       if (i.phpUse === undefined) i.phpUse = i.php_use;
+      if (i.dynamicImport === undefined) i.dynamicImport = i.dynamic_import;
     }
   }
 
@@ -429,11 +473,18 @@ export async function parseFilesAuto(filePaths, rootDir, opts = {}) {
  */
 export function getActiveEngine(opts = {}) {
   const { name, native } = resolveEngine(opts);
-  const version = native
+  let version = native
     ? typeof native.engineVersion === 'function'
       ? native.engineVersion()
       : null
     : null;
+  // Prefer platform package.json version over binary-embedded version
+  // to handle stale binaries that weren't recompiled during a release
+  if (native) {
+    try {
+      version = getNativePackageVersion() ?? version;
+    } catch {}
+  }
   return { name, version };
 }
 

package/src/queries-cli.js

@@ -7,6 +7,7 @@
  */
 
 import path from 'node:path';
+import { outputResult } from './infrastructure/result-formatter.js';
 import {
   childrenData,
   contextData,
@@ -26,7 +27,6 @@ import {
   statsData,
   whereData,
 } from './queries.js';
-import { outputResult } from './result-formatter.js';
 
 // ─── symbolPath ─────────────────────────────────────────────────────────