Merge remote-tracking branch 'origin/feat/dynamic-sql-edge-cases' into fix/review-672

Author: carlos-alm

package.json

@@ -4,6 +4,20 @@
   "description": "Local code graph CLI — parse codebases with tree-sitter, build dependency graphs, query them",
   "type": "module",
   "main": "dist/index.js",
+  "imports": {
+    "#shared/*": { "@codegraph/source": "./src/shared/*", "default": "./dist/shared/*" },
+    "#infrastructure/*": { "@codegraph/source": "./src/infrastructure/*", "default": "./dist/infrastructure/*" },
+    "#db/*": { "@codegraph/source": "./src/db/*", "default": "./dist/db/*" },
+    "#domain/*": { "@codegraph/source": "./src/domain/*", "default": "./dist/domain/*" },
+    "#features/*": { "@codegraph/source": "./src/features/*", "default": "./dist/features/*" },
+    "#presentation/*": { "@codegraph/source": "./src/presentation/*", "default": "./dist/presentation/*" },
+    "#graph/*": { "@codegraph/source": "./src/graph/*", "default": "./dist/graph/*" },
+    "#mcp/*": { "@codegraph/source": "./src/mcp/*", "default": "./dist/mcp/*" },
+    "#ast-analysis/*": { "@codegraph/source": "./src/ast-analysis/*", "default": "./dist/ast-analysis/*" },
+    "#extractors/*": { "@codegraph/source": "./src/extractors/*", "default": "./dist/extractors/*" },
+    "#cli/*": { "@codegraph/source": "./src/cli/*", "default": "./dist/cli/*" },
+    "#types": { "@codegraph/source": "./src/types.ts", "default": "./dist/types.js" }
+  },
   "exports": {
     ".": {
       "import": "./dist/index.js",

scripts/verify-imports.ts

@@ -17,7 +17,37 @@ import { fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const srcDir = resolve(__dirname, '..', 'src');
+const projectRoot = resolve(__dirname, '..');
+const srcDir = resolve(projectRoot, 'src');
+
+// ── load package.json subpath imports ───────────────────────────────────
+const pkg = JSON.parse(readFileSync(resolve(projectRoot, 'package.json'), 'utf8'));
+const subpathImports: Record<string, unknown> = pkg.imports || {};
+
+/** Resolve a #-prefixed subpath import to an absolute file path (source condition). */
+function resolveSubpathImport(specifier: string): string | null {
+  for (const [pattern, mapping] of Object.entries(subpathImports)) {
+    const target =
+      typeof mapping === 'string'
+        ? mapping
+        : (mapping as Record<string, string>)['@codegraph/source'] ??
+          (mapping as Record<string, string>).default;
+    if (!target) continue;
+
+    // Exact match (e.g., "#types")
+    if (pattern === specifier) return resolve(projectRoot, target);
+
+    // Wildcard match (e.g., "#shared/*")
+    if (pattern.includes('*')) {
+      const prefix = pattern.slice(0, pattern.indexOf('*'));
+      if (specifier.startsWith(prefix)) {
+        const rest = specifier.slice(prefix.length);
+        return resolve(projectRoot, target.replace('*', rest));
+      }
+    }
+  }
+  return null;
+}
 
 // ── collect source files ────────────────────────────────────────────────
 function walk(dir) {
@@ -102,6 +132,18 @@ function extractDynamicImports(filePath) {
 
 // ── resolve a specifier to a file on disk ───────────────────────────────
 function resolveSpecifier(specifier, fromFile) {
+  // Handle #-prefixed subpath imports via package.json "imports" field
+  if (specifier.startsWith('#')) {
+    const resolved = resolveSubpathImport(specifier);
+    if (!resolved) return specifier; // no matching pattern — broken
+    if (existsSync(resolved) && statSync(resolved).isFile()) return null;
+    if (resolved.endsWith('.js')) {
+      const tsTarget = resolved.replace(/\.js$/, '.ts');
+      if (existsSync(tsTarget) && statSync(tsTarget).isFile()) return null;
+    }
+    return specifier; // mapped but file missing — broken
+  }
+
   // Skip bare specifiers (packages): 'node:*', '@scope/pkg', 'pkg'
   if (!specifier.startsWith('.') && !specifier.startsWith('/')) return null;
 

src/domain/graph/builder/stages/build-edges.ts

@@ -6,9 +6,9 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { getNodeId } from '../../../../db/index.js';
-import { debug } from '../../../../infrastructure/logger.js';
-import { loadNative } from '../../../../infrastructure/native.js';
+import { getNodeId } from '#db/index.js';
+import { debug } from '#infrastructure/logger.js';
+import { loadNative } from '#infrastructure/native.js';
 import type {
   BetterSqlite3Database,
   Call,
@@ -18,7 +18,7 @@ import type {
   NativeAddon,
   NodeRow,
   TypeMapEntry,
-} from '../../../../types.js';
+} from '#types';
 import { computeConfidence } from '../../resolve.js';
 import type { PipelineContext } from '../context.js';
 import { BUILTIN_RECEIVERS, batchInsertEdges } from '../helpers.js';

src/domain/graph/builder/stages/build-structure.ts

@@ -5,10 +5,10 @@
  */
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
-import { debug } from '../../../../infrastructure/logger.js';
-import { loadNative } from '../../../../infrastructure/native.js';
-import { normalizePath } from '../../../../shared/constants.js';
-import type { ExtractorOutput } from '../../../../types.js';
+import { debug } from '#infrastructure/logger.js';
+import { loadNative } from '#infrastructure/native.js';
+import { normalizePath } from '#shared/constants.js';
+import type { ExtractorOutput } from '#types';
 import type { PipelineContext } from '../context.js';
 import { readFileSafe } from '../helpers.js';
 

src/domain/graph/builder/stages/collect-files.ts

@@ -7,8 +7,8 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { debug, info } from '../../../../infrastructure/logger.js';
-import { normalizePath } from '../../../../shared/constants.js';
+import { debug, info } from '#infrastructure/logger.js';
+import { normalizePath } from '#shared/constants.js';
 import { readJournal } from '../../journal.js';
 import type { PipelineContext } from '../context.js';
 import { collectFiles as collectFilesUtil } from '../helpers.js';

tsconfig.json

@@ -8,6 +8,7 @@
     /* Modules */
     "module": "nodenext",
     "moduleResolution": "nodenext",
+    "customConditions": ["@codegraph/source"],
     "rootDir": "./src",
 
     /* Emit */

vitest.config.ts

@@ -6,6 +6,9 @@ const supportsStripTypes = major > 22 || (major === 22 && minor >= 6);
 const stripFlag = major >= 23 ? '--strip-types' : '--experimental-strip-types';
 
 export default defineConfig({
+  resolve: {
+    conditions: ['@codegraph/source'],
+  },
   test: {
     globals: true,
     testTimeout: 30000,