@vitest/web-worker 4.0.0-beta.4 → 4.0.0-beta.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-Present Vitest Team
+Copyright (c) 2021-Present VoidZero Inc. and Vitest contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.js

@@ -1,7 +1,6 @@
 import { defineWebWorkers } from './pure.js';
 import 'node:worker_threads';
-import 'vitest/execute';
-import 'node:fs';
+import 'vitest/internal/module-runner';
 import 'debug';
 
 defineWebWorkers();

package/dist/pure.js

@@ -1,21 +1,28 @@
 import { MessageChannel } from 'node:worker_threads';
-import { VitestExecutor } from 'vitest/execute';
-import { readFileSync as readFileSync$1 } from 'node:fs';
+import { getWorkerState, VitestModuleEvaluator, startVitestModuleRunner, VITEST_VM_CONTEXT_SYMBOL } from 'vitest/internal/module-runner';
 import createDebug from 'debug';
 
-class InlineWorkerRunner extends VitestExecutor {
-	constructor(options, context) {
-		// share the same mocker as main executor
-		const mocker = globalThis.__vitest_mocker__;
-		super(options);
-		this.context = context;
-		this.mocker = globalThis.__vitest_mocker__ = mocker;
-	}
-	prepareContext(context) {
-		const ctx = super.prepareContext(context);
-		// not supported for now, we can't synchronously load modules
-		return Object.assign(ctx, this.context, { importScripts });
-	}
+function startWebWorkerModuleRunner(context) {
+	const state = getWorkerState();
+	const mocker = globalThis.__vitest_mocker__;
+	const compiledFunctionArgumentsNames = Object.keys(context);
+	const compiledFunctionArgumentsValues = Object.values(context);
+	compiledFunctionArgumentsNames.push("importScripts");
+	compiledFunctionArgumentsValues.push(importScripts);
+	const vm = globalThis[VITEST_VM_CONTEXT_SYMBOL];
+	const evaluator = new VitestModuleEvaluator(vm, {
+		interopDefault: state.config.deps.interopDefault,
+		moduleExecutionInfo: state.moduleExecutionInfo,
+		getCurrentTestFilepath: () => state.filepath,
+		compiledFunctionArgumentsNames,
+		compiledFunctionArgumentsValues
+	});
+	return startVitestModuleRunner({
+		evaluator,
+		evaluatedModules: state.evaluatedModules,
+		mocker,
+		state
+	});
 }
 function importScripts() {
 	throw new Error("[vitest] `importScripts` is not supported in Vite workers. Please, consider using `import` instead.");
@@ -297,13 +304,7 @@ var ponyfillStructuredClone = typeof structuredClone === "function" ?
   ) :
   (any, options) => deserialize(serialize(any, options));
 
-// keep the reference in case it was mocked
-const readFileSync = readFileSync$1;
 const debug = createDebug("vitest:web-worker");
-function getWorkerState() {
-	// @ts-expect-error untyped global
-	return globalThis.__vitest_worker__;
-}
 function assertGlobalExists(name) {
 	if (!(name in globalThis)) {
 		throw new Error(`[@vitest/web-worker] Cannot initiate a custom Web Worker. "${name}" is not supported in this environment. Please, consider using jsdom or happy-dom environment.`);
@@ -344,30 +345,6 @@ function createMessageEvent(data, transferOrOptions, clone) {
 		return new MessageEvent("messageerror", { data: error });
 	}
 }
-function getRunnerOptions() {
-	const state = getWorkerState();
-	const { config, rpc, moduleCache, moduleExecutionInfo } = state;
-	return {
-		async fetchModule(id) {
-			const result = await rpc.fetch(id, "web");
-			if (result.id && !result.externalize) {
-				const code = readFileSync(result.id, "utf-8");
-				return { code };
-			}
-			return result;
-		},
-		resolveId(id, importer) {
-			return rpc.resolveId(id, importer, "web");
-		},
-		moduleCache,
-		moduleExecutionInfo,
-		interopDefault: config.deps.interopDefault ?? true,
-		moduleDirectories: config.deps.moduleDirectories,
-		root: config.root,
-		base: config.base,
-		state
-	};
-}
 function stripProtocol(url) {
 	return url.toString().replace(/^file:\/+/, "/");
 }
@@ -429,7 +406,6 @@ function convertNodePortToWebPort(port) {
 	return port;
 }
 function createSharedWorkerConstructor() {
-	const runnerOptions = getRunnerOptions();
 	return class SharedWorker extends EventTarget {
 		static __VITEST_WEB_WORKER__ = true;
 		_vw_workerTarget = new EventTarget();
@@ -452,9 +428,6 @@ function createSharedWorkerConstructor() {
 				onrtctransform: null,
 				onunhandledrejection: null,
 				origin: typeof location !== "undefined" ? location.origin : "http://localhost:3000",
-				importScripts: () => {
-					throw new Error("[vitest] `importScripts` is not supported in Vite workers. Please, consider using `import` instead.");
-				},
 				crossOriginIsolated: false,
 				onconnect: null,
 				name: name || "",
@@ -484,17 +457,17 @@ function createSharedWorkerConstructor() {
 			this._vw_workerTarget.addEventListener("connect", (e) => {
 				context.onconnect?.(e);
 			});
-			const runner = new InlineWorkerRunner(runnerOptions, context);
-			const id = getFileIdFromUrl(url);
-			this._vw_name = id;
-			runner.resolveUrl(id).then(([, fsPath]) => {
-				this._vw_name = name ?? fsPath;
-				debug("initialize shared worker %s", this._vw_name);
-				return runner.executeFile(fsPath).then(() => {
-					// worker should be new every time, invalidate its sub dependency
-					runnerOptions.moduleCache.invalidateSubDepTree([fsPath, runner.mocker.getMockPath(fsPath)]);
-					this._vw_workerTarget.dispatchEvent(new MessageEvent("connect", { ports: [this._vw_workerPort] }));
-					debug("shared worker %s successfully initialized", this._vw_name);
+			const fileId = getFileIdFromUrl(url);
+			this._vw_name = fileId;
+			startWebWorkerModuleRunner(context).then((runner) => {
+				return runner.mocker.resolveId(fileId).then(({ url, id: resolvedId }) => {
+					this._vw_name = name ?? url;
+					debug("initialize shared worker %s", this._vw_name);
+					return runner.import(url).then(() => {
+						runner._invalidateSubTreeById([resolvedId, runner.mocker.getMockPath(resolvedId)]);
+						this._vw_workerTarget.dispatchEvent(new MessageEvent("connect", { ports: [this._vw_workerPort] }));
+						debug("shared worker %s successfully initialized", this._vw_name);
+					});
 				});
 			}).catch((e) => {
 				debug("shared worker %s failed to initialize: %o", this._vw_name, e);
@@ -512,7 +485,6 @@ function createSharedWorkerConstructor() {
 }
 
 function createWorkerConstructor(options) {
-	const runnerOptions = getRunnerOptions();
 	const cloneType = () => options?.clone ?? process.env.VITEST_WEB_WORKER_CLONE ?? "native";
 	return class Worker extends EventTarget {
 		static __VITEST_WEB_WORKER__ = true;
@@ -539,9 +511,6 @@ function createWorkerConstructor(options) {
 				onrtctransform: null,
 				onunhandledrejection: null,
 				origin: typeof location !== "undefined" ? location.origin : "http://localhost:3000",
-				importScripts: () => {
-					throw new Error("[vitest] `importScripts` is not supported in Vite workers. Please, consider using `import` instead.");
-				},
 				crossOriginIsolated: false,
 				name: options?.name || "",
 				close: () => this.terminate(),
@@ -584,21 +553,21 @@ function createWorkerConstructor(options) {
 			this.addEventListener("messageerror", (e) => {
 				this.onmessageerror?.(e);
 			});
-			const runner = new InlineWorkerRunner(runnerOptions, context);
-			const id = getFileIdFromUrl(url);
-			this._vw_name = id;
-			runner.resolveUrl(id).then(([, fsPath]) => {
-				this._vw_name = options?.name ?? fsPath;
-				debug("initialize worker %s", this._vw_name);
-				return runner.executeFile(fsPath).then(() => {
-					// worker should be new every time, invalidate its sub dependency
-					runnerOptions.moduleCache.invalidateSubDepTree([fsPath, runner.mocker.getMockPath(fsPath)]);
-					const q = this._vw_messageQueue;
-					this._vw_messageQueue = null;
-					if (q) {
-						q.forEach(([data, transfer]) => this.postMessage(data, transfer), this);
-					}
-					debug("worker %s successfully initialized", this._vw_name);
+			const fileId = getFileIdFromUrl(url);
+			this._vw_name = fileId;
+			startWebWorkerModuleRunner(context).then((runner) => {
+				return runner.mocker.resolveId(fileId).then(({ url, id: resolvedId }) => {
+					this._vw_name = options?.name ?? url;
+					debug("initialize worker %s", this._vw_name);
+					return runner.import(url).then(() => {
+						runner._invalidateSubTreeById([resolvedId, runner.mocker.getMockPath(resolvedId)]);
+						const q = this._vw_messageQueue;
+						this._vw_messageQueue = null;
+						if (q) {
+							q.forEach(([data, transfer]) => this.postMessage(data, transfer), this);
+						}
+						debug("worker %s successfully initialized", this._vw_name);
+					});
 				});
 			}).catch((e) => {
 				debug("worker %s failed to initialize: %o", this._vw_name, e);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/web-worker",
   "type": "module",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "description": "Web Worker support for testing in Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "4.0.0-beta.4"
+    "vitest": "4.0.0-beta.6"
   },
   "dependencies": {
     "debug": "^4.4.1"