@vitest/runner 1.4.0 → 1.5.1

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { VitestRunner } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';
-import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as CustomAPI, h as SuiteHooks, O as OnTestFailedHandler, i as OnTestFinishedHandler, a as Test, C as Custom, S as Suite } from './tasks-B4r0U6Dq.js';
-export { D as DoneCallback, E as ExtendedContext, t as Fixture, s as FixtureFn, r as FixtureOptions, u as Fixtures, v as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, y as RuntimeContext, B as SequenceHooks, G as SequenceSetupFiles, x as SuiteFactory, k as TaskBase, A as TaskContext, w as TaskCustomOptions, m as TaskMeta, l as TaskPopulated, n as TaskResult, o as TaskResultPack, j as TaskState, z as TestContext, p as TestFunction, q as TestOptions, U as Use } from './tasks-B4r0U6Dq.js';
+import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as CustomAPI, h as SuiteHooks, O as OnTestFailedHandler, i as OnTestFinishedHandler, a as Test, C as Custom, S as Suite } from './tasks-K5XERDtv.js';
+export { D as DoneCallback, E as ExtendedContext, t as Fixture, s as FixtureFn, r as FixtureOptions, u as Fixtures, v as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, y as RuntimeContext, B as SequenceHooks, G as SequenceSetupFiles, x as SuiteFactory, k as TaskBase, A as TaskContext, w as TaskCustomOptions, m as TaskMeta, l as TaskPopulated, n as TaskResult, o as TaskResultPack, j as TaskState, z as TestContext, p as TestFunction, q as TestOptions, U as Use } from './tasks-K5XERDtv.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils/diff';

package/dist/index.js

@@ -355,10 +355,10 @@ function createSuiteCollector(name, factory = () => {
     }
     if (runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
-      Error.stackTraceLimit = 10;
+      Error.stackTraceLimit = 15;
       const error = new Error("stacktrace").stack;
       Error.stackTraceLimit = limit;
-      const stack = findStackTrace(error, task2.each ?? false);
+      const stack = findTestFileStackTrace(error, task2.each ?? false);
       if (stack)
         task2.location = stack;
     }
@@ -411,18 +411,12 @@ function createSuiteCollector(name, factory = () => {
     };
     if (runner && includeLocation && runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
-      Error.stackTraceLimit = 5;
+      Error.stackTraceLimit = 15;
       const error = new Error("stacktrace").stack;
       Error.stackTraceLimit = limit;
-      const stack = parseSingleStack(error.split("\n")[5]);
-      if (stack) {
-        suite2.location = {
-          line: stack.line,
-          // because source map is boundary based, this line leads to ")" in test.each()[(]),
-          // but it should be the next opening bracket - here we assume it's on the same line
-          column: each ? stack.column + 1 : stack.column
-        };
-      }
+      const stack = findTestFileStackTrace(error, suite2.each ?? false);
+      if (stack)
+        suite2.location = stack;
     }
     setHooks(suite2, createSuiteHooks());
   }
@@ -566,8 +560,8 @@ function formatTemplateString(cases, args) {
   }
   return res;
 }
-function findStackTrace(error, each) {
-  const lines = error.split("\n").slice(4);
+function findTestFileStackTrace(error, each) {
+  const lines = error.split("\n").slice(1);
   for (const line of lines) {
     const stack = parseSingleStack(line);
     if (stack && stack.file === getTestFilepath()) {
@@ -672,6 +666,16 @@ function getSuiteHooks(suite, name, sequence) {
     return hooks.slice().reverse();
   return hooks;
 }
+async function callTaskHooks(task, hooks, sequence) {
+  if (sequence === "stack")
+    hooks = hooks.slice().reverse();
+  if (sequence === "parallel") {
+    await Promise.all(hooks.map((fn) => fn(task.result)));
+  } else {
+    for (const fn of hooks)
+      await fn(task.result);
+  }
+}
 async function callSuiteHook(suite, currentTask, name, runner, args) {
   const sequence = runner.config.sequence.hooks;
   const callbacks = [];
@@ -733,7 +737,7 @@ async function callCleanupHooks(cleanups) {
   }));
 }
 async function runTest(test, runner) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
   await ((_a = runner.onBeforeRunTask) == null ? void 0 : _a.call(runner, test));
   if (test.mode !== "run")
     return;
@@ -806,13 +810,13 @@ async function runTest(test, runner) {
     }
   }
   try {
-    await Promise.all(((_f = test.onFinished) == null ? void 0 : _f.map((fn) => fn(test.result))) || []);
+    await callTaskHooks(test, test.onFinished || [], "stack");
   } catch (e) {
     failTask(test.result, e, runner.config.diffOptions);
   }
   if (test.result.state === "fail") {
     try {
-      await Promise.all(((_g = test.onFailed) == null ? void 0 : _g.map((fn) => fn(test.result))) || []);
+      await callTaskHooks(test, test.onFailed || [], runner.config.sequence.hooks);
     } catch (e) {
       failTask(test.result, e, runner.config.diffOptions);
     }
@@ -829,7 +833,7 @@ async function runTest(test, runner) {
   }
   setCurrentTest(void 0);
   test.result.duration = now() - start;
-  await ((_h = runner.onAfterRunTask) == null ? void 0 : _h.call(runner, test));
+  await ((_f = runner.onAfterRunTask) == null ? void 0 : _f.call(runner, test));
   updateTask(test, runner);
 }
 function failTask(result, err, diffOptions) {

package/dist/{tasks-B4r0U6Dq.d.ts → tasks-K5XERDtv.d.ts}

@@ -203,9 +203,9 @@ interface SuiteCollectorCallable<ExtraContext = {}> {
     /**
      * @deprecated Use options as the second argument instead
      */
-    (name: string | Function, fn: SuiteFactory<ExtraContext>, options: TestOptions): SuiteCollector<ExtraContext>;
-    (name: string | Function, fn?: SuiteFactory<ExtraContext>, options?: number | TestOptions): SuiteCollector<ExtraContext>;
-    (name: string | Function, options: TestOptions, fn?: SuiteFactory<ExtraContext>): SuiteCollector<ExtraContext>;
+    <OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, fn: SuiteFactory<OverrideExtraContext>, options: TestOptions): SuiteCollector<OverrideExtraContext>;
+    <OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, fn?: SuiteFactory<OverrideExtraContext>, options?: number | TestOptions): SuiteCollector<OverrideExtraContext>;
+    <OverrideExtraContext extends ExtraContext = ExtraContext>(name: string | Function, options: TestOptions, fn?: SuiteFactory<OverrideExtraContext>): SuiteCollector<OverrideExtraContext>;
 }
 type ChainableSuiteAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'sequential' | 'only' | 'skip' | 'todo' | 'shuffle', SuiteCollectorCallable<ExtraContext>, {
     each: TestEachFunction;
@@ -246,7 +246,7 @@ interface SuiteCollector<ExtraContext = {}> {
     clear: () => void;
     on: <T extends keyof SuiteHooks<ExtraContext>>(name: T, ...fn: SuiteHooks<ExtraContext>[T]) => void;
 }
-type SuiteFactory<ExtraContext = {}> = (test: (name: string | Function, fn: TestFunction<ExtraContext>) => void) => Awaitable<void>;
+type SuiteFactory<ExtraContext = {}> = (test: TestAPI<ExtraContext>) => Awaitable<void>;
 interface RuntimeContext {
     tasks: (SuiteCollector | Test)[];
     currentSuite: SuiteCollector | null;

package/dist/types.d.ts

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

package/dist/utils.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
   "dependencies": {
     "p-limit": "^5.0.0",
     "pathe": "^1.1.1",
-    "@vitest/utils": "1.4.0"
+    "@vitest/utils": "1.5.1"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",