@alwaysmeticulous/backend-recorder-workerd 2.339.0 → 2.342.0

package/dist/version.js

@@ -8,7 +8,7 @@
 * Replaced by tsdown's `define`. The guard keeps a direct source import
 * (vitest, typecheck) working, where no bundler has substituted the value.
 */
-const WORKERD_SHIM_VERSION = "2.339.0";
+const WORKERD_SHIM_VERSION = "2.342.0";
 //#endregion
 export { WORKERD_SHIM_VERSION };
 

package/dist/vite/index.js

@@ -6117,6 +6117,79 @@ var MagicString = class MagicString {
 	}
 };
 //#endregion
+//#region src/vite/annotations.ts
+/**
+* Keeps a build annotation attached to the node it was written for when the
+* instrumenter inserts code in front of that node.
+*
+* Bundlers read `/* @__PURE__ *\/` and its family off the comment immediately
+* preceding an expression. A marker inserted at the node's own start goes
+* *between* the two, leaving the annotation on the marker — a shape every
+* bundler reports as `INVALID_ANNOTATION` and then ignores, so a JSX-heavy
+* build both fills with warnings (esbuild's JSX transform annotates every
+* `jsx(...)` call, and the instrumenter runs after it) and silently loses the
+* hint. Opening the insertion before the annotation instead keeps it adjacent
+* to its own expression.
+*
+* Comment positions come from the parse rather than a backwards scan of the
+* text: `jsx("*\/", p)` puts a comment terminator inside a string literal, and
+* a scanner would read it as the end of a comment that never existed.
+*/
+/**
+* `@__PURE__`, `#__PURE__`, `@__NO_SIDE_EFFECTS__`, and whatever a bundler adds
+* next. Matching the family rather than a fixed list only risks moving an
+* insertion a few bytes earlier than it had to be, which is always valid.
+*/
+const ANNOTATION = /[@#]__[A-Z\d_]+__/;
+/** Whitespace between a comment and what it annotates. */
+const WHITESPACE = new Set([
+	" ",
+	"	",
+	"\n",
+	"\r",
+	"\f",
+	"\v"
+]);
+const createAnnotationIndex = (code) => {
+	const commentsByEnd = /* @__PURE__ */ new Map();
+	const annotationRunStart = (start, crossOpenParens) => {
+		let index = start;
+		let earliest = start;
+		let sawAnnotation = false;
+		for (;;) {
+			index = skipBackwards(code, index, crossOpenParens);
+			const comment = commentsByEnd.get(index);
+			if (comment === void 0) break;
+			sawAnnotation = sawAnnotation || comment.isAnnotation;
+			index = comment.start;
+			earliest = comment.start;
+		}
+		return sawAnnotation ? earliest : start;
+	};
+	return {
+		record: (_isBlock, text, start, end) => {
+			commentsByEnd.set(end, {
+				start,
+				isAnnotation: ANNOTATION.test(text)
+			});
+		},
+		beforeStatement: (start) => annotationRunStart(start, false),
+		beforeWrappedExpression: (start) => annotationRunStart(start, true)
+	};
+};
+const skipBackwards = (code, index, crossOpenParens) => {
+	let i = index;
+	while (i > 0) {
+		const char = code[i - 1];
+		if (WHITESPACE.has(char) || crossOpenParens && char === "(") {
+			i--;
+			continue;
+		}
+		return i;
+	}
+	return i;
+};
+//#endregion
 //#region src/vite/instrument.ts
 /**
 * Inserts per-line coverage markers into an ES module.
@@ -6184,6 +6257,7 @@ const SKIPPED_KEYS = new Set([
 * worth breaking it for.
 */
 const instrumentModule = ({ code, fileName, firstId, runtimeModuleId, resolveOriginalLine = (line) => line }) => {
+	const annotations = createAnnotationIndex(code);
 	let program;
 	try {
 		program = parse(code, {
@@ -6192,7 +6266,8 @@ const instrumentModule = ({ code, fileName, firstId, runtimeModuleId, resolveOri
 			locations: true,
 			allowAwaitOutsideFunction: true,
 			allowReturnOutsideFunction: true,
-			allowHashBang: true
+			allowHashBang: true,
+			onComment: annotations.record
 		});
 	} catch {
 		return null;
@@ -6213,7 +6288,13 @@ const instrumentModule = ({ code, fileName, firstId, runtimeModuleId, resolveOri
 	const markStatement = (node) => {
 		const id = nextId(node);
 		if (id === null) return;
-		magic.appendLeft(node.start, `${SINK}&&(${SINK}[${id}]=1);`);
+		const marker = `${SINK}&&(${SINK}[${id}]=1);`;
+		const at = annotations.beforeStatement(node.start);
+		if (at === node.start) {
+			magic.appendLeft(at, marker);
+			return;
+		}
+		magic.appendLeft(at, `;${marker}`);
 	};
 	const openFunctionBody = (body) => {
 		magic.appendLeft(body.start + 1, `const ${SINK}=typeof ${ENTER}==="function"?${ENTER}():undefined;`);
@@ -6221,7 +6302,7 @@ const instrumentModule = ({ code, fileName, firstId, runtimeModuleId, resolveOri
 	const markConciseArrowBody = (body) => {
 		const id = nextId(body);
 		if (id === null) return;
-		magic.appendLeft(body.start, `(typeof ${HIT}==="function"&&${HIT}(${id}),`);
+		magic.appendLeft(annotations.beforeWrappedExpression(body.start), `(typeof ${HIT}==="function"&&${HIT}(${id}),`);
 		magic.appendRight(body.end, ")");
 	};
 	visitProgram(program, {