@optave/codegraph 1.1.0 → 1.4.1

package/src/config.js

@@ -1,55 +1,103 @@
-import fs from 'fs';
-import path from 'path';
-import { debug } from './logger.js';
-
-export const CONFIG_FILES = ['.codegraphrc.json', '.codegraphrc', 'codegraph.config.json'];
-
-export const DEFAULTS = {
-  include: [],
-  exclude: [],
-  ignoreDirs: [],
-  extensions: [],
-  aliases: {},
-  build: {
-    incremental: true,
-    dbPath: '.codegraph/graph.db'
-  },
-  query: {
-    defaultDepth: 3,
-    defaultLimit: 20
-  }
-};
-
-/**
- * Load project configuration from a .codegraphrc.json or similar file.
- * Returns merged config with defaults.
- */
-export function loadConfig(cwd) {
-  cwd = cwd || process.cwd();
-  for (const name of CONFIG_FILES) {
-    const filePath = path.join(cwd, name);
-    if (fs.existsSync(filePath)) {
-      try {
-        const raw = fs.readFileSync(filePath, 'utf-8');
-        const config = JSON.parse(raw);
-        debug(`Loaded config from ${filePath}`);
-        return mergeConfig(DEFAULTS, config);
-      } catch (err) {
-        debug(`Failed to parse config ${filePath}: ${err.message}`);
-      }
-    }
-  }
-  return { ...DEFAULTS };
-}
-
-function mergeConfig(defaults, overrides) {
-  const result = { ...defaults };
-  for (const [key, value] of Object.entries(overrides)) {
-    if (value && typeof value === 'object' && !Array.isArray(value) && defaults[key] && typeof defaults[key] === 'object') {
-      result[key] = { ...defaults[key], ...value };
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { debug, warn } from './logger.js';
+
+export const CONFIG_FILES = ['.codegraphrc.json', '.codegraphrc', 'codegraph.config.json'];
+
+export const DEFAULTS = {
+  include: [],
+  exclude: [],
+  ignoreDirs: [],
+  extensions: [],
+  aliases: {},
+  build: {
+    incremental: true,
+    dbPath: '.codegraph/graph.db',
+  },
+  query: {
+    defaultDepth: 3,
+    defaultLimit: 20,
+  },
+  embeddings: { model: 'minilm', llmProvider: null },
+  llm: { provider: null, model: null, baseUrl: null, apiKey: null, apiKeyCommand: null },
+  search: { defaultMinScore: 0.2, rrfK: 60, topK: 15 },
+  ci: { failOnCycles: false, impactThreshold: null },
+};
+
+/**
+ * Load project configuration from a .codegraphrc.json or similar file.
+ * Returns merged config with defaults.
+ */
+export function loadConfig(cwd) {
+  cwd = cwd || process.cwd();
+  for (const name of CONFIG_FILES) {
+    const filePath = path.join(cwd, name);
+    if (fs.existsSync(filePath)) {
+      try {
+        const raw = fs.readFileSync(filePath, 'utf-8');
+        const config = JSON.parse(raw);
+        debug(`Loaded config from ${filePath}`);
+        return resolveSecrets(applyEnvOverrides(mergeConfig(DEFAULTS, config)));
+      } catch (err) {
+        debug(`Failed to parse config ${filePath}: ${err.message}`);
+      }
+    }
+  }
+  return resolveSecrets(applyEnvOverrides({ ...DEFAULTS }));
+}
+
+const ENV_LLM_MAP = {
+  CODEGRAPH_LLM_PROVIDER: 'provider',
+  CODEGRAPH_LLM_API_KEY: 'apiKey',
+  CODEGRAPH_LLM_MODEL: 'model',
+};
+
+export function applyEnvOverrides(config) {
+  for (const [envKey, field] of Object.entries(ENV_LLM_MAP)) {
+    if (process.env[envKey] !== undefined) {
+      config.llm[field] = process.env[envKey];
+    }
+  }
+  return config;
+}
+
+export function resolveSecrets(config) {
+  const cmd = config.llm.apiKeyCommand;
+  if (typeof cmd !== 'string' || cmd.trim() === '') return config;
+
+  const parts = cmd.trim().split(/\s+/);
+  const [executable, ...args] = parts;
+  try {
+    const result = execFileSync(executable, args, {
+      encoding: 'utf-8',
+      timeout: 10_000,
+      maxBuffer: 64 * 1024,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    }).trim();
+    if (result) {
+      config.llm.apiKey = result;
+    }
+  } catch (err) {
+    warn(`apiKeyCommand failed: ${err.message}`);
+  }
+  return config;
+}
+
+function mergeConfig(defaults, overrides) {
+  const result = { ...defaults };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (
+      value &&
+      typeof value === 'object' &&
+      !Array.isArray(value) &&
+      defaults[key] &&
+      typeof defaults[key] === 'object'
+    ) {
+      result[key] = { ...defaults[key], ...value };
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}

package/src/constants.js

@@ -1,28 +1,41 @@
-import path from 'path';
-
-export const IGNORE_DIRS = new Set([
-  'node_modules', '.git', 'dist', 'build', '.next', '.nuxt', '.svelte-kit',
-  'coverage', '.codegraph', '__pycache__', '.tox', 'vendor', '.venv', 'venv',
-  'env', '.env'
-]);
-
-export const EXTENSIONS = new Set([
-  '.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs',
-  '.tf', '.hcl', '.py'
-]);
-
-export function shouldIgnore(dirName) {
-  return IGNORE_DIRS.has(dirName) || dirName.startsWith('.');
-}
-
-export function isSupportedFile(filePath) {
-  return EXTENSIONS.has(path.extname(filePath));
-}
-
-/**
- * Normalize a file path to always use forward slashes.
- * Ensures cross-platform consistency in the SQLite database.
- */
-export function normalizePath(filePath) {
-  return filePath.split(path.sep).join('/');
-}
+import path from 'node:path';
+import { SUPPORTED_EXTENSIONS } from './parser.js';
+
+export const IGNORE_DIRS = new Set([
+  'node_modules',
+  '.git',
+  'dist',
+  'build',
+  '.next',
+  '.nuxt',
+  '.svelte-kit',
+  'coverage',
+  '.codegraph',
+  '__pycache__',
+  '.tox',
+  'vendor',
+  '.venv',
+  'venv',
+  'env',
+  '.env',
+]);
+
+// Re-export as an indirect binding to avoid TDZ in the circular
+// parser.js ↔ constants.js import (no value read at evaluation time).
+export { SUPPORTED_EXTENSIONS as EXTENSIONS };
+
+export function shouldIgnore(dirName) {
+  return IGNORE_DIRS.has(dirName) || dirName.startsWith('.');
+}
+
+export function isSupportedFile(filePath) {
+  return SUPPORTED_EXTENSIONS.has(path.extname(filePath));
+}
+
+/**
+ * Normalize a file path to always use forward slashes.
+ * Ensures cross-platform consistency in the SQLite database.
+ */
+export function normalizePath(filePath) {
+  return filePath.split(path.sep).join('/');
+}

package/src/cycles.js

@@ -1,104 +1,125 @@
-/**
- * Detect circular dependencies in the codebase using Tarjan's SCC algorithm.
- * @param {object} db - Open SQLite database
- * @param {object} opts - { fileLevel: true }
- * @returns {string[][]} Array of cycles, each cycle is an array of file paths
- */
-export function findCycles(db, opts = {}) {
-  const fileLevel = opts.fileLevel !== false;
-
-  // Build adjacency list
-  let edges;
-  if (fileLevel) {
-    edges = db.prepare(`
-      SELECT DISTINCT n1.file AS source, n2.file AS target
-      FROM edges e
-      JOIN nodes n1 ON e.source_id = n1.id
-      JOIN nodes n2 ON e.target_id = n2.id
-      WHERE n1.file != n2.file AND e.kind IN ('imports', 'imports-type')
-    `).all();
-  } else {
-    edges = db.prepare(`
-      SELECT DISTINCT
-        (n1.name || '|' || n1.file) AS source,
-        (n2.name || '|' || n2.file) AS target
-      FROM edges e
-      JOIN nodes n1 ON e.source_id = n1.id
-      JOIN nodes n2 ON e.target_id = n2.id
-      WHERE n1.kind IN ('function', 'method', 'class')
-        AND n2.kind IN ('function', 'method', 'class')
-        AND e.kind = 'calls'
-        AND n1.id != n2.id
-    `).all();
-  }
-
-  const graph = new Map();
-  for (const { source, target } of edges) {
-    if (!graph.has(source)) graph.set(source, []);
-    graph.get(source).push(target);
-    if (!graph.has(target)) graph.set(target, []);
-  }
-
-  // Tarjan's strongly connected components algorithm
-  let index = 0;
-  const stack = [];
-  const onStack = new Set();
-  const indices = new Map();
-  const lowlinks = new Map();
-  const sccs = [];
-
-  function strongconnect(v) {
-    indices.set(v, index);
-    lowlinks.set(v, index);
-    index++;
-    stack.push(v);
-    onStack.add(v);
-
-    for (const w of (graph.get(v) || [])) {
-      if (!indices.has(w)) {
-        strongconnect(w);
-        lowlinks.set(v, Math.min(lowlinks.get(v), lowlinks.get(w)));
-      } else if (onStack.has(w)) {
-        lowlinks.set(v, Math.min(lowlinks.get(v), indices.get(w)));
-      }
-    }
-
-    if (lowlinks.get(v) === indices.get(v)) {
-      const scc = [];
-      let w;
-      do {
-        w = stack.pop();
-        onStack.delete(w);
-        scc.push(w);
-      } while (w !== v);
-      if (scc.length > 1) sccs.push(scc);
-    }
-  }
-
-  for (const node of graph.keys()) {
-    if (!indices.has(node)) strongconnect(node);
-  }
-
-  return sccs;
-}
-
-/**
- * Format cycles for human-readable output.
- */
-export function formatCycles(cycles) {
-  if (cycles.length === 0) {
-    return 'No circular dependencies detected.';
-  }
-
-  const lines = [`Found ${cycles.length} circular dependency cycle(s):\n`];
-  for (let i = 0; i < cycles.length; i++) {
-    const cycle = cycles[i];
-    lines.push(`  Cycle ${i + 1} (${cycle.length} files):`);
-    for (const file of cycle) {
-      lines.push(`    -> ${file}`);
-    }
-    lines.push(`    -> ${cycle[0]} (back to start)`);
-    lines.push('');
-  }
-  return lines.join('\n');
-}
+import { loadNative } from './native.js';
+
+/**
+ * Detect circular dependencies in the codebase using Tarjan's SCC algorithm.
+ * Dispatches to native Rust implementation when available, falls back to JS.
+ * @param {object} db - Open SQLite database
+ * @param {object} opts - { fileLevel: true }
+ * @returns {string[][]} Array of cycles, each cycle is an array of file paths
+ */
+export function findCycles(db, opts = {}) {
+  const fileLevel = opts.fileLevel !== false;
+
+  // Build adjacency list from SQLite (stays in JS — only the algorithm can move to Rust)
+  let edges;
+  if (fileLevel) {
+    edges = db
+      .prepare(`
+      SELECT DISTINCT n1.file AS source, n2.file AS target
+      FROM edges e
+      JOIN nodes n1 ON e.source_id = n1.id
+      JOIN nodes n2 ON e.target_id = n2.id
+      WHERE n1.file != n2.file AND e.kind IN ('imports', 'imports-type')
+    `)
+      .all();
+  } else {
+    edges = db
+      .prepare(`
+      SELECT DISTINCT
+        (n1.name || '|' || n1.file) AS source,
+        (n2.name || '|' || n2.file) AS target
+      FROM edges e
+      JOIN nodes n1 ON e.source_id = n1.id
+      JOIN nodes n2 ON e.target_id = n2.id
+      WHERE n1.kind IN ('function', 'method', 'class')
+        AND n2.kind IN ('function', 'method', 'class')
+        AND e.kind = 'calls'
+        AND n1.id != n2.id
+    `)
+      .all();
+  }
+
+  // Try native Rust implementation
+  const native = loadNative();
+  if (native) {
+    return native.detectCycles(edges);
+  }
+
+  // Fallback: JS Tarjan
+  return findCyclesJS(edges);
+}
+
+/**
+ * Pure-JS Tarjan's SCC implementation.
+ */
+export function findCyclesJS(edges) {
+  const graph = new Map();
+  for (const { source, target } of edges) {
+    if (!graph.has(source)) graph.set(source, []);
+    graph.get(source).push(target);
+    if (!graph.has(target)) graph.set(target, []);
+  }
+
+  // Tarjan's strongly connected components algorithm
+  let index = 0;
+  const stack = [];
+  const onStack = new Set();
+  const indices = new Map();
+  const lowlinks = new Map();
+  const sccs = [];
+
+  function strongconnect(v) {
+    indices.set(v, index);
+    lowlinks.set(v, index);
+    index++;
+    stack.push(v);
+    onStack.add(v);
+
+    for (const w of graph.get(v) || []) {
+      if (!indices.has(w)) {
+        strongconnect(w);
+        lowlinks.set(v, Math.min(lowlinks.get(v), lowlinks.get(w)));
+      } else if (onStack.has(w)) {
+        lowlinks.set(v, Math.min(lowlinks.get(v), indices.get(w)));
+      }
+    }
+
+    if (lowlinks.get(v) === indices.get(v)) {
+      const scc = [];
+      let w;
+      do {
+        w = stack.pop();
+        onStack.delete(w);
+        scc.push(w);
+      } while (w !== v);
+      if (scc.length > 1) sccs.push(scc);
+    }
+  }
+
+  for (const node of graph.keys()) {
+    if (!indices.has(node)) strongconnect(node);
+  }
+
+  return sccs;
+}
+
+/**
+ * Format cycles for human-readable output.
+ */
+export function formatCycles(cycles) {
+  if (cycles.length === 0) {
+    return 'No circular dependencies detected.';
+  }
+
+  const lines = [`Found ${cycles.length} circular dependency cycle(s):\n`];
+  for (let i = 0; i < cycles.length; i++) {
+    const cycle = cycles[i];
+    lines.push(`  Cycle ${i + 1} (${cycle.length} files):`);
+    for (const file of cycle) {
+      lines.push(`    -> ${file}`);
+    }
+    lines.push(`    -> ${cycle[0]} (back to start)`);
+    lines.push('');
+  }
+  return lines.join('\n');
+}