@vitest/web-worker 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.js

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

package/dist/pure.js

@@ -1,6 +1,6 @@
 import { VitestExecutor } from 'vitest/execute';
 import createDebug from 'debug';
-import { MessageChannel } from 'worker_threads';
+import { MessageChannel } from 'node:worker_threads';
 
 class InlineWorkerRunner extends VitestExecutor {
   constructor(options, context) {
@@ -287,7 +287,7 @@ function assertGlobalExists(name) {
     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.`);
 }
 function createClonedMessageEvent(data, transferOrOptions, clone) {
-  const transfer = Array.isArray(transferOrOptions) ? transferOrOptions : transferOrOptions == null ? void 0 : transferOrOptions.transfer;
+  const transfer = Array.isArray(transferOrOptions) ? transferOrOptions : transferOrOptions?.transfer;
   debug("clone worker message %o", data);
   const origin = typeof location === "undefined" ? void 0 : location.origin;
   if (typeof structuredClone === "function" && clone === "native") {
@@ -299,7 +299,7 @@ function createClonedMessageEvent(data, transferOrOptions, clone) {
   }
   if (clone !== "none") {
     debug("create message event, using polyfilled structured clone");
-    (transfer == null ? void 0 : transfer.length) && console.warn(
+    transfer?.length && console.warn(
       '[@vitest/web-worker] `structuredClone` is not supported in this environment. Falling back to polyfill, your transferable options will be lost. Set `VITEST_WEB_WORKER_CLONE` environmental variable to "none", if you don\'t want to loose it,or update to Node 17+.'
     );
     return new MessageEvent("message", {
@@ -357,7 +357,7 @@ function getFileIdFromUrl(url) {
 
 function createWorkerConstructor(options) {
   const runnerOptions = getRunnerOptions();
-  const cloneType = () => (options == null ? void 0 : options.clone) ?? process.env.VITEST_WEB_WORKER_CLONE ?? "native";
+  const cloneType = () => options?.clone ?? process.env.VITEST_WEB_WORKER_CLONE ?? "native";
   return class Worker extends EventTarget {
     static __VITEST_WEB_WORKER__ = true;
     _vw_workerTarget = new EventTarget();
@@ -372,7 +372,7 @@ function createWorkerConstructor(options) {
       super();
       const context = {
         onmessage: null,
-        name: options2 == null ? void 0 : options2.name,
+        name: options2?.name,
         close: () => this.terminate(),
         dispatchEvent: (event) => {
           return this._vw_workerTarget.dispatchEvent(event);
@@ -398,22 +398,19 @@ function createWorkerConstructor(options) {
         }
       };
       this._vw_workerTarget.addEventListener("message", (e) => {
-        var _a;
-        (_a = context.onmessage) == null ? void 0 : _a.call(context, e);
+        context.onmessage?.(e);
       });
       this.addEventListener("message", (e) => {
-        var _a;
-        (_a = this.onmessage) == null ? void 0 : _a.call(this, e);
+        this.onmessage?.(e);
       });
       this.addEventListener("messageerror", (e) => {
-        var _a;
-        (_a = this.onmessageerror) == null ? void 0 : _a.call(this, 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 = (options2 == null ? void 0 : options2.name) ?? fsPath;
+        this._vw_name = options2?.name ?? fsPath;
         debug("initialize worker %s", this._vw_name);
         return runner.executeFile(fsPath).then(() => {
           runnerOptions.moduleCache.invalidateSubDepTree([fsPath, runner.mocker.getMockPath(fsPath)]);
@@ -424,7 +421,6 @@ function createWorkerConstructor(options) {
           debug("worker %s successfully initialized", this._vw_name);
         });
       }).catch((e) => {
-        var _a;
         debug("worker %s failed to initialize: %o", this._vw_name, e);
         const EventConstructor = globalThis.ErrorEvent || globalThis.Event;
         const error = new EventConstructor("error", {
@@ -432,7 +428,7 @@ function createWorkerConstructor(options) {
           message: e.message
         });
         this.dispatchEvent(error);
-        (_a = this.onerror) == null ? void 0 : _a.call(this, error);
+        this.onerror?.(error);
         console.error(e);
       });
     }
@@ -492,11 +488,10 @@ function convertNodePortToWebPort(port) {
     const emit = port.emit.bind(port);
     Object.defineProperty(port, "emit", {
       value(event) {
-        var _a, _b;
         if (event.name === "message")
-          (_a = port.onmessage) == null ? void 0 : _a.call(port, event);
+          port.onmessage?.(event);
         if (event.name === "messageerror")
-          (_b = port.onmessageerror) == null ? void 0 : _b.call(port, event);
+          port.onmessageerror?.(event);
         return emit(event);
       },
       configurable: true,
@@ -523,7 +518,7 @@ function createSharedWorkerConstructor() {
     port;
     constructor(url, options) {
       super();
-      const name = typeof options === "string" ? options : options == null ? void 0 : options.name;
+      const name = typeof options === "string" ? options : options?.name;
       const context = {
         onconnect: null,
         name,
@@ -546,8 +541,7 @@ function createSharedWorkerConstructor() {
       this.port = convertNodePortToWebPort(channel.port1);
       this._vw_workerPort = convertNodePortToWebPort(channel.port2);
       this._vw_workerTarget.addEventListener("connect", (e) => {
-        var _a;
-        (_a = context.onconnect) == null ? void 0 : _a.call(context, e);
+        context.onconnect?.(e);
       });
       const runner = new InlineWorkerRunner(runnerOptions, context);
       const id = getFileIdFromUrl(url);
@@ -565,7 +559,6 @@ function createSharedWorkerConstructor() {
           debug("shared worker %s successfully initialized", this._vw_name);
         });
       }).catch((e) => {
-        var _a;
         debug("shared worker %s failed to initialize: %o", this._vw_name, e);
         const EventConstructor = globalThis.ErrorEvent || globalThis.Event;
         const error = new EventConstructor("error", {
@@ -573,7 +566,7 @@ function createSharedWorkerConstructor() {
           message: e.message
         });
         this.dispatchEvent(error);
-        (_a = this.onerror) == null ? void 0 : _a.call(this, error);
+        this.onerror?.(error);
         console.error(e);
       });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/web-worker",
   "type": "module",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "description": "Web Worker support for testing in Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -35,7 +35,7 @@
     "*.d.ts"
   ],
   "peerDependencies": {
-    "vitest": ">=0.34.0"
+    "vitest": "^1.0.0-0"
   },
   "dependencies": {
     "debug": "^4.3.4"