@alloy-js/core 0.23.0-dev.11 → 0.23.0-dev.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/core",
-  "version": "0.23.0-dev.11",
+  "version": "0.23.0-dev.12",
   "description": "",
   "repository": {
     "type": "git",
@@ -10,27 +10,33 @@
   "exports": {
     ".": {
       "browser": "./dist/src/index.browser.js",
+      "development": "./dist/dev/src/index.js",
       "import": "./dist/src/index.js"
     },
     "./jsx-runtime": {
       "types": "./dist/src/jsx-runtime.d.ts",
+      "development": "./dist/dev/src/jsx-runtime.js",
       "import": "./dist/src/jsx-runtime.js"
     },
     "./testing": {
+      "development": "./dist/dev/testing/index.js",
       "import": "./dist/testing/index.js"
     },
     "./testing/matchers": {
       "types": "./testing/vitest.d.ts"
     },
     "./stc": {
+      "development": "./dist/dev/src/components/stc/index.js",
       "import": "./dist/src/components/stc/index.js"
     },
     "./components": {
+      "development": "./dist/dev/src/components/index.js",
       "import": "./dist/src/components/index.js"
     },
     "./devtools": {
       "types": "./dist/src/devtools-entry.d.ts",
       "browser": "./dist/src/devtools-entry.browser.js",
+      "development": "./dist/dev/src/devtools-entry.js",
       "import": "./dist/src/devtools-entry.js"
     }
   },
@@ -56,7 +62,7 @@
     "ws": "^8.19.0"
   },
   "devDependencies": {
-    "@alloy-js/cli": "~0.22.0 || >= 0.23.0-dev.3",
+    "@alloy-js/cli": "~0.22.0 || >= 0.23.0-dev.4",
     "@alloy-js/rollup-plugin": "~0.1.0 || >= 0.1.1-dev.1",
     "@microsoft/api-extractor": "~7.52.8",
     "@rollup/plugin-typescript": "^12.1.2",
@@ -68,7 +74,7 @@
   "type": "module",
   "scripts": {
     "generate-docs": "api-extractor run",
-    "build": "alloy build && pnpm run generate-docs",
+    "build": "alloy build --with-dev && pnpm run generate-docs",
     "clean": "rimraf dist/ .temp/",
     "test": "vitest run",
     "test:watch": "vitest -w",

package/src/debug/effects.ts

@@ -4,6 +4,7 @@ import {
   getReactiveCreationLocation,
   nextReactiveId,
 } from "../reactivity.js";
+import { loadSourceMapSupport, resolveSourceMap } from "./source-map.js";
 import { insertEdge, insertEffect, insertRef } from "./trace-writer.js";
 import {
   isDebugEnabled,
@@ -112,68 +113,6 @@ const VUE_REACTIVITY_MARKERS = [
 // Fast source location capture using V8 structured CallSite API
 // ─────────────────────────────────────────────────────────────────────────────
 
-// Lazily loaded findSourceMap from node:module
-let findSourceMap:
-  | ((path: string) =>
-      | {
-          findEntry: (
-            line: number,
-            col: number,
-          ) =>
-            | {
-                originalSource: string;
-                originalLine: number;
-                originalColumn: number;
-              }
-            | undefined;
-        }
-      | undefined)
-  | undefined;
-let findSourceMapLoaded = false;
-let realpathSync: ((path: string) => string) | undefined;
-// Cache realpath lookups to avoid repeated fs calls
-const realpathCache = new Map<string, string>();
-
-function loadFindSourceMap() {
-  if (findSourceMapLoaded) return;
-  findSourceMapLoaded = true;
-  // process.getBuiltinModule works in both ESM and CJS contexts
-  try {
-    const mod = process.getBuiltinModule?.("node:module") as
-      | typeof import("node:module")
-      | undefined;
-    if (mod && typeof mod.findSourceMap === "function") {
-      findSourceMap = mod.findSourceMap as typeof findSourceMap;
-    }
-  } catch {
-    // not available
-  }
-  try {
-    const fs = process.getBuiltinModule?.("node:fs") as
-      | typeof import("node:fs")
-      | undefined;
-    if (fs) {
-      realpathSync = fs.realpathSync;
-    }
-  } catch {
-    // not available
-  }
-}
-
-function getRealPath(fileName: string): string {
-  if (!realpathSync) return fileName;
-  let real = realpathCache.get(fileName);
-  if (real === undefined) {
-    try {
-      real = realpathSync(fileName);
-    } catch {
-      real = fileName;
-    }
-    realpathCache.set(fileName, real);
-  }
-  return real;
-}
-
 function isSkipFile(fileName: string): boolean {
   for (const skip of STACK_SKIP) {
     if (fileName.includes(skip)) return true;
@@ -188,25 +127,6 @@ function isVueReactivityFile(fileName: string): boolean {
   return false;
 }
 
-function resolveSourceMap(
-  fileName: string,
-  line: number,
-  col: number,
-): { fileName: string; line: number; col: number } {
-  if (!findSourceMap) return { fileName, line, col };
-  // pnpm uses symlinks; findSourceMap only matches the real path
-  const real = getRealPath(fileName);
-  const map = findSourceMap(real);
-  if (!map) return { fileName, line, col };
-  const entry = map.findEntry(line - 1, col - 1);
-  if (!entry) return { fileName, line, col };
-  return {
-    fileName: entry.originalSource,
-    line: entry.originalLine + 1,
-    col: entry.originalColumn + 1,
-  };
-}
-
 // V8 structured stack capture — avoids string formatting entirely
 const structuredPrepare = (
   _err: Error,
@@ -227,7 +147,7 @@ export function captureSourceLocation(
   skipReactives = true,
 ): SourceLocation | undefined {
   if (!isDebugEnabled()) return undefined;
-  loadFindSourceMap();
+  loadSourceMapSupport();
 
   const sites = captureCallSites();
 

package/src/debug/render.ts

@@ -17,6 +17,7 @@ import { getContext, untrack } from "../reactivity.js";
 import type { ComponentCreator } from "../runtime/component.js";
 import { flushJobsAsync } from "../scheduler.js";
 import { sanitizeRecord } from "./serialize.js";
+import { resolveComponentSource } from "./source-map.js";
 import {
   deleteDirectory,
   deleteOutputFile,
@@ -79,7 +80,10 @@ type TrackedNode = RenderedTextTree | PrintHook;
 let nodeIds = new WeakMap<TrackedNode, number>();
 let idToNode = new Map<number, TrackedNode>();
 let entryIds = new WeakMap<RenderedTextTree, number[]>();
-let nodeKinds = new WeakMap<TrackedNode, { kind: string; name?: string }>();
+let nodeKinds = new WeakMap<
+  TrackedNode,
+  { kind: string; name?: string; source?: RenderTreeNodeInfo["source"] }
+>();
 let fileNodes = new Map<number, { path: string; filetype: string }>();
 let directoryNodes = new Map<number, { path: string }>();
 let nodeProps = new Map<number, string | undefined>();
@@ -269,8 +273,12 @@ function recordNodeAdded(
   if (info.propsSerialized !== undefined) {
     nodeProps.set(id, info.propsSerialized);
   }
-  // Remember the kind so cached re-adds preserve it
-  nodeKinds.set(node, { kind: info.kind, name: info.name });
+  // Remember the kind and source so cached re-adds preserve them
+  nodeKinds.set(node, {
+    kind: info.kind,
+    name: info.name,
+    source: info.source,
+  });
   setEntryId(parent, index, id);
   insertRenderNode(
     id,
@@ -297,8 +305,11 @@ function recordSubtreeAdded(
   const existingId = nodeIds.get(subtree);
   const isCached = existingId !== undefined;
   const id = isCached ? existingId : getOrCreateNodeId(subtree);
-  // Remember the kind so cached re-adds preserve it
-  nodeKinds.set(subtree, { kind: info.kind, name: info.name });
+  // Merge source from previously-saved nodeKinds if the caller didn't provide one
+  const savedKind = nodeKinds.get(subtree);
+  const source = info.source ?? savedKind?.source;
+  // Remember the kind and source so cached re-adds preserve them
+  nodeKinds.set(subtree, { kind: info.kind, name: info.name, source });
   // Track in entryIds so clearRenderTreeChildren can find and remove it
   if (Array.isArray(parentNode)) {
     const list = getEntryList(parentNode);
@@ -310,9 +321,9 @@ function recordSubtreeAdded(
     info.kind,
     info.name,
     info.propsSerialized,
-    info.source?.fileName,
-    info.source?.lineNumber,
-    info.source?.columnNumber,
+    source?.fileName,
+    source?.lineNumber,
+    source?.columnNumber,
     null,
     undefined,
   );
@@ -366,7 +377,7 @@ function recordCachedSubtreeChildrenRecursively(node: RenderedTextTree) {
         );
       }
     } else if (Array.isArray(child)) {
-      // Nested RenderedTextTree - record and recurse, preserving original kind
+      // Nested RenderedTextTree - record and recurse, preserving original kind and source
       const id = getOrCreateNodeId(child);
       list.push(id);
       const savedKind = nodeKinds.get(child);
@@ -376,9 +387,9 @@ function recordCachedSubtreeChildrenRecursively(node: RenderedTextTree) {
         savedKind?.kind ?? "fragment",
         savedKind?.name,
         undefined,
-        undefined,
-        undefined,
-        undefined,
+        savedKind?.source?.fileName,
+        savedKind?.source?.lineNumber,
+        savedKind?.source?.columnNumber,
         null,
         undefined,
       );
@@ -544,6 +555,7 @@ export function beginComponent(
       }
     }
     const propsSerialized = serializeRenderTreeProps(propsSource);
+    const resolvedSource = resolveComponentSource(source);
     if (isExisting) {
       clearRenderTreeChildren(node);
     } else {
@@ -551,7 +563,7 @@ export function beginComponent(
         kind: "component",
         name: componentName,
         propsSerialized,
-        source,
+        source: resolvedSource,
       });
     }
 

package/src/debug/source-map.ts

@@ -0,0 +1,135 @@
+/**
+ * Shared source-map resolution utilities.
+ *
+ * Used by both effect source capture (effects.ts) and component source
+ * resolution (render.ts) to convert file paths and resolve source maps.
+ */
+
+import type { SourceLocation } from "../devtools/devtools-protocol.js";
+
+// Lazily loaded findSourceMap from node:module
+let findSourceMap:
+  | ((path: string) =>
+      | {
+          findEntry: (
+            line: number,
+            col: number,
+          ) =>
+            | {
+                originalSource: string;
+                originalLine: number;
+                originalColumn: number;
+              }
+            | undefined;
+        }
+      | undefined)
+  | undefined;
+let loaded = false;
+let realpathSync: ((path: string) => string) | undefined;
+let fileURLToPath: ((url: string | URL) => string) | undefined;
+const realpathCache = new Map<string, string>();
+
+export function loadSourceMapSupport() {
+  if (loaded) return;
+  loaded = true;
+  try {
+    const mod = process.getBuiltinModule?.("node:module") as
+      | typeof import("node:module")
+      | undefined;
+    if (mod && typeof mod.findSourceMap === "function") {
+      findSourceMap = mod.findSourceMap as typeof findSourceMap;
+    }
+  } catch {
+    // not available
+  }
+  try {
+    const fs = process.getBuiltinModule?.("node:fs") as
+      | typeof import("node:fs")
+      | undefined;
+    if (fs) {
+      realpathSync = fs.realpathSync;
+    }
+  } catch {
+    // not available
+  }
+  try {
+    const url = process.getBuiltinModule?.("node:url") as
+      | typeof import("node:url")
+      | undefined;
+    if (url) {
+      fileURLToPath = url.fileURLToPath;
+    }
+  } catch {
+    // not available
+  }
+}
+
+export function getRealPath(fileName: string): string {
+  if (!realpathSync) return fileName;
+  let real = realpathCache.get(fileName);
+  if (real === undefined) {
+    try {
+      real = realpathSync(fileName);
+    } catch {
+      real = fileName;
+    }
+    realpathCache.set(fileName, real);
+  }
+  return real;
+}
+
+export function resolveSourceMap(
+  fileName: string,
+  line: number,
+  col: number,
+): { fileName: string; line: number; col: number } {
+  if (!findSourceMap) return { fileName, line, col };
+  // pnpm uses symlinks; findSourceMap only matches the real path
+  const real = getRealPath(fileName);
+  const map = findSourceMap(real);
+  if (!map) return { fileName, line, col };
+  const entry = map.findEntry(line - 1, col - 1);
+  if (!entry) return { fileName, line, col };
+  return {
+    fileName: entry.originalSource,
+    line: entry.originalLine + 1,
+    col: entry.originalColumn + 1,
+  };
+}
+
+function stripFileUrl(path: string): string {
+  if (!path.startsWith("file://")) return path;
+  if (fileURLToPath) return fileURLToPath(path);
+  return new URL(path).pathname;
+}
+
+/**
+ * Resolve a component source location. Handles:
+ * - `file://` URLs from import.meta.url (converts to file path)
+ * - Source map resolution (maps compiled .js to original .tsx)
+ * - Plain absolute paths (legacy format, returned as-is)
+ */
+export function resolveComponentSource(
+  source: SourceLocation | undefined,
+): SourceLocation | undefined {
+  if (!source?.fileName) return source;
+  loadSourceMapSupport();
+
+  const fileName = stripFileUrl(source.fileName);
+
+  if (source.lineNumber != null && source.columnNumber != null) {
+    // Resolve through source maps to get the original .tsx path
+    const resolved = resolveSourceMap(
+      fileName,
+      source.lineNumber,
+      source.columnNumber,
+    );
+    return {
+      fileName: stripFileUrl(resolved.fileName),
+      lineNumber: resolved.line,
+      columnNumber: resolved.col,
+    };
+  }
+
+  return { ...source, fileName };
+}

package/src/debug/trace.ts

@@ -71,12 +71,28 @@ if (traceDbEnv) {
     traceDbEnv === "1" || traceDbEnv === "true" ? "alloy-trace.db" : traceDbEnv;
   try {
     await initTrace(traceDbPath);
+    // eslint-disable-next-line no-console
+    console.log(`  Trace database: ${traceDbPath}`);
   } catch (e) {
     // eslint-disable-next-line no-console
     console.warn(`Failed to initialize trace database at ${traceDbPath}:`, e);
   }
 }
 
+if (import.meta.url.includes("/dist/dev/")) {
+  // eslint-disable-next-line no-console
+  console.log("Alloy debug build loaded.");
+  if (process.sourceMapsEnabled) {
+    // eslint-disable-next-line no-console
+    console.log("  Source maps enabled.");
+  } else {
+    // eslint-disable-next-line no-console
+    console.log(
+      "  Source maps disabled. Run with --enable-source-maps for better stack traces.",
+    );
+  }
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Trace phases
 // ─────────────────────────────────────────────────────────────────────────────

package/test/browser-build.test.ts

@@ -80,7 +80,7 @@ describe("Browser Build Test", () => {
     expect(() => {
       execSync("npm run build", { cwd: testDir, stdio: "inherit" });
     }).not.toThrow();
-  });
+  }, 10000);
 
   afterAll(() => {
     // Ensure testDir exists before attempting to remove it

package/vitest.config.ts

@@ -2,6 +2,14 @@ import alloyPlugin from "@alloy-js/rollup-plugin";
 import { defineConfig } from "vitest/config";
 
 export default defineConfig({
+  resolve: {
+    conditions: ["source"],
+  },
+  ssr: {
+    resolve: {
+      conditions: ["source"],
+    },
+  },
   esbuild: {
     jsx: "preserve",
     sourcemap: "both",