@vitest/runner 3.1.0-beta.2 → 3.1.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, e as TaskHook, O as OnTestFailedHandler, f as OnTestFinishedHandler, a as Test, g as Custom, S as Suite, h as SuiteHooks, F as File, i as TaskUpdateEvent, T as Task, j as TestAPI, k as SuiteAPI, l as SuiteCollector } from './tasks.d-CnuPOyeL.js';
-export { D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskContext, x as TaskCustomOptions, y as TaskEventPack, z as TaskMeta, G as TaskPopulated, J as TaskResult, K as TaskResultPack, L as TaskState, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-CnuPOyeL.js';
+import { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, e as TaskHook, O as OnTestFailedHandler, f as OnTestFinishedHandler, a as Test, g as Custom, S as Suite, h as SuiteHooks, F as File, i as TaskUpdateEvent, T as Task, j as TestAPI, k as SuiteAPI, l as SuiteCollector } from './tasks.d-hsdzc98-.js';
+export { D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskContext, x as TaskCustomOptions, y as TaskEventPack, z as TaskMeta, G as TaskPopulated, J as TaskResult, K as TaskResultPack, L as TaskState, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-hsdzc98-.js';
 import { Awaitable } from '@vitest/utils';
 import { FileSpecification, VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { getSafeTimers, isObject, createDefer, toArray, isNegativeNaN, format, objectAttr, objDisplay, assertTypes, shuffle } from '@vitest/utils';
+import { isObject, createDefer, toArray, isNegativeNaN, format, objectAttr, objDisplay, getSafeTimers, assertTypes, shuffle } from '@vitest/utils';
 import { parseSingleStack } from '@vitest/utils/source-map';
 import { c as createChainable, b as createFileTask, a as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, l as limitConcurrency, p as partitionSuiteChildren, o as hasTests, n as hasFailed } from './chunk-tasks.js';
 import { processError } from '@vitest/utils/error';
@@ -16,96 +16,6 @@ class PendingError extends Error {
 	}
 }
 
-const now$2 = Date.now;
-const collectorContext = {
-	tasks: [],
-	currentSuite: null
-};
-function collectTask(task) {
-	var _collectorContext$cur;
-	(_collectorContext$cur = collectorContext.currentSuite) === null || _collectorContext$cur === void 0 ? void 0 : _collectorContext$cur.tasks.push(task);
-}
-async function runWithSuite(suite, fn) {
-	const prev = collectorContext.currentSuite;
-	collectorContext.currentSuite = suite;
-	await fn();
-	collectorContext.currentSuite = prev;
-}
-function withTimeout(fn, timeout, isHook = false, stackTraceError) {
-	if (timeout <= 0 || timeout === Number.POSITIVE_INFINITY) {
-		return fn;
-	}
-	const { setTimeout, clearTimeout } = getSafeTimers();
-	return function runWithTimeout(...args) {
-		const startTime = now$2();
-		return new Promise((resolve_, reject_) => {
-			var _timer$unref;
-			const timer = setTimeout(() => {
-				clearTimeout(timer);
-				rejectTimeoutError();
-			}, timeout);
-			(_timer$unref = timer.unref) === null || _timer$unref === void 0 ? void 0 : _timer$unref.call(timer);
-			function rejectTimeoutError() {
-				reject_(makeTimeoutError(isHook, timeout, stackTraceError));
-			}
-			function resolve(result) {
-				clearTimeout(timer);
-				if (now$2() - startTime >= timeout) {
-					rejectTimeoutError();
-					return;
-				}
-				resolve_(result);
-			}
-			function reject(error) {
-				clearTimeout(timer);
-				reject_(error);
-			}
-			try {
-				const result = fn(...args);
-				if (typeof result === "object" && result != null && typeof result.then === "function") {
-					result.then(resolve, reject);
-				} else {
-					resolve(result);
-				}
-			} catch (error) {
-				reject(error);
-			}
-		});
-	};
-}
-function createTestContext(test, runner) {
-	var _runner$extendTaskCon;
-	const context = function() {
-		throw new Error("done() callback is deprecated, use promise instead");
-	};
-	context.task = test;
-	context.skip = (condition, note) => {
-		if (condition === false) {
-			return undefined;
-		}
-		test.result ?? (test.result = { state: "skip" });
-		test.result.pending = true;
-		throw new PendingError("test is skipped; abort execution", test, typeof condition === "string" ? condition : note);
-	};
-	context.onTestFailed = (handler, timeout) => {
-		test.onFailed || (test.onFailed = []);
-		test.onFailed.push(withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR")));
-	};
-	context.onTestFinished = (handler, timeout) => {
-		test.onFinished || (test.onFinished = []);
-		test.onFinished.push(withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR")));
-	};
-	return ((_runner$extendTaskCon = runner.extendTaskContext) === null || _runner$extendTaskCon === void 0 ? void 0 : _runner$extendTaskCon.call(runner, context)) || context;
-}
-function makeTimeoutError(isHook, timeout, stackTraceError) {
-	const message = `${isHook ? "Hook" : "Test"} timed out in ${timeout}ms.\nIf this is a long-running ${isHook ? "hook" : "test"}, pass a timeout value as the last argument or configure it globally with "${isHook ? "hookTimeout" : "testTimeout"}".`;
-	const error = new Error(message);
-	if (stackTraceError === null || stackTraceError === void 0 ? void 0 : stackTraceError.stack) {
-		error.stack = stackTraceError.stack.replace(error.message, stackTraceError.message);
-	}
-	return error;
-}
-
 const fnMap = new WeakMap();
 const testFixtureMap = new WeakMap();
 const hooksMap = new WeakMap();
@@ -912,6 +822,103 @@ function findTestFileStackTrace(error, each) {
 	}
 }
 
+const now$2 = Date.now;
+const collectorContext = {
+	tasks: [],
+	currentSuite: null
+};
+function collectTask(task) {
+	var _collectorContext$cur;
+	(_collectorContext$cur = collectorContext.currentSuite) === null || _collectorContext$cur === void 0 ? void 0 : _collectorContext$cur.tasks.push(task);
+}
+async function runWithSuite(suite, fn) {
+	const prev = collectorContext.currentSuite;
+	collectorContext.currentSuite = suite;
+	await fn();
+	collectorContext.currentSuite = prev;
+}
+function withTimeout(fn, timeout, isHook = false, stackTraceError) {
+	if (timeout <= 0 || timeout === Number.POSITIVE_INFINITY) {
+		return fn;
+	}
+	const { setTimeout, clearTimeout } = getSafeTimers();
+	return function runWithTimeout(...args) {
+		const startTime = now$2();
+		const runner = getRunner();
+		runner._currentTaskStartTime = startTime;
+		runner._currentTaskTimeout = timeout;
+		return new Promise((resolve_, reject_) => {
+			var _timer$unref;
+			const timer = setTimeout(() => {
+				clearTimeout(timer);
+				rejectTimeoutError();
+			}, timeout);
+			(_timer$unref = timer.unref) === null || _timer$unref === void 0 ? void 0 : _timer$unref.call(timer);
+			function rejectTimeoutError() {
+				reject_(makeTimeoutError(isHook, timeout, stackTraceError));
+			}
+			function resolve(result) {
+				runner._currentTaskStartTime = undefined;
+				runner._currentTaskTimeout = undefined;
+				clearTimeout(timer);
+				if (now$2() - startTime >= timeout) {
+					rejectTimeoutError();
+					return;
+				}
+				resolve_(result);
+			}
+			function reject(error) {
+				runner._currentTaskStartTime = undefined;
+				runner._currentTaskTimeout = undefined;
+				clearTimeout(timer);
+				reject_(error);
+			}
+			try {
+				const result = fn(...args);
+				if (typeof result === "object" && result != null && typeof result.then === "function") {
+					result.then(resolve, reject);
+				} else {
+					resolve(result);
+				}
+			} catch (error) {
+				reject(error);
+			}
+		});
+	};
+}
+function createTestContext(test, runner) {
+	var _runner$extendTaskCon;
+	const context = function() {
+		throw new Error("done() callback is deprecated, use promise instead");
+	};
+	context.task = test;
+	context.skip = (condition, note) => {
+		if (condition === false) {
+			return undefined;
+		}
+		test.result ?? (test.result = { state: "skip" });
+		test.result.pending = true;
+		throw new PendingError("test is skipped; abort execution", test, typeof condition === "string" ? condition : note);
+	};
+	context.onTestFailed = (handler, timeout) => {
+		test.onFailed || (test.onFailed = []);
+		test.onFailed.push(withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR")));
+	};
+	context.onTestFinished = (handler, timeout) => {
+		test.onFinished || (test.onFinished = []);
+		test.onFinished.push(withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR")));
+	};
+	return ((_runner$extendTaskCon = runner.extendTaskContext) === null || _runner$extendTaskCon === void 0 ? void 0 : _runner$extendTaskCon.call(runner, context)) || context;
+}
+function makeTimeoutError(isHook, timeout, stackTraceError) {
+	const message = `${isHook ? "Hook" : "Test"} timed out in ${timeout}ms.\nIf this is a long-running ${isHook ? "hook" : "test"}, pass a timeout value as the last argument or configure it globally with "${isHook ? "hookTimeout" : "testTimeout"}".`;
+	const error = new Error(message);
+	if (stackTraceError === null || stackTraceError === void 0 ? void 0 : stackTraceError.stack) {
+		error.stack = stackTraceError.stack.replace(error.message, stackTraceError.message);
+	}
+	return error;
+}
+
 function getDefaultHookTimeout() {
 	return getRunner().config.hookTimeout;
 }
@@ -1245,21 +1252,8 @@ async function callSuiteHook(suite, currentTask, name, runner, args) {
 }
 const packs = new Map();
 const eventsPacks = [];
-let updateTimer;
-let previousUpdate;
-function updateTask(event, task, runner) {
-	eventsPacks.push([task.id, event]);
-	packs.set(task.id, [task.result, task.meta]);
-	const { clearTimeout, setTimeout } = getSafeTimers();
-	clearTimeout(updateTimer);
-	updateTimer = setTimeout(() => {
-		previousUpdate = sendTasksUpdate(runner);
-	}, 10);
-}
-async function sendTasksUpdate(runner) {
-	const { clearTimeout } = getSafeTimers();
-	clearTimeout(updateTimer);
-	await previousUpdate;
+const pendingTasksUpdates = [];
+function sendTasksUpdate(runner) {
 	if (packs.size) {
 		var _runner$onTaskUpdate;
 		const taskPacks = Array.from(packs).map(([id, task]) => {
@@ -1270,11 +1264,34 @@ async function sendTasksUpdate(runner) {
 			];
 		});
 		const p = (_runner$onTaskUpdate = runner.onTaskUpdate) === null || _runner$onTaskUpdate === void 0 ? void 0 : _runner$onTaskUpdate.call(runner, taskPacks, eventsPacks);
+		if (p) {
+			pendingTasksUpdates.push(p);
+			p.then(() => pendingTasksUpdates.splice(pendingTasksUpdates.indexOf(p), 1), () => {});
+		}
 		eventsPacks.length = 0;
 		packs.clear();
-		return p;
 	}
 }
+async function finishSendTasksUpdate(runner) {
+	sendTasksUpdate(runner);
+	await Promise.all(pendingTasksUpdates);
+}
+function throttle(fn, ms) {
+	let last = 0;
+	return function(...args) {
+		const now = unixNow();
+		if (now - last > ms) {
+			last = now;
+			return fn.apply(this, args);
+		}
+	};
+}
+const sendTasksUpdateThrottled = throttle(sendTasksUpdate, 100);
+function updateTask(event, task, runner) {
+	eventsPacks.push([task.id, event]);
+	packs.set(task.id, [task.result, task.meta]);
+	sendTasksUpdateThrottled(runner);
+}
 async function callCleanupHooks(cleanups) {
 	await Promise.all(cleanups.map(async (fn) => {
 		if (typeof fn !== "function") {
@@ -1287,6 +1304,8 @@ async function runTest(test, runner) {
 	var _runner$onBeforeRunTa, _test$result, _runner$onAfterRunTas;
 	await ((_runner$onBeforeRunTa = runner.onBeforeRunTask) === null || _runner$onBeforeRunTa === void 0 ? void 0 : _runner$onBeforeRunTa.call(runner, test));
 	if (test.mode !== "run" && test.mode !== "queued") {
+		updateTask("test-prepare", test, runner);
+		updateTask("test-finished", test, runner);
 		return;
 	}
 	if (((_test$result = test.result) === null || _test$result === void 0 ? void 0 : _test$result.state) === "fail") {
@@ -1535,7 +1554,7 @@ async function startTests(specs, runner) {
 	await ((_runner$onBeforeRunFi = runner.onBeforeRunFiles) === null || _runner$onBeforeRunFi === void 0 ? void 0 : _runner$onBeforeRunFi.call(runner, files));
 	await runFiles(files, runner);
 	await ((_runner$onAfterRunFil = runner.onAfterRunFiles) === null || _runner$onAfterRunFil === void 0 ? void 0 : _runner$onAfterRunFil.call(runner, files));
-	await sendTasksUpdate(runner);
+	await finishSendTasksUpdate(runner);
 	return files;
 }
 async function publicCollect(specs, runner) {

package/dist/{tasks.d-CnuPOyeL.d.ts → tasks.d-hsdzc98-.d.ts}

@@ -454,7 +454,7 @@ interface TestContext {
 	/**
 	* Metadata of the current test
 	*/
-	task: Readonly<Task>;
+	task: Readonly<Test<TestContext>>;
 	/**
 	* Extract hooks on test failed
 	*/
@@ -487,4 +487,5 @@ interface TaskHook<HookListener> {
 type SequenceHooks = "stack" | "list" | "parallel";
 type SequenceSetupFiles = "list" | "parallel";
 
-export { type AfterAllListener as A, type BeforeAllListener as B, type ChainableFunction as C, type DoneCallback as D, type ExtendedContext as E, type File as F, type TaskPopulated as G, type HookCleanupCallback as H, type InferFixturesTypes as I, type TaskResult as J, type TaskResultPack as K, type TaskState as L, type TestContext as M, type TestFunction as N, type OnTestFailedHandler as O, type TestOptions as P, type RunMode as R, type Suite as S, type Task as T, type Use as U, type Test as a, type AfterEachListener as b, createChainable as c, type BeforeEachListener as d, type TaskHook as e, type OnTestFinishedHandler as f, type Custom as g, type SuiteHooks as h, type TaskUpdateEvent as i, type TestAPI as j, type SuiteAPI as k, type SuiteCollector as l, type Fixture as m, type FixtureFn as n, type FixtureOptions as o, type Fixtures as p, type HookListener as q, type RuntimeContext as r, type SequenceHooks as s, type SequenceSetupFiles as t, type SuiteFactory as u, type TaskBase as v, type TaskContext as w, type TaskCustomOptions as x, type TaskEventPack as y, type TaskMeta as z };
+export { createChainable as c };
+export type { AfterAllListener as A, BeforeAllListener as B, ChainableFunction as C, DoneCallback as D, ExtendedContext as E, File as F, TaskPopulated as G, HookCleanupCallback as H, InferFixturesTypes as I, TaskResult as J, TaskResultPack as K, TaskState as L, TestContext as M, TestFunction as N, OnTestFailedHandler as O, TestOptions as P, RunMode as R, Suite as S, Task as T, Use as U, Test as a, AfterEachListener as b, BeforeEachListener as d, TaskHook as e, OnTestFinishedHandler as f, Custom as g, SuiteHooks as h, TaskUpdateEvent as i, TestAPI as j, SuiteAPI as k, SuiteCollector as l, Fixture as m, FixtureFn as n, FixtureOptions as o, Fixtures as p, HookListener as q, RuntimeContext as r, SequenceHooks as s, SequenceSetupFiles as t, SuiteFactory as u, TaskBase as v, TaskContext as w, TaskCustomOptions as x, TaskEventPack as y, TaskMeta as z };

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { DiffOptions } from '@vitest/utils/diff';
-import { F as File, T as Task, a as Test, S as Suite, K as TaskResultPack, y as TaskEventPack, M as TestContext, s as SequenceHooks, t as SequenceSetupFiles } from './tasks.d-CnuPOyeL.js';
-export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, k as SuiteAPI, l as SuiteCollector, u as SuiteFactory, h as SuiteHooks, v as TaskBase, w as TaskContext, x as TaskCustomOptions, e as TaskHook, z as TaskMeta, G as TaskPopulated, J as TaskResult, L as TaskState, i as TaskUpdateEvent, j as TestAPI, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-CnuPOyeL.js';
+import { F as File, T as Task, a as Test, S as Suite, K as TaskResultPack, y as TaskEventPack, M as TestContext, s as SequenceHooks, t as SequenceSetupFiles } from './tasks.d-hsdzc98-.js';
+export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, k as SuiteAPI, l as SuiteCollector, u as SuiteFactory, h as SuiteHooks, v as TaskBase, w as TaskContext, x as TaskCustomOptions, e as TaskHook, z as TaskMeta, G as TaskPopulated, J as TaskResult, L as TaskState, i as TaskUpdateEvent, j as TestAPI, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-hsdzc98-.js';
 import '@vitest/utils';
 
 /**
@@ -140,6 +140,11 @@ interface VitestRunner {
 	* The name of the current pool. Can affect how stack trace is inferred on the server side.
 	*/
 	pool?: string;
+	/** @private */
+	_currentTaskStartTime?: number;
+	/** @private */
+	_currentTaskTimeout?: number;
 }
 
-export { type CancelReason, File, type FileSpecification, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskEventPack, TaskResultPack, Test, TestContext, type VitestRunner, type VitestRunnerConfig, type VitestRunnerConstructor, type VitestRunnerImportSource };
+export { File, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskEventPack, TaskResultPack, Test, TestContext };
+export type { CancelReason, FileSpecification, VitestRunner, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource };

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-CnuPOyeL.js';
-export { C as ChainableFunction, c as createChainable } from './tasks.d-CnuPOyeL.js';
+import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-hsdzc98-.js';
+export { C as ChainableFunction, c as createChainable } from './tasks.d-hsdzc98-.js';
 import { Arrayable } from '@vitest/utils';
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "3.1.0-beta.2",
+  "version": "3.1.0",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "pathe": "^2.0.3",
-    "@vitest/utils": "3.1.0-beta.2"
+    "@vitest/utils": "3.1.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",