Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ jobs:
- name: Type check
run: npm run typecheck

verify-imports:
runs-on: ubuntu-latest
name: Verify dynamic imports
steps:
- uses: actions/checkout@v6

- name: Setup Node.js
uses: actions/setup-node@v6
with:
node-version: 22

- name: Verify all dynamic imports resolve
run: node scripts/verify-imports.js

rust-check:
runs-on: ubuntu-latest
name: Rust compile check
Expand All @@ -121,7 +135,7 @@ jobs:

ci-pipeline:
if: always()
needs: [lint, test, typecheck, rust-check]
needs: [lint, test, typecheck, verify-imports, rust-check]
runs-on: ubuntu-latest
name: CI Testing Pipeline
steps:
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"build": "tsc",
"build:wasm": "node scripts/build-wasm.js",
"typecheck": "tsc --noEmit",
"verify-imports": "node scripts/verify-imports.js",
"test": "vitest run",
"test:watch": "vitest",
"test:coverage": "vitest run --coverage",
Expand Down
155 changes: 155 additions & 0 deletions scripts/verify-imports.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
#!/usr/bin/env node

/**
* Verify that all dynamic import() paths in src/ resolve to existing files.
*
* Catches stale paths left behind after moves/renames — the class of bug
* that caused the ast-command crash (see roadmap 10.3).
*
* Exit codes:
* 0 — all imports resolve
* 1 — one or more broken imports found
*/

import { readFileSync, existsSync, readdirSync, statSync } from 'node:fs';
import { resolve, dirname, join, extname } from 'node:path';
import { fileURLToPath } from 'node:url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
const srcDir = resolve(__dirname, '..', 'src');

// ── collect source files ────────────────────────────────────────────────
function walk(dir) {
const results = [];
for (const entry of readdirSync(dir, { withFileTypes: true })) {
const full = join(dir, entry.name);
if (entry.isDirectory()) {
if (entry.name === 'node_modules') continue;
results.push(...walk(full));
} else if (/\.[jt]sx?$/.test(entry.name)) {
results.push(full);
}
}
return results;
}

// ── extract dynamic import specifiers ───────────────────────────────────
// Matches: import('...') and import("...") — with or without await
const DYNAMIC_IMPORT_RE = /(?:await\s+)?import\(\s*(['"])(.+?)\1\s*\)/g;

/**
* Check whether the text contains a `//` line-comment marker that is NOT
* inside a string literal. Walks character-by-character tracking quote state.
*/
function isInsideLineComment(text) {
let inStr = null; // null | "'" | '"' | '`'
for (let i = 0; i < text.length; i++) {
const ch = text[i];
if (ch === '\\' && inStr) { i++; continue; } // skip escaped char
if (inStr) {
if (ch === inStr) inStr = null;
continue;
}
if (ch === "'" || ch === '"' || ch === '`') { inStr = ch; continue; }
if (ch === '/' && text[i + 1] === '/') return true;
}
return false;
}

function extractDynamicImports(filePath) {
const src = readFileSync(filePath, 'utf8');
const imports = [];
const lines = src.split('\n');

let inBlockComment = false;
for (let i = 0; i < lines.length; i++) {
const line = lines[i];

// Track block comments (/** ... */ and /* ... */)
let scanLine = line;
if (inBlockComment) {
const closeIdx = scanLine.indexOf('*/');
if (closeIdx === -1) continue; // still fully inside a block comment
inBlockComment = false;
scanLine = scanLine.slice(closeIdx + 2); // scan content after */
}
// Skip single-line comments
if (/^\s*\/\//.test(scanLine)) continue;
if (scanLine.includes('/*')) {
// Remove fully closed inline block comments: code /* ... */ more code
scanLine = scanLine.replace(/\/\*.*?\*\//g, '');
// If an unclosed /* remains, keep only the part before it and enter block mode
const openIdx = scanLine.indexOf('/*');
if (openIdx !== -1) {
scanLine = scanLine.slice(0, openIdx);
inBlockComment = true;
}
}

let match;
DYNAMIC_IMPORT_RE.lastIndex = 0;
while ((match = DYNAMIC_IMPORT_RE.exec(scanLine)) !== null) {
// Skip if the match is inside a trailing line comment (// outside quotes)
const before = scanLine.slice(0, match.index);
if (isInsideLineComment(before)) continue;

imports.push({ specifier: match[2], line: i + 1 });
}
}
return imports;
}

// ── resolve a specifier to a file on disk ───────────────────────────────
function resolveSpecifier(specifier, fromFile) {
// Skip bare specifiers (packages): 'node:*', '@scope/pkg', 'pkg'
if (!specifier.startsWith('.') && !specifier.startsWith('/')) return null;

const base = dirname(fromFile);
const target = resolve(base, specifier);

// Exact file exists
if (existsSync(target) && statSync(target).isFile()) return null;

// Try implicit extensions (.js, .ts, .mjs, .cjs)
for (const ext of ['.js', '.ts', '.mjs', '.cjs']) {
if (!extname(target) && existsSync(target + ext)) return null;
}

// Try index files (directory import)
if (existsSync(target) && statSync(target).isDirectory()) {
for (const idx of ['index.js', 'index.ts', 'index.mjs']) {
if (existsSync(join(target, idx))) return null;
}
}

// Not resolved — broken
return specifier;
}

// ── main ────────────────────────────────────────────────────────────────
const files = walk(srcDir);
const broken = [];

for (const file of files) {
const imports = extractDynamicImports(file);
for (const { specifier, line } of imports) {
const bad = resolveSpecifier(specifier, file);
if (bad !== null) {
const rel = file.replace(resolve(srcDir, '..') + '/', '').replace(/\\/g, '/');
broken.push({ file: rel, line, specifier: bad });
}
}
}

if (broken.length === 0) {
console.log(`✓ All dynamic imports in src/ resolve (${files.length} files scanned)`);
process.exit(0);
} else {
console.error(`✗ ${broken.length} broken dynamic import(s) found:\n`);
for (const { file, line, specifier } of broken) {
console.error(` ${file}:${line} → ${specifier}`);
}
console.error('\nFix the import paths and re-run.');
process.exit(1);
}
2 changes: 1 addition & 1 deletion src/cli/commands/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const command = {
console.log();

try {
const { findDbPath, getBuildMeta } = await import('../../db.js');
const { findDbPath, getBuildMeta } = await import('../../db/index.js');
const Database = (await import('better-sqlite3')).default;
const dbPath = findDbPath();
const fs = await import('node:fs');
Expand Down
6 changes: 3 additions & 3 deletions src/mcp/tools/semantic-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export async function handler(args, ctx) {
};

if (mode === 'keyword') {
const { ftsSearchData } = await import('../../embeddings/index.js');
const { ftsSearchData } = await import('../../domain/search/index.js');
const result = ftsSearchData(args.query, ctx.dbPath, searchOpts);
if (result === null) {
return {
Expand All @@ -28,7 +28,7 @@ export async function handler(args, ctx) {
}

if (mode === 'semantic') {
const { searchData } = await import('../../embeddings/index.js');
const { searchData } = await import('../../domain/search/index.js');
const result = await searchData(args.query, ctx.dbPath, searchOpts);
if (result === null) {
return {
Expand All @@ -45,7 +45,7 @@ export async function handler(args, ctx) {
}

// hybrid (default) — falls back to semantic if no FTS5
const { hybridSearchData, searchData } = await import('../../embeddings/index.js');
const { hybridSearchData, searchData } = await import('../../domain/search/index.js');
let result = await hybridSearchData(args.query, ctx.dbPath, searchOpts);
if (result === null) {
result = await searchData(args.query, ctx.dbPath, searchOpts);
Expand Down
Loading