@vitest/runner 3.0.7 → 3.0.8

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, g as Custom, S as Suite, h as SuiteHooks, F as File, i as TaskUpdateEvent, T as Task, j as TestAPI, k as SuiteAPI, l as SuiteCollector } from './tasks-CAp19cBR.js';
-export { D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskContext, x as TaskCustomOptions, y as TaskEventPack, z as TaskMeta, G as TaskPopulated, J as TaskResult, K as TaskResultPack, L as TaskState, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks-CAp19cBR.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, g as Custom, S as Suite, h as SuiteHooks, F as File, i as TaskUpdateEvent, T as Task, j as TestAPI, k as SuiteAPI, l as SuiteCollector } from './tasks-CPSpEF1h.js';
+export { D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, R as RunMode, r as RuntimeContext, s as SequenceHooks, t as SequenceSetupFiles, u as SuiteFactory, v as TaskBase, w as TaskContext, x as TaskCustomOptions, y as TaskEventPack, z as TaskMeta, G as TaskPopulated, J as TaskResult, K as TaskResultPack, L as TaskState, M as TestContext, N as TestFunction, P as TestOptions, U as Use } from './tasks-CPSpEF1h.js';
 import { Awaitable } from '@vitest/utils';
 import { FileSpecification, VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';

package/dist/index.js

@@ -357,8 +357,10 @@ function getRunner() {
 }
 function createDefaultSuite(runner2) {
   const config = runner2.config.sequence;
-  return suite("", { concurrent: config.concurrent }, () => {
+  const collector = suite("", { concurrent: config.concurrent }, () => {
   });
+  delete collector.suite;
+  return collector;
 }
 function clearCollectorContext(filepath, currentRunner) {
   if (!defaultSuite) {
@@ -423,10 +425,11 @@ function createSuiteCollector(name, factory = () => {
   let suite2;
   initSuite(true);
   const task = function(name2 = "", options = {}) {
+    var _a;
     const task2 = {
       id: "",
       name: name2,
-      suite: void 0,
+      suite: (_a = collectorContext.currentSuite) == null ? void 0 : _a.suite,
       each: options.each,
       fails: options.fails,
       context: void 0,
@@ -488,6 +491,7 @@ function createSuiteCollector(name, factory = () => {
     type: "collector",
     name,
     mode,
+    suite: suite2,
     options: suiteOptions,
     test: test2,
     tasks,
@@ -500,6 +504,7 @@ function createSuiteCollector(name, factory = () => {
     getHooks(suite2)[name2].push(...fn);
   }
   function initSuite(includeLocation) {
+    var _a;
     if (typeof suiteOptions === "number") {
       suiteOptions = { timeout: suiteOptions };
     }
@@ -507,6 +512,7 @@ function createSuiteCollector(name, factory = () => {
       id: "",
       type: "suite",
       name,
+      suite: (_a = collectorContext.currentSuite) == null ? void 0 : _a.suite,
       mode,
       each,
       file: void 0,
@@ -545,7 +551,6 @@ function createSuiteCollector(name, factory = () => {
     suite2.file = file;
     suite2.tasks = allChildren;
     allChildren.forEach((task2) => {
-      task2.suite = suite2;
       task2.file = file;
     });
     return suite2;
@@ -804,11 +809,18 @@ function findTestFileStackTrace(error, each) {
 function getDefaultHookTimeout() {
   return getRunner().config.hookTimeout;
 }
-function beforeAll(fn, timeout) {
+const CLEANUP_TIMEOUT_KEY = Symbol.for("VITEST_CLEANUP_TIMEOUT");
+function getBeforeHookCleanupCallback(hook, result) {
+  if (typeof result === "function") {
+    const timeout = CLEANUP_TIMEOUT_KEY in hook && typeof hook[CLEANUP_TIMEOUT_KEY] === "number" ? hook[CLEANUP_TIMEOUT_KEY] : getDefaultHookTimeout();
+    return withTimeout(result, timeout, true);
+  }
+}
+function beforeAll(fn, timeout = getDefaultHookTimeout()) {
   assertTypes(fn, '"beforeAll" callback', ["function"]);
   return getCurrentSuite().on(
     "beforeAll",
-    withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
+    Object.assign(withTimeout(fn, timeout, true), { [CLEANUP_TIMEOUT_KEY]: timeout })
   );
 }
 function afterAll(fn, timeout) {
@@ -818,11 +830,14 @@ function afterAll(fn, timeout) {
     withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
   );
 }
-function beforeEach(fn, timeout) {
+function beforeEach(fn, timeout = getDefaultHookTimeout()) {
   assertTypes(fn, '"beforeEach" callback', ["function"]);
   return getCurrentSuite().on(
     "beforeEach",
-    withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true)
+    Object.assign(
+      withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true),
+      { [CLEANUP_TIMEOUT_KEY]: timeout }
+    )
   );
 }
 function afterEach(fn, timeout) {
@@ -925,12 +940,6 @@ async function collectTests(specs, runner) {
       };
     }
     calculateSuiteHash(file);
-    file.tasks.forEach((task) => {
-      var _a2;
-      if (((_a2 = task.suite) == null ? void 0 : _a2.id) === "") {
-        delete task.suite;
-      }
-    });
     const hasOnlyTasks = someTasksAreOnly(file);
     interpretTaskModes(
       file,
@@ -1031,13 +1040,16 @@ async function callSuiteHook(suite, currentTask, name, runner, args) {
   if (hooks.length > 0) {
     updateSuiteHookState(currentTask, name, "run", runner);
   }
+  async function runHook(hook) {
+    return getBeforeHookCleanupCallback(hook, await hook(...args));
+  }
   if (sequence === "parallel") {
     callbacks.push(
-      ...await Promise.all(hooks.map((hook) => hook(...args)))
+      ...await Promise.all(hooks.map((hook) => runHook(hook)))
     );
   } else {
     for (const hook of hooks) {
-      callbacks.push(await hook(...args));
+      callbacks.push(await runHook(hook));
     }
   }
   if (hooks.length > 0) {

package/dist/{tasks-CAp19cBR.d.ts → tasks-CPSpEF1h.d.ts}

@@ -433,6 +433,7 @@ interface SuiteCollector<ExtraContext = object> {
     type: 'collector';
     test: TestAPI<ExtraContext>;
     tasks: (Suite | Test<ExtraContext> | SuiteCollector<ExtraContext>)[];
+    suite?: Suite;
     task: (name: string, options?: TaskCustomOptions) => Test<ExtraContext>;
     collect: (file: File) => Promise<Suite>;
     clear: () => void;

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { DiffOptions } from '@vitest/utils/diff';
-import { F as File, T as Task, a as Test, S as Suite, K as TaskResultPack, y as TaskEventPack, M as TestContext, s as SequenceHooks, t as SequenceSetupFiles } from './tasks-CAp19cBR.js';
-export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, k as SuiteAPI, l as SuiteCollector, u as SuiteFactory, h as SuiteHooks, v as TaskBase, w as TaskContext, x as TaskCustomOptions, e as TaskHook, z as TaskMeta, G as TaskPopulated, J as TaskResult, L as TaskState, i as TaskUpdateEvent, j as TestAPI, N as TestFunction, P as TestOptions, U as Use } from './tasks-CAp19cBR.js';
+import { F as File, T as Task, a as Test, S as Suite, K as TaskResultPack, y as TaskEventPack, M as TestContext, s as SequenceHooks, t as SequenceSetupFiles } from './tasks-CPSpEF1h.js';
+export { A as AfterAllListener, b as AfterEachListener, B as BeforeAllListener, d as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, E as ExtendedContext, m as Fixture, n as FixtureFn, o as FixtureOptions, p as Fixtures, H as HookCleanupCallback, q as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, r as RuntimeContext, k as SuiteAPI, l as SuiteCollector, u as SuiteFactory, h as SuiteHooks, v as TaskBase, w as TaskContext, x as TaskCustomOptions, e as TaskHook, z as TaskMeta, G as TaskPopulated, J as TaskResult, L as TaskState, i as TaskUpdateEvent, j as TestAPI, N as TestFunction, P as TestOptions, U as Use } from './tasks-CPSpEF1h.js';
 import '@vitest/utils';
 
 /**

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, F as File, T as Task, a as Test } from './tasks-CAp19cBR.js';
-export { C as ChainableFunction, c as createChainable } from './tasks-CAp19cBR.js';
+import { S as Suite, F as File, T as Task, a as Test } from './tasks-CPSpEF1h.js';
+export { C as ChainableFunction, c as createChainable } from './tasks-CPSpEF1h.js';
 import { Arrayable } from '@vitest/utils';
 
 /**

package/package.json

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