vitest 3.2.0-beta.2 → 3.2.0

package/dist/chunks/{typechecker.DnTrplSJ.js → typechecker.DRKU1-1g.js}

@@ -23,11 +23,14 @@ function convertTasksToEvents(file, onTask) {
 			suite.result,
 			suite.meta
 		]);
-		events.push([suite.id, "suite-prepare"]);
+		events.push([
+			suite.id,
+			"suite-prepare",
+			void 0
+		]);
 		suite.tasks.forEach((task) => {
-			if (task.type === "suite") {
-				visit(task);
-			} else {
+			if (task.type === "suite") visit(task);
+			else {
 				onTask?.(task);
 				if (suite.mode !== "skip" && suite.mode !== "todo") {
 					packs.push([
@@ -35,11 +38,31 @@ function convertTasksToEvents(file, onTask) {
 						task.result,
 						task.meta
 					]);
-					events.push([task.id, "test-prepare"], [task.id, "test-finished"]);
+					events.push([
+						task.id,
+						"test-prepare",
+						void 0
+					]);
+					task.annotations.forEach((annotation) => {
+						events.push([
+							task.id,
+							"test-annotation",
+							{ annotation }
+						]);
+					});
+					events.push([
+						task.id,
+						"test-finished",
+						void 0
+					]);
 				}
 			}
 		});
-		events.push([suite.id, "suite-finished"]);
+		events.push([
+			suite.id,
+			"suite-finished",
+			void 0
+		]);
 	}
 	visit(file);
 	return {
@@ -50,12 +73,8 @@ function convertTasksToEvents(file, onTask) {
 
 const REGEXP_WRAP_PREFIX = "$$vitest:";
 function getOutputFile(config, reporter) {
-	if (!config?.outputFile) {
-		return;
-	}
-	if (typeof config.outputFile === "string") {
-		return config.outputFile;
-	}
+	if (!config?.outputFile) return;
+	if (typeof config.outputFile === "string") return config.outputFile;
 	return config.outputFile[reporter];
 }
 /**
@@ -64,15 +83,13 @@ function getOutputFile(config, reporter) {
 function wrapSerializableConfig(config) {
 	let testNamePattern = config.testNamePattern;
 	let defines = config.defines;
-	if (testNamePattern && typeof testNamePattern !== "string") {
-		testNamePattern = `${REGEXP_WRAP_PREFIX}${testNamePattern.toString()}`;
-	}
-	if (defines) {
-		defines = {
-			keys: Object.keys(defines),
-			original: defines
-		};
-	}
+	// v8 serialize does not support regex
+	if (testNamePattern && typeof testNamePattern !== "string") testNamePattern = `${REGEXP_WRAP_PREFIX}${testNamePattern.toString()}`;
+	// v8 serialize drops properties with undefined value
+	if (defines) defines = {
+		keys: Object.keys(defines),
+		original: defines
+	};
 	return {
 		...config,
 		testNamePattern,
@@ -358,9 +375,7 @@ base.MethodDefinition = base.PropertyDefinition = base.Property = function (node
 
 async function collectTests(ctx, filepath) {
 	const request = await ctx.vitenode.transformRequest(filepath, filepath);
-	if (!request) {
-		return null;
-	}
+	if (!request) return null;
 	const ast = await parseAstAsync(request.code);
 	const testFilepath = relative(ctx.config.root, filepath);
 	const projectName = ctx.name;
@@ -381,79 +396,59 @@ async function collectTests(ctx, filepath) {
 	file.file = file;
 	const definitions = [];
 	const getName = (callee) => {
-		if (!callee) {
-			return null;
-		}
-		if (callee.type === "Identifier") {
-			return callee.name;
-		}
-		if (callee.type === "CallExpression") {
-			return getName(callee.callee);
-		}
-		if (callee.type === "TaggedTemplateExpression") {
-			return getName(callee.tag);
-		}
+		if (!callee) return null;
+		if (callee.type === "Identifier") return callee.name;
+		if (callee.type === "CallExpression") return getName(callee.callee);
+		if (callee.type === "TaggedTemplateExpression") return getName(callee.tag);
 		if (callee.type === "MemberExpression") {
 			if (callee.object?.type === "Identifier" && [
 				"it",
 				"test",
 				"describe",
 				"suite"
-			].includes(callee.object.name)) {
-				return callee.object?.name;
-			}
-			if (callee.object?.name?.startsWith("__vite_ssr_")) {
-				return getName(callee.property);
-			}
+			].includes(callee.object.name)) return callee.object?.name;
+			// direct call as `__vite_ssr_exports_0__.test()`
+			if (callee.object?.name?.startsWith("__vite_ssr_")) return getName(callee.property);
+			// call as `__vite_ssr__.test.skip()`
 			return getName(callee.object?.property);
 		}
+		// unwrap (0, ...)
 		if (callee.type === "SequenceExpression" && callee.expressions.length === 2) {
 			const [e0, e1] = callee.expressions;
-			if (e0.type === "Literal" && e0.value === 0) {
-				return getName(e1);
-			}
+			if (e0.type === "Literal" && e0.value === 0) return getName(e1);
 		}
 		return null;
 	};
 	ancestor(ast, { CallExpression(node) {
 		const { callee } = node;
 		const name = getName(callee);
-		if (!name) {
-			return;
-		}
+		if (!name) return;
 		if (![
 			"it",
 			"test",
 			"describe",
 			"suite"
-		].includes(name)) {
-			return;
-		}
+		].includes(name)) return;
 		const property = callee?.property?.name;
 		let mode = !property || property === name ? "run" : property;
+		// they will be picked up in the next iteration
 		if ([
 			"each",
 			"for",
 			"skipIf",
 			"runIf"
-		].includes(mode)) {
-			return;
-		}
+		].includes(mode)) return;
 		let start;
 		const end = node.end;
-		if (callee.type === "CallExpression") {
-			start = callee.end;
-		} else if (callee.type === "TaggedTemplateExpression") {
-			start = callee.end + 1;
-		} else {
-			start = node.start;
-		}
+		// .each
+		if (callee.type === "CallExpression") start = callee.end;
+		else if (callee.type === "TaggedTemplateExpression") start = callee.end + 1;
+		else start = node.start;
 		const { arguments: [messageNode] } = node;
 		const isQuoted = messageNode?.type === "Literal" || messageNode?.type === "TemplateLiteral";
 		const message = isQuoted ? request.code.slice(messageNode.start + 1, messageNode.end - 1) : request.code.slice(messageNode.start, messageNode.end);
-		if (mode === "skipIf" || mode === "runIf") {
-			mode = "skip";
-		}
+		// cannot statically analyze, so we always skip it
+		if (mode === "skipIf" || mode === "runIf") mode = "skip";
 		definitions.push({
 			start,
 			end,
@@ -465,17 +460,15 @@ async function collectTests(ctx, filepath) {
 	} });
 	let lastSuite = file;
 	const updateLatestSuite = (index) => {
-		while (lastSuite.suite && lastSuite.end < index) {
-			lastSuite = lastSuite.suite;
-		}
+		while (lastSuite.suite && lastSuite.end < index) lastSuite = lastSuite.suite;
 		return lastSuite;
 	};
 	definitions.sort((a, b) => a.start - b.start).forEach((definition) => {
 		const latestSuite = updateLatestSuite(definition.start);
 		let mode = definition.mode;
-		if (latestSuite.mode !== "run") {
-			mode = latestSuite.mode;
-		}
+		if (latestSuite.mode !== "run")
+ // inherit suite mode, if it's set
+		mode = latestSuite.mode;
 		if (definition.type === "suite") {
 			const task = {
 				type: definition.type,
@@ -505,6 +498,7 @@ async function collectTests(ctx, filepath) {
 			name: definition.name,
 			end: definition.end,
 			start: definition.start,
+			annotations: [],
 			meta: { typecheck: true }
 		};
 		definition.task = task;
@@ -512,7 +506,7 @@ async function collectTests(ctx, filepath) {
 	});
 	calculateSuiteHash(file);
 	const hasOnly = someTasksAreOnly(file);
-	interpretTaskModes(file, ctx.config.testNamePattern, undefined, hasOnly, false, ctx.config.allowOnly);
+	interpretTaskModes(file, ctx.config.testNamePattern, void 0, hasOnly, false, ctx.config.allowOnly);
 	return {
 		file,
 		parsed: request.code,
@@ -526,26 +520,18 @@ const newLineRegExp = /\r?\n/;
 const errCodeRegExp = /error TS(?<errCode>\d+)/;
 async function makeTscErrorInfo(errInfo) {
 	const [errFilePathPos = "", ...errMsgRawArr] = errInfo.split(":");
-	if (!errFilePathPos || errMsgRawArr.length === 0 || errMsgRawArr.join("").length === 0) {
-		return ["unknown filepath", null];
-	}
+	if (!errFilePathPos || errMsgRawArr.length === 0 || errMsgRawArr.join("").length === 0) return ["unknown filepath", null];
 	const errMsgRaw = errMsgRawArr.join("").trim();
+	// get filePath, line, col
 	const [errFilePath, errPos] = errFilePathPos.slice(0, -1).split("(");
-	if (!errFilePath || !errPos) {
-		return ["unknown filepath", null];
-	}
+	if (!errFilePath || !errPos) return ["unknown filepath", null];
 	const [errLine, errCol] = errPos.split(",");
-	if (!errLine || !errCol) {
-		return [errFilePath, null];
-	}
+	if (!errLine || !errCol) return [errFilePath, null];
+	// get errCode, errMsg
 	const execArr = errCodeRegExp.exec(errMsgRaw);
-	if (!execArr) {
-		return [errFilePath, null];
-	}
+	if (!execArr) return [errFilePath, null];
 	const errCodeStr = execArr.groups?.errCode ?? "";
-	if (!errCodeStr) {
-		return [errFilePath, null];
-	}
+	if (!errCodeStr) return [errFilePath, null];
 	const line = Number(errLine);
 	const col = Number(errCol);
 	const errCode = Number(errCodeStr);
@@ -558,32 +544,24 @@ async function makeTscErrorInfo(errInfo) {
 	}];
 }
 async function getRawErrsMapFromTsCompile(tscErrorStdout) {
-	const rawErrsMap = new Map();
+	const rawErrsMap = /* @__PURE__ */ new Map();
+	// Merge details line with main line (i.e. which contains file path)
 	const infos = await Promise.all(tscErrorStdout.split(newLineRegExp).reduce((prev, next) => {
-		if (!next) {
-			return prev;
-		} else if (!next.startsWith(" ")) {
-			prev.push(next);
-		} else {
-			prev[prev.length - 1] += `\n${next}`;
-		}
+		if (!next) return prev;
+		else if (!next.startsWith(" ")) prev.push(next);
+		else prev[prev.length - 1] += `\n${next}`;
 		return prev;
 	}, []).map((errInfoLine) => makeTscErrorInfo(errInfoLine)));
 	infos.forEach(([errFilePath, errInfo]) => {
-		if (!errInfo) {
-			return;
-		}
-		if (!rawErrsMap.has(errFilePath)) {
-			rawErrsMap.set(errFilePath, [errInfo]);
-		} else {
-			rawErrsMap.get(errFilePath)?.push(errInfo);
-		}
+		if (!errInfo) return;
+		if (!rawErrsMap.has(errFilePath)) rawErrsMap.set(errFilePath, [errInfo]);
+		else rawErrsMap.get(errFilePath)?.push(errInfo);
 	});
 	return rawErrsMap;
 }
 
 function createIndexMap(source) {
-	const map = new Map();
+	const map = /* @__PURE__ */ new Map();
 	let index = 0;
 	let line = 1;
 	let column = 1;
@@ -592,9 +570,7 @@ function createIndexMap(source) {
 		if (char === "\n" || char === "\r\n") {
 			line++;
 			column = 0;
-		} else {
-			column++;
-		}
+		} else column++;
 	}
 	return map;
 }
@@ -644,9 +620,7 @@ class Typechecker {
 	}
 	async collectTests() {
 		const tests = (await Promise.all(this.getFiles().map((filepath) => this.collectFileTests(filepath)))).reduce((acc, data) => {
-			if (!data) {
-				return acc;
-			}
+			if (!data) return acc;
 			acc[data.filepath] = data;
 			return acc;
 		}, {});
@@ -654,17 +628,11 @@ class Typechecker {
 		return tests;
 	}
 	markPassed(file) {
-		if (!file.result?.state) {
-			file.result = { state: "pass" };
-		}
+		if (!file.result?.state) file.result = { state: "pass" };
 		const markTasks = (tasks) => {
 			for (const task of tasks) {
-				if ("tasks" in task) {
-					markTasks(task.tasks);
-				}
-				if (!task.result?.state && (task.mode === "run" || task.mode === "queued")) {
-					task.result = { state: "pass" };
-				}
+				if ("tasks" in task) markTasks(task.tasks);
+				if (!task.result?.state && (task.mode === "run" || task.mode === "queued")) task.result = { state: "pass" };
 			}
 		};
 		markTasks(file.tasks);
@@ -672,9 +640,7 @@ class Typechecker {
 	async prepareResults(output) {
 		const typeErrors = await this.parseTscLikeOutput(output);
 		const testFiles = new Set(this.getFiles());
-		if (!this._tests) {
-			this._tests = await this.collectTests();
-		}
+		if (!this._tests) this._tests = await this.collectTests();
 		const sourceErrors = [];
 		const files = [];
 		testFiles.forEach((path) => {
@@ -686,15 +652,13 @@ class Typechecker {
 				return;
 			}
 			const sortedDefinitions = [...definitions.sort((a, b) => b.start - a.start)];
+			// has no map for ".js" files that use // @ts-check
 			const traceMap = map && new TraceMap(map);
 			const indexMap = createIndexMap(parsed);
 			const markState = (task, state) => {
 				task.result = { state: task.mode === "run" || task.mode === "only" ? state : task.mode };
-				if (task.suite) {
-					markState(task.suite, state);
-				} else if (task.file && task !== task.file) {
-					markState(task.file, state);
-				}
+				if (task.suite) markState(task.suite, state);
+				else if (task.file && task !== task.file) markState(task.file, state);
 			};
 			errors.forEach(({ error, originalError }) => {
 				const processedPos = traceMap ? findGeneratedPosition(traceMap, {
@@ -715,19 +679,14 @@ class Typechecker {
 				};
 				errors.push(error);
 				if (state === "fail") {
-					if (suite.suite) {
-						markState(suite.suite, "fail");
-					} else if (suite.file && suite !== suite.file) {
-						markState(suite.file, "fail");
-					}
+					if (suite.suite) markState(suite.suite, "fail");
+					else if (suite.file && suite !== suite.file) markState(suite.file, "fail");
 				}
 			});
 			this.markPassed(file);
 		});
 		typeErrors.forEach((errors, path) => {
-			if (!testFiles.has(path)) {
-				sourceErrors.push(...errors.map(({ error }) => error));
-			}
+			if (!testFiles.has(path)) sourceErrors.push(...errors.map(({ error }) => error));
 		});
 		return {
 			files,
@@ -737,12 +696,13 @@ class Typechecker {
 	}
 	async parseTscLikeOutput(output) {
 		const errorsMap = await getRawErrsMapFromTsCompile(output);
-		const typesErrors = new Map();
+		const typesErrors = /* @__PURE__ */ new Map();
 		errorsMap.forEach((errors, path) => {
 			const filepath = resolve(this.project.config.root, path);
 			const suiteErrors = errors.map((info) => {
 				const limit = Error.stackTraceLimit;
 				Error.stackTraceLimit = 0;
+				// Some expect-type errors have the most useful information on the second line e.g. `This expression is not callable.\n  Type 'ExpectString<number>' has no call signatures.`
 				const errMsg = info.errMsg.replace(/\r?\n\s*(Type .* has no call signatures)/g, " $1");
 				const error = new TypeCheckError(errMsg, [{
 					file: filepath,
@@ -755,11 +715,9 @@ class Typechecker {
 					originalError: info,
 					error: {
 						name: error.name,
-						nameStr: String(error.name),
 						message: errMsg,
 						stacks: error.stacks,
-						stack: "",
-						stackStr: ""
+						stack: ""
 					}
 				};
 			});
@@ -769,12 +727,10 @@ class Typechecker {
 	}
 	async stop() {
 		this.process?.kill();
-		this.process = undefined;
+		this.process = void 0;
 	}
 	async ensurePackageInstalled(ctx, checker) {
-		if (checker !== "tsc" && checker !== "vue-tsc") {
-			return;
-		}
+		if (checker !== "tsc" && checker !== "vue-tsc") return;
 		const packageName = checker === "tsc" ? "typescript" : "vue-tsc";
 		await ctx.packageInstaller.ensureInstalled(packageName, ctx.config.root);
 	}
@@ -784,10 +740,7 @@ class Typechecker {
 	getOutput() {
 		return this._output;
 	}
-	async start() {
-		if (this.process) {
-			return;
-		}
+	async spawn() {
 		const { root, watch, typecheck } = this.project.config;
 		const args = [
 			"--noEmit",
@@ -797,15 +750,10 @@ class Typechecker {
 			"--tsBuildInfoFile",
 			join(process.versions.pnp ? join(nodeos__default.tmpdir(), this.project.hash) : distDir, "tsconfig.tmp.tsbuildinfo")
 		];
-		if (watch) {
-			args.push("--watch");
-		}
-		if (typecheck.allowJs) {
-			args.push("--allowJs", "--checkJs");
-		}
-		if (typecheck.tsconfig) {
-			args.push("-p", resolve(root, typecheck.tsconfig));
-		}
+		// use builtin watcher because it's faster
+		if (watch) args.push("--watch");
+		if (typecheck.allowJs) args.push("--allowJs", "--checkJs");
+		if (typecheck.tsconfig) args.push("-p", resolve(root, typecheck.tsconfig));
 		this._output = "";
 		this._startTime = performance.now();
 		const child = x(typecheck.checker, args, {
@@ -816,30 +764,62 @@ class Typechecker {
 			throwOnError: false
 		});
 		this.process = child.process;
-		await this._onParseStart?.();
 		let rerunTriggered = false;
-		child.process?.stdout?.on("data", (chunk) => {
-			this._output += chunk;
-			if (!watch) {
+		let dataReceived = false;
+		return new Promise((resolve, reject) => {
+			if (!child.process || !child.process.stdout) {
+				reject(new Error(`Failed to initialize ${typecheck.checker}. This is a bug in Vitest - please, open an issue with reproduction.`));
 				return;
 			}
-			if (this._output.includes("File change detected") && !rerunTriggered) {
-				this._onWatcherRerun?.();
-				this._startTime = performance.now();
-				this._result.sourceErrors = [];
-				this._result.files = [];
-				this._tests = null;
-				rerunTriggered = true;
-			}
-			if (/Found \w+ errors*. Watching for/.test(this._output)) {
-				rerunTriggered = false;
-				this.prepareResults(this._output).then((result) => {
-					this._result = result;
-					this._onParseEnd?.(result);
-				});
-				this._output = "";
+			child.process.stdout.on("data", (chunk) => {
+				dataReceived = true;
+				this._output += chunk;
+				if (!watch) return;
+				if (this._output.includes("File change detected") && !rerunTriggered) {
+					this._onWatcherRerun?.();
+					this._startTime = performance.now();
+					this._result.sourceErrors = [];
+					this._result.files = [];
+					this._tests = null;
+					rerunTriggered = true;
+				}
+				if (/Found \w+ errors*. Watching for/.test(this._output)) {
+					rerunTriggered = false;
+					this.prepareResults(this._output).then((result) => {
+						this._result = result;
+						this._onParseEnd?.(result);
+					});
+					this._output = "";
+				}
+			});
+			const timeout = setTimeout(() => reject(new Error(`${typecheck.checker} spawn timed out`)), this.project.config.typecheck.spawnTimeout);
+			function onError(cause) {
+				clearTimeout(timeout);
+				reject(new Error("Spawning typechecker failed - is typescript installed?", { cause }));
 			}
+			child.process.once("spawn", () => {
+				this._onParseStart?.();
+				child.process?.off("error", onError);
+				clearTimeout(timeout);
+				if (process.platform === "win32")
+ // on Windows, the process might be spawned but fail to start
+				// we wait for a potential error here. if "close" event didn't trigger,
+				// we resolve the promise
+				setTimeout(() => {
+					resolve({ result: child });
+				}, 200);
+				else resolve({ result: child });
+			});
+			if (process.platform === "win32") child.process.once("close", (code) => {
+				if (code != null && code !== 0 && !dataReceived) onError(new Error(`The ${typecheck.checker} command exited with code ${code}.`));
+			});
+			child.process.once("error", onError);
 		});
+	}
+	async start() {
+		if (this.process) return;
+		const { watch } = this.project.config;
+		const { result: child } = await this.spawn();
 		if (!watch) {
 			await child;
 			this._result = await this.prepareResults(this._output);
@@ -872,22 +852,19 @@ function findGeneratedPosition(traceMap, { line, column, source }) {
 		column,
 		source
 	});
-	if (found.line !== null) {
-		return found;
-	}
+	if (found.line !== null) return found;
+	// find the next source token position when the exact error position doesn't exist in source map.
+	// this can happen, for example, when the type error is in the comment "// @ts-expect-error"
+	// and comments are stripped away in the generated code.
 	const mappings = [];
 	eachMapping(traceMap, (m) => {
-		if (m.source === source && m.originalLine !== null && m.originalColumn !== null && (line === m.originalLine ? column < m.originalColumn : line < m.originalLine)) {
-			mappings.push(m);
-		}
+		if (m.source === source && m.originalLine !== null && m.originalColumn !== null && (line === m.originalLine ? column < m.originalColumn : line < m.originalLine)) mappings.push(m);
 	});
 	const next = mappings.sort((a, b) => a.originalLine === b.originalLine ? a.originalColumn - b.originalColumn : a.originalLine - b.originalLine).at(0);
-	if (next) {
-		return {
-			line: next.generatedLine,
-			column: next.generatedColumn
-		};
-	}
+	if (next) return {
+		line: next.generatedLine,
+		column: next.generatedColumn
+	};
 	return {
 		line: null,
 		column: null

package/dist/chunks/{utils.BfxieIyZ.js → utils.CAioKnHs.js}

@@ -1,6 +1,7 @@
 import { parseRegexp } from '@vitest/utils';
 
 const REGEXP_WRAP_PREFIX = "$$vitest:";
+// Store global APIs in case process is overwritten by tests
 const processSend = process.send?.bind(process);
 const processOn = process.on?.bind(process);
 const processOff = process.off?.bind(process);
@@ -16,11 +17,9 @@ function createThreadsRpcOptions({ port }) {
 	};
 }
 function disposeInternalListeners() {
-	for (const fn of dispose) {
-		try {
-			fn();
-		} catch {}
-	}
+	for (const fn of dispose) try {
+		fn();
+	} catch {}
 	dispose.length = 0;
 }
 function createForksRpcOptions(nodeV8) {
@@ -32,9 +31,8 @@ function createForksRpcOptions(nodeV8) {
 		},
 		on(fn) {
 			const handler = (message, ...extras) => {
-				if (message?.__tinypool_worker_message__) {
-					return;
-				}
+				// Do not react on Tinypool's internal messaging
+				if (message?.__tinypool_worker_message__) return;
 				return fn(message, ...extras);
 			};
 			processOn("message", handler);
@@ -48,16 +46,13 @@ function createForksRpcOptions(nodeV8) {
 function unwrapSerializableConfig(config) {
 	if (config.testNamePattern && typeof config.testNamePattern === "string") {
 		const testNamePattern = config.testNamePattern;
-		if (testNamePattern.startsWith(REGEXP_WRAP_PREFIX)) {
-			config.testNamePattern = parseRegexp(testNamePattern.slice(REGEXP_WRAP_PREFIX.length));
-		}
+		if (testNamePattern.startsWith(REGEXP_WRAP_PREFIX)) config.testNamePattern = parseRegexp(testNamePattern.slice(REGEXP_WRAP_PREFIX.length));
 	}
 	if (config.defines && Array.isArray(config.defines.keys) && config.defines.original) {
 		const { keys, original } = config.defines;
 		const defines = {};
-		for (const key of keys) {
-			defines[key] = original[key];
-		}
+		// Apply all keys from the original. Entries which had undefined value are missing from original now
+		for (const key of keys) defines[key] = original[key];
 		config.defines = defines;
 	}
 	return config;