@vitest/runner 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/chunk-artifact.js

@@ -1074,17 +1074,17 @@ function calculateSuiteHash(parent) {
 		}
 	});
 }
-function createFileTask(filepath, root, projectName, pool, viteEnvironment) {
+function createFileTask(filepath, root, projectName, pool, viteEnvironment, meta) {
 	const path = relative(root, filepath);
 	const file = {
-		id: generateFileHash(path, projectName),
+		id: generateFileHash(path, projectName, meta),
 		name: path,
 		fullName: path,
 		type: "suite",
 		mode: "queued",
 		filepath,
 		tasks: [],
-		meta: Object.create(null),
+		meta: Object.assign(Object.create(null), meta),
 		projectName,
 		file: undefined,
 		pool,
@@ -1099,8 +1099,14 @@ function createFileTask(filepath, root, projectName, pool, viteEnvironment) {
 * @param projectName The name of the test project
 */
 /* @__NO_SIDE_EFFECTS__ */
-function generateFileHash(file, projectName) {
-	return /* @__PURE__ */ generateHash(`${file}${projectName || ""}`);
+function generateFileHash(file, projectName, meta) {
+	const seed = [
+		file,
+		projectName || "",
+		meta?.typecheck ? "__typecheck__" : "",
+		meta?.__vitest_label__ || ""
+	].join("\0");
+	return generateHash(seed);
 }
 function findTestFileStackTrace(testFilePath, error) {
 	// first line is the error message
@@ -1741,11 +1747,25 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 			return acc;
 		}, {});
 		const testOwnMeta = options.meta;
+		const parentOptions = collectorContext.currentSuite?.options;
 		options = {
+			...parentOptions,
 			...tagsOptions,
 			...options
 		};
 		const timeout = options.timeout ?? runner.config.testTimeout;
+		// TODO: should this be `parentTask.meta`?
+		// currently we don't inherit
+		//   file.meta -> task.meta
+		//   file.meta -> suite.meta (see initSuite)
+		// but we do inherit
+		//   suite.meta -> task.meta
+		//   suite.meta -> suite.meta
+		// and also
+		//   file.tags -> task.tags
+		//   file.tags -> suite.tags
+		//   suite.tags -> suite.tags
+		//   suite.tags -> task.tags
 		const parentMeta = currentSuite?.meta;
 		const tagMeta = tagsOptions.meta;
 		const testMeta = Object.create(null);
@@ -1782,7 +1802,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		if (task.mode === "run" && !handler) {
 			task.mode = "todo";
 		}
-		if (options.concurrent || !options.sequential && runner.config.sequence.concurrent) {
+		if (options.concurrent ?? runner.config.sequence.concurrent) {
 			task.concurrent = true;
 		}
 		task.shuffle = suiteOptions?.shuffle;
@@ -1814,20 +1834,11 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		return task;
 	};
 	const test = createTest(function(name, optionsOrFn, timeoutOrTest) {
-		let { options, handler } = parseArguments(optionsOrFn, timeoutOrTest);
-		// inherit repeats, retry, timeout from suite
-		if (typeof suiteOptions === "object") {
-			options = Object.assign({}, suiteOptions, options);
-		}
-		// inherit concurrent / sequential from suite
-		const concurrent = this.concurrent ?? (!this.sequential && options?.concurrent);
-		if (options.concurrent != null && concurrent != null) {
+		const { options, handler } = parseArguments(optionsOrFn, timeoutOrTest);
+		const concurrent = this.concurrent ?? options?.concurrent;
+		if (concurrent != null) {
 			options.concurrent = concurrent;
 		}
-		const sequential = this.sequential ?? (!this.concurrent && options?.sequential);
-		if (options.sequential != null && sequential != null) {
-			options.sequential = sequential;
-		}
 		const test = task(formatName(name), {
 			...this,
 			...options,
@@ -1933,8 +1944,6 @@ function createSuite() {
 		}
 		const currentSuite = collectorContext.currentSuite || defaultSuite;
 		let { options, handler: factory } = parseArguments(factoryOrOptions, optionsOrFactory);
-		const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
-		const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
 		const { meta: parentMeta, ...parentOptions } = currentSuite?.options || {};
 		// inherit options from current suite
 		options = {
@@ -1950,14 +1959,9 @@ function createSuite() {
 		if (mode === "run" && !factory) {
 			mode = "todo";
 		}
-		// inherit concurrent / sequential from suite
-		const isConcurrent = isConcurrentSpecified || options.concurrent && !isSequentialSpecified;
-		const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
-		if (isConcurrent != null) {
-			options.concurrent = isConcurrent && !isSequential;
-		}
-		if (isSequential != null) {
-			options.sequential = isSequential && !isConcurrent;
+		const concurrent = this.concurrent ?? options.concurrent;
+		if (concurrent != null) {
+			options.concurrent = concurrent;
 		}
 		if (parentMeta) {
 			options.meta = Object.assign(Object.create(null), parentMeta, options.meta);
@@ -1996,6 +2000,8 @@ function createSuite() {
 		};
 	};
 	suiteFn.for = function(cases, ...args) {
+		const context = getChainableContext(this);
+		const suite = context.withContext();
 		if (Array.isArray(cases) && args.length) {
 			cases = formatTemplateString(cases, args);
 		}
@@ -2011,7 +2017,6 @@ function createSuite() {
 	suiteFn.runIf = (condition) => condition ? suite : suite.skip;
 	return createChainable([
 		"concurrent",
-		"sequential",
 		"shuffle",
 		"skip",
 		"only",
@@ -2166,7 +2171,6 @@ function createTaskCollector(fn) {
 	taskFn.aroundAll = aroundAll;
 	const _test = createChainable([
 		"concurrent",
-		"sequential",
 		"skip",
 		"only",
 		"todo",
@@ -2282,7 +2286,7 @@ function withTimeout(fn, timeout, isHook = false, stackTraceError, onTimeout) {
 		return fn;
 	}
 	const { setTimeout, clearTimeout } = getSafeTimers();
-	// this function name is used to filter error in test/cli/test/fails.test.ts
+	// this function name is used to filter error in test/e2e/test/fails.test.ts
 	return (function runWithTimeout(...args) {
 		const startTime = now$2();
 		const runner = getRunner();
@@ -2340,15 +2344,25 @@ catch (error) {
 function withCancel(fn, signal) {
 	return (function runWithCancel(...args) {
 		return new Promise((resolve, reject) => {
-			signal.addEventListener("abort", () => reject(signal.reason));
+			const onAbort = () => reject(signal.reason);
+			signal.addEventListener("abort", onAbort, { once: true });
+			const cleanup = () => signal.removeEventListener("abort", onAbort);
 			try {
 				const result = fn(...args);
 				if (typeof result === "object" && result != null && typeof result.then === "function") {
-					result.then(resolve, reject);
+					result.then((value) => {
+						cleanup();
+						resolve(value);
+					}, (error) => {
+						cleanup();
+						reject(error);
+					});
 				} else {
+					cleanup();
 					resolve(result);
 				}
 			} catch (error) {
+				cleanup();
 				reject(error);
 			}
 		});
@@ -2456,7 +2470,7 @@ async function collectTests(specs, runner) {
 			const testIds = typeof spec === "string" ? undefined : spec.testIds;
 			const testTagsFilter = typeof spec === "object" && spec.testTagsFilter ? createTagsFilter(spec.testTagsFilter, config.tags) : undefined;
 			const fileTags = typeof spec === "string" ? [] : spec.fileTags || [];
-			const file = createFileTask(filepath, config.root, config.name, runner.pool, runner.viteEnvironment);
+			const file = createFileTask(filepath, config.root, config.name, runner.pool, runner.viteEnvironment, { __vitest_label__: config.mergeReportsLabel });
 			file.tags = fileTags;
 			file.shuffle = config.sequence.shuffle;
 			try {
@@ -3163,7 +3177,8 @@ async function runSuite(suite, runner) {
 					} else {
 						for (let tasksGroup of partitionSuiteChildren(suite)) {
 							if (tasksGroup[0].concurrent === true) {
-								await Promise.all(tasksGroup.map((c) => runSuiteChild(c, runner)));
+								const groupLimiter = limitConcurrency(runner.config.maxConcurrency);
+								await Promise.all(tasksGroup.map((c) => groupLimiter(() => runSuiteChild(c, runner))));
 							} else {
 								const { sequence } = runner.config;
 								if (suite.shuffle) {

package/dist/index.d.ts

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

package/dist/{tasks.d-Br8qsHTh.d.ts → tasks.d-B4a0-8OW.d.ts}

@@ -31,6 +31,7 @@ interface VitestRunnerConfig {
 	tags: TestTagDefinition[];
 	tagsFilter: string[] | undefined;
 	strictTags: boolean;
+	mergeReportsLabel: string | undefined;
 }
 /**
 * Possible options to run a single file in a test.
@@ -402,6 +403,13 @@ type ChainableFunction<
 > = F & { [x in T] : ChainableFunction<T, F, C> } & {
 	fn: (this: Record<T, any>, ...args: Parameters<F>) => ReturnType<F>;
 } & C;
+type TypedChainableFunction<
+	T,
+	F extends (...args: any) => any,
+	C = object
+> = F & { [x in keyof T] : TypedChainableFunction<T, F, C> } & {
+	fn: (this: Record<keyof T, any>, ...args: Parameters<F>) => ReturnType<F>;
+} & C;
 declare function createChainable<
 	T extends string,
 	Args extends any[],
@@ -711,7 +719,8 @@ interface TestCollectorCallable<C = object> {
 	<ExtraContext extends C>(name: string | Function, fn?: TestFunction<ExtraContext>, options?: number): void;
 	<ExtraContext extends C>(name: string | Function, options?: TestCollectorOptions, fn?: TestFunction<ExtraContext>): void;
 }
-type ChainableTestAPI<ExtraContext = object> = ChainableFunction<"concurrent" | "sequential" | "only" | "skip" | "todo" | "fails", TestCollectorCallable<ExtraContext>, {
+type ChainableTestContextMap = Pick<Required<TestOptions>, "concurrent" | "only" | "skip" | "todo" | "fails">;
+type ChainableTestAPI<ExtraContext = object> = TypedChainableFunction<ChainableTestContextMap, TestCollectorCallable<ExtraContext>, {
 	each: TestEachFunction;
 	for: TestForFunction<ExtraContext>;
 }>;
@@ -791,11 +800,6 @@ interface TestOptions {
 	*/
 	concurrent?: boolean;
 	/**
-	* Whether tests run sequentially.
-	* Tests inherit `sequential` from `describe()` and nested `describe()` will inherit from parent's `sequential`.
-	*/
-	sequential?: boolean;
-	/**
 	* Whether the test should be skipped.
 	*/
 	skip?: boolean;
@@ -1191,7 +1195,8 @@ interface SuiteCollectorCallable<ExtraContext = object> {
 	<OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, fn?: SuiteFactory<OverrideExtraContext>, options?: number): SuiteCollector<OverrideExtraContext>;
 	<OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, options: SuiteOptions, fn?: SuiteFactory<OverrideExtraContext>): SuiteCollector<OverrideExtraContext>;
 }
-type ChainableSuiteAPI<ExtraContext = object> = ChainableFunction<"concurrent" | "sequential" | "only" | "skip" | "todo" | "shuffle", SuiteCollectorCallable<ExtraContext>, {
+type ChainableSuiteContextMap = Pick<Required<SuiteOptions>, "concurrent" | "only" | "skip" | "todo" | "shuffle">;
+type ChainableSuiteAPI<ExtraContext = object> = TypedChainableFunction<ChainableSuiteContextMap, SuiteCollectorCallable<ExtraContext>, {
 	each: TestEachFunction;
 	for: SuiteForFunction;
 }>;

package/dist/types.d.ts

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

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, F as File, T as Task, a as TestTagDefinition, V as VitestRunnerConfig, b as Test } from './tasks.d-Br8qsHTh.js';
-export { C as ChainableFunction, c as createChainable } from './tasks.d-Br8qsHTh.js';
+import { S as Suite, F as File, T as Task, a as TestTagDefinition, V as VitestRunnerConfig, b as Test } from './tasks.d-B4a0-8OW.js';
+export { C as ChainableFunction, c as createChainable } from './tasks.d-B4a0-8OW.js';
 import { ParsedStack, Arrayable } from '@vitest/utils';
 import '@vitest/utils/diff';
 
@@ -10,13 +10,17 @@ declare function interpretTaskModes(file: Suite, namePattern?: string | RegExp,
 declare function someTasksAreOnly(suite: Suite): boolean;
 declare function generateHash(str: string): string;
 declare function calculateSuiteHash(parent: Suite): void;
-declare function createFileTask(filepath: string, root: string, projectName: string | undefined, pool?: string, viteEnvironment?: string): File;
+interface HashMeta {
+	typecheck?: boolean;
+	__vitest_label__?: string;
+}
+declare function createFileTask(filepath: string, root: string, projectName: string | undefined, pool?: string, viteEnvironment?: string, meta?: HashMeta): File;
 /**
 * Generate a unique ID for a file based on its path and project name
 * @param file File relative to the root of the project to keep ID the same between different machines
 * @param projectName The name of the test project
 */
-declare function generateFileHash(file: string, projectName: string | undefined): string;
+declare function generateFileHash(file: string, projectName: string | undefined, meta?: HashMeta): string;
 declare function findTestFileStackTrace(testFilePath: string, error: string): ParsedStack | undefined;
 
 interface ConcurrencyLimiter extends ConcurrencyLimiterFn {

package/package.json

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