@vitest/runner 4.1.0-beta.3 → 4.1.0-beta.5

package/dist/chunk-tasks.js

@@ -3,19 +3,29 @@ import { parseSingleStack } from '@vitest/utils/source-map';
 import { relative } from 'pathe';
 import { toArray } from '@vitest/utils/helpers';
 
-function createChainable(keys, fn) {
+const kChainableContext = Symbol("kChainableContext");
+function getChainableContext(chainable) {
+	return chainable?.[kChainableContext];
+}
+function createChainable(keys, fn, context) {
 	function create(context) {
 		const chain = function(...args) {
 			return fn.apply(context, args);
 		};
 		Object.assign(chain, fn);
-		chain.withContext = () => chain.bind(context);
-		chain.setContext = (key, value) => {
-			context[key] = value;
-		};
-		chain.mergeContext = (ctx) => {
-			Object.assign(context, ctx);
-		};
+		Object.defineProperty(chain, kChainableContext, {
+			value: {
+				withContext: () => chain.bind(context),
+				getFixtures: () => context.fixtures,
+				setContext: (key, value) => {
+					context[key] = value;
+				},
+				mergeContext: (ctx) => {
+					Object.assign(context, ctx);
+				}
+			},
+			enumerable: false
+		});
 		for (const key of keys) {
 			Object.defineProperty(chain, key, { get() {
 				return create({
@@ -26,8 +36,11 @@ function createChainable(keys, fn) {
 		}
 		return chain;
 	}
-	const chain = create({});
-	chain.fn = fn;
+	const chain = create(context ?? {});
+	Object.defineProperty(chain, "fn", {
+		value: fn,
+		enumerable: false
+	});
 	return chain;
 }
 
@@ -63,7 +76,7 @@ function interpretTaskModes(file, namePattern, testLocations, testIds, testTagsF
 			// 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))) {
+				if (t.location && testLocations?.includes(t.location.line)) {
 					t.mode = "run";
 					matchedLocations.push(t.location.line);
 					hasLocationMatch = true;
@@ -101,7 +114,7 @@ function interpretTaskModes(file, namePattern, testLocations, testIds, testTagsF
 		}
 	};
 	traverseSuite(file, parentIsOnly, false);
-	const nonMatching = testLocations === null || testLocations === void 0 ? void 0 : testLocations.filter((loc) => !matchedLocations.includes(loc));
+	const nonMatching = testLocations?.filter((loc) => !matchedLocations.includes(loc));
 	if (nonMatching && nonMatching.length !== 0) {
 		const message = nonMatching.length === 1 ? `line ${nonMatching[0]}` : `lines ${nonMatching.join(", ")}`;
 		if (file.result === undefined) {
@@ -236,28 +249,45 @@ function limitConcurrency(concurrency = Infinity) {
 			tail = head && tail;
 		}
 	};
-	return (func, ...args) => {
-		// Create a promise chain that:
-		//  1. Waits for its turn in the task queue (if necessary).
-		//  2. Runs the task.
-		//  3. Allows the next pending task (if any) to run.
+	const acquire = () => {
+		let released = false;
+		const release = () => {
+			if (!released) {
+				released = true;
+				finish();
+			}
+		};
+		if (count++ < concurrency) {
+			return release;
+		}
 		return new Promise((resolve) => {
-			if (count++ < concurrency) {
-				// No need to queue if fewer than maxConcurrency tasks are running.
-				resolve();
-			} else if (tail) {
+			if (tail) {
 				// There are pending tasks, so append to the queue.
-				tail = tail[1] = [resolve];
+				tail = tail[1] = [() => resolve(release)];
 			} else {
 				// No other pending tasks, initialize the queue with a new tail and head.
-				head = tail = [resolve];
+				head = tail = [() => resolve(release)];
 			}
-		}).then(() => {
-			// Running func here ensures that even a non-thenable result or an
-			// immediately thrown error gets wrapped into a Promise.
-			return func(...args);
-		}).finally(finish);
+		});
 	};
+	const limiterFn = (func, ...args) => {
+		function run(release) {
+			try {
+				const result = func(...args);
+				if (result instanceof Promise) {
+					return result.finally(release);
+				}
+				release();
+				return Promise.resolve(result);
+			} catch (error) {
+				release();
+				return Promise.reject(error);
+			}
+		}
+		const release = acquire();
+		return release instanceof Promise ? release.then(run) : run(release);
+	};
+	return Object.assign(limiterFn, { acquire });
 }
 
 /**
@@ -549,17 +579,14 @@ function hasTests(suite) {
 	return toArray(suite).some((s) => s.tasks.some((c) => isTestCase(c) || hasTests(c)));
 }
 function hasFailed(suite) {
-	return toArray(suite).some((s) => {
-		var _s$result;
-		return ((_s$result = s.result) === null || _s$result === void 0 ? void 0 : _s$result.state) === "fail" || s.type === "suite" && hasFailed(s.tasks);
-	});
+	return toArray(suite).some((s) => s.result?.state === "fail" || s.type === "suite" && hasFailed(s.tasks));
 }
 function getNames(task) {
 	const names = [task.name];
 	let current = task;
-	while (current === null || current === void 0 ? void 0 : current.suite) {
+	while (current?.suite) {
 		current = current.suite;
-		if (current === null || current === void 0 ? void 0 : current.name) {
+		if (current?.name) {
 			names.unshift(current.name);
 		}
 	}
@@ -578,4 +605,4 @@ function createTaskName(names, separator = " > ") {
 	return names.filter((name) => name !== undefined).join(separator);
 }
 
-export { createChainable as a, createFileTask as b, calculateSuiteHash as c, createTagsFilter as d, createTaskName as e, findTestFileStackTrace as f, generateFileHash as g, generateHash as h, getFullName as i, getNames as j, getSuites as k, getTasks as l, getTestName as m, getTests as n, hasFailed as o, hasTests as p, interpretTaskModes as q, isTestCase as r, limitConcurrency as s, partitionSuiteChildren as t, someTasksAreOnly as u, validateTags as v, createNoTagsError as w };
+export { createChainable as a, createFileTask as b, calculateSuiteHash as c, createTagsFilter as d, createTaskName as e, findTestFileStackTrace as f, generateFileHash as g, generateHash as h, getFullName as i, getNames as j, getSuites as k, getTasks as l, getTestName as m, getTests as n, hasFailed as o, hasTests as p, interpretTaskModes as q, isTestCase as r, limitConcurrency as s, partitionSuiteChildren as t, someTasksAreOnly as u, validateTags as v, getChainableContext as w, createNoTagsError as x };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { T as TestArtifact, a as Test, S as Suite, b as SuiteHooks, F as FileSpecification, V as VitestRunner, c as File, d as TaskUpdateEvent, e as Task, f as TestAPI, g as SuiteAPI, h as SuiteCollector } from './tasks.d-WWG4yDf6.js';
-export { A as AfterAllListener, i as AfterEachListener, j as AroundAllListener, k as AroundEachListener, B as BeforeAllListener, l as BeforeEachListener, C as CancelReason, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, I as ImportDuration, q as InferFixturesTypes, O as OnTestFailedHandler, r as OnTestFinishedHandler, R as Retry, s as RunMode, t as RuntimeContext, u as SequenceHooks, v as SequenceSetupFiles, w as SerializableRetry, x as SuiteFactory, y as SuiteOptions, z as TaskBase, D as TaskCustomOptions, E as TaskEventPack, G as TaskHook, H as TaskMeta, J as TaskPopulated, K as TaskResult, L as TaskResultPack, M as TaskState, N as TestAnnotation, P as TestAnnotationArtifact, Q as TestAnnotationLocation, U as TestArtifactBase, W as TestArtifactLocation, X as TestArtifactRegistry, Y as TestAttachment, Z as TestContext, _ as TestFunction, $ as TestOptions, a0 as TestTagDefinition, a1 as TestTags, a2 as Use, a3 as VisualRegressionArtifact, a4 as VitestRunnerConfig, a5 as VitestRunnerConstructor, a6 as VitestRunnerImportSource, a7 as afterAll, a8 as afterEach, a9 as aroundAll, aa as aroundEach, ab as beforeAll, ac as beforeEach, ad as onTestFailed, ae as onTestFinished } from './tasks.d-WWG4yDf6.js';
+import { T as TestArtifact, a as Test, S as Suite, b as SuiteHooks, F as FileSpecification, V as VitestRunner, c as File, d as TaskUpdateEvent, e as Task, f as TestAPI, g as SuiteAPI, h as SuiteCollector } from './tasks.d-D2GKpdwQ.js';
+export { A as AfterAllListener, i as AfterEachListener, j as AroundAllListener, k as AroundEachListener, B as BeforeAllListener, l as BeforeEachListener, C as CancelReason, m as FailureScreenshotArtifact, n as Fixture, o as FixtureFn, p as FixtureOptions, q as Fixtures, I as ImportDuration, r as InferFixturesTypes, O as OnTestFailedHandler, s as OnTestFinishedHandler, R as Retry, t as RunMode, u as RuntimeContext, v as SequenceHooks, w as SequenceSetupFiles, x as SerializableRetry, y as SuiteFactory, z as SuiteOptions, 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, W as TestArtifactBase, X as TestArtifactLocation, Y as TestArtifactRegistry, Z as TestAttachment, _ as TestContext, $ as TestFunction, a0 as TestOptions, a1 as TestTagDefinition, a2 as TestTags, a3 as Use, a4 as VisualRegressionArtifact, a5 as VitestRunnerConfig, a6 as VitestRunnerConstructor, a7 as VitestRunnerImportSource, a8 as afterAll, a9 as afterEach, aa as aroundAll, ab as aroundEach, ac as beforeAll, ad as beforeEach, ae as onTestFailed, af as onTestFinished } from './tasks.d-D2GKpdwQ.js';
 import { Awaitable } from '@vitest/utils';
 import '@vitest/utils/diff';
 
@@ -13,12 +13,13 @@ import '@vitest/utils/diff';
 *
 * Vitest automatically injects the source location where the artifact was created and manages any attachments you include.
 *
+* **Note:** artifacts must be recorded before the task is reported. Any artifacts recorded after that will not be included in the task.
+*
 * @param task - The test task context, typically accessed via `this.task` in custom matchers or `context.task` in tests
 * @param artifact - The artifact to record. Must extend {@linkcode TestArtifactBase}
 *
 * @returns A promise that resolves to the recorded artifact with location injected
 *
-* @throws {Error} If called after the test has finished running
 * @throws {Error} If the test runner doesn't support artifacts
 *
 * @example
@@ -171,7 +172,7 @@ declare const describe: SuiteAPI;
 */
 declare const it: TestAPI;
 declare function getCurrentSuite<ExtraContext = object>(): SuiteCollector<ExtraContext>;
-declare function createTaskCollector(fn: (...args: any[]) => any, context?: Record<string, unknown>): TestAPI;
+declare function createTaskCollector(fn: (...args: any[]) => any): TestAPI;
 
 declare function getCurrentTest<T extends Test | undefined>(): T;