reg-cli 0.19.0-rc1 → 0.19.0-rc2

package/dist/index.cjs

@@ -50,7 +50,7 @@ const runInternal = async (argv, emitter) => {
 					if (msg.event) emitter.emit("compare", msg.event);
 					return;
 				case "thread-spawn":
-					spawn(msg.startArg, msg.threadId, msg.memory);
+					spawn(msg.startArg, msg.threadId, msg.memory, msg.wasmModule);
 					return;
 				case "worker-spans":
 					if (Array.isArray(msg.workerSpans)) threadWorkerSpans.push(...msg.workerSpans);
@@ -66,7 +66,7 @@ const runInternal = async (argv, emitter) => {
 			emitter.emit("error", e);
 		});
 	};
-	const spawn = (startArg, threadId, memory) => {
+	const spawn = (startArg, threadId, memory, wasmModule) => {
 		const t_new_worker = Date.now();
 		const w = new node_worker_threads.Worker((0, node_path.join)(dir(), `./runner.${require_tracing.resolveExtention()}`), { workerData: {
 			argv,
@@ -83,7 +83,8 @@ const runInternal = async (argv, emitter) => {
 		w.postMessage({
 			startArg,
 			tid,
-			memory
+			memory,
+			wasmModule
 		});
 		return tid;
 	};

package/dist/index.mjs

@@ -48,7 +48,7 @@ const runInternal = async (argv, emitter) => {
 					if (msg.event) emitter.emit("compare", msg.event);
 					return;
 				case "thread-spawn":
-					spawn(msg.startArg, msg.threadId, msg.memory);
+					spawn(msg.startArg, msg.threadId, msg.memory, msg.wasmModule);
 					return;
 				case "worker-spans":
 					if (Array.isArray(msg.workerSpans)) threadWorkerSpans.push(...msg.workerSpans);
@@ -64,7 +64,7 @@ const runInternal = async (argv, emitter) => {
 			emitter.emit("error", e);
 		});
 	};
-	const spawn = (startArg, threadId, memory) => {
+	const spawn = (startArg, threadId, memory, wasmModule) => {
 		const t_new_worker = Date.now();
 		const w = new Worker(join(dir(), `./runner.${resolveExtention()}`), { workerData: {
 			argv,
@@ -81,7 +81,8 @@ const runInternal = async (argv, emitter) => {
 		w.postMessage({
 			startArg,
 			tid,
-			memory
+			memory,
+			wasmModule
 		});
 		return tid;
 	};

package/dist/runner.cjs

@@ -105,7 +105,7 @@ const wasi = new _tybys_wasm_util.WASI({
 	fs: node_fs.default,
 	printErr
 });
-const wasmFile = require_tracing.readWasm();
+const wasmFile = mode === "entry" ? require_tracing.readWasm() : null;
 const readWasmString = (exports, memory, outputPtr) => {
 	const view = new DataView(memory.buffer, outputPtr);
 	const len = view.getUint32(0, true);
@@ -135,7 +135,7 @@ const makeSpanRecorder = (workerLabel) => {
 		tSpan
 	};
 };
-const makeThreadSpawnImport = (memory) => (startArg) => {
+const makeThreadSpawnImport = (memory, wasmModule) => (startArg) => {
 	const buf = new SharedArrayBuffer(4);
 	const id = new Int32Array(buf);
 	Atomics.store(id, 0, -1);
@@ -143,19 +143,26 @@ const makeThreadSpawnImport = (memory) => (startArg) => {
 		cmd: "thread-spawn",
 		startArg,
 		threadId: id,
-		memory
+		memory,
+		wasmModule
 	});
 	Atomics.wait(id, 0, -1);
 	return Atomics.load(id, 0);
 };
-const compileAndInstantiate = async (memory, tSpan, prefix) => {
-	const wasm = await tSpan(`${prefix}.wasm_compile`, async () => WebAssembly.compile(await wasmFile));
+const compileAndInstantiate = async (memory, tSpan, prefix, compiledModule) => {
+	const wasm = compiledModule ?? await tSpan(`${prefix}.wasm_compile`, async () => {
+		if (!wasmFile) throw new Error("Wasm bytes are unavailable in a thread worker");
+		return WebAssembly.compile(await wasmFile);
+	});
 	const wasi_snapshot_preview1 = require_tracing.filterWasiImports(wasm, wasi.getImportObject().wasi_snapshot_preview1);
-	return tSpan(`${prefix}.wasm_instantiate`, async () => WebAssembly.instantiate(wasm, {
-		wasi_snapshot_preview1,
-		wasi: { "thread-spawn": makeThreadSpawnImport(memory) },
-		env: { memory }
-	}));
+	return {
+		instance: await tSpan(`${prefix}.wasm_instantiate`, async () => WebAssembly.instantiate(wasm, {
+			wasi_snapshot_preview1,
+			wasi: { "thread-spawn": makeThreadSpawnImport(memory, wasm) },
+			env: { memory }
+		})),
+		module: wasm
+	};
 };
 if (mode === "entry") (async () => {
 	const entry_start_ms = Date.now();
@@ -165,7 +172,7 @@ if (mode === "entry") (async () => {
 		maximum: 16384,
 		shared: true
 	});
-	const instance = await compileAndInstantiate(memory, tSpan, "entry");
+	const { instance } = await compileAndInstantiate(memory, tSpan, "entry");
 	const exports = instance.exports;
 	await tSpan("entry.wasi_start", async () => {
 		wasi.start(instance);
@@ -199,11 +206,11 @@ if (mode === "entry") (async () => {
 		workerSpans
 	});
 })();
-else node_worker_threads.parentPort?.addListener("message", async ({ startArg, tid, memory }) => {
+else node_worker_threads.parentPort?.addListener("message", async ({ startArg, tid, memory, wasmModule }) => {
 	const workerLabel = `thread-${tid}`;
 	const handler_start_ms = Date.now();
 	const { workerSpans, tSpan } = makeSpanRecorder(workerLabel);
-	let instance = await compileAndInstantiate(memory, tSpan, "worker");
+	let { instance } = await compileAndInstantiate(memory, tSpan, "worker", wasmModule);
 	instance = createInstanceProxy(instance, memory);
 	await tSpan("worker.wasi_start", async () => {
 		wasi.start(instance);

package/dist/runner.mjs

@@ -104,7 +104,7 @@ const wasi = new WASI({
 	fs,
 	printErr
 });
-const wasmFile = readWasm();
+const wasmFile = mode === "entry" ? readWasm() : null;
 const readWasmString = (exports, memory, outputPtr) => {
 	const view = new DataView(memory.buffer, outputPtr);
 	const len = view.getUint32(0, true);
@@ -134,7 +134,7 @@ const makeSpanRecorder = (workerLabel) => {
 		tSpan
 	};
 };
-const makeThreadSpawnImport = (memory) => (startArg) => {
+const makeThreadSpawnImport = (memory, wasmModule) => (startArg) => {
 	const buf = new SharedArrayBuffer(4);
 	const id = new Int32Array(buf);
 	Atomics.store(id, 0, -1);
@@ -142,19 +142,26 @@ const makeThreadSpawnImport = (memory) => (startArg) => {
 		cmd: "thread-spawn",
 		startArg,
 		threadId: id,
-		memory
+		memory,
+		wasmModule
 	});
 	Atomics.wait(id, 0, -1);
 	return Atomics.load(id, 0);
 };
-const compileAndInstantiate = async (memory, tSpan, prefix) => {
-	const wasm = await tSpan(`${prefix}.wasm_compile`, async () => WebAssembly.compile(await wasmFile));
+const compileAndInstantiate = async (memory, tSpan, prefix, compiledModule) => {
+	const wasm = compiledModule ?? await tSpan(`${prefix}.wasm_compile`, async () => {
+		if (!wasmFile) throw new Error("Wasm bytes are unavailable in a thread worker");
+		return WebAssembly.compile(await wasmFile);
+	});
 	const wasi_snapshot_preview1 = filterWasiImports(wasm, wasi.getImportObject().wasi_snapshot_preview1);
-	return tSpan(`${prefix}.wasm_instantiate`, async () => WebAssembly.instantiate(wasm, {
-		wasi_snapshot_preview1,
-		wasi: { "thread-spawn": makeThreadSpawnImport(memory) },
-		env: { memory }
-	}));
+	return {
+		instance: await tSpan(`${prefix}.wasm_instantiate`, async () => WebAssembly.instantiate(wasm, {
+			wasi_snapshot_preview1,
+			wasi: { "thread-spawn": makeThreadSpawnImport(memory, wasm) },
+			env: { memory }
+		})),
+		module: wasm
+	};
 };
 if (mode === "entry") (async () => {
 	const entry_start_ms = Date.now();
@@ -164,7 +171,7 @@ if (mode === "entry") (async () => {
 		maximum: 16384,
 		shared: true
 	});
-	const instance = await compileAndInstantiate(memory, tSpan, "entry");
+	const { instance } = await compileAndInstantiate(memory, tSpan, "entry");
 	const exports = instance.exports;
 	await tSpan("entry.wasi_start", async () => {
 		wasi.start(instance);
@@ -198,11 +205,11 @@ if (mode === "entry") (async () => {
 		workerSpans
 	});
 })();
-else parentPort?.addListener("message", async ({ startArg, tid, memory }) => {
+else parentPort?.addListener("message", async ({ startArg, tid, memory, wasmModule }) => {
 	const workerLabel = `thread-${tid}`;
 	const handler_start_ms = Date.now();
 	const { workerSpans, tSpan } = makeSpanRecorder(workerLabel);
-	let instance = await compileAndInstantiate(memory, tSpan, "worker");
+	let { instance } = await compileAndInstantiate(memory, tSpan, "worker", wasmModule);
 	instance = createInstanceProxy(instance, memory);
 	await tSpan("worker.wasi_start", async () => {
 		wasi.start(instance);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reg-cli",
-  "version": "0.19.0-rc1",
+  "version": "0.19.0-rc2",
   "description": "Visual regression testing CLI, Wasm-backed. Drop-in compatible with classic reg-cli's CLI flags, reg.json/junit schema, and `compare()` EventEmitter API (verified against reg-suit's processor.ts).",
   "type": "module",
   "exports": {