@vitest/runner 4.0.16 → 4.1.0-beta.1

package/dist/chunk-tasks.js

@@ -34,13 +34,16 @@ function createChainable(keys, fn) {
 /**
 * If any tasks been marked as `only`, mark all other tasks as `skip`.
 */
-function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIsOnly, allowOnly) {
+function interpretTaskModes(file, namePattern, testLocations, testIds, onlyMode, parentIsOnly, allowOnly) {
 	const matchedLocations = [];
 	const traverseSuite = (suite, parentIsOnly, parentMatchedWithLocation) => {
 		const suiteIsOnly = parentIsOnly || suite.mode === "only";
+		// Check if any tasks in this suite have `.only` - if so, only those should run
+		const hasSomeTasksOnly = onlyMode && suite.tasks.some((t) => t.mode === "only" || t.type === "suite" && someTasksAreOnly(t));
 		suite.tasks.forEach((t) => {
 			// Check if either the parent suite or the task itself are marked as included
-			const includeTask = suiteIsOnly || t.mode === "only";
+			// If there are tasks with `.only` in this suite, only include those (not all tasks from describe.only)
+			const includeTask = hasSomeTasksOnly ? t.mode === "only" || t.type === "suite" && someTasksAreOnly(t) : suiteIsOnly || t.mode === "only";
 			if (onlyMode) {
 				if (t.type === "suite" && (includeTask || someTasksAreOnly(t))) {
 					// Don't skip this suite
@@ -57,7 +60,7 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
 			}
 			let hasLocationMatch = parentMatchedWithLocation;
 			// Match test location against provided locations, only run if present
-			// in `testLocations`. Note: if `includeTaskLocations` is not enabled,
+			// in `testLocations`. Note: if `includeTaskLocation` is not enabled,
 			// all test will be skipped.
 			if (testLocations !== undefined && testLocations.length !== 0) {
 				if (t.location && (testLocations === null || testLocations === void 0 ? void 0 : testLocations.includes(t.location.line))) {
@@ -74,6 +77,9 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
 				if (namePattern && !getTaskFullName(t).match(namePattern)) {
 					t.mode = "skip";
 				}
+				if (testIds && !testIds.includes(t.id)) {
+					t.mode = "skip";
+				}
 			} else if (t.type === "suite") {
 				if (t.mode === "skip") {
 					skipAllTasks(t);

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { b as TestArtifact, a as Test, S as Suite, d as SuiteHooks, F as File, e as TaskUpdateEvent, T as Task, f as TestAPI, g as SuiteAPI, h as SuiteCollector } from './tasks.d-BUa1HjoW.js';
-export { A as AfterAllListener, n as AfterEachListener, B as BeforeAllListener, p as BeforeEachListener, q as Fixture, r as FixtureFn, s as FixtureOptions, t as Fixtures, I as ImportDuration, u as InferFixturesTypes, O as OnTestFailedHandler, v as OnTestFinishedHandler, R as RunMode, w as RuntimeContext, x as SequenceHooks, y as SequenceSetupFiles, z as SuiteFactory, D as TaskBase, E as TaskCustomOptions, G as TaskEventPack, H as TaskHook, J as TaskMeta, K as TaskPopulated, L as TaskResult, M as TaskResultPack, N as TaskState, P as TestAnnotation, Q as TestAnnotationArtifact, U as TestAnnotationLocation, V as TestArtifactBase, W as TestArtifactLocation, X as TestArtifactRegistry, Y as TestAttachment, Z as TestContext, _ as TestFunction, $ as TestOptions, a0 as Use, a1 as VisualRegressionArtifact, i as afterAll, j as afterEach, k as beforeAll, l as beforeEach, o as onTestFailed, m as onTestFinished } from './tasks.d-BUa1HjoW.js';
+import { b as TestArtifact, a as Test, S as Suite, d as SuiteHooks, F as File, e as TaskUpdateEvent, T as Task, f as TestAPI, g as SuiteAPI, h as SuiteCollector } from './tasks.d-hZ73xajr.js';
+export { A as AfterAllListener, n as AfterEachListener, B as BeforeAllListener, p as BeforeEachListener, q as Fixture, r as FixtureFn, s as FixtureOptions, t as Fixtures, I as ImportDuration, u as InferFixturesTypes, O as OnTestFailedHandler, v as OnTestFinishedHandler, R as Retry, w as RunMode, x as RuntimeContext, y as SequenceHooks, z as SequenceSetupFiles, D as SerializableRetry, E as SuiteFactory, G as TaskBase, H as TaskCustomOptions, J as TaskEventPack, K as TaskHook, L as TaskMeta, M as TaskPopulated, N as TaskResult, P as TaskResultPack, Q as TaskState, U as TestAnnotation, V as TestAnnotationArtifact, W as TestAnnotationLocation, X as TestArtifactBase, Y as TestArtifactLocation, Z as TestArtifactRegistry, _ as TestAttachment, $ as TestContext, a0 as TestFunction, a1 as TestOptions, a2 as Use, a3 as VisualRegressionArtifact, i as afterAll, j as afterEach, k as beforeAll, l as beforeEach, o as onTestFailed, m as onTestFinished } from './tasks.d-hZ73xajr.js';
 import { Awaitable } from '@vitest/utils';
 import { FileSpecification, VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';

package/dist/index.js

@@ -680,7 +680,7 @@ let defaultSuite;
 let currentTestFilepath;
 function assert(condition, message) {
 	if (!condition) {
-		throw new Error(`Vitest failed to find ${message}. This is a bug in Vitest. Please, open an issue with reproduction.`);
+		throw new Error(`Vitest failed to find ${message}. One 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");
 	}
 }
 function getDefaultSuite() {
@@ -1365,6 +1365,8 @@ async function collectTests(specs, runner) {
 		await $("collect_spec", { "code.file.path": filepath }, async () => {
 			var _runner$onCollectStar;
 			const testLocations = typeof spec === "string" ? undefined : spec.testLocations;
+			const testNamePattern = typeof spec === "string" ? undefined : spec.testNamePattern;
+			const testIds = typeof spec === "string" ? undefined : spec.testIds;
 			const file = createFileTask(filepath, config.root, config.name, runner.pool, runner.viteEnvironment);
 			setFileContext(file, Object.create(null));
 			file.shuffle = config.sequence.shuffle;
@@ -1420,7 +1422,7 @@ async function collectTests(specs, runner) {
 			}
 			calculateSuiteHash(file);
 			const hasOnlyTasks = someTasksAreOnly(file);
-			interpretTaskModes(file, config.testNamePattern, testLocations, hasOnlyTasks, false, config.allowOnly);
+			interpretTaskModes(file, testNamePattern ?? config.testNamePattern, testLocations, testIds, hasOnlyTasks, false, config.allowOnly);
 			if (file.mode === "queued") {
 				file.mode = "run";
 			}
@@ -1440,6 +1442,37 @@ function mergeHooks(baseHooks, hooks) {
 const now = globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 const unixNow = Date.now;
 const { clearTimeout, setTimeout } = getSafeTimers();
+/**
+* Normalizes retry configuration to extract individual values.
+* Handles both number and object forms.
+*/
+function getRetryCount(retry) {
+	if (retry === undefined) {
+		return 0;
+	}
+	if (typeof retry === "number") {
+		return retry;
+	}
+	return retry.count ?? 0;
+}
+function getRetryDelay(retry) {
+	if (retry === undefined) {
+		return 0;
+	}
+	if (typeof retry === "number") {
+		return 0;
+	}
+	return retry.delay ?? 0;
+}
+function getRetryCondition(retry) {
+	if (retry === undefined) {
+		return undefined;
+	}
+	if (typeof retry === "number") {
+		return undefined;
+	}
+	return retry.condition;
+}
 function updateSuiteHookState(task, name, state, runner) {
 	if (!task.result) {
 		task.result = { state: "run" };
@@ -1603,6 +1636,25 @@ async function callCleanupHooks(runner, cleanups) {
 		}
 	}
 }
+/**
+* Determines if a test should be retried based on its retryCondition configuration
+*/
+function passesRetryCondition(test, errors) {
+	const condition = getRetryCondition(test.retry);
+	if (!errors || errors.length === 0) {
+		return false;
+	}
+	if (!condition) {
+		return true;
+	}
+	const error = errors[errors.length - 1];
+	if (condition instanceof RegExp) {
+		return condition.test(error.message || "");
+	} else if (typeof condition === "function") {
+		return condition(error);
+	}
+	return false;
+}
 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));
@@ -1631,7 +1683,7 @@ async function runTest(test, runner) {
 	const $ = runner.trace;
 	const repeats = test.repeats ?? 0;
 	for (let repeatCount = 0; repeatCount <= repeats; repeatCount++) {
-		const retry = test.retry ?? 0;
+		const retry = getRetryCount(test.retry);
 		for (let retryCount = 0; retryCount <= retry; retryCount++) {
 			var _test$onFinished, _test$onFailed, _runner$onAfterRetryT, _test$result2, _test$result3;
 			let beforeEachCleanups = [];
@@ -1712,9 +1764,16 @@ async function runTest(test, runner) {
 				break;
 			}
 			if (retryCount < retry) {
-				// reset state when retry test
+				const shouldRetry = passesRetryCondition(test, test.result.errors);
+				if (!shouldRetry) {
+					break;
+				}
 				test.result.state = "run";
 				test.result.retryCount = (test.result.retryCount ?? 0) + 1;
+				const delay = getRetryDelay(test.retry);
+				if (delay > 0) {
+					await new Promise((resolve) => setTimeout(resolve, delay));
+				}
 			}
 			// update retry info
 			updateTask("test-retried", test, runner);

package/dist/{tasks.d-BUa1HjoW.d.ts → tasks.d-hZ73xajr.d.ts}

@@ -226,10 +226,12 @@ interface TaskBase {
 	*/
 	result?: TaskResult;
 	/**
-	* The amount of times the task should be retried if it fails.
+	* Retry configuration for the task.
+	* - If a number, specifies how many times to retry
+	* - If an object, allows fine-grained retry control
 	* @default 0
 	*/
-	retry?: number;
+	retry?: Retry;
 	/**
 	* The amount of times the task should be repeated after the successful run.
 	* If the task fails, it will not be retried unless `retry` is specified.
@@ -448,18 +450,68 @@ type ChainableTestAPI<ExtraContext = object> = ChainableFunction<"concurrent" |
 	for: TestForFunction<ExtraContext>;
 }>;
 type TestCollectorOptions = Omit<TestOptions, "shuffle">;
+/**
+* Retry configuration for tests.
+* Can be a number for simple retry count, or an object for advanced retry control.
+*/
+type Retry = number | {
+	/**
+	* The number of times to retry the test if it fails.
+	* @default 0
+	*/
+	count?: number;
+	/**
+	* Delay in milliseconds between retry attempts.
+	* @default 0
+	*/
+	delay?: number;
+	/**
+	* Condition to determine if a test should be retried based on the error.
+	* - If a RegExp, it is tested against the error message
+	* - If a function, called with the TestError object; return true to retry
+	*
+	* NOTE: Functions can only be used in test files, not in vitest.config.ts,
+	* because the configuration is serialized when passed to worker threads.
+	*
+	* @default undefined (retry on all errors)
+	*/
+	condition?: RegExp | ((error: TestError) => boolean);
+};
+/**
+* Serializable retry configuration (used in config files).
+* Functions cannot be serialized, so only string conditions are allowed.
+*/
+type SerializableRetry = number | {
+	/**
+	* The number of times to retry the test if it fails.
+	* @default 0
+	*/
+	count?: number;
+	/**
+	* Delay in milliseconds between retry attempts.
+	* @default 0
+	*/
+	delay?: number;
+	/**
+	* Condition to determine if a test should be retried based on the error.
+	* Must be a RegExp tested against the error message.
+	*
+	* @default undefined (retry on all errors)
+	*/
+	condition?: RegExp;
+};
 interface TestOptions {
 	/**
 	* Test timeout.
 	*/
 	timeout?: number;
 	/**
-	* Times to retry the test if fails. Useful for making flaky tests more stable.
-	* When retries is up, the last test error will be thrown.
-	*
+	* Retry configuration for the test.
+	* - If a number, specifies how many times to retry
+	* - If an object, allows fine-grained retry control
 	* @default 0
 	*/
-	retry?: number;
+	retry?: Retry;
 	/**
 	* How many times the test will run again.
 	* Only inner tests will repeat if set on `describe()`, nested `describe()` will inherit parent's repeat by default.
@@ -510,7 +562,7 @@ interface Hooks<ExtraContext> {
 }
 type TestAPI<ExtraContext = object> = ChainableTestAPI<ExtraContext> & ExtendedAPI<ExtraContext> & Hooks<ExtraContext> & {
 	extend: <T extends Record<string, any> = object>(fixtures: Fixtures<T, ExtraContext>) => TestAPI<{ [K in keyof T | keyof ExtraContext] : K extends keyof T ? T[K] : K extends keyof ExtraContext ? ExtraContext[K] : never }>;
-	scoped: (fixtures: Fixtures<Partial<ExtraContext>>) => void;
+	scoped: (fixtures: Partial<Fixtures<ExtraContext>>) => void;
 };
 interface FixtureOptions {
 	/**
@@ -545,7 +597,7 @@ type Fixture<
 	ExtraContext = object
 > = ((...args: any) => any) extends T[K] ? T[K] extends any ? FixtureFn<T, K, Omit<ExtraContext, Exclude<keyof T, K>>> : never : T[K] | (T[K] extends any ? FixtureFn<T, K, Omit<ExtraContext, Exclude<keyof T, K>>> : never);
 type Fixtures<
-	T extends Record<string, any>,
+	T,
 	ExtraContext = object
 > = { [K in keyof T] : Fixture<T, K, ExtraContext & TestContext> | [Fixture<T, K, ExtraContext & TestContext>, FixtureOptions?] };
 type InferFixturesTypes<T> = T extends TestAPI<infer C> ? C : T;
@@ -732,13 +784,11 @@ interface TestAnnotationArtifact extends TestArtifactBase {
 	type: "internal:annotation";
 	annotation: TestAnnotation;
 }
-type VisualRegressionArtifactAttachment = TestAttachment & ({
-	name: "reference" | "actual";
+interface VisualRegressionArtifactAttachment extends TestAttachment {
+	name: "reference" | "actual" | "diff";
 	width: number;
 	height: number;
-} | {
-	name: "diff";
-});
+}
 /**
 * @experimental
 *
@@ -833,4 +883,4 @@ interface TestArtifactRegistry {}
 type TestArtifact = TestAnnotationArtifact | VisualRegressionArtifact | TestArtifactRegistry[keyof TestArtifactRegistry];
 
 export { createChainable as c, afterAll as i, afterEach as j, beforeAll as k, beforeEach as l, onTestFinished as m, onTestFailed as o };
-export type { TestOptions as $, AfterAllListener as A, BeforeAllListener as B, ChainableFunction as C, TaskBase as D, TaskCustomOptions as E, File as F, TaskEventPack as G, TaskHook as H, ImportDuration as I, TaskMeta as J, TaskPopulated as K, TaskResult as L, TaskResultPack as M, TaskState as N, OnTestFailedHandler as O, TestAnnotation as P, TestAnnotationArtifact as Q, RunMode as R, Suite as S, Task as T, TestAnnotationLocation as U, TestArtifactBase as V, TestArtifactLocation as W, TestArtifactRegistry as X, TestAttachment as Y, TestContext as Z, TestFunction as _, Test as a, Use as a0, VisualRegressionArtifact as a1, TestArtifact as b, SuiteHooks as d, TaskUpdateEvent as e, TestAPI as f, SuiteAPI as g, SuiteCollector as h, AfterEachListener as n, BeforeEachListener as p, Fixture as q, FixtureFn as r, FixtureOptions as s, Fixtures as t, InferFixturesTypes as u, OnTestFinishedHandler as v, RuntimeContext as w, SequenceHooks as x, SequenceSetupFiles as y, SuiteFactory as z };
+export type { TestContext as $, AfterAllListener as A, BeforeAllListener as B, ChainableFunction as C, SerializableRetry as D, SuiteFactory as E, File as F, TaskBase as G, TaskCustomOptions as H, ImportDuration as I, TaskEventPack as J, TaskHook as K, TaskMeta as L, TaskPopulated as M, TaskResult as N, OnTestFailedHandler as O, TaskResultPack as P, TaskState as Q, Retry as R, Suite as S, Task as T, TestAnnotation as U, TestAnnotationArtifact as V, TestAnnotationLocation as W, TestArtifactBase as X, TestArtifactLocation as Y, TestArtifactRegistry as Z, TestAttachment as _, Test as a, TestFunction as a0, TestOptions as a1, Use as a2, VisualRegressionArtifact as a3, TestArtifact as b, SuiteHooks as d, TaskUpdateEvent as e, TestAPI as f, SuiteAPI as g, SuiteCollector as h, AfterEachListener as n, BeforeEachListener as p, Fixture as q, FixtureFn as r, FixtureOptions as s, Fixtures as t, InferFixturesTypes as u, OnTestFinishedHandler as v, RunMode as w, RuntimeContext as x, SequenceHooks as y, SequenceSetupFiles as z };

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { DiffOptions } from '@vitest/utils/diff';
-import { F as File, a as Test, S as Suite, M as TaskResultPack, G as TaskEventPack, P as TestAnnotation, b as TestArtifact, Z as TestContext, I as ImportDuration, x as SequenceHooks, y as SequenceSetupFiles } from './tasks.d-BUa1HjoW.js';
-export { A as AfterAllListener, n as AfterEachListener, B as BeforeAllListener, p as BeforeEachListener, q as Fixture, r as FixtureFn, s as FixtureOptions, t as Fixtures, u as InferFixturesTypes, O as OnTestFailedHandler, v as OnTestFinishedHandler, R as RunMode, w as RuntimeContext, g as SuiteAPI, h as SuiteCollector, z as SuiteFactory, d as SuiteHooks, T as Task, D as TaskBase, E as TaskCustomOptions, H as TaskHook, J as TaskMeta, K as TaskPopulated, L as TaskResult, N as TaskState, e as TaskUpdateEvent, f as TestAPI, Q as TestAnnotationArtifact, U as TestAnnotationLocation, V as TestArtifactBase, W as TestArtifactLocation, X as TestArtifactRegistry, Y as TestAttachment, _ as TestFunction, $ as TestOptions, a0 as Use, a1 as VisualRegressionArtifact } from './tasks.d-BUa1HjoW.js';
+import { F as File, a as Test, S as Suite, P as TaskResultPack, J as TaskEventPack, U as TestAnnotation, b as TestArtifact, $ as TestContext, I as ImportDuration, y as SequenceHooks, z as SequenceSetupFiles, D as SerializableRetry } from './tasks.d-hZ73xajr.js';
+export { A as AfterAllListener, n as AfterEachListener, B as BeforeAllListener, p as BeforeEachListener, q as Fixture, r as FixtureFn, s as FixtureOptions, t as Fixtures, u as InferFixturesTypes, O as OnTestFailedHandler, v as OnTestFinishedHandler, R as Retry, w as RunMode, x as RuntimeContext, g as SuiteAPI, h as SuiteCollector, E as SuiteFactory, d as SuiteHooks, T as Task, G as TaskBase, H as TaskCustomOptions, K as TaskHook, L as TaskMeta, M as TaskPopulated, N as TaskResult, Q as TaskState, e as TaskUpdateEvent, f as TestAPI, V as TestAnnotationArtifact, W as TestAnnotationLocation, X as TestArtifactBase, Y as TestArtifactLocation, Z as TestArtifactRegistry, _ as TestAttachment, a0 as TestFunction, a1 as TestOptions, a2 as Use, a3 as VisualRegressionArtifact } from './tasks.d-hZ73xajr.js';
 import '@vitest/utils';
 
 /**
@@ -26,7 +26,7 @@ interface VitestRunnerConfig {
 	maxConcurrency: number;
 	testTimeout: number;
 	hookTimeout: number;
-	retry: number;
+	retry: SerializableRetry;
 	includeTaskLocation?: boolean;
 	diffOptions?: DiffOptions;
 }
@@ -36,6 +36,8 @@ interface VitestRunnerConfig {
 interface FileSpecification {
 	filepath: string;
 	testLocations: number[] | undefined;
+	testNamePattern: RegExp | undefined;
+	testIds: string[] | undefined;
 }
 type VitestRunnerImportSource = "collect" | "setup";
 interface VitestRunnerConstructor {
@@ -179,5 +181,5 @@ interface VitestRunner {
 	_currentTaskTimeout?: number;
 }
 
-export { File, ImportDuration, SequenceHooks, SequenceSetupFiles, Suite, TaskEventPack, TaskResultPack, Test, TestAnnotation, TestArtifact, TestContext };
+export { File, ImportDuration, SequenceHooks, SequenceSetupFiles, SerializableRetry, Suite, TaskEventPack, TaskResultPack, Test, TestAnnotation, TestArtifact, TestContext };
 export type { CancelReason, FileSpecification, VitestRunner, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource };

package/dist/utils.d.ts

@@ -1,11 +1,11 @@
-import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-BUa1HjoW.js';
-export { C as ChainableFunction, c as createChainable } from './tasks.d-BUa1HjoW.js';
+import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-hZ73xajr.js';
+export { C as ChainableFunction, c as createChainable } from './tasks.d-hZ73xajr.js';
 import { ParsedStack, Arrayable } from '@vitest/utils';
 
 /**
 * If any tasks been marked as `only`, mark all other tasks as `skip`.
 */
-declare function interpretTaskModes(file: Suite, namePattern?: string | RegExp, testLocations?: number[] | undefined, onlyMode?: boolean, parentIsOnly?: boolean, allowOnly?: boolean): void;
+declare function interpretTaskModes(file: Suite, namePattern?: string | RegExp, testLocations?: number[] | undefined, testIds?: string[] | undefined, onlyMode?: boolean, parentIsOnly?: boolean, allowOnly?: boolean): void;
 declare function someTasksAreOnly(suite: Suite): boolean;
 declare function generateHash(str: string): string;
 declare function calculateSuiteHash(parent: Suite): void;

package/package.json

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