vitest 4.0.0-beta.5 → 4.0.0-beta.7

package/dist/chunks/{resolver.D5bG4zy5.js → resolver.Bx6lE0iq.js}

@@ -2,39 +2,22 @@ import fs from 'node:fs';
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
-	if (!input) return input;
-	return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+	return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 }
-const _UNC_REGEX = /^[/\\]{2}/;
-const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
-const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
-const normalize = function(path) {
+const _UNC_REGEX = /^[/\\]{2}/, _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, _DRIVE_LETTER_RE = /^[A-Za-z]:$/, normalize = function(path) {
 	if (path.length === 0) return ".";
 	path = normalizeWindowsPath(path);
-	const isUNCPath = path.match(_UNC_REGEX);
-	const isPathAbsolute = isAbsolute(path);
-	const trailingSeparator = path[path.length - 1] === "/";
-	path = normalizeString(path, !isPathAbsolute);
-	if (path.length === 0) {
-		if (isPathAbsolute) return "/";
-		return trailingSeparator ? "./" : ".";
-	}
+	const isUNCPath = path.match(_UNC_REGEX), isPathAbsolute = isAbsolute(path), trailingSeparator = path[path.length - 1] === "/";
+	if (path = normalizeString(path, !isPathAbsolute), path.length === 0) return isPathAbsolute ? "/" : trailingSeparator ? "./" : ".";
 	if (trailingSeparator) path += "/";
 	if (_DRIVE_LETTER_RE.test(path)) path += "/";
-	if (isUNCPath) {
-		if (!isPathAbsolute) return `//./${path}`;
-		return `//${path}`;
-	}
-	return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-};
-const join = function(...segments) {
+	return isUNCPath ? isPathAbsolute ? `//${path}` : `//./${path}` : isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
+}, join = function(...segments) {
 	let path = "";
 	for (const seg of segments) {
 		if (!seg) continue;
 		if (path.length > 0) {
-			const pathTrailing = path[path.length - 1] === "/";
-			const segLeading = seg[0] === "/";
-			const both = pathTrailing && segLeading;
+			const pathTrailing = path[path.length - 1] === "/", segLeading = seg[0] === "/", both = pathTrailing && segLeading;
 			if (both) path += seg.slice(1);
 			else path += pathTrailing || segLeading ? seg : `/${seg}`;
 		} else path += seg;
@@ -42,11 +25,7 @@ const join = function(...segments) {
 	return normalize(path);
 };
 function normalizeString(path, allowAboveRoot) {
-	let res = "";
-	let lastSegmentLength = 0;
-	let lastSlash = -1;
-	let dots = 0;
-	let char = null;
+	let res = "", lastSegmentLength = 0, lastSlash = -1, dots = 0, char = null;
 	for (let index = 0; index <= path.length; ++index) {
 		if (index < path.length) char = path[index];
 		else if (char === "/") break;
@@ -57,35 +36,22 @@ function normalizeString(path, allowAboveRoot) {
 				if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
 					if (res.length > 2) {
 						const lastSlashIndex = res.lastIndexOf("/");
-						if (lastSlashIndex === -1) {
-							res = "";
-							lastSegmentLength = 0;
-						} else {
-							res = res.slice(0, lastSlashIndex);
-							lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
-						}
-						lastSlash = index;
-						dots = 0;
+						if (lastSlashIndex === -1) res = "", lastSegmentLength = 0;
+						else res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
+						lastSlash = index, dots = 0;
 						continue;
 					} else if (res.length > 0) {
-						res = "";
-						lastSegmentLength = 0;
-						lastSlash = index;
-						dots = 0;
+						res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
 						continue;
 					}
 				}
-				if (allowAboveRoot) {
-					res += res.length > 0 ? "/.." : "..";
-					lastSegmentLength = 2;
-				}
+				if (allowAboveRoot) res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2;
 			} else {
 				if (res.length > 0) res += `/${path.slice(lastSlash + 1, index)}`;
 				else res = path.slice(lastSlash + 1, index);
 				lastSegmentLength = index - lastSlash - 1;
 			}
-			lastSlash = index;
-			dots = 0;
+			lastSlash = index, dots = 0;
 		} else if (char === "." && dots !== -1) ++dots;
 		else dots = -1;
 	}
@@ -93,8 +59,7 @@ function normalizeString(path, allowAboveRoot) {
 }
 const isAbsolute = function(p) {
 	return _IS_ABSOLUTE_RE.test(p);
-};
-const dirname = function(p) {
+}, dirname = function(p) {
 	const segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
 	if (segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0])) segments[0] += "/";
 	return segments.join("/") || (isAbsolute(p) ? "/" : ".");
@@ -120,8 +85,7 @@ function findNearestPackageData(basedir) {
 	return {};
 }
 function stripBomTag(content) {
-	if (content.charCodeAt(0) === 65279) return content.slice(1);
-	return content;
+	return content.charCodeAt(0) === 65279 ? content.slice(1) : content;
 }
 function tryStatSync(file) {
 	try {
@@ -131,16 +95,12 @@ function tryStatSync(file) {
 }
 function getCachedData(cache, basedir, originalBasedir) {
 	const pkgData = cache.get(getFnpdCacheKey(basedir));
-	if (pkgData) {
-		traverseBetweenDirs(originalBasedir, basedir, (dir) => {
-			cache.set(getFnpdCacheKey(dir), pkgData);
-		});
-		return pkgData;
-	}
+	if (pkgData) return traverseBetweenDirs(originalBasedir, basedir, (dir) => {
+		cache.set(getFnpdCacheKey(dir), pkgData);
+	}), pkgData;
 }
 function setCacheData(cache, data, basedir, originalBasedir) {
-	cache.set(getFnpdCacheKey(basedir), data);
-	traverseBetweenDirs(originalBasedir, basedir, (dir) => {
+	cache.set(getFnpdCacheKey(basedir), data), traverseBetweenDirs(originalBasedir, basedir, (dir) => {
 		cache.set(getFnpdCacheKey(dir), data);
 	});
 }
@@ -153,10 +113,7 @@ function getFnpdCacheKey(basedir) {
 * @param shorterDir Shorter dir path, e.g. `/User/foo`
 */
 function traverseBetweenDirs(longerDir, shorterDir, cb) {
-	while (longerDir !== shorterDir) {
-		cb(longerDir);
-		longerDir = dirname(longerDir);
-	}
+	while (longerDir !== shorterDir) cb(longerDir), longerDir = dirname(longerDir);
 }
 
 export { findNearestPackageData as f };

package/dist/chunks/{rpc.DGoW_Vl-.js → rpc.RpPylpp0.js}

@@ -1,29 +1,18 @@
 import { getSafeTimers } from '@vitest/utils';
 import { c as createBirpc } from './index.Bgo3tNWt.js';
-import { g as getWorkerState } from './utils.B9FY3b73.js';
+import { g as getWorkerState } from './utils.C7__0Iv5.js';
 
 const { get } = Reflect;
 function withSafeTimers(fn) {
-	const { setTimeout, clearTimeout, nextTick, setImmediate, clearImmediate } = getSafeTimers();
-	const currentSetTimeout = globalThis.setTimeout;
-	const currentClearTimeout = globalThis.clearTimeout;
-	const currentSetImmediate = globalThis.setImmediate;
-	const currentClearImmediate = globalThis.clearImmediate;
-	const currentNextTick = globalThis.process?.nextTick;
+	const { setTimeout, clearTimeout, nextTick, setImmediate, clearImmediate } = getSafeTimers(), currentSetTimeout = globalThis.setTimeout, currentClearTimeout = globalThis.clearTimeout, currentSetImmediate = globalThis.setImmediate, currentClearImmediate = globalThis.clearImmediate, currentNextTick = globalThis.process?.nextTick;
 	try {
-		globalThis.setTimeout = setTimeout;
-		globalThis.clearTimeout = clearTimeout;
-		if (setImmediate) globalThis.setImmediate = setImmediate;
+		if (globalThis.setTimeout = setTimeout, globalThis.clearTimeout = clearTimeout, setImmediate) globalThis.setImmediate = setImmediate;
 		if (clearImmediate) globalThis.clearImmediate = clearImmediate;
 		if (globalThis.process && nextTick) globalThis.process.nextTick = nextTick;
 		const result = fn();
 		return result;
 	} finally {
-		globalThis.setTimeout = currentSetTimeout;
-		globalThis.clearTimeout = currentClearTimeout;
-		globalThis.setImmediate = currentSetImmediate;
-		globalThis.clearImmediate = currentClearImmediate;
-		if (globalThis.process && nextTick) nextTick(() => {
+		if (globalThis.setTimeout = currentSetTimeout, globalThis.clearTimeout = currentClearTimeout, globalThis.setImmediate = currentSetImmediate, globalThis.clearImmediate = currentClearImmediate, globalThis.process && nextTick) nextTick(() => {
 			globalThis.process.nextTick = currentNextTick;
 		});
 	}
@@ -38,8 +27,7 @@ function createRuntimeRpc(options) {
 	let setCancel = (_reason) => {};
 	const onCancel = new Promise((resolve) => {
 		setCancel = resolve;
-	});
-	const rpc = createSafeRpc(createBirpc({ onCancel: setCancel }, {
+	}), rpc = createSafeRpc(createBirpc({ onCancel: setCancel }, {
 		eventNames: [
 			"onUserConsoleLog",
 			"onCollected",
@@ -57,8 +45,7 @@ function createSafeRpc(rpc) {
 	return new Proxy(rpc, { get(target, p, handler) {
 		// keep $rejectPendingCalls as sync function
 		if (p === "$rejectPendingCalls") return rpc.$rejectPendingCalls;
-		const sendCall = get(target, p, handler);
-		const safeSendCall = (...args) => withSafeTimers(async () => {
+		const sendCall = get(target, p, handler), safeSendCall = (...args) => withSafeTimers(async () => {
 			const result = sendCall(...args);
 			promises.add(result);
 			try {
@@ -67,8 +54,7 @@ function createSafeRpc(rpc) {
 				promises.delete(result);
 			}
 		});
-		safeSendCall.asEvent = sendCall.asEvent;
-		return safeSendCall;
+		return safeSendCall.asEvent = sendCall.asEvent, safeSendCall;
 	} });
 }
 function rpc() {

package/dist/chunks/{runBaseTests.B3KcKqlF.js → runBaseTests.D6sfuWBM.js}

@@ -1,21 +1,21 @@
 import { performance } from 'node:perf_hooks';
 import { startTests, collectTests } from '@vitest/runner';
-import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './index.oWRWx-nj.js';
-import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './setup-common.lgPs-bYv.js';
-import { a as globalExpect, v as vi } from './vi.DGAfBY4R.js';
-import { c as closeInspector } from './inspector.C914Efll.js';
+import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './index.CsFXYRkW.js';
+import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './setup-common.hLGRxhC8.js';
+import { a as globalExpect, v as vi } from './vi.BfdOiD4j.js';
+import { c as closeInspector } from './inspector.CvQD-Nie.js';
 import { createRequire } from 'node:module';
 import timers from 'node:timers';
 import timersPromises from 'node:timers/promises';
 import util from 'node:util';
 import { KNOWN_ASSET_TYPES, getSafeTimers } from '@vitest/utils';
-import { V as VitestIndex } from './index.QZr3S3vQ.js';
-import { g as getWorkerState, r as resetModules } from './utils.B9FY3b73.js';
+import { V as VitestIndex } from './index.AR8aAkCC.js';
+import { g as getWorkerState, r as resetModules } from './utils.C7__0Iv5.js';
 import 'chai';
 import 'node:path';
 import '../path.js';
 import 'node:url';
-import './rpc.DGoW_Vl-.js';
+import './rpc.RpPylpp0.js';
 import './index.Bgo3tNWt.js';
 import './coverage.D_JHT54q.js';
 import '@vitest/snapshot';
@@ -25,16 +25,15 @@ import './_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/utils/error';
 import '@vitest/spy';
 import '@vitest/utils/source-map';
-import './date.Bq6ZW5rf.js';
-import './benchmark.CtuRzf-i.js';
+import './date.-jtEtIeV.js';
+import './benchmark.UW6Ezvxy.js';
 import 'expect-type';
 import 'vite/module-runner';
 
 // this should only be used in Node
 let globalSetup = false;
 async function setupGlobalEnv(config, { environment }, moduleRunner) {
-	await setupCommonEnv(config);
-	Object.defineProperty(globalThis, "__vitest_index__", {
+	await setupCommonEnv(config), Object.defineProperty(globalThis, "__vitest_index__", {
 		value: VitestIndex,
 		enumerable: false
 	});
@@ -45,24 +44,15 @@ async function setupGlobalEnv(config, { environment }, moduleRunner) {
 	const viteEnvironment = environment.viteEnvironment || environment.name;
 	if (viteEnvironment === "client") {
 		const _require = createRequire(import.meta.url);
-		// always mock "required" `css` files, because we cannot process them
-		_require.extensions[".css"] = resolveCss;
-		_require.extensions[".scss"] = resolveCss;
-		_require.extensions[".sass"] = resolveCss;
-		_require.extensions[".less"] = resolveCss;
-		// since we are using Vite, we can assume how these will be resolved
-		KNOWN_ASSET_TYPES.forEach((type) => {
+		_require.extensions[".css"] = resolveCss, _require.extensions[".scss"] = resolveCss, _require.extensions[".sass"] = resolveCss, _require.extensions[".less"] = resolveCss, KNOWN_ASSET_TYPES.forEach((type) => {
 			_require.extensions[`.${type}`] = resolveAsset;
-		});
-		process.env.SSR = "";
+		}), process.env.SSR = "";
 	} else process.env.SSR = "1";
-	// @ts-expect-error not typed global for patched timers
-	globalThis.__vitest_required__ = {
+	if (globalThis.__vitest_required__ = {
 		util,
 		timers,
 		timersPromises
-	};
-	if (!config.disableConsoleIntercept) await setupConsoleLogSpy();
+	}, !config.disableConsoleIntercept) await setupConsoleLogSpy();
 }
 function resolveCss(mod) {
 	mod.exports = "";
@@ -71,58 +61,39 @@ function resolveAsset(mod, url) {
 	mod.exports = url;
 }
 async function setupConsoleLogSpy() {
-	const { createCustomConsole } = await import('./console.Duv2dVIC.js');
+	const { createCustomConsole } = await import('./console.B0quX7yH.js');
 	globalThis.console = createCustomConsole();
 }
 async function withEnv({ environment }, options, fn) {
-	// @ts-expect-error untyped global
-	globalThis.__vitest_environment__ = environment.name;
-	globalExpect.setState({ environment: environment.name });
+	globalThis.__vitest_environment__ = environment.name, globalExpect.setState({ environment: environment.name });
 	const env = await environment.setup(globalThis, options);
 	try {
 		await fn();
 	} finally {
 		// Run possible setTimeouts, e.g. the onces used by ConsoleLogSpy
 		const { setTimeout } = getSafeTimers();
-		await new Promise((resolve) => setTimeout(resolve));
-		await env.teardown(globalThis);
+		await new Promise((resolve) => setTimeout(resolve)), await env.teardown(globalThis);
 	}
 }
 
 // browser shouldn't call this!
 async function run(method, files, config, environment, moduleRunner) {
-	const workerState = getWorkerState();
-	const isIsolatedThreads = config.pool === "threads" && (config.poolOptions?.threads?.isolate ?? true);
-	const isIsolatedForks = config.pool === "forks" && (config.poolOptions?.forks?.isolate ?? true);
-	const isolate = isIsolatedThreads || isIsolatedForks;
-	await setupGlobalEnv(config, environment, moduleRunner);
-	await startCoverageInsideWorker(config.coverage, moduleRunner, { isolate });
-	if (config.chaiConfig) setupChaiConfig(config.chaiConfig);
+	const workerState = getWorkerState(), isIsolatedThreads = config.pool === "threads" && (config.poolOptions?.threads?.isolate ?? true), isIsolatedForks = config.pool === "forks" && (config.poolOptions?.forks?.isolate ?? true), isolate = isIsolatedThreads || isIsolatedForks;
+	if (await setupGlobalEnv(config, environment, moduleRunner), await startCoverageInsideWorker(config.coverage, moduleRunner, { isolate }), config.chaiConfig) setupChaiConfig(config.chaiConfig);
 	const runner = await resolveTestRunner(config, moduleRunner);
 	workerState.onCancel.then((reason) => {
-		closeInspector(config);
-		runner.cancel?.(reason);
-	});
-	workerState.durations.prepare = performance.now() - workerState.durations.prepare;
-	workerState.durations.environment = performance.now();
-	await withEnv(environment, environment.options || config.environmentOptions || {}, async () => {
+		closeInspector(config), runner.cancel?.(reason);
+	}), workerState.durations.prepare = performance.now() - workerState.durations.prepare, workerState.durations.environment = performance.now(), await withEnv(environment, environment.options || config.environmentOptions || {}, async () => {
 		workerState.durations.environment = performance.now() - workerState.durations.environment;
 		for (const file of files) {
-			if (isolate) {
-				moduleRunner.mocker.reset();
-				resetModules(workerState.evaluatedModules, true);
-			}
-			workerState.filepath = file.filepath;
-			if (method === "run") await startTests([file], runner);
+			if (isolate) moduleRunner.mocker.reset(), resetModules(workerState.evaluatedModules, true);
+			if (workerState.filepath = file.filepath, method === "run") await startTests([file], runner);
 			else await collectTests([file], runner);
-			// reset after tests, because user might call `vi.setConfig` in setupFile
-			vi.resetConfig();
 			// mocks should not affect different files
-			vi.restoreAllMocks();
+			vi.resetConfig(), vi.restoreAllMocks();
 		}
 		await stopCoverageInsideWorker(config.coverage, moduleRunner, { isolate });
-	});
-	workerState.environmentTeardownRun = true;
+	}), workerState.environmentTeardownRun = true;
 }
 
 export { run };

package/dist/chunks/{setup-common.lgPs-bYv.js → setup-common.hLGRxhC8.js}

@@ -1,54 +1,41 @@
 import { r as resolveCoverageProviderModule } from './coverage.D_JHT54q.js';
 import { addSerializer } from '@vitest/snapshot';
 import { setSafeTimers } from '@vitest/utils';
-import { g as getWorkerState } from './utils.B9FY3b73.js';
+import { g as getWorkerState } from './utils.C7__0Iv5.js';
 
 async function startCoverageInsideWorker(options, loader, runtimeOptions) {
 	const coverageModule = await resolveCoverageProviderModule(options, loader);
-	if (coverageModule) return coverageModule.startCoverage?.(runtimeOptions);
-	return null;
+	return coverageModule ? coverageModule.startCoverage?.(runtimeOptions) : null;
 }
 async function takeCoverageInsideWorker(options, loader) {
 	const coverageModule = await resolveCoverageProviderModule(options, loader);
-	if (coverageModule) return coverageModule.takeCoverage?.({ moduleExecutionInfo: loader.moduleExecutionInfo });
-	return null;
+	return coverageModule ? coverageModule.takeCoverage?.({ moduleExecutionInfo: loader.moduleExecutionInfo }) : null;
 }
 async function stopCoverageInsideWorker(options, loader, runtimeOptions) {
 	const coverageModule = await resolveCoverageProviderModule(options, loader);
-	if (coverageModule) return coverageModule.stopCoverage?.(runtimeOptions);
-	return null;
+	return coverageModule ? coverageModule.stopCoverage?.(runtimeOptions) : null;
 }
 
 let globalSetup = false;
 async function setupCommonEnv(config) {
-	setupDefines(config.defines);
-	setupEnv(config.env);
-	if (globalSetup) return;
-	globalSetup = true;
-	setSafeTimers();
-	if (config.globals) (await import('./globals.CJQ63oO0.js')).registerApiGlobally();
+	if (setupDefines(config.defines), setupEnv(config.env), !globalSetup && (globalSetup = true, setSafeTimers(), config.globals)) (await import('./globals.lgsmH00r.js')).registerApiGlobally();
 }
 function setupDefines(defines) {
 	for (const key in defines) globalThis[key] = defines[key];
 }
 function setupEnv(env) {
-	const state = getWorkerState();
-	// same boolean-to-string assignment as VitestPlugin.configResolved
-	const { PROD, DEV,...restEnvs } = env;
-	state.metaEnv.PROD = PROD;
-	state.metaEnv.DEV = DEV;
-	for (const key in restEnvs) state.metaEnv[key] = env[key];
+	const state = getWorkerState(), { PROD, DEV,...restEnvs } = env;
+	for (const key in state.metaEnv.PROD = PROD, state.metaEnv.DEV = DEV, restEnvs) state.metaEnv[key] = env[key];
 }
 async function loadDiffConfig(config, moduleRunner) {
 	if (typeof config.diff === "object") return config.diff;
 	if (typeof config.diff !== "string") return;
 	const diffModule = await moduleRunner.import(config.diff);
 	if (diffModule && typeof diffModule.default === "object" && diffModule.default != null) return diffModule.default;
-	else throw new Error(`invalid diff config file ${config.diff}. Must have a default export with config object`);
+	throw new Error(`invalid diff config file ${config.diff}. Must have a default export with config object`);
 }
 async function loadSnapshotSerializers(config, moduleRunner) {
-	const files = config.snapshotSerializers;
-	const snapshotSerializers = await Promise.all(files.map(async (file) => {
+	const files = config.snapshotSerializers, snapshotSerializers = await Promise.all(files.map(async (file) => {
 		const mo = await moduleRunner.import(file);
 		if (!mo || typeof mo.default !== "object" || mo.default === null) throw new Error(`invalid snapshot serializer file ${file}. Must export a default object`);
 		const config = mo.default;