vitest 4.0.0-beta.11 → 4.0.0-beta.12

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

@@ -28,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;
 	}
@@ -114,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;
@@ -278,7 +275,7 @@ 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:
 `, `vi.mock(import("${mock.raw}"), async (importOriginal) => {
@@ -302,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);
@@ -318,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();
@@ -334,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);
@@ -420,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) {
@@ -446,17 +438,27 @@ class VitestTransport {
 		const { name, data } = event.data;
 		if (name !== "fetchModule") return { error: /* @__PURE__ */ new Error(`Unknown method: ${name}. Expected "fetchModule".`) };
 		try {
-			const result = await this.options.fetchModule(...data);
-			return { result };
+			return { result: await this.options.fetchModule(...data) };
 		} catch (error) {
 			return { error };
 		}
 	}
 }
 
-// eslint-disable-next-line ts/ban-ts-comment
-// @ts-ignore
-const createNodeImportMeta = viteModuleRunner.createNodeImportMeta;
+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;
@@ -491,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
@@ -564,10 +565,10 @@ 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;
+		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;
@@ -614,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}`;
 					}
@@ -642,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 '")) {
@@ -669,8 +663,6 @@ function startVitestModuleRunner(options) {
 		vm,
 		createImportMeta: options.createImportMeta
 	});
-	// await moduleRunner.import('/@vite/env')
-	// await moduleRunner.mocker.initializeSpyModule()
 	return moduleRunner;
 }
 function toBuiltin(id) {

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

@@ -1,14 +1,14 @@
 import { updateTask } from '@vitest/runner';
 import { createDefer } from '@vitest/utils/helpers';
 import { getSafeTimers } from '@vitest/utils/timers';
-import { a as getBenchOptions, g as getBenchFn } from './benchmark.LXhJ0F0X.js';
-import { g as getWorkerState } from './utils.DGKhod2J.js';
+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.CiJ0Laa6.js';
-import { r as rpc } from './rpc.jKGRSXIH.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 {
@@ -37,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;

package/dist/chunks/{typechecker.gXq-5P3n.js → typechecker.BfOQ86_a.js}

@@ -30,9 +30,7 @@ function wrapSerializableConfig(config) {
 	};
 }
 function createDefinesScript(define) {
-	if (!define) return "";
-	const serializedDefine = serializeDefine(define);
-	return serializedDefine === "{}" ? "" : `
+	return !define || serializeDefine(define) === "{}" ? "" : `
 const defines = ${serializeDefine(define)}
 Object.keys(defines).forEach((key) => {
   const segments = key.split('.')
@@ -244,16 +242,6 @@ const urlRegex = /^([\w+.-]+:)\/\/([^@/#?]*@)?([^:/#?]*)(:\d+)?(\/[^#?]*)?(\?[^#
  * 4. Hash, including "#", optional.
  */
 const fileRegex = /^file:(?:\/\/((?![a-z]:)[^/#?]*)?)?(\/?[^#?]*)(\?[^#]*)?(#.*)?/i;
-var UrlType;
-(function (UrlType) {
-    UrlType[UrlType["Empty"] = 1] = "Empty";
-    UrlType[UrlType["Hash"] = 2] = "Hash";
-    UrlType[UrlType["Query"] = 3] = "Query";
-    UrlType[UrlType["RelativePath"] = 4] = "RelativePath";
-    UrlType[UrlType["AbsolutePath"] = 5] = "AbsolutePath";
-    UrlType[UrlType["SchemeRelative"] = 6] = "SchemeRelative";
-    UrlType[UrlType["Absolute"] = 7] = "Absolute";
-})(UrlType || (UrlType = {}));
 function isAbsoluteUrl(input) {
     return schemeRegex.test(input);
 }
@@ -287,21 +275,21 @@ function makeUrl(scheme, user, host, port, path, query, hash) {
         path,
         query,
         hash,
-        type: UrlType.Absolute,
+        type: 7 /* Absolute */,
     };
 }
 function parseUrl(input) {
     if (isSchemeRelativeUrl(input)) {
         const url = parseAbsoluteUrl('http:' + input);
         url.scheme = '';
-        url.type = UrlType.SchemeRelative;
+        url.type = 6 /* SchemeRelative */;
         return url;
     }
     if (isAbsolutePath(input)) {
         const url = parseAbsoluteUrl('http://foo.com' + input);
         url.scheme = '';
         url.host = '';
-        url.type = UrlType.AbsolutePath;
+        url.type = 5 /* AbsolutePath */;
         return url;
     }
     if (isFileUrl(input))
@@ -313,11 +301,11 @@ function parseUrl(input) {
     url.host = '';
     url.type = input
         ? input.startsWith('?')
-            ? UrlType.Query
+            ? 3 /* Query */
             : input.startsWith('#')
-                ? UrlType.Hash
-                : UrlType.RelativePath
-        : UrlType.Empty;
+                ? 2 /* Hash */
+                : 4 /* RelativePath */
+        : 1 /* Empty */;
     return url;
 }
 function stripPathFilename(path) {
@@ -345,7 +333,7 @@ function mergePaths(url, base) {
  * "foo/.". We need to normalize to a standard representation.
  */
 function normalizePath(url, type) {
-    const rel = type <= UrlType.RelativePath;
+    const rel = type <= 4 /* RelativePath */;
     const pieces = url.path.split('/');
     // We need to preserve the first piece always, so that we output a leading slash. The item at
     // pieces[0] is an empty string.
@@ -406,27 +394,27 @@ function resolve(input, base) {
         return '';
     const url = parseUrl(input);
     let inputType = url.type;
-    if (base && inputType !== UrlType.Absolute) {
+    if (base && inputType !== 7 /* Absolute */) {
         const baseUrl = parseUrl(base);
         const baseType = baseUrl.type;
         switch (inputType) {
-            case UrlType.Empty:
+            case 1 /* Empty */:
                 url.hash = baseUrl.hash;
             // fall through
-            case UrlType.Hash:
+            case 2 /* Hash */:
                 url.query = baseUrl.query;
             // fall through
-            case UrlType.Query:
-            case UrlType.RelativePath:
+            case 3 /* Query */:
+            case 4 /* RelativePath */:
                 mergePaths(url, baseUrl);
             // fall through
-            case UrlType.AbsolutePath:
+            case 5 /* AbsolutePath */:
                 // The host, user, and port are joined, you can't copy one without the others.
                 url.user = baseUrl.user;
                 url.host = baseUrl.host;
                 url.port = baseUrl.port;
             // fall through
-            case UrlType.SchemeRelative:
+            case 6 /* SchemeRelative */:
                 // The input doesn't have a schema at least, so we need to copy at least that over.
                 url.scheme = baseUrl.scheme;
         }
@@ -438,10 +426,10 @@ function resolve(input, base) {
     switch (inputType) {
         // This is impossible, because of the empty checks at the start of the function.
         // case UrlType.Empty:
-        case UrlType.Hash:
-        case UrlType.Query:
+        case 2 /* Hash */:
+        case 3 /* Query */:
             return queryHash;
-        case UrlType.RelativePath: {
+        case 4 /* RelativePath */: {
             // The first char is always a "/", and we need it to be relative.
             const path = url.path.slice(1);
             if (!path)
@@ -454,7 +442,7 @@ function resolve(input, base) {
             }
             return path + queryHash;
         }
-        case UrlType.AbsolutePath:
+        case 5 /* AbsolutePath */:
             return url.path + queryHash;
         default:
             return url.scheme + '//' + url.user + url.host + url.port + url.path + queryHash;
@@ -518,6 +506,32 @@ function sortComparator(a, b) {
   return a[COLUMN] - b[COLUMN];
 }
 
+// src/by-source.ts
+function buildBySources(decoded, memos) {
+  const sources = memos.map(() => []);
+  for (let i = 0; i < decoded.length; i++) {
+    const line = decoded[i];
+    for (let j = 0; j < line.length; j++) {
+      const seg = line[j];
+      if (seg.length === 1) continue;
+      const sourceIndex2 = seg[SOURCES_INDEX];
+      const sourceLine = seg[SOURCE_LINE];
+      const sourceColumn = seg[SOURCE_COLUMN];
+      const source = sources[sourceIndex2];
+      const segs = source[sourceLine] || (source[sourceLine] = []);
+      segs.push([sourceColumn, i, seg[COLUMN]]);
+    }
+  }
+  for (let i = 0; i < sources.length; i++) {
+    const source = sources[i];
+    for (let j = 0; j < source.length; j++) {
+      const line = source[j];
+      if (line) line.sort(sortComparator);
+    }
+  }
+  return sources;
+}
+
 // src/binary-search.ts
 var found = false;
 function binarySearch(haystack, needle, low, high) {
@@ -576,41 +590,6 @@ function memoizedBinarySearch(haystack, needle, state, key) {
   return state.lastIndex = binarySearch(haystack, needle, low, high);
 }
 
-// src/by-source.ts
-function buildBySources(decoded, memos) {
-  const sources = memos.map(buildNullArray);
-  for (let i = 0; i < decoded.length; i++) {
-    const line = decoded[i];
-    for (let j = 0; j < line.length; j++) {
-      const seg = line[j];
-      if (seg.length === 1) continue;
-      const sourceIndex2 = seg[SOURCES_INDEX];
-      const sourceLine = seg[SOURCE_LINE];
-      const sourceColumn = seg[SOURCE_COLUMN];
-      const originalSource = sources[sourceIndex2];
-      const originalLine = originalSource[sourceLine] || (originalSource[sourceLine] = []);
-      const memo = memos[sourceIndex2];
-      let index = upperBound(
-        originalLine,
-        sourceColumn,
-        memoizedBinarySearch(originalLine, sourceColumn, memo, sourceLine)
-      );
-      memo.lastIndex = ++index;
-      insert(originalLine, index, [sourceColumn, i, seg[COLUMN]]);
-    }
-  }
-  return sources;
-}
-function insert(array, index, value) {
-  for (let i = array.length; i > index; i--) {
-    array[i] = array[i - 1];
-  }
-  array[index] = value;
-}
-function buildNullArray() {
-  return { __proto__: null };
-}
-
 // src/types.ts
 function parse(map) {
   return typeof map === "string" ? JSON.parse(map) : map;
@@ -735,7 +714,7 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
   return index;
 }
 function generatedPosition(map, source, line, column, bias, all) {
-  var _a;
+  var _a, _b;
   line--;
   if (line < 0) throw new Error(LINE_GTR_ZERO);
   if (column < 0) throw new Error(COL_GTR_EQ_ZERO);
@@ -743,13 +722,11 @@ function generatedPosition(map, source, line, column, bias, all) {
   let sourceIndex2 = sources.indexOf(source);
   if (sourceIndex2 === -1) sourceIndex2 = resolvedSources.indexOf(source);
   if (sourceIndex2 === -1) return all ? [] : GMapping(null, null);
-  const generated = (_a = cast(map))._bySources || (_a._bySources = buildBySources(
-    decodedMappings(map),
-    cast(map)._bySourceMemos = sources.map(memoizedState)
-  ));
+  const bySourceMemos = (_a = cast(map))._bySourceMemos || (_a._bySourceMemos = sources.map(memoizedState));
+  const generated = (_b = cast(map))._bySources || (_b._bySources = buildBySources(decodedMappings(map), bySourceMemos));
   const segments = generated[sourceIndex2][line];
   if (segments == null) return all ? [] : GMapping(null, null);
-  const memo = cast(map)._bySourceMemos[sourceIndex2];
+  const memo = bySourceMemos[sourceIndex2];
   const index = traceSegmentInternal(segments, memo, line, column, bias);
   if (index === -1) return GMapping(null, null);
   const segment = segments[index];
@@ -1092,7 +1069,7 @@ async function collectTests(ctx, filepath) {
 		if (callee.type === "CallExpression") start = callee.end;
 		else if (callee.type === "TaggedTemplateExpression") start = callee.end + 1;
 		else start = node.start;
-		const { arguments: [messageNode] } = node, isQuoted = messageNode?.type === "Literal" || messageNode?.type === "TemplateLiteral", message = isQuoted ? request.code.slice(messageNode.start + 1, messageNode.end - 1) : request.code.slice(messageNode.start, messageNode.end);
+		const { arguments: [messageNode] } = node, message = messageNode?.type === "Literal" || messageNode?.type === "TemplateLiteral" ? request.code.slice(messageNode.start + 1, messageNode.end - 1) : request.code.slice(messageNode.start, messageNode.end);
 		// cannot statically analyze, so we always skip it
 		if (mode === "skipIf" || mode === "runIf") mode = "skip";
 		definitions.push({
@@ -1180,13 +1157,13 @@ async function makeTscErrorInfo(errInfo) {
 	}];
 }
 async function getRawErrsMapFromTsCompile(tscErrorStdout) {
-	const rawErrsMap = /* @__PURE__ */ new Map(), infos = await Promise.all(tscErrorStdout.split(newLineRegExp).reduce((prev, next) => {
+	const rawErrsMap = /* @__PURE__ */ new Map();
+	return (await Promise.all(tscErrorStdout.split(newLineRegExp).reduce((prev, next) => {
 		if (!next) return prev;
 		if (next[0] !== " ") prev.push(next);
 		else prev[prev.length - 1] += `\n${next}`;
 		return prev;
-	}, []).map((errInfoLine) => makeTscErrorInfo(errInfoLine)));
-	return infos.forEach(([errFilePath, errInfo]) => {
+	}, []).map((errInfoLine) => makeTscErrorInfo(errInfoLine)))).forEach(([errFilePath, errInfo]) => {
 		if (errInfo) if (!rawErrsMap.has(errFilePath)) rawErrsMap.set(errFilePath, [errInfo]);
 		else rawErrsMap.get(errFilePath)?.push(errInfo);
 	}), rawErrsMap;

package/dist/chunks/{utils.DGKhod2J.js → utils.CG9h5ccR.js}

@@ -4,10 +4,7 @@ const NAME_WORKER_STATE = "__vitest_worker__";
 function getWorkerState() {
 	// @ts-expect-error untyped global
 	const workerState = globalThis[NAME_WORKER_STATE];
-	if (!workerState) {
-		const errorMsg = "Vitest failed to access its internal state.\n\nOne of the following is possible:\n- \"vitest\" is imported directly without running \"vitest\" command\n- \"vitest\" is imported inside \"globalSetup\" (to fix this, use \"setupFiles\" instead, because \"globalSetup\" runs in a different context)\n- \"vitest\" is imported inside Vite / Vitest config file\n- Otherwise, it might be a Vitest bug. Please report it to https://github.com/vitest-dev/vitest/issues\n";
-		throw new Error(errorMsg);
-	}
+	if (!workerState) throw new Error("Vitest failed to access its internal state.\n\nOne of the following is possible:\n- \"vitest\" is imported directly without running \"vitest\" command\n- \"vitest\" is imported inside \"globalSetup\" (to fix this, use \"setupFiles\" instead, because \"globalSetup\" runs in a different context)\n- \"vitest\" is imported inside Vite / Vitest config file\n- Otherwise, it might be a Vitest bug. Please report it to https://github.com/vitest-dev/vitest/issues\n");
 	return workerState;
 }
 function provideWorkerState(context, state) {