@vitest/runner 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/chunk-hooks.js

@@ -1,7 +1,7 @@
 import { isObject, createDefer, toArray, isNegativeNaN, format, objectAttr, objDisplay, getSafeTimers, shuffle, assertTypes } from '@vitest/utils';
-import { parseSingleStack } from '@vitest/utils/source-map';
 import { processError } from '@vitest/utils/error';
 import { stripLiteral } from 'strip-literal';
+import { parseSingleStack } from '@vitest/utils/source-map';
 import { relative } from 'pathe';
 
 class PendingError extends Error {
@@ -391,6 +391,309 @@ function createChainable(keys, fn) {
 	return chain;
 }
 
+/**
+* If any tasks been marked as `only`, mark all other tasks as `skip`.
+*/
+function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIsOnly, allowOnly) {
+	const matchedLocations = [];
+	const traverseSuite = (suite, parentIsOnly, parentMatchedWithLocation) => {
+		const suiteIsOnly = parentIsOnly || suite.mode === "only";
+		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 (onlyMode) {
+				if (t.type === "suite" && (includeTask || someTasksAreOnly(t))) {
+					// Don't skip this suite
+					if (t.mode === "only") {
+						checkAllowOnly(t, allowOnly);
+						t.mode = "run";
+					}
+				} else if (t.mode === "run" && !includeTask) {
+					t.mode = "skip";
+				} else if (t.mode === "only") {
+					checkAllowOnly(t, allowOnly);
+					t.mode = "run";
+				}
+			}
+			let hasLocationMatch = parentMatchedWithLocation;
+			// Match test location against provided locations, only run if present
+			// in `testLocations`. Note: if `includeTaskLocations` 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))) {
+					t.mode = "run";
+					matchedLocations.push(t.location.line);
+					hasLocationMatch = true;
+				} else if (parentMatchedWithLocation) {
+					t.mode = "run";
+				} else if (t.type === "test") {
+					t.mode = "skip";
+				}
+			}
+			if (t.type === "test") {
+				if (namePattern && !getTaskFullName(t).match(namePattern)) {
+					t.mode = "skip";
+				}
+			} else if (t.type === "suite") {
+				if (t.mode === "skip") {
+					skipAllTasks(t);
+				} else if (t.mode === "todo") {
+					todoAllTasks(t);
+				} else {
+					traverseSuite(t, includeTask, hasLocationMatch);
+				}
+			}
+		});
+		// if all subtasks are skipped, mark as skip
+		if (suite.mode === "run" || suite.mode === "queued") {
+			if (suite.tasks.length && suite.tasks.every((i) => i.mode !== "run" && i.mode !== "queued")) {
+				suite.mode = "skip";
+			}
+		}
+	};
+	traverseSuite(file, parentIsOnly, false);
+	const nonMatching = testLocations === null || testLocations === void 0 ? void 0 : 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) {
+			file.result = {
+				state: "fail",
+				errors: []
+			};
+		}
+		if (file.result.errors === undefined) {
+			file.result.errors = [];
+		}
+		file.result.errors.push(processError(new Error(`No test found in ${file.name} in ${message}`)));
+	}
+}
+function getTaskFullName(task) {
+	return `${task.suite ? `${getTaskFullName(task.suite)} ` : ""}${task.name}`;
+}
+function someTasksAreOnly(suite) {
+	return suite.tasks.some((t) => t.mode === "only" || t.type === "suite" && someTasksAreOnly(t));
+}
+function skipAllTasks(suite) {
+	suite.tasks.forEach((t) => {
+		if (t.mode === "run" || t.mode === "queued") {
+			t.mode = "skip";
+			if (t.type === "suite") {
+				skipAllTasks(t);
+			}
+		}
+	});
+}
+function todoAllTasks(suite) {
+	suite.tasks.forEach((t) => {
+		if (t.mode === "run" || t.mode === "queued") {
+			t.mode = "todo";
+			if (t.type === "suite") {
+				todoAllTasks(t);
+			}
+		}
+	});
+}
+function checkAllowOnly(task, allowOnly) {
+	if (allowOnly) {
+		return;
+	}
+	const error = processError(new Error("[Vitest] Unexpected .only modifier. Remove it or pass --allowOnly argument to bypass this error"));
+	task.result = {
+		state: "fail",
+		errors: [error]
+	};
+}
+function generateHash(str) {
+	let hash = 0;
+	if (str.length === 0) {
+		return `${hash}`;
+	}
+	for (let i = 0; i < str.length; i++) {
+		const char = str.charCodeAt(i);
+		hash = (hash << 5) - hash + char;
+		hash = hash & hash;
+	}
+	return `${hash}`;
+}
+function calculateSuiteHash(parent) {
+	parent.tasks.forEach((t, idx) => {
+		t.id = `${parent.id}_${idx}`;
+		if (t.type === "suite") {
+			calculateSuiteHash(t);
+		}
+	});
+}
+function createFileTask(filepath, root, projectName, pool) {
+	const path = relative(root, filepath);
+	const file = {
+		id: generateFileHash(path, projectName),
+		name: path,
+		type: "suite",
+		mode: "queued",
+		filepath,
+		tasks: [],
+		meta: Object.create(null),
+		projectName,
+		file: undefined,
+		pool
+	};
+	file.file = file;
+	setFileContext(file, Object.create(null));
+	return 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
+*/
+function generateFileHash(file, projectName) {
+	return generateHash(`${file}${projectName || ""}`);
+}
+function findTestFileStackTrace(testFilePath, error) {
+	// first line is the error message
+	const lines = error.split("\n").slice(1);
+	for (const line of lines) {
+		const stack = parseSingleStack(line);
+		if (stack && stack.file === testFilePath) {
+			return stack;
+		}
+	}
+}
+
+/**
+* Return a function for running multiple async operations with limited concurrency.
+*/
+function limitConcurrency(concurrency = Infinity) {
+	// The number of currently active + pending tasks.
+	let count = 0;
+	// The head and tail of the pending task queue, built using a singly linked list.
+	// Both head and tail are initially undefined, signifying an empty queue.
+	// They both become undefined again whenever there are no pending tasks.
+	let head;
+	let tail;
+	// A bookkeeping function executed whenever a task has been run to completion.
+	const finish = () => {
+		count--;
+		// Check if there are further pending tasks in the queue.
+		if (head) {
+			// Allow the next pending task to run and pop it from the queue.
+			head[0]();
+			head = head[1];
+			// The head may now be undefined if there are no further pending tasks.
+			// In that case, set tail to undefined as well.
+			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.
+		return new Promise((resolve) => {
+			if (count++ < concurrency) {
+				// No need to queue if fewer than maxConcurrency tasks are running.
+				resolve();
+			} else if (tail) {
+				// There are pending tasks, so append to the queue.
+				tail = tail[1] = [resolve];
+			} else {
+				// No other pending tasks, initialize the queue with a new tail and head.
+				head = tail = [resolve];
+			}
+		}).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);
+	};
+}
+
+/**
+* Partition in tasks groups by consecutive concurrent
+*/
+function partitionSuiteChildren(suite) {
+	let tasksGroup = [];
+	const tasksGroups = [];
+	for (const c of suite.tasks) {
+		if (tasksGroup.length === 0 || c.concurrent === tasksGroup[0].concurrent) {
+			tasksGroup.push(c);
+		} else {
+			tasksGroups.push(tasksGroup);
+			tasksGroup = [c];
+		}
+	}
+	if (tasksGroup.length > 0) {
+		tasksGroups.push(tasksGroup);
+	}
+	return tasksGroups;
+}
+
+/**
+* @deprecated use `isTestCase` instead
+*/
+function isAtomTest(s) {
+	return isTestCase(s);
+}
+function isTestCase(s) {
+	return s.type === "test";
+}
+function getTests(suite) {
+	const tests = [];
+	const arraySuites = toArray(suite);
+	for (const s of arraySuites) {
+		if (isTestCase(s)) {
+			tests.push(s);
+		} else {
+			for (const task of s.tasks) {
+				if (isTestCase(task)) {
+					tests.push(task);
+				} else {
+					const taskTests = getTests(task);
+					for (const test of taskTests) {
+						tests.push(test);
+					}
+				}
+			}
+		}
+	}
+	return tests;
+}
+function getTasks(tasks = []) {
+	return toArray(tasks).flatMap((s) => isTestCase(s) ? [s] : [s, ...getTasks(s.tasks)]);
+}
+function getSuites(suite) {
+	return toArray(suite).flatMap((s) => s.type === "suite" ? [s, ...getSuites(s.tasks)] : []);
+}
+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);
+	});
+}
+function getNames(task) {
+	const names = [task.name];
+	let current = task;
+	while (current === null || current === void 0 ? void 0 : current.suite) {
+		current = current.suite;
+		if (current === null || current === void 0 ? void 0 : current.name) {
+			names.unshift(current.name);
+		}
+	}
+	if (current !== task.file) {
+		names.unshift(task.file.name);
+	}
+	return names;
+}
+function getFullName(task, separator = " > ") {
+	return getNames(task).join(separator);
+}
+function getTestName(task, separator = " > ") {
+	return getNames(task).slice(1).join(separator);
+}
+
 /**
 * Creates a suite of tests, allowing for grouping and hierarchical organization of tests.
 * Suites can contain both tests and other suites, enabling complex test structures.
@@ -530,9 +833,6 @@ function getDefaultSuite() {
 	assert(defaultSuite, "the default suite");
 	return defaultSuite;
 }
-function getTestFilepath() {
-	return currentTestFilepath;
-}
 function getRunner() {
 	assert(runner, "the runner");
 	return runner;
@@ -642,9 +942,12 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		}
 		if (runner.config.includeTaskLocation) {
 			const error = stackTraceError.stack;
-			const stack = findTestFileStackTrace(error);
+			const stack = findTestFileStackTrace(currentTestFilepath, error);
 			if (stack) {
-				task.location = stack;
+				task.location = {
+					line: stack.line,
+					column: stack.column
+				};
 			}
 		}
 		tasks.push(task);
@@ -715,9 +1018,12 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 			Error.stackTraceLimit = 15;
 			const error = new Error("stacktrace").stack;
 			Error.stackTraceLimit = limit;
-			const stack = findTestFileStackTrace(error);
+			const stack = findTestFileStackTrace(currentTestFilepath, error);
 			if (stack) {
-				suite.location = stack;
+				suite.location = {
+					line: stack.line,
+					column: stack.column
+				};
 			}
 		}
 		setHooks(suite, createSuiteHooks());
@@ -898,6 +1204,7 @@ function createTaskCollector(fn, context) {
 		const _context = mergeContextFixtures(fixtures, context || {}, runner);
 		const originalWrapper = fn;
 		return createTest(function(name, optionsOrFn, optionsOrTest) {
+			var _collector$options;
 			const collector = getCurrentSuite();
 			const scopedFixtures = collector.fixtures();
 			const context = { ...this };
@@ -905,7 +1212,7 @@ function createTaskCollector(fn, context) {
 				context.fixtures = mergeScopedFixtures(context.fixtures || [], scopedFixtures);
 			}
 			const { handler, options } = parseArguments(optionsOrFn, optionsOrTest);
-			const timeout = options.timeout ?? (runner === null || runner === void 0 ? void 0 : runner.config.testTimeout);
+			const timeout = options.timeout ?? ((_collector$options = collector.options) === null || _collector$options === void 0 ? void 0 : _collector$options.timeout) ?? (runner === null || runner === void 0 ? void 0 : runner.config.testTimeout);
 			originalWrapper.call(context, formatName(name), handler, timeout);
 		}, _context);
 	};
@@ -915,236 +1222,63 @@ function createTaskCollector(fn, context) {
 		"skip",
 		"only",
 		"todo",
-		"fails"
-	], taskFn);
-	if (context) {
-		_test.mergeContext(context);
-	}
-	return _test;
-}
-function createTest(fn, context) {
-	return createTaskCollector(fn, context);
-}
-function formatName(name) {
-	return typeof name === "string" ? name : typeof name === "function" ? name.name || "<anonymous>" : String(name);
-}
-function formatTitle(template, items, idx) {
-	if (template.includes("%#") || template.includes("%$")) {
-		// '%#' match index of the test case
-		template = template.replace(/%%/g, "__vitest_escaped_%__").replace(/%#/g, `${idx}`).replace(/%\$/g, `${idx + 1}`).replace(/__vitest_escaped_%__/g, "%%");
-	}
-	const count = template.split("%").length - 1;
-	if (template.includes("%f")) {
-		const placeholders = template.match(/%f/g) || [];
-		placeholders.forEach((_, i) => {
-			if (isNegativeNaN(items[i]) || Object.is(items[i], -0)) {
-				// Replace the i-th occurrence of '%f' with '-%f'
-				let occurrence = 0;
-				template = template.replace(/%f/g, (match) => {
-					occurrence++;
-					return occurrence === i + 1 ? "-%f" : match;
-				});
-			}
-		});
-	}
-	let formatted = format(template, ...items.slice(0, count));
-	const isObjectItem = isObject(items[0]);
-	formatted = formatted.replace(/\$([$\w.]+)/g, (_, key) => {
-		var _runner$config;
-		const isArrayKey = /^\d+$/.test(key);
-		if (!isObjectItem && !isArrayKey) {
-			return `$${key}`;
-		}
-		const arrayElement = isArrayKey ? objectAttr(items, key) : undefined;
-		const value = isObjectItem ? objectAttr(items[0], key, arrayElement) : arrayElement;
-		return objDisplay(value, { truncate: runner === null || runner === void 0 || (_runner$config = runner.config) === null || _runner$config === void 0 || (_runner$config = _runner$config.chaiConfig) === null || _runner$config === void 0 ? void 0 : _runner$config.truncateThreshold });
-	});
-	return formatted;
-}
-function formatTemplateString(cases, args) {
-	const header = cases.join("").trim().replace(/ /g, "").split("\n").map((i) => i.split("|"))[0];
-	const res = [];
-	for (let i = 0; i < Math.floor(args.length / header.length); i++) {
-		const oneCase = {};
-		for (let j = 0; j < header.length; j++) {
-			oneCase[header[j]] = args[i * header.length + j];
-		}
-		res.push(oneCase);
-	}
-	return res;
-}
-function findTestFileStackTrace(error) {
-	const testFilePath = getTestFilepath();
-	// first line is the error message
-	const lines = error.split("\n").slice(1);
-	for (const line of lines) {
-		const stack = parseSingleStack(line);
-		if (stack && stack.file === testFilePath) {
-			return {
-				line: stack.line,
-				column: stack.column
-			};
-		}
-	}
-}
-
-/**
-* If any tasks been marked as `only`, mark all other tasks as `skip`.
-*/
-function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIsOnly, allowOnly) {
-	const matchedLocations = [];
-	const traverseSuite = (suite, parentIsOnly, parentMatchedWithLocation) => {
-		const suiteIsOnly = parentIsOnly || suite.mode === "only";
-		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 (onlyMode) {
-				if (t.type === "suite" && (includeTask || someTasksAreOnly(t))) {
-					// Don't skip this suite
-					if (t.mode === "only") {
-						checkAllowOnly(t, allowOnly);
-						t.mode = "run";
-					}
-				} else if (t.mode === "run" && !includeTask) {
-					t.mode = "skip";
-				} else if (t.mode === "only") {
-					checkAllowOnly(t, allowOnly);
-					t.mode = "run";
-				}
-			}
-			let hasLocationMatch = parentMatchedWithLocation;
-			// Match test location against provided locations, only run if present
-			// in `testLocations`. Note: if `includeTaskLocations` 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))) {
-					t.mode = "run";
-					matchedLocations.push(t.location.line);
-					hasLocationMatch = true;
-				} else if (parentMatchedWithLocation) {
-					t.mode = "run";
-				} else if (t.type === "test") {
-					t.mode = "skip";
-				}
-			}
-			if (t.type === "test") {
-				if (namePattern && !getTaskFullName(t).match(namePattern)) {
-					t.mode = "skip";
-				}
-			} else if (t.type === "suite") {
-				if (t.mode === "skip") {
-					skipAllTasks(t);
-				} else if (t.mode === "todo") {
-					todoAllTasks(t);
-				} else {
-					traverseSuite(t, includeTask, hasLocationMatch);
-				}
-			}
-		});
-		// if all subtasks are skipped, mark as skip
-		if (suite.mode === "run" || suite.mode === "queued") {
-			if (suite.tasks.length && suite.tasks.every((i) => i.mode !== "run" && i.mode !== "queued")) {
-				suite.mode = "skip";
-			}
-		}
-	};
-	traverseSuite(file, parentIsOnly, false);
-	const nonMatching = testLocations === null || testLocations === void 0 ? void 0 : 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) {
-			file.result = {
-				state: "fail",
-				errors: []
-			};
-		}
-		if (file.result.errors === undefined) {
-			file.result.errors = [];
-		}
-		file.result.errors.push(processError(new Error(`No test found in ${file.name} in ${message}`)));
+		"fails"
+	], taskFn);
+	if (context) {
+		_test.mergeContext(context);
 	}
+	return _test;
 }
-function getTaskFullName(task) {
-	return `${task.suite ? `${getTaskFullName(task.suite)} ` : ""}${task.name}`;
+function createTest(fn, context) {
+	return createTaskCollector(fn, context);
 }
-function someTasksAreOnly(suite) {
-	return suite.tasks.some((t) => t.mode === "only" || t.type === "suite" && someTasksAreOnly(t));
+function formatName(name) {
+	return typeof name === "string" ? name : typeof name === "function" ? name.name || "<anonymous>" : String(name);
 }
-function skipAllTasks(suite) {
-	suite.tasks.forEach((t) => {
-		if (t.mode === "run" || t.mode === "queued") {
-			t.mode = "skip";
-			if (t.type === "suite") {
-				skipAllTasks(t);
+function formatTitle(template, items, idx) {
+	if (template.includes("%#") || template.includes("%$")) {
+		// '%#' match index of the test case
+		template = template.replace(/%%/g, "__vitest_escaped_%__").replace(/%#/g, `${idx}`).replace(/%\$/g, `${idx + 1}`).replace(/__vitest_escaped_%__/g, "%%");
+	}
+	const count = template.split("%").length - 1;
+	if (template.includes("%f")) {
+		const placeholders = template.match(/%f/g) || [];
+		placeholders.forEach((_, i) => {
+			if (isNegativeNaN(items[i]) || Object.is(items[i], -0)) {
+				// Replace the i-th occurrence of '%f' with '-%f'
+				let occurrence = 0;
+				template = template.replace(/%f/g, (match) => {
+					occurrence++;
+					return occurrence === i + 1 ? "-%f" : match;
+				});
 			}
+		});
+	}
+	let formatted = format(template, ...items.slice(0, count));
+	const isObjectItem = isObject(items[0]);
+	formatted = formatted.replace(/\$([$\w.]+)/g, (_, key) => {
+		var _runner$config;
+		const isArrayKey = /^\d+$/.test(key);
+		if (!isObjectItem && !isArrayKey) {
+			return `$${key}`;
 		}
+		const arrayElement = isArrayKey ? objectAttr(items, key) : undefined;
+		const value = isObjectItem ? objectAttr(items[0], key, arrayElement) : arrayElement;
+		return objDisplay(value, { truncate: runner === null || runner === void 0 || (_runner$config = runner.config) === null || _runner$config === void 0 || (_runner$config = _runner$config.chaiConfig) === null || _runner$config === void 0 ? void 0 : _runner$config.truncateThreshold });
 	});
+	return formatted;
 }
-function todoAllTasks(suite) {
-	suite.tasks.forEach((t) => {
-		if (t.mode === "run" || t.mode === "queued") {
-			t.mode = "todo";
-			if (t.type === "suite") {
-				todoAllTasks(t);
-			}
+function formatTemplateString(cases, args) {
+	const header = cases.join("").trim().replace(/ /g, "").split("\n").map((i) => i.split("|"))[0];
+	const res = [];
+	for (let i = 0; i < Math.floor(args.length / header.length); i++) {
+		const oneCase = {};
+		for (let j = 0; j < header.length; j++) {
+			oneCase[header[j]] = args[i * header.length + j];
 		}
-	});
-}
-function checkAllowOnly(task, allowOnly) {
-	if (allowOnly) {
-		return;
-	}
-	const error = processError(new Error("[Vitest] Unexpected .only modifier. Remove it or pass --allowOnly argument to bypass this error"));
-	task.result = {
-		state: "fail",
-		errors: [error]
-	};
-}
-function generateHash(str) {
-	let hash = 0;
-	if (str.length === 0) {
-		return `${hash}`;
-	}
-	for (let i = 0; i < str.length; i++) {
-		const char = str.charCodeAt(i);
-		hash = (hash << 5) - hash + char;
-		hash = hash & hash;
+		res.push(oneCase);
 	}
-	return `${hash}`;
-}
-function calculateSuiteHash(parent) {
-	parent.tasks.forEach((t, idx) => {
-		t.id = `${parent.id}_${idx}`;
-		if (t.type === "suite") {
-			calculateSuiteHash(t);
-		}
-	});
-}
-function createFileTask(filepath, root, projectName, pool) {
-	const path = relative(root, filepath);
-	const file = {
-		id: generateFileHash(path, projectName),
-		name: path,
-		type: "suite",
-		mode: "queued",
-		filepath,
-		tasks: [],
-		meta: Object.create(null),
-		projectName,
-		file: undefined,
-		pool
-	};
-	file.file = file;
-	setFileContext(file, Object.create(null));
-	return 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
-*/
-function generateFileHash(file, projectName) {
-	return generateHash(`${file}${projectName || ""}`);
+	return res;
 }
 
 const now$2 = globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
@@ -1225,140 +1359,6 @@ function mergeHooks(baseHooks, hooks) {
 	return baseHooks;
 }
 
-/**
-* Return a function for running multiple async operations with limited concurrency.
-*/
-function limitConcurrency(concurrency = Infinity) {
-	// The number of currently active + pending tasks.
-	let count = 0;
-	// The head and tail of the pending task queue, built using a singly linked list.
-	// Both head and tail are initially undefined, signifying an empty queue.
-	// They both become undefined again whenever there are no pending tasks.
-	let head;
-	let tail;
-	// A bookkeeping function executed whenever a task has been run to completion.
-	const finish = () => {
-		count--;
-		// Check if there are further pending tasks in the queue.
-		if (head) {
-			// Allow the next pending task to run and pop it from the queue.
-			head[0]();
-			head = head[1];
-			// The head may now be undefined if there are no further pending tasks.
-			// In that case, set tail to undefined as well.
-			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.
-		return new Promise((resolve) => {
-			if (count++ < concurrency) {
-				// No need to queue if fewer than maxConcurrency tasks are running.
-				resolve();
-			} else if (tail) {
-				// There are pending tasks, so append to the queue.
-				tail = tail[1] = [resolve];
-			} else {
-				// No other pending tasks, initialize the queue with a new tail and head.
-				head = tail = [resolve];
-			}
-		}).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);
-	};
-}
-
-/**
-* Partition in tasks groups by consecutive concurrent
-*/
-function partitionSuiteChildren(suite) {
-	let tasksGroup = [];
-	const tasksGroups = [];
-	for (const c of suite.tasks) {
-		if (tasksGroup.length === 0 || c.concurrent === tasksGroup[0].concurrent) {
-			tasksGroup.push(c);
-		} else {
-			tasksGroups.push(tasksGroup);
-			tasksGroup = [c];
-		}
-	}
-	if (tasksGroup.length > 0) {
-		tasksGroups.push(tasksGroup);
-	}
-	return tasksGroups;
-}
-
-/**
-* @deprecated use `isTestCase` instead
-*/
-function isAtomTest(s) {
-	return isTestCase(s);
-}
-function isTestCase(s) {
-	return s.type === "test";
-}
-function getTests(suite) {
-	const tests = [];
-	const arraySuites = toArray(suite);
-	for (const s of arraySuites) {
-		if (isTestCase(s)) {
-			tests.push(s);
-		} else {
-			for (const task of s.tasks) {
-				if (isTestCase(task)) {
-					tests.push(task);
-				} else {
-					const taskTests = getTests(task);
-					for (const test of taskTests) {
-						tests.push(test);
-					}
-				}
-			}
-		}
-	}
-	return tests;
-}
-function getTasks(tasks = []) {
-	return toArray(tasks).flatMap((s) => isTestCase(s) ? [s] : [s, ...getTasks(s.tasks)]);
-}
-function getSuites(suite) {
-	return toArray(suite).flatMap((s) => s.type === "suite" ? [s, ...getSuites(s.tasks)] : []);
-}
-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);
-	});
-}
-function getNames(task) {
-	const names = [task.name];
-	let current = task;
-	while (current === null || current === void 0 ? void 0 : current.suite) {
-		current = current.suite;
-		if (current === null || current === void 0 ? void 0 : current.name) {
-			names.unshift(current.name);
-		}
-	}
-	if (current !== task.file) {
-		names.unshift(task.file.name);
-	}
-	return names;
-}
-function getFullName(task, separator = " > ") {
-	return getNames(task).join(separator);
-}
-function getTestName(task, separator = " > ") {
-	return getNames(task).slice(1).join(separator);
-}
-
 const now$1 = globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 const unixNow = Date.now;
 const { clearTimeout, setTimeout } = getSafeTimers();
@@ -1974,16 +1974,13 @@ function createTestContext(test, runner) {
 		if (test.result && test.result.state !== "run") {
 			throw new Error(`Cannot annotate tests outside of the test run. The test "${test.name}" finished running with the "${test.result.state}" state already.`);
 		}
+		const stack = findTestFileStackTrace(test.file.filepath, new Error("STACK_TRACE").stack);
 		let location;
-		const stack = new Error("STACK_TRACE").stack;
-		const index = stack.includes("STACK_TRACE") ? 2 : 1;
-		const stackLine = stack.split("\n")[index];
-		const parsed = parseSingleStack(stackLine);
-		if (parsed) {
+		if (stack) {
 			location = {
-				file: parsed.file,
-				line: parsed.line,
-				column: parsed.column
+				file: stack.file,
+				line: stack.line,
+				column: stack.column
 			};
 		}
 		if (typeof type === "object") {
@@ -2251,4 +2248,4 @@ function createTestHook(name, handler) {
 	};
 }
 
-export { someTasksAreOnly as A, limitConcurrency as B, partitionSuiteChildren as C, getFullName as D, getNames as E, getSuites as F, getTasks as G, getTestName as H, getTests as I, hasFailed as J, hasTests as K, isAtomTest as L, isTestCase as M, afterAll as a, afterEach as b, beforeAll as c, beforeEach as d, onTestFinished as e, getHooks as f, getFn as g, setHooks as h, startTests as i, createTaskCollector as j, describe as k, getCurrentSuite as l, it as m, suite as n, onTestFailed as o, publicCollect as p, getCurrentTest as q, createChainable as r, setFn as s, test as t, updateTask as u, calculateSuiteHash as v, createFileTask as w, generateFileHash as x, generateHash as y, interpretTaskModes as z };
+export { interpretTaskModes as A, someTasksAreOnly as B, limitConcurrency as C, partitionSuiteChildren as D, getFullName as E, getNames as F, getSuites as G, getTasks as H, getTestName as I, getTests as J, hasFailed as K, hasTests as L, isAtomTest as M, isTestCase as N, afterAll as a, afterEach as b, beforeAll as c, beforeEach as d, onTestFinished as e, getHooks as f, getFn as g, setHooks as h, startTests as i, createTaskCollector as j, describe as k, getCurrentSuite as l, it as m, suite as n, onTestFailed as o, publicCollect as p, getCurrentTest as q, createChainable as r, setFn as s, test as t, updateTask as u, calculateSuiteHash as v, createFileTask as w, findTestFileStackTrace as x, generateFileHash as y, generateHash as z };

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, S as Suite, g as SuiteHooks, F as File, h as TaskUpdateEvent, T as Task, i as TestAPI, j as SuiteAPI, k as SuiteCollector } from './tasks.d-BPS2nWLO.js';
-export { l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as ImportDuration, q as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskCustomOptions, x as TaskEventPack, y as TaskMeta, z as TaskPopulated, D as TaskResult, E as TaskResultPack, G as TaskState, J as TestAnnotation, K as TestAnnotationLocation, L as TestAttachment, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-BPS2nWLO.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, S as Suite, g as SuiteHooks, F as File, h as TaskUpdateEvent, T as Task, i as TestAPI, j as SuiteAPI, k as SuiteCollector } from './tasks.d-B1vSIWO6.js';
+export { l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as ImportDuration, q as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskCustomOptions, x as TaskEventPack, y as TaskMeta, z as TaskPopulated, D as TaskResult, E as TaskResultPack, G as TaskState, J as TestAnnotation, K as TestAnnotationLocation, L as TestAttachment, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-B1vSIWO6.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,6 +1,6 @@
 export { a as afterAll, b as afterEach, c as beforeAll, d as beforeEach, p as collectTests, j as createTaskCollector, k as describe, l as getCurrentSuite, q as getCurrentTest, g as getFn, f as getHooks, m as it, o as onTestFailed, e as onTestFinished, s as setFn, h as setHooks, i as startTests, n as suite, t as test, u as updateTask } from './chunk-hooks.js';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils';
-import '@vitest/utils/source-map';
 import 'strip-literal';
+import '@vitest/utils/source-map';
 import 'pathe';

package/dist/{tasks.d-BPS2nWLO.d.ts → tasks.d-B1vSIWO6.d.ts}

@@ -19,7 +19,7 @@ type ChainableFunction<
 	F extends (...args: any) => any,
 	C = object
 > = F & { [x in T] : ChainableFunction<T, F, C> } & {
-	fn: (this: Record<T, any>, ...args: Parameters<F>) => ReturnType<F>
+	fn: (this: Record<T, any>, ...args: Parameters<F>) => ReturnType<F>;
 } & C;
 declare function createChainable<
 	T extends string,
@@ -92,8 +92,8 @@ interface TaskBase {
 	* and parsing the stack trace, so the location might differ depending on the runtime.
 	*/
 	location?: {
-		line: number
-		column: number
+		line: number;
+		column: number;
 	};
 }
 interface TaskPopulated extends TaskBase {
@@ -247,17 +247,17 @@ type Task = Test | Suite | File;
 type TestFunction<ExtraContext = object> = (context: TestContext & ExtraContext) => Awaitable<any> | void;
 // jest's ExtractEachCallbackArgs
 type ExtractEachCallbackArgs<T extends ReadonlyArray<any>> = {
-	1: [T[0]]
-	2: [T[0], T[1]]
-	3: [T[0], T[1], T[2]]
-	4: [T[0], T[1], T[2], T[3]]
-	5: [T[0], T[1], T[2], T[3], T[4]]
-	6: [T[0], T[1], T[2], T[3], T[4], T[5]]
-	7: [T[0], T[1], T[2], T[3], T[4], T[5], T[6]]
-	8: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7]]
-	9: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], T[8]]
-	10: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], T[8], T[9]]
-	fallback: Array<T extends ReadonlyArray<infer U> ? U : any>
+	1: [T[0]];
+	2: [T[0], T[1]];
+	3: [T[0], T[1], T[2]];
+	4: [T[0], T[1], T[2], T[3]];
+	5: [T[0], T[1], T[2], T[3], T[4]];
+	6: [T[0], T[1], T[2], T[3], T[4], T[5]];
+	7: [T[0], T[1], T[2], T[3], T[4], T[5], T[6]];
+	8: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7]];
+	9: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], T[8]];
+	10: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], T[8], T[9]];
+	fallback: Array<T extends ReadonlyArray<infer U> ? U : any>;
 }[T extends Readonly<[any]> ? 1 : T extends Readonly<[any, any]> ? 2 : T extends Readonly<[any, any, any]> ? 3 : T extends Readonly<[any, any, any, any]> ? 4 : T extends Readonly<[any, any, any, any, any]> ? 5 : T extends Readonly<[any, any, any, any, any, any]> ? 6 : T extends Readonly<[any, any, any, any, any, any, any]> ? 7 : T extends Readonly<[any, any, any, any, any, any, any, any]> ? 8 : T extends Readonly<[any, any, any, any, any, any, any, any, any]> ? 9 : T extends Readonly<[any, any, any, any, any, any, any, any, any, any]> ? 10 : "fallback"];
 interface EachFunctionReturn<T extends any[]> {
 	/**
@@ -304,8 +304,8 @@ interface TestCollectorCallable<C = object> {
 	<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>, {
-	each: TestEachFunction
-	for: TestForFunction<ExtraContext>
+	each: TestEachFunction;
+	for: TestForFunction<ExtraContext>;
 }>;
 type TestCollectorOptions = Omit<TestOptions, "shuffle">;
 interface TestOptions {
@@ -363,8 +363,8 @@ interface ExtendedAPI<ExtraContext> {
 	runIf: (condition: any) => ChainableTestAPI<ExtraContext>;
 }
 type TestAPI<ExtraContext = object> = ChainableTestAPI<ExtraContext> & ExtendedAPI<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
+	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;
 };
 interface FixtureOptions {
 	/**
@@ -412,12 +412,12 @@ interface SuiteCollectorCallable<ExtraContext = object> {
 	<OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, options: TestOptions, fn?: SuiteFactory<OverrideExtraContext>): SuiteCollector<OverrideExtraContext>;
 }
 type ChainableSuiteAPI<ExtraContext = object> = ChainableFunction<"concurrent" | "sequential" | "only" | "skip" | "todo" | "shuffle", SuiteCollectorCallable<ExtraContext>, {
-	each: TestEachFunction
-	for: SuiteForFunction
+	each: TestEachFunction;
+	for: SuiteForFunction;
 }>;
 type SuiteAPI<ExtraContext = object> = ChainableSuiteAPI<ExtraContext> & {
-	skipIf: (condition: any) => ChainableSuiteAPI<ExtraContext>
-	runIf: (condition: any) => ChainableSuiteAPI<ExtraContext>
+	skipIf: (condition: any) => ChainableSuiteAPI<ExtraContext>;
+	runIf: (condition: any) => ChainableSuiteAPI<ExtraContext>;
 };
 /**
 * @deprecated
@@ -518,16 +518,16 @@ interface TestContext {
 	* @see {@link https://vitest.dev/guide/test-context#skip}
 	*/
 	readonly skip: {
-		(note?: string): never
-		(condition: boolean, note?: string): void
+		(note?: string): never;
+		(condition: boolean, note?: string): void;
 	};
 	/**
 	* Add a test annotation that will be displayed by your reporter.
 	* @see {@link https://vitest.dev/guide/test-context#annotate}
 	*/
 	readonly annotate: {
-		(message: string, type?: string, attachment?: TestAttachment): Promise<TestAnnotation>
-		(message: string, attachment?: TestAttachment): Promise<TestAnnotation>
+		(message: string, type?: string, attachment?: TestAttachment): Promise<TestAnnotation>;
+		(message: string, attachment?: TestAttachment): Promise<TestAnnotation>;
 	};
 }
 type OnTestFailedHandler = (context: TestContext) => Awaitable<void>;

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, E as TaskResultPack, x as TaskEventPack, J as TestAnnotation, M as TestContext, I as ImportDuration, s as SequenceHooks, t as SequenceSetupFiles } from './tasks.d-BPS2nWLO.js';
-export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, q as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, j as SuiteAPI, k as SuiteCollector, u as SuiteFactory, g as SuiteHooks, T as Task, v as TaskBase, w as TaskCustomOptions, e as TaskHook, y as TaskMeta, z as TaskPopulated, D as TaskResult, G as TaskState, h as TaskUpdateEvent, i as TestAPI, K as TestAnnotationLocation, L as TestAttachment, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-BPS2nWLO.js';
+import { F as File, a as Test, S as Suite, E as TaskResultPack, x as TaskEventPack, J as TestAnnotation, M as TestContext, I as ImportDuration, s as SequenceHooks, t as SequenceSetupFiles } from './tasks.d-B1vSIWO6.js';
+export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, q as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, j as SuiteAPI, k as SuiteCollector, u as SuiteFactory, g as SuiteHooks, T as Task, v as TaskBase, w as TaskCustomOptions, e as TaskHook, y as TaskMeta, z as TaskPopulated, D as TaskResult, G as TaskState, h as TaskUpdateEvent, i as TestAPI, K as TestAnnotationLocation, L as TestAttachment, N as TestFunction, P as TestOptions, U as Use } from './tasks.d-B1vSIWO6.js';
 import '@vitest/utils';
 
 /**
@@ -14,14 +14,14 @@ interface VitestRunnerConfig {
 	testNamePattern?: RegExp;
 	allowOnly?: boolean;
 	sequence: {
-		shuffle?: boolean
-		concurrent?: boolean
-		seed: number
-		hooks: SequenceHooks
-		setupFiles: SequenceSetupFiles
+		shuffle?: boolean;
+		concurrent?: boolean;
+		seed: number;
+		hooks: SequenceHooks;
+		setupFiles: SequenceSetupFiles;
 	};
 	chaiConfig?: {
-		truncateThreshold?: number
+		truncateThreshold?: number;
 	};
 	maxConcurrency: number;
 	testTimeout: number;
@@ -69,8 +69,8 @@ interface VitestRunner {
 	* Called before actually running the test function. Already has "result" with "state" and "startTime".
 	*/
 	onBeforeTryTask?: (test: Test, options: {
-		retry: number
-		repeats: number
+		retry: number;
+		repeats: number;
 	}) => unknown;
 	/**
 	* When the task has finished running, but before cleanup hooks are called
@@ -84,8 +84,8 @@ interface VitestRunner {
 	* Called right after running the test function. Doesn't have new state yet. Will not be called, if the test function throws.
 	*/
 	onAfterTryTask?: (test: Test, options: {
-		retry: number
-		repeats: number
+		retry: number;
+		repeats: number;
 	}) => unknown;
 	/**
 	* Called before running a single suite. Doesn't have "result" yet.

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
-import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-BPS2nWLO.js';
-export { C as ChainableFunction, c as createChainable } from './tasks.d-BPS2nWLO.js';
-import { Arrayable } from '@vitest/utils';
+import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-B1vSIWO6.js';
+export { C as ChainableFunction, c as createChainable } from './tasks.d-B1vSIWO6.js';
+import { ParsedStack, Arrayable } from '@vitest/utils';
 
 /**
 * If any tasks been marked as `only`, mark all other tasks as `skip`.
@@ -16,6 +16,7 @@ declare function createFileTask(filepath: string, root: string, projectName: str
 * @param projectName The name of the test project
 */
 declare function generateFileHash(file: string, projectName: string | undefined): string;
+declare function findTestFileStackTrace(testFilePath: string, error: string): ParsedStack | undefined;
 
 /**
 * Return a function for running multiple async operations with limited concurrency.
@@ -44,4 +45,4 @@ declare function getNames(task: Task): string[];
 declare function getFullName(task: Task, separator?: string): string;
 declare function getTestName(task: Task, separator?: string): string;
 
-export { calculateSuiteHash, createFileTask, generateFileHash, generateHash, getFullName, getNames, getSuites, getTasks, getTestName, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, isTestCase, limitConcurrency, partitionSuiteChildren, someTasksAreOnly };
+export { calculateSuiteHash, createFileTask, findTestFileStackTrace, generateFileHash, generateHash, getFullName, getNames, getSuites, getTasks, getTestName, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, isTestCase, limitConcurrency, partitionSuiteChildren, someTasksAreOnly };

package/dist/utils.js

@@ -1,6 +1,6 @@
-export { v as calculateSuiteHash, r as createChainable, w as createFileTask, x as generateFileHash, y as generateHash, D as getFullName, E as getNames, F as getSuites, G as getTasks, H as getTestName, I as getTests, J as hasFailed, K as hasTests, z as interpretTaskModes, L as isAtomTest, M as isTestCase, B as limitConcurrency, C as partitionSuiteChildren, A as someTasksAreOnly } from './chunk-hooks.js';
+export { v as calculateSuiteHash, r as createChainable, w as createFileTask, x as findTestFileStackTrace, y as generateFileHash, z as generateHash, E as getFullName, F as getNames, G as getSuites, H as getTasks, I as getTestName, J as getTests, K as hasFailed, L as hasTests, A as interpretTaskModes, M as isAtomTest, N as isTestCase, C as limitConcurrency, D as partitionSuiteChildren, B as someTasksAreOnly } from './chunk-hooks.js';
 import '@vitest/utils';
-import '@vitest/utils/source-map';
 import '@vitest/utils/error';
 import 'strip-literal';
+import '@vitest/utils/source-map';
 import 'pathe';

package/package.json

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