@vitest/runner 1.3.1 → 1.5.0

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-_kyNRBhz.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-_kyNRBhz.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

@@ -4,6 +4,7 @@ import { processError } from '@vitest/utils/error';
 export { processError } from '@vitest/utils/error';
 import { j as createChainable, g as generateHash, c as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, p as partitionSuiteChildren, h as hasTests, e as hasFailed } from './chunk-tasks.js';
 import { relative } from 'pathe';
+import { parseSingleStack } from '@vitest/utils/source-map';
 
 const fnMap = /* @__PURE__ */ new WeakMap();
 const fixtureMap = /* @__PURE__ */ new WeakMap();
@@ -260,16 +261,21 @@ const describe = suite;
 const it = test;
 let runner;
 let defaultSuite;
+let currentTestFilepath;
 function getDefaultSuite() {
   return defaultSuite;
 }
+function getTestFilepath() {
+  return currentTestFilepath;
+}
 function getRunner() {
   return runner;
 }
-function clearCollectorContext(currentRunner) {
+function clearCollectorContext(filepath, currentRunner) {
   if (!defaultSuite)
     defaultSuite = currentRunner.config.sequence.shuffle ? suite.shuffle("") : currentRunner.config.sequence.concurrent ? suite.concurrent("") : suite("");
   runner = currentRunner;
+  currentTestFilepath = filepath;
   collectorContext.tasks.length = 0;
   defaultSuite.clear();
   collectorContext.currentSuite = defaultSuite;
@@ -315,7 +321,7 @@ function createSuiteCollector(name, factory = () => {
   const tasks = [];
   const factoryQueue = [];
   let suite2;
-  initSuite();
+  initSuite(true);
   const task = function(name2 = "", options = {}) {
     const task2 = {
       id: "",
@@ -347,6 +353,15 @@ function createSuiteCollector(name, factory = () => {
         (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
       ));
     }
+    if (runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit;
+      Error.stackTraceLimit = 15;
+      const error = new Error("stacktrace").stack;
+      Error.stackTraceLimit = limit;
+      const stack = findTestFileStackTrace(error, task2.each ?? false);
+      if (stack)
+        task2.location = stack;
+    }
     tasks.push(task2);
     return task2;
   };
@@ -380,7 +395,7 @@ function createSuiteCollector(name, factory = () => {
   function addHook(name2, ...fn) {
     getHooks(suite2)[name2].push(...fn);
   }
-  function initSuite() {
+  function initSuite(includeLocation) {
     if (typeof suiteOptions === "number")
       suiteOptions = { timeout: suiteOptions };
     suite2 = {
@@ -394,12 +409,21 @@ function createSuiteCollector(name, factory = () => {
       meta: /* @__PURE__ */ Object.create(null),
       projectName: ""
     };
+    if (runner && includeLocation && runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit;
+      Error.stackTraceLimit = 15;
+      const error = new Error("stacktrace").stack;
+      Error.stackTraceLimit = limit;
+      const stack = findTestFileStackTrace(error, suite2.each ?? false);
+      if (stack)
+        suite2.location = stack;
+    }
     setHooks(suite2, createSuiteHooks());
   }
   function clear() {
     tasks.length = 0;
     factoryQueue.length = 0;
-    initSuite();
+    initSuite(false);
   }
   async function collect(file) {
     factoryQueue.length = 0;
@@ -536,6 +560,24 @@ function formatTemplateString(cases, args) {
   }
   return res;
 }
+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()) {
+      return {
+        line: stack.line,
+        /**
+         * test.each([1, 2])('name')
+         *                 ^ leads here, but should
+         *                  ^ lead here
+         * in source maps it's the same boundary, so it just points to the start of it
+         */
+        column: each ? stack.column + 1 : stack.column
+      };
+    }
+  }
+}
 
 async function runSetupFiles(config, runner) {
   const files = toArray(config.setupFiles);
@@ -567,7 +609,7 @@ async function collectTests(paths, runner) {
       meta: /* @__PURE__ */ Object.create(null),
       projectName: config.name
     };
-    clearCollectorContext(runner);
+    clearCollectorContext(filepath, runner);
     try {
       const setupStart = now$1();
       await runSetupFiles(config, runner);
@@ -900,7 +942,7 @@ async function startTests(paths, runner) {
   var _a, _b, _c, _d;
   await ((_a = runner.onBeforeCollect) == null ? void 0 : _a.call(runner, paths));
   const files = await collectTests(paths, runner);
-  (_b = runner.onCollected) == null ? void 0 : _b.call(runner, files);
+  await ((_b = runner.onCollected) == null ? void 0 : _b.call(runner, files));
   await ((_c = runner.onBeforeRunFiles) == null ? void 0 : _c.call(runner, files));
   await runFiles(files, runner);
   await ((_d = runner.onAfterRunFiles) == null ? void 0 : _d.call(runner, files));

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

@@ -35,6 +35,10 @@ interface TaskBase {
     result?: TaskResult;
     retry?: number;
     repeats?: number;
+    location?: {
+        line: number;
+        column: number;
+    };
 }
 interface TaskPopulated extends TaskBase {
     suite: Suite;
@@ -199,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;
@@ -242,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-_kyNRBhz.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-_kyNRBhz.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';
 
@@ -24,6 +24,7 @@ interface VitestRunnerConfig {
     testTimeout: number;
     hookTimeout: number;
     retry: number;
+    includeTaskLocation?: boolean;
     diffOptions?: DiffOptions;
 }
 type VitestRunnerImportSource = 'collect' | 'setup';

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, T as Task, a as Test, C as Custom } from './tasks-_kyNRBhz.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-_kyNRBhz.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.3.1",
+  "version": "1.5.0",
   "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.3.1"
+    "@vitest/utils": "1.5.0"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",