vitest 4.0.0-beta.10 → 4.0.0-beta.12

package/dist/chunks/{setup-common.uiMcU3cv.js → setup-common.BewgbkTd.js}

@@ -1,7 +1,7 @@
 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.D2R2NiOH.js';
+import { setSafeTimers } from '@vitest/utils/timers';
+import { g as getWorkerState } from './utils.CG9h5ccR.js';
 
 async function startCoverageInsideWorker(options, loader, runtimeOptions) {
 	const coverageModule = await resolveCoverageProviderModule(options, loader);
@@ -18,7 +18,7 @@ async function stopCoverageInsideWorker(options, loader, runtimeOptions) {
 
 let globalSetup = false;
 async function setupCommonEnv(config) {
-	if (setupDefines(config), setupEnv(config.env), !globalSetup && (globalSetup = true, setSafeTimers(), config.globals)) (await import('./globals.DG-S3xFe.js')).registerApiGlobally();
+	if (setupDefines(config), setupEnv(config.env), !globalSetup && (globalSetup = true, setSafeTimers(), config.globals)) (await import('./globals.DC4ntO86.js')).registerApiGlobally();
 }
 function setupDefines(config) {
 	for (const key in config.defines) globalThis[key] = config.defines[key];
@@ -35,14 +35,14 @@ async function loadDiffConfig(config, moduleRunner) {
 	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, snapshotSerializers = await Promise.all(files.map(async (file) => {
+	const files = config.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;
 		if (typeof config.test !== "function" || typeof config.serialize !== "function" && typeof config.print !== "function") throw new TypeError(`invalid snapshot serializer in ${file}. Must have a 'test' method along with either a 'serialize' or 'print' method.`);
 		return config;
-	}));
-	snapshotSerializers.forEach((serializer) => addSerializer(serializer));
+	}))).forEach((serializer) => addSerializer(serializer));
 }
 
 export { stopCoverageInsideWorker as a, loadSnapshotSerializers as b, setupCommonEnv as c, loadDiffConfig as l, startCoverageInsideWorker as s, takeCoverageInsideWorker as t };

package/dist/chunks/{startModuleRunner.p67gbNo9.js → startModuleRunner.DPBo3mme.js}

@@ -1,16 +1,15 @@
 import fs from 'node:fs';
-import { builtinModules, isBuiltin } from 'node:module';
-import { highlight, isBareImport } from '@vitest/utils';
+import nodeModule, { isBuiltin } from 'node:module';
+import { isBareImport } from '@vitest/utils/helpers';
 import { pathToFileURL } from 'node:url';
 import { normalize as normalize$1, join as join$1 } from 'pathe';
 import { distDir } from '../path.js';
-import { processError } from '@vitest/utils/error';
+import { serializeValue } from '@vitest/utils/serialize';
 import { VitestModuleEvaluator, unwrapId } from '../module-evaluator.js';
 import { resolve as resolve$1, isAbsolute as isAbsolute$1 } from 'node:path';
 import vm from 'node:vm';
 import { MockerRegistry, mockObject, RedirectedModule, AutomockedModule } from '@vitest/mocker';
 import * as viteModuleRunner from 'vite/module-runner';
-import { V as VitestTransport } from './moduleTransport.I-bgQy0S.js';
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -29,8 +28,8 @@ const _UNC_REGEX = /^[/\\]{2}/, _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\
 	for (const seg of segments) {
 		if (!seg) continue;
 		if (path.length > 0) {
-			const pathTrailing = path[path.length - 1] === "/", segLeading = seg[0] === "/", both = pathTrailing && segLeading;
-			if (both) path += seg.slice(1);
+			const pathTrailing = path[path.length - 1] === "/", segLeading = seg[0] === "/";
+			if (pathTrailing && segLeading) path += seg.slice(1);
 			else path += pathTrailing || segLeading ? seg : `/${seg}`;
 		} else path += seg;
 	}
@@ -115,17 +114,14 @@ function findMockRedirect(root, mockPath, external) {
 		const baseOriginal = basename(path);
 		function findFile(mockFolder, baseOriginal) {
 			const files = readdirSync(mockFolder);
-			for (const file of files) {
-				const baseFile = basename(file, extname(file));
-				if (baseFile === baseOriginal) {
-					const path = resolve(mockFolder, file);
-					// if the same name, return the file
-					if (statSync(path).isFile()) return path;
-					{
-						// find folder/index.{js,ts}
-						const indexFile = findFile(path, "index");
-						if (indexFile) return indexFile;
-					}
+			for (const file of files) if (basename(file, extname(file)) === baseOriginal) {
+				const path = resolve(mockFolder, file);
+				// if the same name, return the file
+				if (statSync(path).isFile()) return path;
+				{
+					// find folder/index.{js,ts}
+					const indexFile = findFile(path, "index");
+					if (indexFile) return indexFile;
 				}
 			}
 			return null;
@@ -136,7 +132,7 @@ function findMockRedirect(root, mockPath, external) {
 	return existsSync(fullPath) ? fullPath : null;
 }
 const builtins = new Set([
-	...builtinModules,
+	...nodeModule.builtinModules,
 	"assert/strict",
 	"diagnostics_channel",
 	"dns/promises",
@@ -157,7 +153,7 @@ const builtins = new Set([
 	"node:test/reporters"
 ]), NODE_BUILTIN_NAMESPACE = "node:";
 function isNodeBuiltin(id) {
-	return prefixedBuiltins$1.has(id) ? true : builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(5) : id);
+	return nodeModule.isBuiltin ? nodeModule.isBuiltin(id) : prefixedBuiltins$1.has(id) ? true : builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(5) : id);
 }
 
 const spyModulePath = resolve$1(distDir, "spy.js");
@@ -279,16 +275,16 @@ class VitestMocker {
 			if (prop === "then") {
 				if (target instanceof Promise) return target.then.bind(target);
 			} else if (!(prop in target)) {
-				if (this.filterPublicKeys.includes(prop)) return void 0;
+				if (this.filterPublicKeys.includes(prop)) return;
 				throw this.createError(`[vitest] No "${String(prop)}" export is defined on the "${mock.raw}" mock. Did you forget to return it from "vi.mock"?
 If you need to partially mock a module, you can use "importOriginal" helper inside:
-`, highlight(`vi.mock(import("${mock.raw}"), async (importOriginal) => {
+`, `vi.mock(import("${mock.raw}"), async (importOriginal) => {
   const actual = await importOriginal()
   return {
     ...actual,
     // your mocked methods
   }
-})`));
+})`);
 			}
 			return val;
 		} });
@@ -303,8 +299,7 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
 		return `mock:${dep}`;
 	}
 	getDependencyMock(id) {
-		const registry = this.getMockerRegistry();
-		return registry.getById(fixLeadingSlashes(id));
+		return this.getMockerRegistry().getById(fixLeadingSlashes(id));
 	}
 	findMockRedirect(mockPath, external) {
 		return findMockRedirect(this.root, mockPath, external);
@@ -319,8 +314,7 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
 		}, object, mockExports);
 	}
 	unmockPath(id) {
-		const registry = this.getMockerRegistry();
-		registry.deleteById(id), this.invalidateModuleById(id);
+		this.getMockerRegistry().deleteById(id), this.invalidateModuleById(id);
 	}
 	mockPath(originalId, id, url, external, mockType, factory) {
 		const registry = this.getMockerRegistry();
@@ -335,8 +329,8 @@ If you need to partially mock a module, you can use "importOriginal" helper insi
 		this.invalidateModuleById(id);
 	}
 	async importActual(rawId, importer, callstack) {
-		const { url } = await this.resolveId(rawId, importer), node = await this.moduleRunner.fetchModule(url, importer), result = await this.moduleRunner.cachedRequest(node.url, node, callstack || [importer], void 0, true);
-		return result;
+		const { url } = await this.resolveId(rawId, importer), node = await this.moduleRunner.fetchModule(url, importer);
+		return await this.moduleRunner.cachedRequest(node.url, node, callstack || [importer], void 0, true);
 	}
 	async importMock(rawId, importer) {
 		const { id, url, external } = await this.resolveId(rawId, importer);
@@ -421,11 +415,8 @@ const prefixedBuiltins = new Set([
 // C:\root\id.js -> /id.js
 // TODO: expose this in vite/module-runner
 function normalizeModuleId(file) {
-	if (prefixedBuiltins.has(file)) return file;
-	// unix style, but Windows path still starts with the drive letter to check the root
-	const unixFile = slash(file).replace(/^\/@fs\//, isWindows$1 ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
 	// if it's not in the root, keep it as a path, not a URL
-	return unixFile.replace(/^file:\//, "/");
+	return prefixedBuiltins.has(file) ? file : slash(file).replace(/^\/@fs\//, isWindows$1 ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/").replace(/^file:\//, "/");
 }
 const windowsSlashRE = /\\/g;
 function slash(p) {
@@ -437,9 +428,37 @@ function fixLeadingSlashes(id) {
 	return id.startsWith("//") ? id.replace(multipleSlashRe, "/") : id;
 }
 
-// eslint-disable-next-line ts/ban-ts-comment
-// @ts-ignore
-const createNodeImportMeta = viteModuleRunner.createNodeImportMeta;
+class VitestTransport {
+	constructor(options) {
+		this.options = options;
+	}
+	async invoke(event) {
+		if (event.type !== "custom") return { error: /* @__PURE__ */ new Error(`Vitest Module Runner doesn't support Vite HMR events.`) };
+		if (event.event !== "vite:invoke") return { error: /* @__PURE__ */ new Error(`Vitest Module Runner doesn't support ${event.event} event.`) };
+		const { name, data } = event.data;
+		if (name !== "fetchModule") return { error: /* @__PURE__ */ new Error(`Unknown method: ${name}. Expected "fetchModule".`) };
+		try {
+			return { result: await this.options.fetchModule(...data) };
+		} catch (error) {
+			return { error };
+		}
+	}
+}
+
+const createNodeImportMeta = (modulePath) => {
+	if (!viteModuleRunner.createDefaultImportMeta) throw new Error(`createNodeImportMeta is not supported in this version of Vite.`);
+	const defaultMeta = viteModuleRunner.createDefaultImportMeta(modulePath), href = defaultMeta.url, importMetaResolver = createImportMetaResolver();
+	return {
+		...defaultMeta,
+		main: false,
+		resolve(id, parent) {
+			return (importMetaResolver ?? defaultMeta.resolve)(id, parent ?? href);
+		}
+	};
+};
+function createImportMetaResolver() {
+	if (import.meta.resolve) return (specifier, importer) => import.meta.resolve(specifier, importer);
+}
 // @ts-expect-error overriding private method
 class VitestModuleRunner extends viteModuleRunner.ModuleRunner {
 	mocker;
@@ -474,11 +493,10 @@ class VitestModuleRunner extends viteModuleRunner.ModuleRunner {
 	}
 	async import(rawId) {
 		const resolved = await this.vitestOptions.transport.resolveId(rawId);
-		return resolved ? super.import(resolved.url) : super.import(rawId);
+		return super.import(resolved ? resolved.url : rawId);
 	}
 	async fetchModule(url, importer) {
-		const module = await this.cachedModule(url, importer);
-		return module;
+		return await this.cachedModule(url, importer);
 	}
 	_cachedRequest(url, module, callstack = [], metadata) {
 		// @ts-expect-error "cachedRequest" is private
@@ -547,11 +565,11 @@ const dispose = [];
 function listenForErrors(state) {
 	dispose.forEach((fn) => fn()), dispose.length = 0;
 	function catchError(err, type, event) {
-		const worker = state(), listeners = process.listeners(event);
+		const worker = state();
 		// if there is another listener, assume that it's handled by user code
 		// one is Vitest's own listener
-		if (listeners.length > 1) return;
-		const error = processError(err);
+		if (process.listeners(event).length > 1) return;
+		const error = serializeValue(err);
 		if (typeof error === "object" && error != null) {
 			if (error.VITEST_TEST_NAME = worker.current?.type === "test" ? worker.current.name : void 0, worker.filepath) error.VITEST_TEST_PATH = worker.filepath;
 			error.VITEST_AFTER_ENV_TEARDOWN = worker.environmentTeardownRun;
@@ -597,10 +615,7 @@ function startVitestModuleRunner(options) {
 				if (isWindows) {
 					if (id[1] === ":") {
 						// The drive letter is different for whatever reason, we need to normalize it to CWD
-						if (id[0] !== cwd[0] && id[0].toUpperCase() === cwd[0].toUpperCase()) {
-							const isUpperCase = cwd[0].toUpperCase() === cwd[0];
-							id = (isUpperCase ? id[0].toUpperCase() : id[0].toLowerCase()) + id.slice(1);
-						}
+						if (id[0] !== cwd[0] && id[0].toUpperCase() === cwd[0].toUpperCase()) id = (cwd[0].toUpperCase() === cwd[0] ? id[0].toUpperCase() : id[0].toLowerCase()) + id.slice(1);
 						// always mark absolute windows paths, otherwise Vite will externalize it
 						id = `/@id/${id}`;
 					}
@@ -625,14 +640,10 @@ function startVitestModuleRunner(options) {
 						type: "builtin"
 					};
 					const result = await rpc().fetch(id, importer, environment(), options);
-					if ("cached" in result) {
-						const code = readFileSync(result.tmp, "utf-8");
-						return {
-							code,
-							...result
-						};
-					}
-					return result;
+					return "cached" in result ? {
+						code: readFileSync(result.tmp, "utf-8"),
+						...result
+					} : result;
 				} catch (cause) {
 					// rethrow vite error if it cannot load the module because it's not resolved
 					if (typeof cause === "object" && cause != null && cause.code === "ERR_LOAD_URL" || typeof cause?.message === "string" && cause.message.includes("Failed to load url") || typeof cause?.message === "string" && cause.message.startsWith("Cannot find module '")) {
@@ -652,8 +663,6 @@ function startVitestModuleRunner(options) {
 		vm,
 		createImportMeta: options.createImportMeta
 	});
-	// await moduleRunner.import('/@vite/env')
-	// await moduleRunner.mocker.initializeSpyModule()
 	return moduleRunner;
 }
 function toBuiltin(id) {
@@ -662,4 +671,4 @@ function toBuiltin(id) {
 	return id;
 }
 
-export { VitestModuleRunner as V, VITEST_VM_CONTEXT_SYMBOL as a, createNodeImportMeta as c, startVitestModuleRunner as s };
+export { VitestModuleRunner as V, VITEST_VM_CONTEXT_SYMBOL as a, VitestTransport as b, createNodeImportMeta as c, startVitestModuleRunner as s };

package/dist/chunks/{test.BiqSKISg.js → test.CTuWuHYH.js}

@@ -1,13 +1,14 @@
 import { updateTask } from '@vitest/runner';
-import { createDefer, getSafeTimers } from '@vitest/utils';
-import { a as getBenchOptions, g as getBenchFn } from './benchmark.CJUa-Hsa.js';
-import { g as getWorkerState } from './utils.D2R2NiOH.js';
+import { createDefer } from '@vitest/utils/helpers';
+import { getSafeTimers } from '@vitest/utils/timers';
+import { a as getBenchOptions, g as getBenchFn } from './benchmark.DHKMYAts.js';
+import { g as getWorkerState } from './utils.CG9h5ccR.js';
 import { setState, GLOBAL_EXPECT, getState } from '@vitest/expect';
 import { getTests, getNames, getTestName } from '@vitest/runner/utils';
 import { processError } from '@vitest/utils/error';
 import { normalize } from 'pathe';
-import { a as getSnapshotClient, i as inject, c as createExpect, v as vi } from './vi.ZPgvtBao.js';
-import { r as rpc } from './rpc.BKr6mtxz.js';
+import { a as getSnapshotClient, i as inject, c as createExpect, v as vi } from './vi.B2--mG9U.js';
+import { r as rpc } from './rpc.cD77ENhU.js';
 
 function createBenchmarkResult(name) {
 	return {
@@ -36,7 +37,7 @@ async function runBenchmarkSuite(suite, runner) {
 		}, updateTask$1("suite-prepare", suite);
 		const addBenchTaskListener = (task, benchmark) => {
 			task.addEventListener("complete", (e) => {
-				const task = e.task, taskRes = task.result, result = benchmark.result.benchmark;
+				const taskRes = e.task.result, result = benchmark.result.benchmark;
 				benchmark.result.state = "pass", Object.assign(result, taskRes);
 				// compute extra stats and free raw samples as early as possible
 				const samples = result.samples;
@@ -93,7 +94,6 @@ class NodeBenchmarkRunner {
 	}
 }
 
-// import type { VitestExecutor } from '../execute'
 // worker context is shared between all tests
 const workerContext = Object.create(null);
 class VitestTestRunner {