vitest 4.0.0-beta.5 → 4.0.0-beta.6

package/dist/chunks/{vi.DGAfBY4R.js → vi.BfdOiD4j.js}

@@ -2,14 +2,14 @@ import { equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, J
 import { getCurrentTest } from '@vitest/runner';
 import { getNames, getTestName } from '@vitest/runner/utils';
 import * as chai$1 from 'chai';
-import { g as getWorkerState, a as getCurrentEnvironment, i as isChildProcess, w as waitForImportsToResolve, r as resetModules } from './utils.B9FY3b73.js';
+import { g as getWorkerState, a as getCurrentEnvironment, i as isChildProcess, w as waitForImportsToResolve, r as resetModules } from './utils.C7__0Iv5.js';
 import { getSafeTimers, assertTypes, createSimpleStackTrace } from '@vitest/utils';
 import { g as getDefaultExportFromCjs, c as commonjsGlobal } from './_commonjsHelpers.BFTU3MAI.js';
 import { stripSnapshotIndentation, addSerializer, SnapshotClient } from '@vitest/snapshot';
 import '@vitest/utils/error';
-import { fn, spyOn, mocks, isMockFunction } from '@vitest/spy';
+import { fn, spyOn, restoreAllMocks, resetAllMocks, clearAllMocks, isMockFunction } from '@vitest/spy';
 import { parseSingleStack } from '@vitest/utils/source-map';
-import { R as RealDate, r as resetDate, m as mockDate } from './date.Bq6ZW5rf.js';
+import { R as RealDate, r as resetDate, m as mockDate } from './date.-jtEtIeV.js';
 
 // these matchers are not supported because they don't make sense with poll
 const unsupported = [
@@ -26,11 +26,7 @@ const unsupported = [
 ];
 function createExpectPoll(expect) {
 	return function poll(fn, options = {}) {
-		const state = getWorkerState();
-		const defaults = state.config.expect?.poll ?? {};
-		const { interval = defaults.interval ?? 50, timeout = defaults.timeout ?? 1e3, message } = options;
-		// @ts-expect-error private poll access
-		const assertion = expect(null, message).withContext({ poll: true });
+		const state = getWorkerState(), defaults = state.config.expect?.poll ?? {}, { interval = defaults.interval ?? 50, timeout = defaults.timeout ?? 1e3, message } = options, assertion = expect(null, message).withContext({ poll: true });
 		fn = fn.bind(assertion);
 		const test = chai$1.util.flag(assertion, "vitest-test");
 		if (!test) throw new Error("expect.poll() must be called inside a test");
@@ -40,43 +36,29 @@ function createExpectPoll(expect) {
 			if (key === "assert") return assertionFunction;
 			if (typeof key === "string" && unsupported.includes(key)) throw new SyntaxError(`expect.poll() is not supported in combination with .${key}(). Use vi.waitFor() if your assertion condition is unstable.`);
 			return function(...args) {
-				const STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
-				const promise = () => new Promise((resolve, reject) => {
-					let intervalId;
-					let timeoutId;
-					let lastError;
-					const { setTimeout, clearTimeout } = getSafeTimers();
-					const check = async () => {
+				const STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR"), promise = () => new Promise((resolve, reject) => {
+					let intervalId, timeoutId, lastError;
+					const { setTimeout, clearTimeout } = getSafeTimers(), check = async () => {
 						try {
 							chai$1.util.flag(assertion, "_name", key);
 							const obj = await fn();
-							chai$1.util.flag(assertion, "object", obj);
-							resolve(await assertionFunction.call(assertion, ...args));
-							clearTimeout(intervalId);
-							clearTimeout(timeoutId);
+							chai$1.util.flag(assertion, "object", obj), resolve(await assertionFunction.call(assertion, ...args)), clearTimeout(intervalId), clearTimeout(timeoutId);
 						} catch (err) {
-							lastError = err;
-							if (!chai$1.util.flag(assertion, "_isLastPollAttempt")) intervalId = setTimeout(check, interval);
+							if (lastError = err, !chai$1.util.flag(assertion, "_isLastPollAttempt")) intervalId = setTimeout(check, interval);
 						}
 					};
 					timeoutId = setTimeout(() => {
-						clearTimeout(intervalId);
-						chai$1.util.flag(assertion, "_isLastPollAttempt", true);
+						clearTimeout(intervalId), chai$1.util.flag(assertion, "_isLastPollAttempt", true);
 						const rejectWithCause = (cause) => {
 							reject(copyStackTrace$1(new Error("Matcher did not succeed in time.", { cause }), STACK_TRACE_ERROR));
 						};
 						check().then(() => rejectWithCause(lastError)).catch((e) => rejectWithCause(e));
-					}, timeout);
-					check();
+					}, timeout), check();
 				});
 				let awaited = false;
-				test.onFinished ??= [];
-				test.onFinished.push(() => {
+				test.onFinished ??= [], test.onFinished.push(() => {
 					if (!awaited) {
-						const negated = chai$1.util.flag(assertion, "negate") ? "not." : "";
-						const name = chai$1.util.flag(assertion, "_poll.element") ? "element(locator)" : "poll(assertion)";
-						const assertionString = `expect.${name}.${negated}${String(key)}()`;
-						const error = /* @__PURE__ */ new Error(`${assertionString} was not awaited. This assertion is asynchronous and must be awaited; otherwise, it is not executed to avoid unhandled rejections:\n\nawait ${assertionString}\n`);
+						const negated = chai$1.util.flag(assertion, "negate") ? "not." : "", name = chai$1.util.flag(assertion, "_poll.element") ? "element(locator)" : "poll(assertion)", assertionString = `expect.${name}.${negated}${String(key)}()`, error = /* @__PURE__ */ new Error(`${assertionString} was not awaited. This assertion is asynchronous and must be awaited; otherwise, it is not executed to avoid unhandled rejections:\n\nawait ${assertionString}\n`);
 						throw copyStackTrace$1(error, STACK_TRACE_ERROR);
 					}
 				});
@@ -85,8 +67,7 @@ function createExpectPoll(expect) {
 				// so let's follow it
 				return {
 					then(onFulfilled, onRejected) {
-						awaited = true;
-						return (resultPromise ||= promise()).then(onFulfilled, onRejected);
+						return awaited = true, (resultPromise ||= promise()).then(onFulfilled, onRejected);
 					},
 					catch(onRejected) {
 						return (resultPromise ||= promise()).catch(onRejected);
@@ -206,31 +187,24 @@ var chaiSubsetExports = requireChaiSubset();
 var Subset = /*@__PURE__*/getDefaultExportFromCjs(chaiSubsetExports);
 
 function createAssertionMessage(util, assertion, hasArgs) {
-	const not = util.flag(assertion, "negate") ? "not." : "";
-	const name = `${util.flag(assertion, "_name")}(${"expected" })`;
-	const promiseName = util.flag(assertion, "promise");
-	const promise = promiseName ? `.${promiseName}` : "";
+	const not = util.flag(assertion, "negate") ? "not." : "", name = `${util.flag(assertion, "_name")}(${"expected" })`, promiseName = util.flag(assertion, "promise"), promise = promiseName ? `.${promiseName}` : "";
 	return `expect(actual)${promise}.${not}${name}`;
 }
 function recordAsyncExpect(_test, promise, assertion, error) {
 	const test = _test;
 	// record promise for test, that resolves before test ends
 	if (test && promise instanceof Promise) {
-		// if promise is explicitly awaited, remove it from the list
-		promise = promise.finally(() => {
+		// record promise
+		if (promise = promise.finally(() => {
 			if (!test.promises) return;
 			const index = test.promises.indexOf(promise);
 			if (index !== -1) test.promises.splice(index, 1);
-		});
-		// record promise
-		if (!test.promises) test.promises = [];
+		}), !test.promises) test.promises = [];
 		test.promises.push(promise);
 		let resolved = false;
-		test.onFinished ??= [];
-		test.onFinished.push(() => {
+		return test.onFinished ??= [], test.onFinished.push(() => {
 			if (!resolved) {
-				const processor = globalThis.__vitest_worker__?.onFilterStackTrace || ((s) => s || "");
-				const stack = processor(error.stack);
+				const processor = globalThis.__vitest_worker__?.onFilterStackTrace || ((s) => s || ""), stack = processor(error.stack);
 				console.warn([
 					`Promise returned by \`${assertion}\` was not awaited. `,
 					"Vitest currently auto-awaits hanging assertions at the end of the test, but this will cause the test to fail in Vitest 3. ",
@@ -238,11 +212,9 @@ function recordAsyncExpect(_test, promise, assertion, error) {
 					stack
 				].join(""));
 			}
-		});
-		return {
+		}), {
 			then(onFulfilled, onRejected) {
-				resolved = true;
-				return promise.then(onFulfilled, onRejected);
+				return resolved = true, promise.then(onFulfilled, onRejected);
 			},
 			catch(onRejected) {
 				return promise.catch(onRejected);
@@ -293,12 +265,8 @@ const SnapshotPlugin = (chai, utils) => {
 		utils.flag(this, "_name", key);
 		const isNot = utils.flag(this, "negate");
 		if (isNot) throw new Error(`${key} cannot be used with "not"`);
-		const expected = utils.flag(this, "object");
-		const test = getTest(key, this);
-		if (typeof properties === "string" && typeof message === "undefined") {
-			message = properties;
-			properties = void 0;
-		}
+		const expected = utils.flag(this, "object"), test = getTest(key, this);
+		if (typeof properties === "string" && typeof message === "undefined") message = properties, properties = void 0;
 		const errorMessage = utils.flag(this, "message");
 		getSnapshotClient().assert({
 			received: expected,
@@ -313,11 +281,7 @@ const SnapshotPlugin = (chai, utils) => {
 		utils.flag(this, "_name", "toMatchFileSnapshot");
 		const isNot = utils.flag(this, "negate");
 		if (isNot) throw new Error("toMatchFileSnapshot cannot be used with \"not\"");
-		const error = /* @__PURE__ */ new Error("resolves");
-		const expected = utils.flag(this, "object");
-		const test = getTest("toMatchFileSnapshot", this);
-		const errorMessage = utils.flag(this, "message");
-		const promise = getSnapshotClient().assertRaw({
+		const error = /* @__PURE__ */ new Error("resolves"), expected = utils.flag(this, "object"), test = getTest("toMatchFileSnapshot", this), errorMessage = utils.flag(this, "message"), promise = getSnapshotClient().assertRaw({
 			received: expected,
 			message,
 			isInline: false,
@@ -326,21 +290,14 @@ const SnapshotPlugin = (chai, utils) => {
 			...getTestNames(test)
 		});
 		return recordAsyncExpect(test, promise, createAssertionMessage(utils, this), error);
-	});
-	utils.addMethod(chai.Assertion.prototype, "toMatchInlineSnapshot", function __INLINE_SNAPSHOT__(properties, inlineSnapshot, message) {
+	}), utils.addMethod(chai.Assertion.prototype, "toMatchInlineSnapshot", function __INLINE_SNAPSHOT__(properties, inlineSnapshot, message) {
 		utils.flag(this, "_name", "toMatchInlineSnapshot");
 		const isNot = utils.flag(this, "negate");
 		if (isNot) throw new Error("toMatchInlineSnapshot cannot be used with \"not\"");
-		const test = getTest("toMatchInlineSnapshot", this);
-		const isInsideEach = test.each || test.suite?.each;
+		const test = getTest("toMatchInlineSnapshot", this), isInsideEach = test.each || test.suite?.each;
 		if (isInsideEach) throw new Error("InlineSnapshot cannot be used inside of test.each or describe.each");
-		const expected = utils.flag(this, "object");
-		const error = utils.flag(this, "error");
-		if (typeof properties === "string") {
-			message = inlineSnapshot;
-			inlineSnapshot = properties;
-			properties = void 0;
-		}
+		const expected = utils.flag(this, "object"), error = utils.flag(this, "error");
+		if (typeof properties === "string") message = inlineSnapshot, inlineSnapshot = properties, properties = void 0;
 		if (inlineSnapshot) inlineSnapshot = stripSnapshotIndentation(inlineSnapshot);
 		const errorMessage = utils.flag(this, "message");
 		getSnapshotClient().assert({
@@ -353,32 +310,23 @@ const SnapshotPlugin = (chai, utils) => {
 			errorMessage,
 			...getTestNames(test)
 		});
-	});
-	utils.addMethod(chai.Assertion.prototype, "toThrowErrorMatchingSnapshot", function(message) {
+	}), utils.addMethod(chai.Assertion.prototype, "toThrowErrorMatchingSnapshot", function(message) {
 		utils.flag(this, "_name", "toThrowErrorMatchingSnapshot");
 		const isNot = utils.flag(this, "negate");
 		if (isNot) throw new Error("toThrowErrorMatchingSnapshot cannot be used with \"not\"");
-		const expected = utils.flag(this, "object");
-		const test = getTest("toThrowErrorMatchingSnapshot", this);
-		const promise = utils.flag(this, "promise");
-		const errorMessage = utils.flag(this, "message");
+		const expected = utils.flag(this, "object"), test = getTest("toThrowErrorMatchingSnapshot", this), promise = utils.flag(this, "promise"), errorMessage = utils.flag(this, "message");
 		getSnapshotClient().assert({
 			received: getError(expected, promise),
 			message,
 			errorMessage,
 			...getTestNames(test)
 		});
-	});
-	utils.addMethod(chai.Assertion.prototype, "toThrowErrorMatchingInlineSnapshot", function __INLINE_SNAPSHOT__(inlineSnapshot, message) {
+	}), utils.addMethod(chai.Assertion.prototype, "toThrowErrorMatchingInlineSnapshot", function __INLINE_SNAPSHOT__(inlineSnapshot, message) {
 		const isNot = utils.flag(this, "negate");
 		if (isNot) throw new Error("toThrowErrorMatchingInlineSnapshot cannot be used with \"not\"");
-		const test = getTest("toThrowErrorMatchingInlineSnapshot", this);
-		const isInsideEach = test.each || test.suite?.each;
+		const test = getTest("toThrowErrorMatchingInlineSnapshot", this), isInsideEach = test.each || test.suite?.each;
 		if (isInsideEach) throw new Error("InlineSnapshot cannot be used inside of test.each or describe.each");
-		const expected = utils.flag(this, "object");
-		const error = utils.flag(this, "error");
-		const promise = utils.flag(this, "promise");
-		const errorMessage = utils.flag(this, "message");
+		const expected = utils.flag(this, "object"), error = utils.flag(this, "error"), promise = utils.flag(this, "promise"), errorMessage = utils.flag(this, "message");
 		if (inlineSnapshot) inlineSnapshot = stripSnapshotIndentation(inlineSnapshot);
 		getSnapshotClient().assert({
 			received: getError(expected, promise),
@@ -389,31 +337,19 @@ const SnapshotPlugin = (chai, utils) => {
 			errorMessage,
 			...getTestNames(test)
 		});
-	});
-	utils.addMethod(chai.expect, "addSnapshotSerializer", addSerializer);
+	}), utils.addMethod(chai.expect, "addSnapshotSerializer", addSerializer);
 };
 
-chai$1.use(JestExtend);
-chai$1.use(JestChaiExpect);
-chai$1.use(Subset);
-chai$1.use(SnapshotPlugin);
-chai$1.use(JestAsymmetricMatchers);
+chai$1.use(JestExtend), chai$1.use(JestChaiExpect), chai$1.use(Subset), chai$1.use(SnapshotPlugin), chai$1.use(JestAsymmetricMatchers);
 
 function createExpect(test) {
-	const expect = (value, message) => {
+	const expect = ((value, message) => {
 		const { assertionCalls } = getState(expect);
 		setState({ assertionCalls: assertionCalls + 1 }, expect);
-		const assert = chai$1.expect(value, message);
-		const _test = test || getCurrentTest();
-		if (_test)
- // @ts-expect-error internal
-		return assert.withTest(_test);
-		else return assert;
-	};
-	Object.assign(expect, chai$1.expect);
-	Object.assign(expect, globalThis[ASYMMETRIC_MATCHERS_OBJECT]);
-	expect.getState = () => getState(expect);
-	expect.setState = (state) => setState(state, expect);
+		const assert = chai$1.expect(value, message), _test = test || getCurrentTest();
+		return _test ? assert.withTest(_test) : assert;
+	});
+	Object.assign(expect, chai$1.expect), Object.assign(expect, globalThis[ASYMMETRIC_MATCHERS_OBJECT]), expect.getState = () => getState(expect), expect.setState = (state) => setState(state, expect);
 	// @ts-expect-error global is not typed
 	const globalState = getState(globalThis[GLOBAL_EXPECT]) || {};
 	setState({
@@ -428,16 +364,10 @@ function createExpect(test) {
 			return getWorkerState().filepath;
 		},
 		currentTestName: test ? getTestName(test) : globalState.currentTestName
-	}, expect);
-	// @ts-expect-error untyped
-	expect.extend = (matchers) => chai$1.expect.extend(expect, matchers);
-	expect.addEqualityTesters = (customTesters) => addCustomEqualityTesters(customTesters);
-	expect.soft = (...args) => {
+	}, expect), expect.extend = (matchers) => chai$1.expect.extend(expect, matchers), expect.addEqualityTesters = (customTesters) => addCustomEqualityTesters(customTesters), expect.soft = (...args) => {
 		// @ts-expect-error private soft access
 		return expect(...args).withContext({ soft: true });
-	};
-	expect.poll = createExpectPoll(expect);
-	expect.unreachable = (message) => {
+	}, expect.poll = createExpectPoll(expect), expect.unreachable = (message) => {
 		chai$1.assert.fail(`expected${message ? ` "${message}" ` : " "}not to be reached`);
 	};
 	function assertions(expected) {
@@ -456,10 +386,7 @@ function createExpect(test) {
 			isExpectingAssertionsError: error
 		});
 	}
-	chai$1.util.addMethod(expect, "assertions", assertions);
-	chai$1.util.addMethod(expect, "hasAssertions", hasAssertions);
-	expect.extend(customMatchers);
-	return expect;
+	return chai$1.util.addMethod(expect, "assertions", assertions), chai$1.util.addMethod(expect, "hasAssertions", hasAssertions), expect.extend(customMatchers), expect;
 }
 const globalExpect = createExpect();
 Object.defineProperty(globalThis, GLOBAL_EXPECT, {
@@ -3585,11 +3512,7 @@ class FakeTimers {
 	_userConfig;
 	_now = RealDate.now;
 	constructor({ global, config }) {
-		this._userConfig = config;
-		this._fakingDate = null;
-		this._fakingTime = false;
-		this._fakeTimers = fakeTimersSrcExports.withGlobal(global);
-		this._global = global;
+		this._userConfig = config, this._fakingDate = null, this._fakingTime = false, this._fakeTimers = fakeTimersSrcExports.withGlobal(global), this._global = global;
 	}
 	clearAllTimers() {
 		if (this._fakingTime) this._clock.reset();
@@ -3610,19 +3533,13 @@ class FakeTimers {
 		if (this._checkFakeTimers()) await this._clock.runToLastAsync();
 	}
 	advanceTimersToNextTimer(steps = 1) {
-		if (this._checkFakeTimers()) for (let i = steps; i > 0; i--) {
-			this._clock.next();
-			// Fire all timers at this point: https://github.com/sinonjs/fake-timers/issues/250
-			this._clock.tick(0);
-			if (this._clock.countTimers() === 0) break;
+		if (this._checkFakeTimers()) {
+			for (let i = steps; i > 0; i--) if (this._clock.next(), this._clock.tick(0), this._clock.countTimers() === 0) break;
 		}
 	}
 	async advanceTimersToNextTimerAsync(steps = 1) {
-		if (this._checkFakeTimers()) for (let i = steps; i > 0; i--) {
-			await this._clock.nextAsync();
-			// Fire all timers at this point: https://github.com/sinonjs/fake-timers/issues/250
-			this._clock.tick(0);
-			if (this._clock.countTimers() === 0) break;
+		if (this._checkFakeTimers()) {
+			for (let i = steps; i > 0; i--) if (await this._clock.nextAsync(), this._clock.tick(0), this._clock.countTimers() === 0) break;
 		}
 	}
 	advanceTimersByTime(msToRun) {
@@ -3640,14 +3557,8 @@ class FakeTimers {
 		this._clock.runMicrotasks();
 	}
 	useRealTimers() {
-		if (this._fakingDate) {
-			resetDate();
-			this._fakingDate = null;
-		}
-		if (this._fakingTime) {
-			this._clock.uninstall();
-			this._fakingTime = false;
-		}
+		if (this._fakingDate) resetDate(), this._fakingDate = null;
+		if (this._fakingTime) this._clock.uninstall(), this._fakingTime = false;
 	}
 	useFakeTimers() {
 		if (this._fakingDate) throw new Error("\"setSystemTime\" was called already and date was mocked. Reset timers using `vi.useRealTimers()` if you want to use fake timers again.");
@@ -3659,24 +3570,19 @@ class FakeTimers {
 				...this._userConfig,
 				toFake: this._userConfig?.toFake || toFake,
 				ignoreMissingTimers: true
-			});
-			this._fakingTime = true;
+			}), this._fakingTime = true;
 		}
 	}
 	reset() {
 		if (this._checkFakeTimers()) {
 			const { now } = this._clock;
-			this._clock.reset();
-			this._clock.setSystemTime(now);
+			this._clock.reset(), this._clock.setSystemTime(now);
 		}
 	}
 	setSystemTime(now) {
 		const date = typeof now === "undefined" || now instanceof Date ? now : new Date(now);
 		if (this._fakingTime) this._clock.setSystemTime(date);
-		else {
-			this._fakingDate = date ?? new Date(this.getRealSystemTime());
-			mockDate(this._fakingDate);
-		}
+		else this._fakingDate = date ?? new Date(this.getRealSystemTime()), mockDate(this._fakingDate);
 	}
 	getMockedSystemTime() {
 		return this._fakingTime ? new Date(this._clock.now) : this._fakingDate;
@@ -3685,8 +3591,7 @@ class FakeTimers {
 		return this._now();
 	}
 	getTimerCount() {
-		if (this._checkFakeTimers()) return this._clock.countTimers();
-		return 0;
+		return this._checkFakeTimers() ? this._clock.countTimers() : 0;
 	}
 	configure(config) {
 		this._userConfig = config;
@@ -3705,96 +3610,68 @@ function copyStackTrace(target, source) {
 	return target;
 }
 function waitFor(callback, options = {}) {
-	const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers();
-	const { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options;
-	const STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
+	const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers(), { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options, STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
 	return new Promise((resolve, reject) => {
-		let lastError;
-		let promiseStatus = "idle";
-		let timeoutId;
-		let intervalId;
+		let lastError, promiseStatus = "idle", timeoutId, intervalId;
 		const onResolve = (result) => {
 			if (timeoutId) clearTimeout(timeoutId);
 			if (intervalId) clearInterval(intervalId);
 			resolve(result);
-		};
-		const handleTimeout = () => {
+		}, handleTimeout = () => {
 			if (intervalId) clearInterval(intervalId);
 			let error = lastError;
 			if (!error) error = copyStackTrace(/* @__PURE__ */ new Error("Timed out in waitFor!"), STACK_TRACE_ERROR);
 			reject(error);
-		};
-		const checkCallback = () => {
+		}, checkCallback = () => {
 			if (vi.isFakeTimers()) vi.advanceTimersByTime(interval);
-			if (promiseStatus === "pending") return;
-			try {
+			if (promiseStatus !== "pending") try {
 				const result = callback();
 				if (result !== null && typeof result === "object" && typeof result.then === "function") {
 					const thenable = result;
-					promiseStatus = "pending";
-					thenable.then((resolvedValue) => {
-						promiseStatus = "resolved";
-						onResolve(resolvedValue);
+					promiseStatus = "pending", thenable.then((resolvedValue) => {
+						promiseStatus = "resolved", onResolve(resolvedValue);
 					}, (rejectedValue) => {
-						promiseStatus = "rejected";
-						lastError = rejectedValue;
+						promiseStatus = "rejected", lastError = rejectedValue;
 					});
-				} else {
-					onResolve(result);
-					return true;
-				}
+				} else return onResolve(result), true;
 			} catch (error) {
 				lastError = error;
 			}
 		};
-		if (checkCallback() === true) return;
-		timeoutId = setTimeout(handleTimeout, timeout);
-		intervalId = setInterval(checkCallback, interval);
+		checkCallback() !== true && (timeoutId = setTimeout(handleTimeout, timeout), intervalId = setInterval(checkCallback, interval));
 	});
 }
 function waitUntil(callback, options = {}) {
-	const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers();
-	const { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options;
-	const STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
+	const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers(), { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options, STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
 	return new Promise((resolve, reject) => {
-		let promiseStatus = "idle";
-		let timeoutId;
-		let intervalId;
+		let promiseStatus = "idle", timeoutId, intervalId;
 		const onReject = (error) => {
 			if (intervalId) clearInterval(intervalId);
 			if (!error) error = copyStackTrace(/* @__PURE__ */ new Error("Timed out in waitUntil!"), STACK_TRACE_ERROR);
 			reject(error);
-		};
-		const onResolve = (result) => {
-			if (!result) return;
-			if (timeoutId) clearTimeout(timeoutId);
-			if (intervalId) clearInterval(intervalId);
-			resolve(result);
-			return true;
-		};
-		const checkCallback = () => {
+		}, onResolve = (result) => {
+			if (result) {
+				if (timeoutId) clearTimeout(timeoutId);
+				if (intervalId) clearInterval(intervalId);
+				return resolve(result), true;
+			}
+		}, checkCallback = () => {
 			if (vi.isFakeTimers()) vi.advanceTimersByTime(interval);
-			if (promiseStatus === "pending") return;
-			try {
+			if (promiseStatus !== "pending") try {
 				const result = callback();
 				if (result !== null && typeof result === "object" && typeof result.then === "function") {
 					const thenable = result;
-					promiseStatus = "pending";
-					thenable.then((resolvedValue) => {
-						promiseStatus = "resolved";
-						onResolve(resolvedValue);
+					promiseStatus = "pending", thenable.then((resolvedValue) => {
+						promiseStatus = "resolved", onResolve(resolvedValue);
 					}, (rejectedValue) => {
-						promiseStatus = "rejected";
-						onReject(rejectedValue);
+						promiseStatus = "rejected", onReject(rejectedValue);
 					});
 				} else return onResolve(result);
 			} catch (error) {
 				onReject(error);
 			}
 		};
-		if (checkCallback() === true) return;
-		timeoutId = setTimeout(onReject, timeout);
-		intervalId = setInterval(checkCallback, interval);
+		checkCallback() !== true && (timeoutId = setTimeout(onReject, timeout), intervalId = setInterval(checkCallback, interval));
 	});
 }
 
@@ -3805,15 +3682,11 @@ function createVitest() {
 	const timers = () => _timers ||= new FakeTimers({
 		global: globalThis,
 		config: workerState.config.fakeTimers
-	});
-	const _stubsGlobal = /* @__PURE__ */ new Map();
-	const _stubsEnv = /* @__PURE__ */ new Map();
-	const _envBooleans = [
+	}), _stubsGlobal = /* @__PURE__ */ new Map(), _stubsEnv = /* @__PURE__ */ new Map(), _envBooleans = [
 		"PROD",
 		"DEV",
 		"SSR"
-	];
-	const utils = {
+	], utils = {
 		useFakeTimers(config) {
 			if (isChildProcess()) {
 				if (config?.toFake?.includes("nextTick") || workerState.config?.fakeTimers?.toFake?.includes("nextTick")) throw new Error("vi.useFakeTimers({ toFake: [\"nextTick\"] }) is not supported in node:child_process. Use --pool=threads if mocking nextTick is required.");
@@ -3823,62 +3696,49 @@ function createVitest() {
 				...config
 			});
 			else timers().configure(workerState.config.fakeTimers);
-			timers().useFakeTimers();
-			return utils;
+			return timers().useFakeTimers(), utils;
 		},
 		isFakeTimers() {
 			return timers().isFakeTimers();
 		},
 		useRealTimers() {
-			timers().useRealTimers();
-			return utils;
+			return timers().useRealTimers(), utils;
 		},
 		runOnlyPendingTimers() {
-			timers().runOnlyPendingTimers();
-			return utils;
+			return timers().runOnlyPendingTimers(), utils;
 		},
 		async runOnlyPendingTimersAsync() {
-			await timers().runOnlyPendingTimersAsync();
-			return utils;
+			return await timers().runOnlyPendingTimersAsync(), utils;
 		},
 		runAllTimers() {
-			timers().runAllTimers();
-			return utils;
+			return timers().runAllTimers(), utils;
 		},
 		async runAllTimersAsync() {
-			await timers().runAllTimersAsync();
-			return utils;
+			return await timers().runAllTimersAsync(), utils;
 		},
 		runAllTicks() {
-			timers().runAllTicks();
-			return utils;
+			return timers().runAllTicks(), utils;
 		},
 		advanceTimersByTime(ms) {
-			timers().advanceTimersByTime(ms);
-			return utils;
+			return timers().advanceTimersByTime(ms), utils;
 		},
 		async advanceTimersByTimeAsync(ms) {
-			await timers().advanceTimersByTimeAsync(ms);
-			return utils;
+			return await timers().advanceTimersByTimeAsync(ms), utils;
 		},
 		advanceTimersToNextTimer() {
-			timers().advanceTimersToNextTimer();
-			return utils;
+			return timers().advanceTimersToNextTimer(), utils;
 		},
 		async advanceTimersToNextTimerAsync() {
-			await timers().advanceTimersToNextTimerAsync();
-			return utils;
+			return await timers().advanceTimersToNextTimerAsync(), utils;
 		},
 		advanceTimersToNextFrame() {
-			timers().advanceTimersToNextFrame();
-			return utils;
+			return timers().advanceTimersToNextFrame(), utils;
 		},
 		getTimerCount() {
 			return timers().getTimerCount();
 		},
 		setSystemTime(time) {
-			timers().setSystemTime(time);
-			return utils;
+			return timers().setSystemTime(time), utils;
 		},
 		getMockedSystemTime() {
 			return timers().getMockedSystemTime();
@@ -3887,16 +3747,14 @@ function createVitest() {
 			return timers().getRealSystemTime();
 		},
 		clearAllTimers() {
-			timers().clearAllTimers();
-			return utils;
+			return timers().clearAllTimers(), utils;
 		},
 		spyOn,
 		fn,
 		waitFor,
 		waitUntil,
 		hoisted(factory) {
-			assertTypes(factory, "\"vi.hoisted\" factory", ["function"]);
-			return factory();
+			return assertTypes(factory, "\"vi.hoisted\" factory", ["function"]), factory();
 		},
 		mock(path, factory) {
 			if (typeof path !== "string") throw new TypeError(`vi.mock() expects a string path, but received a ${typeof path}`);
@@ -3932,30 +3790,25 @@ function createVitest() {
 			return isMockFunction(fn);
 		},
 		clearAllMocks() {
-			[...mocks].reverse().forEach((spy) => spy.mockClear());
-			return utils;
+			return clearAllMocks(), utils;
 		},
 		resetAllMocks() {
-			[...mocks].reverse().forEach((spy) => spy.mockReset());
-			return utils;
+			return resetAllMocks(), utils;
 		},
 		restoreAllMocks() {
-			[...mocks].reverse().forEach((spy) => spy.mockRestore());
-			return utils;
+			return restoreAllMocks(), utils;
 		},
 		stubGlobal(name, value) {
 			if (!_stubsGlobal.has(name)) _stubsGlobal.set(name, Object.getOwnPropertyDescriptor(globalThis, name));
-			Object.defineProperty(globalThis, name, {
+			return Object.defineProperty(globalThis, name, {
 				value,
 				writable: true,
 				configurable: true,
 				enumerable: true
-			});
-			return utils;
+			}), utils;
 		},
 		stubEnv(name, value) {
-			const state = getWorkerState();
-			const env = state.metaEnv;
+			const state = getWorkerState(), env = state.metaEnv;
 			if (!_stubsEnv.has(name)) _stubsEnv.set(name, env[name]);
 			if (_envBooleans.includes(name)) env[name] = value ? "1" : "";
 			else if (value === void 0) delete env[name];
@@ -3963,26 +3816,20 @@ function createVitest() {
 			return utils;
 		},
 		unstubAllGlobals() {
-			_stubsGlobal.forEach((original, name) => {
+			return _stubsGlobal.forEach((original, name) => {
 				if (!original) Reflect.deleteProperty(globalThis, name);
 				else Object.defineProperty(globalThis, name, original);
-			});
-			_stubsGlobal.clear();
-			return utils;
+			}), _stubsGlobal.clear(), utils;
 		},
 		unstubAllEnvs() {
-			const state = getWorkerState();
-			const env = state.metaEnv;
-			_stubsEnv.forEach((original, name) => {
+			const state = getWorkerState(), env = state.metaEnv;
+			return _stubsEnv.forEach((original, name) => {
 				if (original === void 0) delete env[name];
 				else env[name] = original;
-			});
-			_stubsEnv.clear();
-			return utils;
+			}), _stubsEnv.clear(), utils;
 		},
 		resetModules() {
-			resetModules(workerState.evaluatedModules);
-			return utils;
+			return resetModules(workerState.evaluatedModules), utils;
 		},
 		async dynamicImportSettled() {
 			return waitForImportsToResolve();
@@ -4006,13 +3853,9 @@ function _mocker() {
 	} });
 }
 function getImporter(name) {
-	const stackTrace = createSimpleStackTrace({ stackTraceLimit: 5 });
-	const stackArray = stackTrace.split("\n");
-	// if there is no message in a stack trace, use the item - 1
-	const importerStackIndex = stackArray.findIndex((stack) => {
+	const stackTrace = createSimpleStackTrace({ stackTraceLimit: 5 }), stackArray = stackTrace.split("\n"), importerStackIndex = stackArray.findIndex((stack) => {
 		return stack.includes(` at Object.${name}`) || stack.includes(`${name}@`);
-	});
-	const stack = parseSingleStack(stackArray[importerStackIndex + 1]);
+	}), stack = parseSingleStack(stackArray[importerStackIndex + 1]);
 	return stack?.file || "";
 }