@timber-js/app 0.2.0-alpha.85 → 0.2.0-alpha.87

package/dist/index.js

@@ -361,6 +361,35 @@ function formatRscDebugContext(components) {
 	return lines.join("\n");
 }
 /**
+* Dynamically compute the line offset that Vite's module runner adds
+* when wrapping modules in an async function.
+*
+* Vite's `calculateOffsetOnce()` uses the same technique: create a new
+* AsyncFunction, throw from line 1, and check where the engine reports
+* the error. The difference between the reported line and 1 is the offset.
+*
+* This is engine-dependent (currently 2 on Node 18-22) and could change
+* in future Node.js or V8 versions. Computing it at runtime ensures we
+* always match the actual behavior.
+*/
+var _cachedOffset = null;
+function calculateModuleRunnerOffset() {
+	if (_cachedOffset !== null) return _cachedOffset;
+	try {
+		const AsyncFunction = async function() {}.constructor;
+		const src = new AsyncFunction("BODY").toString();
+		const bodyIndex = src.indexOf("BODY");
+		if (bodyIndex === -1) {
+			_cachedOffset = 2;
+			return _cachedOffset;
+		}
+		_cachedOffset = (src.slice(0, bodyIndex).match(/\n/g) || []).length;
+	} catch {
+		_cachedOffset = 2;
+	}
+	return _cachedOffset;
+}
+/**
 * Phases where the error originated in the RSC environment.
 * These use `server.environments.rsc.moduleGraph` for source-mapping.
 */
@@ -420,7 +449,8 @@ function rewriteStacktrace(stack, moduleGraph) {
 				if (!id) return input;
 				const rawSourceMap = moduleGraph.getModuleById(id)?.transformResult?.map;
 				if (!rawSourceMap) return input;
-				const origLine = Number(lineStr) - 2;
+				const OFFSET = calculateModuleRunnerOffset();
+				const origLine = Number(lineStr) - OFFSET;
 				const origCol = Number(colStr) - 1;
 				if (origLine <= 0 || origCol < 0) return input;
 				let pos;
@@ -445,6 +475,19 @@ function rewriteStacktrace(stack, moduleGraph) {
 	};
 }
 /**
+* Source-map an error's stack trace using the Vite dev server's module graph.
+*
+* Exported so that the fallback error renderer (fallback-error.ts) can
+* source-map errors before rendering the dev error page. Without this,
+* the dev error page shows transpiled positions (e.g. page.tsx:1:1 instead
+* of page.tsx:4:9).
+*
+* See TIM-811.
+*/
+function fixErrorStacktrace(server, error, phase) {
+	fixStacktraceForEnvironment(server, error, phase ?? classifyErrorPhase(error, server.config.root));
+}
+/**
 * Send an error to Vite's browser overlay and log it to stderr.
 *
 * Uses `server.ssrFixStacktrace()` to map stack traces back to source,
@@ -1321,6 +1364,10 @@ function createTimberMiddleware(server, projectRoot) {
 			if (typeof setHandler === "function") setHandler((error, _phase, debugComponents) => {
 				sendErrorToOverlay(server, error, classifyErrorPhase(error, projectRoot), projectRoot, debugComponents);
 			});
+			const setSourceMap = rscModule.setDevSourceMapHandler;
+			if (typeof setSourceMap === "function") setSourceMap((error) => {
+				fixErrorStacktrace(server, error);
+			});
 		} catch (error) {
 			if (error instanceof Error) {
 				addTimberContext(error);