@vitest/runner 3.0.7 → 3.0.9

package/dist/index.js

@@ -31,7 +31,7 @@ async function runWithSuite(suite, fn) {
   await fn();
   collectorContext.currentSuite = prev;
 }
-function withTimeout(fn, timeout, isHook = false) {
+function withTimeout(fn, timeout, isHook = false, stackTraceError) {
   if (timeout <= 0 || timeout === Number.POSITIVE_INFINITY) {
     return fn;
   }
@@ -42,13 +42,16 @@ function withTimeout(fn, timeout, isHook = false) {
       var _a;
       const timer = setTimeout(() => {
         clearTimeout(timer);
-        reject(new Error(makeTimeoutMsg(isHook, timeout)));
+        rejectTimeoutError();
       }, timeout);
       (_a = timer.unref) == null ? void 0 : _a.call(timer);
+      function rejectTimeoutError() {
+        reject_(makeTimeoutError(isHook, timeout, stackTraceError));
+      }
       function resolve(result) {
         clearTimeout(timer);
         if (now$2() - startTime >= timeout) {
-          reject_(new Error(makeTimeoutMsg(isHook, timeout)));
+          rejectTimeoutError();
           return;
         }
         resolve_(result);
@@ -84,20 +87,25 @@ function createTestContext(test, runner) {
   context.onTestFailed = (handler, timeout) => {
     test.onFailed || (test.onFailed = []);
     test.onFailed.push(
-      withTimeout(handler, timeout ?? runner.config.hookTimeout, true)
+      withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR"))
     );
   };
   context.onTestFinished = (handler, timeout) => {
     test.onFinished || (test.onFinished = []);
     test.onFinished.push(
-      withTimeout(handler, timeout ?? runner.config.hookTimeout, true)
+      withTimeout(handler, timeout ?? runner.config.hookTimeout, true, new Error("STACK_TRACE_ERROR"))
     );
   };
   return ((_a = runner.extendTaskContext) == null ? void 0 : _a.call(runner, context)) || context;
 }
-function makeTimeoutMsg(isHook, timeout) {
-  return `${isHook ? "Hook" : "Test"} timed out in ${timeout}ms.
+function makeTimeoutError(isHook, timeout, stackTraceError) {
+  const message = `${isHook ? "Hook" : "Test"} timed out in ${timeout}ms.
 If this is a long-running ${isHook ? "hook" : "test"}, pass a timeout value as the last argument or configure it globally with "${isHook ? "hookTimeout" : "testTimeout"}".`;
+  const error = new Error(message);
+  if (stackTraceError == null ? void 0 : stackTraceError.stack) {
+    error.stack = stackTraceError.stack.replace(error.message, stackTraceError.message);
+  }
+  return error;
 }
 
 const fnMap = /* @__PURE__ */ new WeakMap();
@@ -357,8 +365,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,15 +433,18 @@ function createSuiteCollector(name, factory = () => {
   let suite2;
   initSuite(true);
   const task = function(name2 = "", options = {}) {
+    var _a;
+    const timeout = (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout;
     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,
       type: "test",
       file: void 0,
+      timeout,
       retry: options.retry ?? runner.config.retry,
       repeats: options.repeats,
       mode: options.only ? "only" : options.skip ? "skip" : options.todo ? "todo" : "run",
@@ -453,7 +466,7 @@ function createSuiteCollector(name, factory = () => {
         task2,
         withTimeout(
           withAwaitAsyncAssertions(withFixtures(handler, context), task2),
-          (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
+          timeout
         )
       );
     }
@@ -488,6 +501,7 @@ function createSuiteCollector(name, factory = () => {
     type: "collector",
     name,
     mode,
+    suite: suite2,
     options: suiteOptions,
     test: test2,
     tasks,
@@ -500,6 +514,7 @@ function createSuiteCollector(name, factory = () => {
     getHooks(suite2)[name2].push(...fn);
   }
   function initSuite(includeLocation) {
+    var _a;
     if (typeof suiteOptions === "number") {
       suiteOptions = { timeout: suiteOptions };
     }
@@ -507,6 +522,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 +561,6 @@ function createSuiteCollector(name, factory = () => {
     suite2.file = file;
     suite2.tasks = allChildren;
     allChildren.forEach((task2) => {
-      task2.suite = suite2;
       task2.file = file;
     });
     return suite2;
@@ -736,7 +751,7 @@ function createTest(fn, context) {
   return createTaskCollector(fn, context);
 }
 function formatName(name) {
-  return typeof name === "string" ? name : name instanceof Function ? name.name || "<anonymous>" : String(name);
+  return typeof name === "string" ? name : typeof name === "function" ? name.name || "<anonymous>" : String(name);
 }
 function formatTitle(template, items, idx) {
   if (template.includes("%#")) {
@@ -804,32 +819,75 @@ function findTestFileStackTrace(error, each) {
 function getDefaultHookTimeout() {
   return getRunner().config.hookTimeout;
 }
-function beforeAll(fn, timeout) {
+const CLEANUP_TIMEOUT_KEY = Symbol.for("VITEST_CLEANUP_TIMEOUT");
+const CLEANUP_STACK_TRACE_KEY = Symbol.for("VITEST_CLEANUP_STACK_TRACE");
+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();
+    const stackTraceError = CLEANUP_STACK_TRACE_KEY in hook && hook[CLEANUP_STACK_TRACE_KEY] instanceof Error ? hook[CLEANUP_STACK_TRACE_KEY] : void 0;
+    return withTimeout(result, timeout, true, stackTraceError);
+  }
+}
+function beforeAll(fn, timeout = getDefaultHookTimeout()) {
   assertTypes(fn, '"beforeAll" callback', ["function"]);
+  const stackTraceError = new Error("STACK_TRACE_ERROR");
   return getCurrentSuite().on(
     "beforeAll",
-    withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
+    Object.assign(
+      withTimeout(
+        fn,
+        timeout,
+        true,
+        stackTraceError
+      ),
+      {
+        [CLEANUP_TIMEOUT_KEY]: timeout,
+        [CLEANUP_STACK_TRACE_KEY]: stackTraceError
+      }
+    )
   );
 }
 function afterAll(fn, timeout) {
   assertTypes(fn, '"afterAll" callback', ["function"]);
   return getCurrentSuite().on(
     "afterAll",
-    withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
+    withTimeout(
+      fn,
+      timeout ?? getDefaultHookTimeout(),
+      true,
+      new Error("STACK_TRACE_ERROR")
+    )
   );
 }
-function beforeEach(fn, timeout) {
+function beforeEach(fn, timeout = getDefaultHookTimeout()) {
   assertTypes(fn, '"beforeEach" callback', ["function"]);
+  const stackTraceError = new Error("STACK_TRACE_ERROR");
   return getCurrentSuite().on(
     "beforeEach",
-    withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true)
+    Object.assign(
+      withTimeout(
+        withFixtures(fn),
+        timeout ?? getDefaultHookTimeout(),
+        true,
+        stackTraceError
+      ),
+      {
+        [CLEANUP_TIMEOUT_KEY]: timeout,
+        [CLEANUP_STACK_TRACE_KEY]: stackTraceError
+      }
+    )
   );
 }
 function afterEach(fn, timeout) {
   assertTypes(fn, '"afterEach" callback', ["function"]);
   return getCurrentSuite().on(
     "afterEach",
-    withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true)
+    withTimeout(
+      withFixtures(fn),
+      timeout ?? getDefaultHookTimeout(),
+      true,
+      new Error("STACK_TRACE_ERROR")
+    )
   );
 }
 const onTestFailed = createTestHook(
@@ -837,7 +895,12 @@ const onTestFailed = createTestHook(
   (test, handler, timeout) => {
     test.onFailed || (test.onFailed = []);
     test.onFailed.push(
-      withTimeout(handler, timeout ?? getDefaultHookTimeout(), true)
+      withTimeout(
+        handler,
+        timeout ?? getDefaultHookTimeout(),
+        true,
+        new Error("STACK_TRACE_ERROR")
+      )
     );
   }
 );
@@ -846,7 +909,12 @@ const onTestFinished = createTestHook(
   (test, handler, timeout) => {
     test.onFinished || (test.onFinished = []);
     test.onFinished.push(
-      withTimeout(handler, timeout ?? getDefaultHookTimeout(), true)
+      withTimeout(
+        handler,
+        timeout ?? getDefaultHookTimeout(),
+        true,
+        new Error("STACK_TRACE_ERROR")
+      )
     );
   }
 );
@@ -925,12 +993,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 +1093,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) {