vitest 3.2.0-beta.2 → 3.2.0

package/dist/chunks/{index.DswW_LEs.js → index.BbB8_kAK.js}

@@ -1,9 +1,9 @@
 import * as chai from 'chai';
 import { resolve } from 'node:path';
-import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.CYo3Y0dD.js';
+import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.Dd054P77.js';
 import { distDir } from '../path.js';
-import { r as rpc } from './rpc.D9_013TY.js';
-import { g as getWorkerState } from './utils.CgTj3MsC.js';
+import { r as rpc } from './rpc.Iovn4oWe.js';
+import { g as getWorkerState } from './utils.XdZDrNZV.js';
 
 function setupChaiConfig(config) {
 	Object.assign(chai.config, config);
@@ -11,13 +11,11 @@ function setupChaiConfig(config) {
 
 async function resolveSnapshotEnvironment(config, executor) {
 	if (!config.snapshotEnvironment) {
-		const { VitestNodeSnapshotEnvironment } = await import('./node.3xsWotC9.js');
+		const { VitestNodeSnapshotEnvironment } = await import('./node.fjCdwEIl.js');
 		return new VitestNodeSnapshotEnvironment();
 	}
 	const mod = await executor.executeId(config.snapshotEnvironment);
-	if (typeof mod.default !== "object" || !mod.default) {
-		throw new Error("Snapshot environment module must have a default export object with a shape of `SnapshotEnvironment`");
-	}
+	if (typeof mod.default !== "object" || !mod.default) throw new Error("Snapshot environment module must have a default export object with a shape of `SnapshotEnvironment`");
 	return mod.default;
 }
 
@@ -28,33 +26,37 @@ async function getTestRunnerConstructor(config, executor) {
 		return config.mode === "test" ? VitestTestRunner : NodeBenchmarkRunner;
 	}
 	const mod = await executor.executeId(config.runner);
-	if (!mod.default && typeof mod.default !== "function") {
-		throw new Error(`Runner must export a default function, but got ${typeof mod.default} imported from ${config.runner}`);
-	}
+	if (!mod.default && typeof mod.default !== "function") throw new Error(`Runner must export a default function, but got ${typeof mod.default} imported from ${config.runner}`);
 	return mod.default;
 }
 async function resolveTestRunner(config, executor) {
 	const TestRunner = await getTestRunnerConstructor(config, executor);
 	const testRunner = new TestRunner(config);
+	// inject private executor to every runner
 	Object.defineProperty(testRunner, "__vitest_executor", {
 		value: executor,
 		enumerable: false,
 		configurable: false
 	});
-	if (!testRunner.config) {
-		testRunner.config = config;
-	}
-	if (!testRunner.importFile) {
-		throw new Error("Runner must implement \"importFile\" method.");
-	}
+	if (!testRunner.config) testRunner.config = config;
+	if (!testRunner.importFile) throw new Error("Runner must implement \"importFile\" method.");
 	const [diffOptions] = await Promise.all([loadDiffConfig(config, executor), loadSnapshotSerializers(config, executor)]);
 	testRunner.config.diffOptions = diffOptions;
+	// patch some methods, so custom runners don't need to call RPC
 	const originalOnTaskUpdate = testRunner.onTaskUpdate;
 	testRunner.onTaskUpdate = async (task, events) => {
 		const p = rpc().onTaskUpdate(task, events);
 		await originalOnTaskUpdate?.call(testRunner, task, events);
 		return p;
 	};
+	// patch some methods, so custom runners don't need to call RPC
+	const originalOnTestAnnotate = testRunner.onTestAnnotate;
+	testRunner.onTestAnnotate = async (test, annotation) => {
+		const p = rpc().onTaskAnnotate(test.id, annotation);
+		const overridenResult = await originalOnTestAnnotate?.call(testRunner, test, annotation);
+		const vitestResult = await p;
+		return overridenResult || vitestResult;
+	};
 	const originalOnCollectStart = testRunner.onCollectStart;
 	testRunner.onCollectStart = async (file) => {
 		await rpc().onQueued(file);
@@ -66,6 +68,7 @@ async function resolveTestRunner(config, executor) {
 		files.forEach((file) => {
 			file.prepareDuration = state.durations.prepare;
 			file.environmentLoad = state.durations.environment;
+			// should be collected only for a single test file in a batch
 			state.durations.prepare = 0;
 			state.durations.environment = 0;
 		});
@@ -76,14 +79,12 @@ async function resolveTestRunner(config, executor) {
 	testRunner.onAfterRunFiles = async (files) => {
 		const state = getWorkerState();
 		const coverage = await takeCoverageInsideWorker(config.coverage, executor);
-		if (coverage) {
-			rpc().onAfterSuiteRun({
-				coverage,
-				testFiles: files.map((file) => file.name).sort(),
-				transformMode: state.environment.transformMode,
-				projectName: state.ctx.projectName
-			});
-		}
+		if (coverage) rpc().onAfterSuiteRun({
+			coverage,
+			testFiles: files.map((file) => file.name).sort(),
+			transformMode: state.environment.transformMode,
+			projectName: state.ctx.projectName
+		});
 		await originalOnAfterRun?.call(testRunner, files);
 	};
 	const originalOnAfterRunTask = testRunner.onAfterRunTask;

package/dist/chunks/{index.CmC5OK9L.js → index.CIyJn3t1.js}

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import { getTasks, getFullName, getTests } from '@vitest/runner/utils';
 import * as pathe from 'pathe';
 import c from 'tinyrainbow';
-import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName } from './index.CV36oG_L.js';
+import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName } from './index.BZ0g1JD2.js';
 import { stripVTControlCharacters } from 'node:util';
 import { notNullish } from '@vitest/utils';
 
@@ -10,26 +10,20 @@ function createBenchmarkJsonReport(files) {
 	const report = { files: [] };
 	for (const file of files) {
 		const groups = [];
-		for (const task of getTasks(file)) {
-			if (task?.type === "suite") {
-				const benchmarks = [];
-				for (const t of task.tasks) {
-					const benchmark = t.meta.benchmark && t.result?.benchmark;
-					if (benchmark) {
-						benchmarks.push({
-							id: t.id,
-							...benchmark,
-							samples: []
-						});
-					}
-				}
-				if (benchmarks.length) {
-					groups.push({
-						fullName: getFullName(task, " > "),
-						benchmarks
-					});
-				}
+		for (const task of getTasks(file)) if (task?.type === "suite") {
+			const benchmarks = [];
+			for (const t of task.tasks) {
+				const benchmark = t.meta.benchmark && t.result?.benchmark;
+				if (benchmark) benchmarks.push({
+					id: t.id,
+					...benchmark,
+					samples: []
+				});
 			}
+			if (benchmarks.length) groups.push({
+				fullName: getFullName(task, " > "),
+				benchmarks
+			});
 		}
 		report.files.push({
 			filepath: file.filepath,
@@ -40,17 +34,11 @@ function createBenchmarkJsonReport(files) {
 }
 function flattenFormattedBenchmarkReport(report) {
 	const flat = {};
-	for (const file of report.files) {
-		for (const group of file.groups) {
-			for (const t of group.benchmarks) {
-				flat[t.id] = t;
-			}
-		}
-	}
+	for (const file of report.files) for (const group of file.groups) for (const t of group.benchmarks) flat[t.id] = t;
 	return flat;
 }
 
-const outputMap = new WeakMap();
+const outputMap = /* @__PURE__ */ new WeakMap();
 function formatNumber(number) {
 	const res = String(number.toFixed(number < 100 ? 4 : 2)).split(".");
 	return res[0].replace(/(?=(?:\d{3})+$)\B/g, ",") + (res[1] ? `.${res[1]}` : "");
@@ -112,14 +100,10 @@ function renderBenchmark(result, widths) {
 function renderTable(options) {
 	const output = [];
 	const benchMap = {};
-	for (const task of options.tasks) {
-		if (task.meta.benchmark && task.result?.benchmark) {
-			benchMap[task.id] = {
-				current: task.result.benchmark,
-				baseline: options.compare?.[task.id]
-			};
-		}
-	}
+	for (const task of options.tasks) if (task.meta.benchmark && task.result?.benchmark) benchMap[task.id] = {
+		current: task.result.benchmark,
+		baseline: options.compare?.[task.id]
+	};
 	const benchCount = Object.entries(benchMap).length;
 	const columnWidths = computeColumnWidths(Object.values(benchMap).flatMap((v) => [v.current, v.baseline]).filter(notNullish));
 	let idx = 0;
@@ -128,61 +112,40 @@ function renderTable(options) {
 		const duration = task.result?.duration;
 		const bench = benchMap[task.id];
 		let prefix = "";
-		if (idx === 0 && task.meta?.benchmark) {
-			prefix += `${renderTableHead(columnWidths)}\n${padding}`;
-		}
+		if (idx === 0 && task.meta?.benchmark) prefix += `${renderTableHead(columnWidths)}\n${padding}`;
 		prefix += ` ${getStateSymbol(task)} `;
 		let suffix = "";
-		if (task.type === "suite") {
-			suffix += c.dim(` (${getTests(task).length})`);
-		}
-		if (task.mode === "skip" || task.mode === "todo") {
-			suffix += c.dim(c.gray(" [skipped]"));
-		}
+		if (task.type === "suite") suffix += c.dim(` (${getTests(task).length})`);
+		if (task.mode === "skip" || task.mode === "todo") suffix += c.dim(c.gray(" [skipped]"));
 		if (duration != null) {
 			const color = duration > options.slowTestThreshold ? c.yellow : c.green;
 			suffix += color(` ${Math.round(duration)}${c.dim("ms")}`);
 		}
-		if (options.showHeap && task.result?.heap != null) {
-			suffix += c.magenta(` ${Math.floor(task.result.heap / 1024 / 1024)} MB heap used`);
-		}
+		if (options.showHeap && task.result?.heap != null) suffix += c.magenta(` ${Math.floor(task.result.heap / 1024 / 1024)} MB heap used`);
 		if (bench) {
 			let body = renderBenchmark(bench.current, columnWidths);
 			if (options.compare && bench.baseline) {
 				if (bench.current.hz) {
 					const diff = bench.current.hz / bench.baseline.hz;
 					const diffFixed = diff.toFixed(2);
-					if (diffFixed === "1.0.0") {
-						body += c.gray(`  [${diffFixed}x]`);
-					}
-					if (diff > 1) {
-						body += c.blue(`  [${diffFixed}x] ⇑`);
-					} else {
-						body += c.red(`  [${diffFixed}x] ⇓`);
-					}
+					if (diffFixed === "1.0.0") body += c.gray(`  [${diffFixed}x]`);
+					if (diff > 1) body += c.blue(`  [${diffFixed}x] ⇑`);
+					else body += c.red(`  [${diffFixed}x] ⇓`);
 				}
 				output.push(padding + prefix + body + suffix);
 				const bodyBaseline = renderBenchmark(bench.baseline, columnWidths);
 				output.push(`${padding}   ${bodyBaseline}  ${c.dim("(baseline)")}`);
 			} else {
-				if (bench.current.rank === 1 && benchCount > 1) {
-					body += c.bold(c.green("   fastest"));
-				}
-				if (bench.current.rank === benchCount && benchCount > 2) {
-					body += c.bold(c.gray("   slowest"));
-				}
+				if (bench.current.rank === 1 && benchCount > 1) body += c.bold(c.green("   fastest"));
+				if (bench.current.rank === benchCount && benchCount > 2) body += c.bold(c.gray("   slowest"));
 				output.push(padding + prefix + body + suffix);
 			}
-		} else {
-			output.push(padding + prefix + task.name + suffix);
-		}
+		} else output.push(padding + prefix + task.name + suffix);
 		if (task.result?.state !== "pass" && outputMap.get(task) != null) {
 			let data = outputMap.get(task);
 			if (typeof data === "string") {
 				data = stripVTControlCharacters(data.trim().split("\n").filter(Boolean).pop());
-				if (data === "") {
-					data = undefined;
-				}
+				if (data === "") data = void 0;
 			}
 			if (data != null) {
 				const out = `   ${"  ".repeat(options.level)}${F_RIGHT} ${data}`;
@@ -210,11 +173,9 @@ class BenchmarkReporter extends DefaultReporter {
 	onTaskUpdate(packs) {
 		for (const pack of packs) {
 			const task = this.ctx.state.idMap.get(pack[0]);
-			if (task?.type === "suite" && task.result?.state !== "run") {
-				task.tasks.filter((task) => task.result?.benchmark).sort((benchA, benchB) => benchA.result.benchmark.mean - benchB.result.benchmark.mean).forEach((bench, idx) => {
-					bench.result.benchmark.rank = Number(idx) + 1;
-				});
-			}
+			if (task?.type === "suite" && task.result?.state !== "run") task.tasks.filter((task) => task.result?.benchmark).sort((benchA, benchB) => benchA.result.benchmark.mean - benchB.result.benchmark.mean).forEach((bench, idx) => {
+				bench.result.benchmark.rank = Number(idx) + 1;
+			});
 		}
 	}
 	onTestSuiteResult(testSuite) {
@@ -226,16 +187,12 @@ class BenchmarkReporter extends DefaultReporter {
 	}
 	printSuiteTable(testTask) {
 		const state = testTask.state();
-		if (state === "pending" || state === "queued") {
-			return;
-		}
+		if (state === "pending" || state === "queued") return;
 		const benches = testTask.task.tasks.filter((t) => t.meta.benchmark);
 		const duration = testTask.task.result?.duration || 0;
 		if (benches.length > 0 && benches.every((t) => t.result?.state !== "run" && t.result?.state !== "queued")) {
 			let title = `\n ${getStateSymbol(testTask.task)} ${formatProjectName(testTask.project)}${getFullName(testTask.task, c.dim(" > "))}`;
-			if (duration != null && duration > this.ctx.config.slowTestThreshold) {
-				title += c.yellow(` ${Math.round(duration)}${c.dim("ms")}`);
-			}
+			if (duration != null && duration > this.ctx.config.slowTestThreshold) title += c.yellow(` ${Math.round(duration)}${c.dim("ms")}`);
 			this.log(title);
 			this.log(renderTable({
 				tasks: benches,
@@ -249,13 +206,12 @@ class BenchmarkReporter extends DefaultReporter {
 	}
 	async onFinished(files = this.ctx.state.getFiles(), errors = this.ctx.state.getUnhandledErrors()) {
 		super.onFinished(files, errors);
+		// write output for future comparison
 		let outputFile = this.ctx.config.benchmark?.outputJson;
 		if (outputFile) {
 			outputFile = pathe.resolve(this.ctx.config.root, outputFile);
 			const outputDirectory = pathe.dirname(outputFile);
-			if (!fs.existsSync(outputDirectory)) {
-				await fs.promises.mkdir(outputDirectory, { recursive: true });
-			}
+			if (!fs.existsSync(outputDirectory)) await fs.promises.mkdir(outputDirectory, { recursive: true });
 			const output = createBenchmarkJsonReport(files);
 			await fs.promises.writeFile(outputFile, JSON.stringify(output, null, 2));
 			this.log(`Benchmark report written to ${outputFile}`);

package/dist/chunks/{index.CfXMNXHg.js → index.CdQS2e2Q.js}

@@ -1,5 +1,5 @@
-import { c as createExpect, a as globalExpect, i as inject, v as vi, b as vitest } from './vi.BFR5YIgu.js';
-import { b as bench } from './benchmark.BoF7jW0Q.js';
+import { c as createExpect, a as globalExpect, i as inject, v as vi, b as vitest } from './vi.bdSIJ99Y.js';
+import { b as bench } from './benchmark.CYdenmiT.js';
 import { expectTypeOf } from 'expect-type';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
 import * as chai from 'chai';
@@ -7,6 +7,8 @@ import { assert, should } from 'chai';
 
 const assertType = function assertType() {};
 
+// TODO: deprecate <reference types="vitest" /> in favor of `<reference types="vitest/config" />`
+
 var VitestIndex = /*#__PURE__*/Object.freeze({
   __proto__: null,
   afterAll: afterAll,