@wyw-in-js/transform 2.0.0-alpha.0 → 2.0.0-alpha.1

package/esm/eval/protocol.js.map

@@ -1 +1 @@
-{"mappings":"","names":[],"sources":["../../src/eval/protocol.ts"],"version":3,"sourcesContent":["import type {\n  EvalResolverKind,\n  EvalWarning,\n  FeatureFlags,\n  ImportOverrides,\n} from '@wyw-in-js/shared';\n\nimport type { SerializedError, SerializedValue } from './serialize';\n\nexport type EvalRunnerInitPayload = {\n  evalOptions: {\n    mode: 'strict' | 'loose';\n    require: 'warn-and-run' | 'error' | 'off';\n    globals: Record<string, unknown>;\n    importOverrides?: ImportOverrides;\n    root?: string;\n    extensions?: string[];\n  };\n  features: FeatureFlags<'happyDOM'>;\n  entrypoint: string;\n  reuseModules?: boolean;\n};\n\nexport type EvalRequest = {\n  id: string;\n};\n\nexport type EvalResultPayload = {\n  values: Record<string, SerializedValue> | null;\n  modules?: Record<string, Record<string, SerializedValue>>;\n};\n\nexport type ResolveRequestPayload = {\n  specifier: string;\n  importerId: string;\n  kind: EvalResolverKind;\n};\n\nexport type ResolveResultPayload = {\n  resolvedId: string | null;\n  external?: boolean;\n  error?: SerializedError;\n};\n\nexport type LoadRequestPayload = {\n  id: string;\n  importerId?: string | null;\n  request?: string | null;\n};\n\nexport type LoadResultPayload = {\n  id: string;\n  code?: string;\n  codeChunk?: string;\n  chunkIndex?: number;\n  chunkCount?: number;\n  map?: unknown;\n  hash?: string;\n  only?: string[];\n  exports?: Record<string, SerializedValue>;\n  error?: SerializedError;\n};\n\nexport type InitMessage = {\n  type: 'INIT';\n  id: string;\n  payload: EvalRunnerInitPayload;\n};\n\nexport type InitAckMessage = {\n  type: 'INIT_ACK';\n  id: string;\n  error?: SerializedError;\n  // Set by the runner when it just reset its moduleCache during INIT (full\n  // reset on context rebuild, or `reuseModules: false`). The broker uses\n  // this to invalidate its \"what runner has\" mirror without doing any\n  // payload hashing or stringification on its own hot path.\n  modulesReset?: boolean;\n};\n\nexport type EvalMessage = {\n  type: 'EVAL';\n  id: string;\n  payload: EvalRequest;\n};\n\nexport type EvalResultMessage = {\n  type: 'EVAL_RESULT';\n  id: string;\n  payload: EvalResultPayload;\n  error?: SerializedError;\n};\n\nexport type ResolveMessage = {\n  type: 'RESOLVE';\n  id: string;\n  payload: ResolveRequestPayload;\n};\n\nexport type ResolveResultMessage = {\n  type: 'RESOLVE_RESULT';\n  id: string;\n  payload: ResolveResultPayload;\n};\n\nexport type LoadMessage = {\n  type: 'LOAD';\n  id: string;\n  payload: LoadRequestPayload;\n};\n\nexport type LoadResultMessage = {\n  type: 'LOAD_RESULT';\n  id: string;\n  payload: LoadResultPayload;\n};\n\nexport type WarnMessage = {\n  type: 'WARN';\n  payload: EvalWarning;\n};\n\nexport type RunnerToMainMessage =\n  | ResolveMessage\n  | LoadMessage\n  | WarnMessage\n  | InitAckMessage\n  | EvalResultMessage;\n\nexport type MainToRunnerMessage =\n  | InitMessage\n  | EvalMessage\n  | ResolveResultMessage\n  | LoadResultMessage;\n"],"file":"protocol.js"}
+{"mappings":"","names":[],"sources":["../../src/eval/protocol.ts"],"version":3,"sourcesContent":["import type {\n  EvalResolverKind,\n  EvalWarning,\n  FeatureFlags,\n  ImportOverrides,\n} from '@wyw-in-js/shared';\n\nimport type { SerializedError, SerializedValue } from './serialize';\n\nexport type EvalRunnerInitPayload = {\n  evalOptions: {\n    errors: 'strict' | 'loose';\n    require: 'warn-and-run' | 'error' | 'off';\n    globals: Record<string, unknown>;\n    importOverrides?: ImportOverrides;\n    root?: string;\n    extensions?: string[];\n  };\n  features: FeatureFlags<'happyDOM'>;\n  debugEvalFiles?: boolean;\n  entrypoint: string;\n  reuseModules?: boolean;\n};\n\nexport type EvalRequest = {\n  id: string;\n};\n\nexport type EvalResultPayload = {\n  values: Record<string, SerializedValue> | null;\n  modules?: Record<string, Record<string, SerializedValue>>;\n  debugEvalFiles?: Record<string, DebugEvalFileValues>;\n};\n\nexport type DebugEvalFileValue =\n  | {\n      serialized: SerializedValue;\n      status: 'serialized';\n    }\n  | {\n      reason: string;\n      status: 'stringified';\n      stringified: string;\n    };\n\nexport type DebugEvalFileValues = {\n  exports?: Record<string, DebugEvalFileValue>;\n  preval?: Record<string, DebugEvalFileValue>;\n};\n\nexport type ResolveRequestPayload = {\n  specifier: string;\n  importerId: string;\n  kind: EvalResolverKind;\n};\n\nexport type ResolveResultPayload = {\n  resolvedId: string | null;\n  external?: boolean;\n  error?: SerializedError;\n};\n\nexport type LoadRequestPayload = {\n  id: string;\n  importerId?: string | null;\n  request?: string | null;\n};\n\nexport type LoadResultPayload = {\n  id: string;\n  code?: string;\n  codeChunk?: string;\n  chunkIndex?: number;\n  chunkCount?: number;\n  map?: unknown;\n  hash?: string;\n  only?: string[];\n  exports?: Record<string, SerializedValue>;\n  error?: SerializedError;\n};\n\nexport type InitMessage = {\n  type: 'INIT';\n  id: string;\n  payload: EvalRunnerInitPayload;\n};\n\nexport type InitAckMessage = {\n  type: 'INIT_ACK';\n  id: string;\n  error?: SerializedError;\n  // Set by the runner when it just reset its moduleCache during INIT (full\n  // reset on context rebuild, or `reuseModules: false`). The broker uses\n  // this to invalidate its \"what runner has\" mirror without doing any\n  // payload hashing or stringification on its own hot path.\n  modulesReset?: boolean;\n};\n\nexport type EvalMessage = {\n  type: 'EVAL';\n  id: string;\n  payload: EvalRequest;\n};\n\nexport type EvalResultMessage = {\n  type: 'EVAL_RESULT';\n  id: string;\n  payload: EvalResultPayload;\n  error?: SerializedError;\n};\n\nexport type ResolveMessage = {\n  type: 'RESOLVE';\n  id: string;\n  payload: ResolveRequestPayload;\n};\n\nexport type ResolveResultMessage = {\n  type: 'RESOLVE_RESULT';\n  id: string;\n  payload: ResolveResultPayload;\n};\n\nexport type LoadMessage = {\n  type: 'LOAD';\n  id: string;\n  payload: LoadRequestPayload;\n};\n\nexport type LoadResultMessage = {\n  type: 'LOAD_RESULT';\n  id: string;\n  payload: LoadResultPayload;\n};\n\nexport type WarnMessage = {\n  type: 'WARN';\n  payload: EvalWarning;\n};\n\nexport type RunnerToMainMessage =\n  | ResolveMessage\n  | LoadMessage\n  | WarnMessage\n  | InitAckMessage\n  | EvalResultMessage;\n\nexport type MainToRunnerMessage =\n  | InitMessage\n  | EvalMessage\n  | ResolveResultMessage\n  | LoadResultMessage;\n"],"file":"protocol.js"}

package/esm/eval/runner.js

@@ -706,7 +706,7 @@ const state = {
 	happyDomEnabled: null,
 	globalsSignature: null,
 	evalOptions: {
-		mode: "strict",
+		errors: "strict",
 		require: "warn-and-run",
 		globals: {},
 		importOverrides: undefined,
@@ -714,6 +714,7 @@ const state = {
 		extensions: []
 	},
 	features: {},
+	debugEvalFiles: false,
 	entrypoint: "eval-runner"
 };
 const moduleCache = new LruCache(LOAD_CACHE_SIZE);
@@ -729,12 +730,23 @@ const resolveCache = new LruCache(RESOLVE_CACHE_SIZE);
 const resolveInFlight = new Map();
 const pending = new Map();
 const loadResultChunks = new Map();
+// Ids evicted during the in-flight EVAL session via resetSingleModuleState.
+// Surfaced in EVAL_RESULT so the broker can drop matching entries from its
+// "what runner has" mirror (lastSentLoadByModule) — otherwise the broker would
+// keep short-circuiting subsequent LOADs with empty `code` and the runner
+// would have no way to obtain fresh source.
+const evictedThisSession = new Set();
 let nextId = 0;
 const stdoutWriteQueue = [];
 let stdoutWriteInFlight = false;
 let stdoutWriteFailed = null;
 let shutdownRequested = false;
 let shutdownFinished = false;
+// Tracks the SourceTextModule identifier (versioned with hash) that was last
+// included in an EVAL_RESULT for each id. Reused module variants don't need
+// re-serialization across eval sessions — same variant = same namespace =
+// same exports the broker already has cached.
+const sentNamespaceIdentifiers = new Map();
 const resetModuleState = () => {
 	moduleCache.clear();
 	moduleHashes.clear();
@@ -749,11 +761,6 @@ const resetModuleState = () => {
 	resolveCache.clear();
 	sentNamespaceIdentifiers.clear();
 };
-// Tracks the SourceTextModule identifier (versioned with hash) that was last
-// included in an EVAL_RESULT for each id. Reused module variants don't need
-// re-serialization across eval sessions — same variant = same namespace =
-// same exports the broker already has cached.
-const sentNamespaceIdentifiers = new Map();
 const resetSingleModuleState = (id, cachedModule = moduleCache.get(id)) => {
 	if (cachedModule) {
 		linkPromises.delete(cachedModule);
@@ -767,6 +774,16 @@ const resetSingleModuleState = (id, cachedModule = moduleCache.get(id)) => {
 	moduleData.delete(id);
 	moduleVariants.delete(id);
 	moduleLastVariant.delete(id);
+	sentNamespaceIdentifiers.delete(id);
+};
+// Stronger reset for error paths: clears moduleOnly too and records the id so
+// the broker can drop its lastSentLoadByModule entry. Used when a module's
+// SourceTextModule has reached an unrecoverable state (e.g. link errored
+// against a transient missing import) and should not be reused.
+const evictPoisonedModule = (id) => {
+	resetSingleModuleState(id);
+	moduleOnly.delete(id);
+	evictedThisSession.add(id);
 };
 const isFullModuleLoad = (loaded) => !loaded.only || loaded.only.length === 1 && loaded.only[0] === "*";
 const getModuleVariant = (id, hash) => moduleVariants.get(id)?.get(hash);
@@ -924,6 +941,22 @@ const sendWarn = (warning) => {
 		payload: warning
 	});
 };
+const reviveSerializedError = (error) => {
+	if (error instanceof Error) {
+		return error;
+	}
+	const revived = new Error(error?.message ?? String(error));
+	if (error?.name) {
+		revived.name = error.name;
+	}
+	if (error?.stack) {
+		revived.stack = error.stack;
+	}
+	if (error?.cause) {
+		revived.cause = reviveSerializedError(error.cause);
+	}
+	return revived;
+};
 const serializeError = (error) => {
 	const result = {
 		message: error?.message ?? String(error),
@@ -1022,12 +1055,12 @@ const createRequireFn = (importer) => {
 			throw new Error(`[wyw-in-js] require() fallback is disabled by eval.require: 'off'.`);
 		}
 		if (nonLiteral || typeof specifier !== "string") {
-			if (state.evalOptions.mode === "strict") {
+			if (state.evalOptions.errors === "strict") {
 				throw new Error(`[wyw-in-js] Non-literal require() is not supported during eval.\n` + `importer: ${importerFile}\n` + `hint: make it a string literal or mock the import via importOverrides.`);
 			}
 			sendWarn({
 				code: "require-error",
-				message: "[wyw-in-js] Non-literal require() reached during eval (loose mode).",
+				message: "[wyw-in-js] Non-literal require() reached during eval (eval.errors: \"loose\").",
 				importer: importerFile
 			});
 			return {};
@@ -1225,6 +1258,16 @@ const linkModule = async (module) => {
 			await module.link((specifier, referencingModule) => resolveModule(specifier, referencingModule.identifier, "import"));
 			return module;
 		} catch (error) {
+			// The vm SourceTextModule is now in 'errored' (or partially-linked)
+			// state and can never be re-linked. With reuseModules:true the cached
+			// module would otherwise stick around and short-circuit linkModule's
+			// status guard above on the next session — surfacing the original
+			// failure forever even after the user fixes the underlying problem.
+			// Drop it so the next LOAD rebuilds a fresh SourceTextModule.
+			const identifier = typeof module.identifier === "string" ? module.identifier : null;
+			if (identifier) {
+				evictPoisonedModule(toSourceModuleId(identifier));
+			}
 			// ERR_VM_MODULE_LINK_FAILURE means a dependency is in "errored" state.
 			// Node chains .cause through the link failure hierarchy. Walk to the
 			// deepest cause to surface the original evaluation error (e.g. a
@@ -1267,7 +1310,7 @@ resolveModule = async (specifier, importer, kind) => {
 	const cached = resolveCache.get(key);
 	if (cached) {
 		if (!cached.resolvedId) {
-			if (state.evalOptions.mode === "loose") {
+			if (state.evalOptions.errors === "loose") {
 				return createSyntheticModule(specifier, { default: undefined });
 			}
 			throw new Error([
@@ -1312,7 +1355,7 @@ resolveModule = async (specifier, importer, kind) => {
 			external: Boolean(resolved.external)
 		});
 		if (!normalized) {
-			if (state.evalOptions.mode === "loose") {
+			if (state.evalOptions.errors === "loose") {
 				return createSyntheticModule(specifier, { default: undefined });
 			}
 			throw new Error([
@@ -1355,7 +1398,29 @@ loadModule = async (id, importer, requestSpec) => {
 			durationMs: Date.now() - loadStart
 		});
 		if (loaded.error) {
-			throw new Error(loaded.error.message);
+			// Surface the importer + specifier alongside the broker's message.
+			// Without this, ENOENT and similar load failures bubble up as a bare
+			// path (or, after Node's VM wraps them, as the opaque
+			// ERR_VM_MODULE_STATUS) leaving no clue which file's import is broken.
+			const detail = [
+				`[wyw-in-js] Failed to load module during evaluation.`,
+				`  importer: ${importer ?? "(unknown)"}`,
+				`  request:  ${requestSpec ?? id}`,
+				`  resolved: ${id}`,
+				`  cause:    ${loaded.error.message}`
+			].join("\n");
+			// The importer's SourceTextModule (if it was already created and
+			// cached) compiled this `import` against `id`; reusing it next session
+			// would link against the same id and either re-trigger the failure or
+			// skip linking via the status guard. Drop both so the next session
+			// pulls fresh code for both ends of the broken edge.
+			if (importer && importer !== id) {
+				evictPoisonedModule(toSourceModuleId(importer));
+			}
+			evictPoisonedModule(id);
+			const enhanced = new Error(detail);
+			enhanced.cause = reviveSerializedError(loaded.error);
+			throw enhanced;
 		}
 		if (loaded.only) {
 			const current = moduleOnly.get(id) ?? [];
@@ -1379,12 +1444,7 @@ loadModule = async (id, importer, requestSpec) => {
 			if (!evaluated) {
 				const variants = moduleVariants.get(id);
 				if (variants) {
-					for (const variant of variants.values()) {
-						if (variant.status === "evaluated" && coversKeys(variant)) {
-							evaluated = variant;
-							break;
-						}
-					}
+					evaluated = Array.from(variants.values()).find((variant) => variant.status === "evaluated" && coversKeys(variant));
 				}
 			}
 			if (evaluated) {
@@ -1467,7 +1527,7 @@ const createDynamicImportFn = (importer) => {
 				message: "[wyw-in-js] Dynamic import with non-string specifier during eval.",
 				importer
 			});
-			if (state.evalOptions.mode === "strict") {
+			if (state.evalOptions.errors === "strict") {
 				throw new Error(`[wyw-in-js] Dynamic import with non-string specifier is not supported during eval.\n` + `importer: ${importer}\n` + `hint: make it a string literal or mock the import via importOverrides.`);
 			}
 			return createSyntheticModule(`dynamic:${String(specifier)}`, { default: undefined });
@@ -1518,8 +1578,21 @@ const resolveExportValue = (source, key) => {
 	}
 	return undefined;
 };
+const stringifyDebugValue = (value) => {
+	try {
+		const json = JSON.stringify(value);
+		if (json !== undefined) return json;
+	} catch {}
+	try {
+		return String(value);
+	} catch {
+		return Object.prototype.toString.call(value);
+	}
+};
+const serializeDebugReason = (error) => error instanceof Error ? error.message : String(error);
 const collectModuleExports = () => {
 	const exportsByModule = {};
+	const debugEvalFiles = state.debugEvalFiles ? {} : undefined;
 	moduleOnly.forEach((only, id) => {
 		if (!only || only.length === 0) return;
 		const module = moduleCache.get(id) ?? moduleLastVariant.get(id);
@@ -1551,6 +1624,7 @@ const collectModuleExports = () => {
 		const keys = Array.from(new Set([...requestedKeys, ...discoveredKeys]));
 		if (keys.length === 0) return;
 		const serialized = {};
+		const debugExports = state.debugEvalFiles ? {} : undefined;
 		keys.forEach((key) => {
 			const value = resolveExportValue(source, key);
 			try {
@@ -1558,14 +1632,34 @@ const collectModuleExports = () => {
 					rootLabel: "module exports",
 					path: [id, key]
 				});
-			} catch {}
+				if (debugExports) {
+					debugExports[key] = {
+						serialized: serialized[key],
+						status: "serialized"
+					};
+				}
+			} catch (error) {
+				if (debugExports) {
+					debugExports[key] = {
+						reason: serializeDebugReason(error),
+						status: "stringified",
+						stringified: stringifyDebugValue(value)
+					};
+				}
+			}
 		});
+		if (debugEvalFiles && debugExports && Object.keys(debugExports).length) {
+			debugEvalFiles[id] = { exports: debugExports };
+		}
 		if (Object.keys(serialized).length) {
 			exportsByModule[id] = serialized;
 			sentNamespaceIdentifiers.set(id, moduleIdentifier);
 		}
 	});
-	return exportsByModule;
+	return {
+		debugEvalFiles,
+		modules: exportsByModule
+	};
 };
 async function evaluateEntrypoint(id) {
 	const evalStart = Date.now();
@@ -1590,9 +1684,10 @@ async function evaluateEntrypoint(id) {
 	const hasPrevalExport = exportsValue && typeof exportsValue === "object" && "__wywPreval" in exportsValue;
 	const { namespace } = module;
 	const hasPrevalNamespace = namespace && typeof namespace === "object" && "__wywPreval" in namespace;
-	const modules = collectModuleExports();
+	const { debugEvalFiles, modules } = collectModuleExports();
 	if (!hasPrevalExport && !hasPrevalNamespace) {
 		return {
+			debugEvalFiles,
 			values: null,
 			modules
 		};
@@ -1600,11 +1695,13 @@ async function evaluateEntrypoint(id) {
 	const preval = hasPrevalExport ? exportsValue.__wywPreval : namespace.__wywPreval;
 	if (!preval || typeof preval !== "object") {
 		return {
+			debugEvalFiles,
 			values: null,
 			modules
 		};
 	}
 	const values = {};
+	const debugPreval = state.debugEvalFiles ? {} : undefined;
 	Object.entries(preval).forEach(([key, lazy]) => {
 		let value;
 		try {
@@ -1618,8 +1715,21 @@ async function evaluateEntrypoint(id) {
 			rootLabel: "__wywPreval",
 			path: [key]
 		});
+		if (debugPreval) {
+			debugPreval[key] = {
+				serialized: values[key],
+				status: "serialized"
+			};
+		}
 	});
+	if (debugEvalFiles && debugPreval && Object.keys(debugPreval).length) {
+		debugEvalFiles[id] = {
+			...debugEvalFiles[id] ?? {},
+			preval: debugPreval
+		};
+	}
 	return {
+		debugEvalFiles,
 		values,
 		modules
 	};
@@ -1633,6 +1743,7 @@ const handleMessage = async (message) => {
 				const encodedGlobals = message.payload.evalOptions.globals ?? {};
 				const nextGlobalsSignature = JSON.stringify(canonicalizeForSignature(encodedGlobals));
 				const nextFeatures = message.payload.features ?? {};
+				const nextDebugEvalFiles = Boolean(message.payload.debugEvalFiles);
 				const nextEntrypoint = message.payload.entrypoint ?? "eval-runner";
 				const nextHappyDomEnabled = isFeatureEnabled(nextFeatures, "happyDOM", nextEntrypoint);
 				const globalsChanged = state.globalsSignature !== null && state.globalsSignature !== nextGlobalsSignature;
@@ -1663,6 +1774,7 @@ const handleMessage = async (message) => {
 					}
 					state.evalOptions = nextEvalOptions;
 					state.features = nextFeatures;
+					state.debugEvalFiles = nextDebugEvalFiles;
 					state.entrypoint = nextEntrypoint;
 					Object.assign(state.context, {
 						__dirname: path.dirname(nextEntrypoint),
@@ -1682,6 +1794,7 @@ const handleMessage = async (message) => {
 				resetEvaluationState();
 				state.evalOptions = nextEvalOptions;
 				state.features = nextFeatures;
+				state.debugEvalFiles = nextDebugEvalFiles;
 				state.entrypoint = nextEntrypoint;
 				debug("init:globals", Date.now() - initStart);
 				const windowStart = Date.now();
@@ -1711,21 +1824,27 @@ const handleMessage = async (message) => {
 			break;
 		}
 		case "EVAL": {
+			evictedThisSession.clear();
 			try {
-				const { values, modules } = await evaluateEntrypoint(message.payload.id);
+				const { debugEvalFiles, values, modules } = await evaluateEntrypoint(message.payload.id);
 				sendMessage({
 					type: "EVAL_RESULT",
 					id: message.id,
 					payload: {
+						...debugEvalFiles ? { debugEvalFiles } : {},
 						values,
-						modules
+						modules,
+						evictedIds: Array.from(evictedThisSession)
 					}
 				});
 			} catch (error) {
 				sendMessage({
 					type: "EVAL_RESULT",
 					id: message.id,
-					payload: { values: null },
+					payload: {
+						values: null,
+						evictedIds: Array.from(evictedThisSession)
+					},
 					error: serializeError(error)
 				});
 			}