@vitest/runner 4.0.14 → 4.0.16

package/dist/chunk-tasks.js

@@ -164,7 +164,7 @@ function calculateSuiteHash(parent) {
 		}
 	});
 }
-function createFileTask(filepath, root, projectName, pool) {
+function createFileTask(filepath, root, projectName, pool, viteEnvironment) {
 	const path = relative(root, filepath);
 	const file = {
 		id: generateFileHash(path, projectName),
@@ -177,7 +177,8 @@ function createFileTask(filepath, root, projectName, pool) {
 		meta: Object.create(null),
 		projectName,
 		file: undefined,
-		pool
+		pool,
+		viteEnvironment
 	};
 	file.file = file;
 	return file;

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-CettcZBU.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-CettcZBU.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-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 { Awaitable } from '@vitest/utils';
 import { FileSpecification, VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';

package/dist/index.js

@@ -753,7 +753,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 	let suite;
 	initSuite(true);
 	const task = function(name = "", options = {}) {
-		var _collectorContext$cur, _collectorContext$cur2;
+		var _collectorContext$cur, _collectorContext$cur2, _collectorContext$cur3;
 		const timeout = (options === null || options === void 0 ? void 0 : options.timeout) ?? runner.config.testTimeout;
 		const currentSuite = (_collectorContext$cur = collectorContext.currentSuite) === null || _collectorContext$cur === void 0 ? void 0 : _collectorContext$cur.suite;
 		const task = {
@@ -766,7 +766,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 			fails: options.fails,
 			context: undefined,
 			type: "test",
-			file: undefined,
+			file: (currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.file) ?? ((_collectorContext$cur3 = collectorContext.currentSuite) === null || _collectorContext$cur3 === void 0 ? void 0 : _collectorContext$cur3.file),
 			timeout,
 			retry: options.retry ?? runner.config.retry,
 			repeats: options.repeats,
@@ -854,21 +854,21 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		getHooks(suite)[name].push(...fn);
 	}
 	function initSuite(includeLocation) {
-		var _collectorContext$cur3, _collectorContext$cur4;
+		var _collectorContext$cur4, _collectorContext$cur5, _collectorContext$cur6;
 		if (typeof suiteOptions === "number") {
 			suiteOptions = { timeout: suiteOptions };
 		}
-		const currentSuite = (_collectorContext$cur3 = collectorContext.currentSuite) === null || _collectorContext$cur3 === void 0 ? void 0 : _collectorContext$cur3.suite;
+		const currentSuite = (_collectorContext$cur4 = collectorContext.currentSuite) === null || _collectorContext$cur4 === void 0 ? void 0 : _collectorContext$cur4.suite;
 		suite = {
 			id: "",
 			type: "suite",
 			name,
-			fullName: createTaskName([(currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.fullName) ?? ((_collectorContext$cur4 = collectorContext.currentSuite) === null || _collectorContext$cur4 === void 0 || (_collectorContext$cur4 = _collectorContext$cur4.file) === null || _collectorContext$cur4 === void 0 ? void 0 : _collectorContext$cur4.fullName), name]),
+			fullName: createTaskName([(currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.fullName) ?? ((_collectorContext$cur5 = collectorContext.currentSuite) === null || _collectorContext$cur5 === void 0 || (_collectorContext$cur5 = _collectorContext$cur5.file) === null || _collectorContext$cur5 === void 0 ? void 0 : _collectorContext$cur5.fullName), name]),
 			fullTestName: createTaskName([currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.fullTestName, name]),
 			suite: currentSuite,
 			mode,
 			each,
-			file: undefined,
+			file: (currentSuite === null || currentSuite === void 0 ? void 0 : currentSuite.file) ?? ((_collectorContext$cur6 = collectorContext.currentSuite) === null || _collectorContext$cur6 === void 0 ? void 0 : _collectorContext$cur6.file),
 			shuffle: suiteOptions === null || suiteOptions === void 0 ? void 0 : suiteOptions.shuffle,
 			tasks: [],
 			meta: Object.create(null),
@@ -904,11 +904,7 @@ function createSuiteCollector(name, factory = () => {}, mode, each, suiteOptions
 		for (const i of tasks) {
 			allChildren.push(i.type === "collector" ? await i.collect(file) : i);
 		}
-		suite.file = file;
 		suite.tasks = allChildren;
-		allChildren.forEach((task) => {
-			task.file = file;
-		});
 		return suite;
 	}
 	collectTask(collector);
@@ -931,6 +927,9 @@ function withAwaitAsyncAssertions(fn, task) {
 function createSuite() {
 	function suiteFn(name, factoryOrOptions, optionsOrFactory) {
 		var _currentSuite$options;
+		if (getCurrentTest()) {
+			throw new Error("Calling the suite function inside test function is not allowed. It can be only called at the top level or inside another suite function.");
+		}
 		let mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
 		const currentSuite = collectorContext.currentSuite || defaultSuite;
 		let { options, handler: factory } = parseArguments(factoryOrOptions, optionsOrFactory);
@@ -1366,7 +1365,7 @@ 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 file = createFileTask(filepath, config.root, config.name, runner.pool);
+			const file = createFileTask(filepath, config.root, config.name, runner.pool, runner.viteEnvironment);
 			setFileContext(file, Object.create(null));
 			file.shuffle = config.sequence.shuffle;
 			(_runner$onCollectStar = runner.onCollectStart) === null || _runner$onCollectStar === void 0 ? void 0 : _runner$onCollectStar.call(runner, file);

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

@@ -320,6 +320,10 @@ interface ImportDuration {
 	selfTime: number;
 	/** The time spent importing & executing the file and all its imports. */
 	totalTime: number;
+	/** Will be set to `true`, if the module was externalized. In this case totalTime and selfTime are identical. */
+	external?: boolean;
+	/** Which module imported this module first. All subsequent imports are cached. */
+	importer?: string;
 }
 /**
 * The tuple representing a single task update.
@@ -350,6 +354,10 @@ interface File extends Suite {
 	*/
 	pool?: string;
 	/**
+	* The environment that processes the file on the server.
+	*/
+	viteEnvironment?: string;
+	/**
 	* The path to the file in UNIX format.
 	*/
 	filepath: string;
@@ -627,12 +635,14 @@ interface TestContext {
 	*/
 	readonly signal: AbortSignal;
 	/**
-	* Extract hooks on test failed
+	* Register a callback to run when this specific test fails.
+	* Useful when tests run concurrently.
 	* @see {@link https://vitest.dev/guide/test-context#ontestfailed}
 	*/
 	readonly onTestFailed: (fn: OnTestFailedHandler, timeout?: number) => void;
 	/**
-	* Extract hooks on test failed
+	* Register a callback to run when this specific test finishes.
+	* Useful when tests run concurrently.
 	* @see {@link https://vitest.dev/guide/test-context#ontestfinished}
 	*/
 	readonly onTestFinished: (fn: OnTestFinishedHandler, timeout?: number) => 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, 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-CettcZBU.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-CettcZBU.js';
+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 '@vitest/utils';
 
 /**
@@ -163,6 +163,10 @@ interface VitestRunner {
 	*/
 	pool?: string;
 	/**
+	* The current Vite environment that processes the files on the server.
+	*/
+	viteEnvironment?: string;
+	/**
 	* Return the worker context for fixtures specified with `scope: 'worker'`
 	*/
 	getWorkerContext?: () => Record<string, unknown>;

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, F as File, T as Task, a as Test } from './tasks.d-CettcZBU.js';
-export { C as ChainableFunction, c as createChainable } from './tasks.d-CettcZBU.js';
+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 { ParsedStack, Arrayable } from '@vitest/utils';
 
 /**
@@ -9,7 +9,7 @@ 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): File;
+declare function createFileTask(filepath: string, root: string, projectName: string | undefined, pool?: string, viteEnvironment?: string): 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

package/package.json

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