vitest 4.0.7 → 4.0.9

package/dist/chunks/{index.CWIFvlX5.js → index.BfmpdV5p.js}

@@ -176,7 +176,8 @@ const LIVING_KEYS = [
 	"Audio",
 	"Option",
 	"CSS"
-], OTHER_KEYS = [
+];
+const OTHER_KEYS = [
 	"addEventListener",
 	"alert",
 	"blur",
@@ -241,20 +242,28 @@ const skipKeys = [
 function getWindowKeys(global, win, additionalKeys = []) {
 	const keysArray = [...additionalKeys, ...KEYS];
 	return new Set(keysArray.concat(Object.getOwnPropertyNames(win)).filter((k) => {
-		return skipKeys.includes(k) ? false : k in global ? keysArray.includes(k) : true;
+		if (skipKeys.includes(k)) return false;
+		if (k in global) return keysArray.includes(k);
+		return true;
 	}));
 }
 function isClassLikeName(name) {
 	return name[0] === name[0].toUpperCase();
 }
 function populateGlobal(global, win, options = {}) {
-	const { bindFunctions = false } = options, keys = getWindowKeys(global, win, options.additionalKeys), originals = /* @__PURE__ */ new Map(), overridenKeys = new Set([...KEYS, ...options.additionalKeys || []]), overrideObject = /* @__PURE__ */ new Map();
+	const { bindFunctions = false } = options;
+	const keys = getWindowKeys(global, win, options.additionalKeys);
+	const originals = /* @__PURE__ */ new Map();
+	const overridenKeys = new Set([...KEYS, ...options.additionalKeys || []]);
+	const overrideObject = /* @__PURE__ */ new Map();
 	for (const key of keys) {
 		const boundFunction = bindFunctions && typeof win[key] === "function" && !isClassLikeName(key) && win[key].bind(win);
 		if (overridenKeys.has(key) && key in global) originals.set(key, global[key]);
 		Object.defineProperty(global, key, {
 			get() {
-				return overrideObject.has(key) ? overrideObject.get(key) : boundFunction || win[key];
+				if (overrideObject.has(key)) return overrideObject.get(key);
+				if (boundFunction) return boundFunction;
+				return win[key];
 			},
 			set(v) {
 				overrideObject.set(key, v);
@@ -262,14 +271,19 @@ function populateGlobal(global, win, options = {}) {
 			configurable: true
 		});
 	}
-	if (global.window = global, global.self = global, global.top = global, global.parent = global, global.global) global.global = global;
+	global.window = global;
+	global.self = global;
+	global.top = global;
+	global.parent = global;
+	if (global.global) global.global = global;
 	// rewrite defaultView to reference the same global context
 	if (global.document && global.document.defaultView) Object.defineProperty(global.document, "defaultView", {
 		get: () => global,
 		enumerable: true,
 		configurable: true
 	});
-	return skipKeys.forEach((k) => keys.add(k)), {
+	skipKeys.forEach((k) => keys.add(k));
+	return {
 		keys,
 		skipKeys,
 		originals
@@ -280,8 +294,11 @@ var edge = {
 	name: "edge-runtime",
 	viteEnvironment: "ssr",
 	async setupVM() {
-		const { EdgeVM } = await import('@edge-runtime/vm'), vm = new EdgeVM({ extend: (context) => {
-			return context.global = context, context.Buffer = Buffer, context;
+		const { EdgeVM } = await import('@edge-runtime/vm');
+		const vm = new EdgeVM({ extend: (context) => {
+			context.global = context;
+			context.Buffer = Buffer;
+			return context;
 		} });
 		return {
 			getVmContext() {
@@ -293,20 +310,27 @@ var edge = {
 		};
 	},
 	async setup(global) {
-		const { EdgeVM } = await import('@edge-runtime/vm'), vm = new EdgeVM({ extend: (context) => {
-			return context.global = context, context.Buffer = Buffer, KEYS.forEach((key) => {
+		const { EdgeVM } = await import('@edge-runtime/vm');
+		const { keys, originals } = populateGlobal(global, new EdgeVM({ extend: (context) => {
+			context.global = context;
+			context.Buffer = Buffer;
+			KEYS.forEach((key) => {
 				if (key in global) context[key] = global[key];
-			}), context;
-		} }), { keys, originals } = populateGlobal(global, vm.context, { bindFunctions: true });
+			});
+			return context;
+		} }).context, { bindFunctions: true });
 		return { teardown(global) {
-			keys.forEach((key) => delete global[key]), originals.forEach((v, k) => global[k] = v);
+			keys.forEach((key) => delete global[key]);
+			originals.forEach((v, k) => global[k] = v);
 		} };
 	}
 };
 
 async function teardownWindow(win) {
-	if (win.close && win.happyDOM.abort) await win.happyDOM.abort(), win.close();
-	else win.happyDOM.cancelAsync();
+	if (win.close && win.happyDOM.abort) {
+		await win.happyDOM.abort();
+		win.close();
+	} else win.happyDOM.cancelAsync();
 }
 var happy = {
 	name: "happy-dom",
@@ -322,21 +346,25 @@ var happy = {
 				disableErrorCapturing: true
 			}
 		});
+		// TODO: browser doesn't expose Buffer, but a lot of dependencies use it
+		win.Buffer = Buffer;
 		// inject structuredClone if it exists
-		if (win.Buffer = Buffer, typeof structuredClone !== "undefined" && !win.structuredClone) win.structuredClone = structuredClone;
+		if (typeof structuredClone !== "undefined" && !win.structuredClone) win.structuredClone = structuredClone;
 		return {
 			getVmContext() {
 				return win;
 			},
 			async teardown() {
-				await teardownWindow(win), win = void 0;
+				await teardownWindow(win);
+				win = void 0;
 			}
 		};
 	},
 	async setup(global, { happyDOM = {} }) {
 		// happy-dom v3 introduced a breaking change to Window, but
 		// provides GlobalWindow as a way to use previous behaviour
-		const { Window, GlobalWindow } = await import('happy-dom'), win = new (GlobalWindow || Window)({
+		const { Window, GlobalWindow } = await import('happy-dom');
+		const win = new (GlobalWindow || Window)({
 			...happyDOM,
 			console: console && global.console ? global.console : void 0,
 			url: happyDOM.url || "http://localhost:3000",
@@ -344,7 +372,8 @@ var happy = {
 				...happyDOM.settings,
 				disableErrorCapturing: true
 			}
-		}), { keys, originals } = populateGlobal(global, win, {
+		});
+		const { keys, originals } = populateGlobal(global, win, {
 			bindFunctions: true,
 			additionalKeys: [
 				"Request",
@@ -360,7 +389,9 @@ var happy = {
 			]
 		});
 		return { async teardown(global) {
-			await teardownWindow(win), keys.forEach((key) => delete global[key]), originals.forEach((v, k) => global[k] = v);
+			await teardownWindow(win);
+			keys.forEach((key) => delete global[key]);
+			originals.forEach((v, k) => global[k] = v);
 		} };
 	}
 };
@@ -368,40 +399,66 @@ var happy = {
 function catchWindowErrors(window) {
 	let userErrorListenerCount = 0;
 	function throwUnhandlerError(e) {
-		if (userErrorListenerCount === 0 && e.error != null) e.preventDefault(), process.emit("uncaughtException", e.error);
+		if (userErrorListenerCount === 0 && e.error != null) {
+			e.preventDefault();
+			process.emit("uncaughtException", e.error);
+		}
 	}
-	const addEventListener = window.addEventListener.bind(window), removeEventListener = window.removeEventListener.bind(window);
-	return window.addEventListener("error", throwUnhandlerError), window.addEventListener = function(...args) {
+	const addEventListener = window.addEventListener.bind(window);
+	const removeEventListener = window.removeEventListener.bind(window);
+	window.addEventListener("error", throwUnhandlerError);
+	window.addEventListener = function(...args) {
 		if (args[0] === "error") userErrorListenerCount++;
 		return addEventListener.apply(this, args);
-	}, window.removeEventListener = function(...args) {
+	};
+	window.removeEventListener = function(...args) {
 		if (args[0] === "error" && userErrorListenerCount) userErrorListenerCount--;
 		return removeEventListener.apply(this, args);
-	}, function clearErrorHandlers() {
+	};
+	return function clearErrorHandlers() {
 		window.removeEventListener("error", throwUnhandlerError);
 	};
 }
-let NodeFormData_, NodeBlob_, NodeRequest_;
+let NodeFormData_;
+let NodeBlob_;
+let NodeRequest_;
 var jsdom = {
 	name: "jsdom",
 	viteEnvironment: "client",
 	async setupVM({ jsdom = {} }) {
-		NodeFormData_ = globalThis.FormData, NodeBlob_ = globalThis.Blob, NodeRequest_ = globalThis.Request;
-		const { CookieJar, JSDOM, ResourceLoader, VirtualConsole } = await import('jsdom'), { html = "<!DOCTYPE html>", userAgent, url = "http://localhost:3000", contentType = "text/html", pretendToBeVisual = true, includeNodeLocations = false, runScripts = "dangerously", resources, console = false, cookieJar = false,...restOptions } = jsdom;
+		// delay initialization because it takes ~1s
+		NodeFormData_ = globalThis.FormData;
+		NodeBlob_ = globalThis.Blob;
+		NodeRequest_ = globalThis.Request;
+		const { CookieJar, JSDOM, ResourceLoader, VirtualConsole } = await import('jsdom');
+		const { html = "<!DOCTYPE html>", userAgent, url = "http://localhost:3000", contentType = "text/html", pretendToBeVisual = true, includeNodeLocations = false, runScripts = "dangerously", resources, console = false, cookieJar = false,...restOptions } = jsdom;
+		let virtualConsole;
+		if (console && globalThis.console) {
+			virtualConsole = new VirtualConsole();
+			// jsdom <27
+			if ("sendTo" in virtualConsole) virtualConsole.sendTo(globalThis.console);
+			else virtualConsole.forwardTo(globalThis.console);
+		}
 		let dom = new JSDOM(html, {
 			pretendToBeVisual,
 			resources: resources ?? (userAgent ? new ResourceLoader({ userAgent }) : void 0),
 			runScripts,
 			url,
-			virtualConsole: console && globalThis.console ? new VirtualConsole().sendTo(globalThis.console) : void 0,
+			virtualConsole,
 			cookieJar: cookieJar ? new CookieJar() : void 0,
 			includeNodeLocations,
 			contentType,
 			userAgent,
 			...restOptions
 		});
-		const clearAddEventListenerPatch = patchAddEventListener(dom.window), clearWindowErrors = catchWindowErrors(dom.window), utils = createCompatUtils(dom.window);
-		dom.window.Buffer = Buffer, dom.window.jsdom = dom, dom.window.Request = createCompatRequest(utils), dom.window.URL = createJSDOMCompatURL(utils);
+		const clearAddEventListenerPatch = patchAddEventListener(dom.window);
+		const clearWindowErrors = catchWindowErrors(dom.window);
+		const utils = createCompatUtils(dom.window);
+		// TODO: browser doesn't expose Buffer, but a lot of dependencies use it
+		dom.window.Buffer = Buffer;
+		dom.window.jsdom = dom;
+		dom.window.Request = createCompatRequest(utils);
+		dom.window.URL = createJSDOMCompatURL(utils);
 		for (const name of [
 			"structuredClone",
 			"BroadcastChannel",
@@ -429,26 +486,53 @@ var jsdom = {
 				return dom.getInternalVMContext();
 			},
 			teardown() {
-				clearAddEventListenerPatch(), clearWindowErrors(), dom.window.close(), dom = void 0;
+				clearAddEventListenerPatch();
+				clearWindowErrors();
+				dom.window.close();
+				dom = void 0;
 			}
 		};
 	},
 	async setup(global, { jsdom = {} }) {
-		NodeFormData_ = globalThis.FormData, NodeBlob_ = globalThis.Blob, NodeRequest_ = globalThis.Request;
-		const { CookieJar, JSDOM, ResourceLoader, VirtualConsole } = await import('jsdom'), { html = "<!DOCTYPE html>", userAgent, url = "http://localhost:3000", contentType = "text/html", pretendToBeVisual = true, includeNodeLocations = false, runScripts = "dangerously", resources, console = false, cookieJar = false,...restOptions } = jsdom, dom = new JSDOM(html, {
+		// delay initialization because it takes ~1s
+		NodeFormData_ = globalThis.FormData;
+		NodeBlob_ = globalThis.Blob;
+		NodeRequest_ = globalThis.Request;
+		const { CookieJar, JSDOM, ResourceLoader, VirtualConsole } = await import('jsdom');
+		const { html = "<!DOCTYPE html>", userAgent, url = "http://localhost:3000", contentType = "text/html", pretendToBeVisual = true, includeNodeLocations = false, runScripts = "dangerously", resources, console = false, cookieJar = false,...restOptions } = jsdom;
+		let virtualConsole;
+		if (console && globalThis.console) {
+			virtualConsole = new VirtualConsole();
+			// jsdom <27
+			if ("sendTo" in virtualConsole) virtualConsole.sendTo(globalThis.console);
+			else virtualConsole.forwardTo(globalThis.console);
+		}
+		const dom = new JSDOM(html, {
 			pretendToBeVisual,
 			resources: resources ?? (userAgent ? new ResourceLoader({ userAgent }) : void 0),
 			runScripts,
 			url,
-			virtualConsole: console && global.console ? new VirtualConsole().sendTo(global.console) : void 0,
+			virtualConsole,
 			cookieJar: cookieJar ? new CookieJar() : void 0,
 			includeNodeLocations,
 			contentType,
 			userAgent,
 			...restOptions
-		}), clearAddEventListenerPatch = patchAddEventListener(dom.window), { keys, originals } = populateGlobal(global, dom.window, { bindFunctions: true }), clearWindowErrors = catchWindowErrors(global), utils = createCompatUtils(dom.window);
-		return global.jsdom = dom, global.Request = createCompatRequest(utils), global.URL = createJSDOMCompatURL(utils), { teardown(global) {
-			clearAddEventListenerPatch(), clearWindowErrors(), dom.window.close(), delete global.jsdom, keys.forEach((key) => delete global[key]), originals.forEach((v, k) => global[k] = v);
+		});
+		const clearAddEventListenerPatch = patchAddEventListener(dom.window);
+		const { keys, originals } = populateGlobal(global, dom.window, { bindFunctions: true });
+		const clearWindowErrors = catchWindowErrors(global);
+		const utils = createCompatUtils(dom.window);
+		global.jsdom = dom;
+		global.Request = createCompatRequest(utils);
+		global.URL = createJSDOMCompatURL(utils);
+		return { teardown(global) {
+			clearAddEventListenerPatch();
+			clearWindowErrors();
+			dom.window.close();
+			delete global.jsdom;
+			keys.forEach((key) => delete global[key]);
+			originals.forEach((v, k) => global[k] = v);
 		} };
 	}
 };
@@ -463,6 +547,9 @@ function createCompatRequest(utils) {
 				super(input, compatInit);
 			} else super(...args);
 		}
+		static [Symbol.hasInstance](instance) {
+			return instance instanceof NodeRequest_;
+		}
 	};
 }
 function createJSDOMCompatURL(utils) {
@@ -474,19 +561,24 @@ function createJSDOMCompatURL(utils) {
 			}
 			return URL.createObjectURL(blob);
 		}
+		static [Symbol.hasInstance](instance) {
+			return instance instanceof URL;
+		}
 	};
 }
 function createCompatUtils(window) {
 	// this returns a hidden Symbol(impl)
 	// this is cursed, and jsdom should just implement fetch API itself
-	const implSymbol = Object.getOwnPropertySymbols(Object.getOwnPropertyDescriptors(new window.Blob()))[0], utils = {
+	const implSymbol = Object.getOwnPropertySymbols(Object.getOwnPropertyDescriptors(new window.Blob()))[0];
+	const utils = {
 		window,
 		makeCompatFormData(formData) {
 			const nodeFormData = new NodeFormData_();
-			return formData.forEach((value, key) => {
+			formData.forEach((value, key) => {
 				if (value instanceof window.Blob) nodeFormData.append(key, utils.makeCompatBlob(value));
 				else nodeFormData.append(key, value);
-			}), nodeFormData;
+			});
+			return nodeFormData;
 		},
 		makeCompatBlob(blob) {
 			const buffer = blob[implSymbol]._buffer;
@@ -496,8 +588,10 @@ function createCompatUtils(window) {
 	return utils;
 }
 function patchAddEventListener(window) {
-	const JSDOMAbortSignal = window.AbortSignal, JSDOMAbortController = window.AbortController, originalAddEventListener = window.EventTarget.prototype.addEventListener;
-	return window.EventTarget.prototype.addEventListener = function addEventListener(type, callback, options) {
+	const JSDOMAbortSignal = window.AbortSignal;
+	const JSDOMAbortController = window.AbortController;
+	const originalAddEventListener = window.EventTarget.prototype.addEventListener;
+	window.EventTarget.prototype.addEventListener = function addEventListener(type, callback, options) {
 		if (typeof options === "object" && options.signal != null) {
 			const { signal,...otherOptions } = options;
 			// - this happens because AbortSignal is provided by Node.js,
@@ -510,13 +604,16 @@ function patchAddEventListener(window) {
 				// use jsdom-native abort controller instead and forward the
 				// previous one with `addEventListener`
 				const jsdomAbortController = new JSDOMAbortController();
-				return signal.addEventListener("abort", () => {
+				signal.addEventListener("abort", () => {
 					jsdomAbortController.abort(signal.reason);
-				}), jsdomCompatOptions.signal = jsdomAbortController.signal, originalAddEventListener.call(this, type, callback, jsdomCompatOptions);
+				});
+				jsdomCompatOptions.signal = jsdomAbortController.signal;
+				return originalAddEventListener.call(this, type, callback, jsdomCompatOptions);
 			}
 		}
 		return originalAddEventListener.call(this, type, callback, options);
-	}, () => {
+	};
+	return () => {
 		window.EventTarget.prototype.addEventListener = originalAddEventListener;
 	};
 }
@@ -529,10 +626,12 @@ const denyList = new Set([
 	"Buffer",
 	"ArrayBuffer",
 	"Uint8Array"
-]), nodeGlobals = /* @__PURE__ */ new Map();
+]);
+const nodeGlobals = /* @__PURE__ */ new Map();
 function populateNodeGlobals() {
 	if (nodeGlobals.size !== 0) return;
-	const names = Object.getOwnPropertyNames(globalThis), length = names.length;
+	const names = Object.getOwnPropertyNames(globalThis);
+	const length = names.length;
 	for (let i = 0; i < length; i++) {
 		const globalName = names[i];
 		if (!denyList.has(globalName)) {
@@ -548,7 +647,8 @@ var node = {
 	async setupVM() {
 		populateNodeGlobals();
 		const vm = await import('node:vm');
-		let context = vm.createContext(), global = vm.runInContext("this", context);
+		let context = vm.createContext();
+		let global = vm.runInContext("this", context);
 		const contextGlobals = new Set(Object.getOwnPropertyNames(global));
 		for (const [nodeGlobalsKey, descriptor] of nodeGlobals) if (!contextGlobals.has(nodeGlobalsKey)) if (descriptor.configurable) Object.defineProperty(global, nodeGlobalsKey, {
 			configurable: true,
@@ -556,12 +656,14 @@ var node = {
 			get() {
 				// @ts-expect-error: no index signature
 				const val = globalThis[nodeGlobalsKey];
-				return Object.defineProperty(global, nodeGlobalsKey, {
+				// override lazy getter
+				Object.defineProperty(global, nodeGlobalsKey, {
 					configurable: true,
 					enumerable: descriptor.enumerable,
 					value: val,
 					writable: descriptor.writable === true || nodeGlobalsKey === "performance"
-				}), val;
+				});
+				return val;
 			},
 			set(val) {
 				// override lazy getter
@@ -585,17 +687,26 @@ var node = {
 			get: descriptor.get,
 			set: descriptor.set
 		});
-		return global.global = global, global.Buffer = Buffer, global.ArrayBuffer = ArrayBuffer, global.Uint8Array = Uint8Array, {
+		global.global = global;
+		global.Buffer = Buffer;
+		global.ArrayBuffer = ArrayBuffer;
+		// TextEncoder (global or via 'util') references a Uint8Array constructor
+		// different than the global one used by users in tests. This makes sure the
+		// same constructor is referenced by both.
+		global.Uint8Array = Uint8Array;
+		return {
 			getVmContext() {
 				return context;
 			},
 			teardown() {
-				context = void 0, global = void 0;
+				context = void 0;
+				global = void 0;
 			}
 		};
 	},
 	async setup(global) {
-		return global.console.Console = Console, { teardown(global) {
+		global.console.Console = Console;
+		return { teardown(global) {
 			delete global.console.Console;
 		} };
 	}

package/dist/chunks/{index.RwjEGCQ0.js → index.CGezRSGU.js}

@@ -1,5 +1,5 @@
-import { b as assert, c as createExpect, g as globalExpect, i as inject, s as should, v as vi, d as vitest } from './vi.BZvkKVkM.js';
-import { b as bench } from './benchmark.DHKMYAts.js';
+import { b as assert, c as createExpect, g as globalExpect, i as inject, s as should, v as vi, d as vitest } from './vi.CyIUVSoU.js';
+import { b as bench } from './benchmark.B3N2zMcH.js';
 import { V as VitestEvaluatedModules } from './evaluatedModules.Dg1zASAC.js';
 import { expectTypeOf } from 'expect-type';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';

package/dist/chunks/{index.DEPqWSIZ.js → index.CPA8jGhR.js}

@@ -1,8 +1,8 @@
 import { chai } from '@vitest/expect';
-import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.DR1sucx6.js';
-import { r as rpc } from './rpc.D38ahn14.js';
-import { g as getWorkerState } from './utils.CG9h5ccR.js';
-import { V as VitestTestRunner, N as NodeBenchmarkRunner } from './test.B6aJd6T3.js';
+import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.Dw1XgX0v.js';
+import { r as rpc } from './rpc.BytlcPfC.js';
+import { g as getWorkerState } from './utils.DvEY5TfP.js';
+import { V as VitestTestRunner, N as NodeBenchmarkRunner } from './test.w5HLbjmU.js';
 
 function setupChaiConfig(config) {
 	Object.assign(chai.config, config);
@@ -10,7 +10,7 @@ function setupChaiConfig(config) {
 
 async function resolveSnapshotEnvironment(config, executor) {
 	if (!config.snapshotEnvironment) {
-		const { VitestNodeSnapshotEnvironment } = await import('./node.BwAWWjHZ.js');
+		const { VitestNodeSnapshotEnvironment } = await import('./node.Ce0vMQM7.js');
 		return new VitestNodeSnapshotEnvironment();
 	}
 	const mod = await executor.import(config.snapshotEnvironment);
@@ -26,11 +26,13 @@ async function getTestRunnerConstructor(config, moduleRunner) {
 }
 async function resolveTestRunner(config, moduleRunner) {
 	const testRunner = new (await (getTestRunnerConstructor(config, moduleRunner)))(config);
-	if (Object.defineProperty(testRunner, "moduleRunner", {
+	// inject private executor to every runner
+	Object.defineProperty(testRunner, "moduleRunner", {
 		value: moduleRunner,
 		enumerable: false,
 		configurable: false
-	}), !testRunner.config) testRunner.config = config;
+	});
+	if (!testRunner.config) testRunner.config = config;
 	if (!testRunner.importFile) throw new Error("Runner must implement \"importFile\" method.");
 	const [diffOptions] = await Promise.all([loadDiffConfig(config, moduleRunner), loadSnapshotSerializers(config, moduleRunner)]);
 	testRunner.config.diffOptions = diffOptions;
@@ -38,28 +40,39 @@ async function resolveTestRunner(config, moduleRunner) {
 	const originalOnTaskUpdate = testRunner.onTaskUpdate;
 	testRunner.onTaskUpdate = async (task, events) => {
 		const p = rpc().onTaskUpdate(task, events);
-		return await originalOnTaskUpdate?.call(testRunner, task, events), p;
+		await originalOnTaskUpdate?.call(testRunner, task, events);
+		return p;
 	};
 	// patch some methods, so custom runners don't need to call RPC
 	const originalOnTestAnnotate = testRunner.onTestAnnotate;
 	testRunner.onTestAnnotate = async (test, annotation) => {
-		const p = rpc().onTaskAnnotate(test.id, annotation), overriddenResult = await originalOnTestAnnotate?.call(testRunner, test, annotation), vitestResult = await p;
+		const p = rpc().onTaskAnnotate(test.id, annotation);
+		const overriddenResult = await originalOnTestAnnotate?.call(testRunner, test, annotation);
+		const vitestResult = await p;
 		return overriddenResult || vitestResult;
 	};
 	const originalOnCollectStart = testRunner.onCollectStart;
 	testRunner.onCollectStart = async (file) => {
-		await rpc().onQueued(file), await originalOnCollectStart?.call(testRunner, file);
+		await rpc().onQueued(file);
+		await originalOnCollectStart?.call(testRunner, file);
 	};
 	const originalOnCollected = testRunner.onCollected;
 	testRunner.onCollected = async (files) => {
 		const state = getWorkerState();
 		files.forEach((file) => {
-			file.prepareDuration = state.durations.prepare, file.environmentLoad = state.durations.environment, state.durations.prepare = 0, state.durations.environment = 0;
-		}), rpc().onCollected(files), await originalOnCollected?.call(testRunner, files);
+			file.prepareDuration = state.durations.prepare;
+			file.environmentLoad = state.durations.environment;
+			// should be collected only for a single test file in a batch
+			state.durations.prepare = 0;
+			state.durations.environment = 0;
+		});
+		rpc().onCollected(files);
+		await originalOnCollected?.call(testRunner, files);
 	};
 	const originalOnAfterRun = testRunner.onAfterRunFiles;
 	testRunner.onAfterRunFiles = async (files) => {
-		const state = getWorkerState(), coverage = await takeCoverageInsideWorker(config.coverage, moduleRunner);
+		const state = getWorkerState();
+		const coverage = await takeCoverageInsideWorker(config.coverage, moduleRunner);
 		if (coverage) rpc().onAfterSuiteRun({
 			coverage,
 			testFiles: files.map((file) => file.name).sort(),
@@ -69,12 +82,16 @@ async function resolveTestRunner(config, moduleRunner) {
 		await originalOnAfterRun?.call(testRunner, files);
 	};
 	const originalOnAfterRunTask = testRunner.onAfterRunTask;
-	return testRunner.onAfterRunTask = async (test) => {
+	testRunner.onAfterRunTask = async (test) => {
 		if (config.bail && test.result?.state === "fail") {
-			if (1 + await rpc().getCountOfFailedTests() >= config.bail) rpc().onCancel("test-failure"), testRunner.cancel?.("test-failure");
+			if (1 + await rpc().getCountOfFailedTests() >= config.bail) {
+				rpc().onCancel("test-failure");
+				testRunner.cancel?.("test-failure");
+			}
 		}
 		await originalOnAfterRunTask?.call(testRunner, test);
-	}, testRunner;
+	};
+	return testRunner;
 }
 
 export { resolveSnapshotEnvironment as a, resolveTestRunner as r, setupChaiConfig as s };