@vitest/runner 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/chunk-tasks.js

@@ -31,7 +31,7 @@ function createChainable(keys, fn) {
 
 function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIsOnly, allowOnly) {
   const matchedLocations = [];
-  const traverseSuite = (suite, parentIsOnly2) => {
+  const traverseSuite = (suite, parentIsOnly2, parentMatchedWithLocation) => {
     const suiteIsOnly = parentIsOnly2 || suite.mode === "only";
     suite.tasks.forEach((t) => {
       const includeTask = suiteIsOnly || t.mode === "only";
@@ -48,23 +48,27 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
           t.mode = "run";
         }
       }
+      let hasLocationMatch = parentMatchedWithLocation;
+      if (testLocations !== void 0 && testLocations.length !== 0) {
+        if (t.location && (testLocations == null ? void 0 : testLocations.includes(t.location.line))) {
+          t.mode = "run";
+          matchedLocations.push(t.location.line);
+          hasLocationMatch = true;
+        } else if (parentMatchedWithLocation) {
+          t.mode = "run";
+        } else if (t.type === "test") {
+          t.mode = "skip";
+        }
+      }
       if (t.type === "test") {
         if (namePattern && !getTaskFullName(t).match(namePattern)) {
           t.mode = "skip";
         }
-        if (testLocations !== void 0 && testLocations.length !== 0) {
-          if (t.location && (testLocations == null ? void 0 : testLocations.includes(t.location.line))) {
-            t.mode = "run";
-            matchedLocations.push(t.location.line);
-          } else {
-            t.mode = "skip";
-          }
-        }
       } else if (t.type === "suite") {
         if (t.mode === "skip") {
           skipAllTasks(t);
         } else {
-          traverseSuite(t, includeTask);
+          traverseSuite(t, includeTask, hasLocationMatch);
         }
       }
     });
@@ -74,7 +78,7 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
       }
     }
   };
-  traverseSuite(file, parentIsOnly);
+  traverseSuite(file, parentIsOnly, false);
   const nonMatching = testLocations == null ? void 0 : testLocations.filter((loc) => !matchedLocations.includes(loc));
   if (nonMatching && nonMatching.length !== 0) {
     const message = nonMatching.length === 1 ? `line ${nonMatching[0]}` : `lines ${nonMatching.join(", ")}`;
@@ -147,7 +151,7 @@ function calculateSuiteHash(parent) {
 function createFileTask(filepath, root, projectName, pool) {
   const path = relative(root, filepath);
   const file = {
-    id: generateHash(`${path}${projectName || ""}`),
+    id: generateFileHash(path, projectName),
     name: path,
     type: "suite",
     mode: "run",
@@ -161,6 +165,9 @@ function createFileTask(filepath, root, projectName, pool) {
   file.file = file;
   return file;
 }
+function generateFileHash(file, projectName) {
+  return generateHash(`${file}${projectName || ""}`);
+}
 
 function limitConcurrency(concurrency = Infinity) {
   let count = 0;
@@ -277,4 +284,4 @@ function getTestName(task, separator = " > ") {
   return getNames(task).slice(1).join(separator);
 }
 
-export { calculateSuiteHash as a, createFileTask as b, createChainable as c, getFullName as d, getNames as e, getSuites as f, generateHash as g, getTasks as h, interpretTaskModes as i, getTestName as j, getTests as k, limitConcurrency as l, hasFailed as m, hasTests as n, isAtomTest as o, partitionSuiteChildren as p, isTestCase as q, someTasksAreOnly as s };
+export { calculateSuiteHash as a, createFileTask as b, createChainable as c, generateHash as d, getFullName as e, getNames as f, generateFileHash as g, getSuites as h, interpretTaskModes as i, getTasks as j, getTestName as k, limitConcurrency as l, getTests as m, hasFailed as n, hasTests as o, partitionSuiteChildren as p, isAtomTest as q, isTestCase as r, someTasksAreOnly as s };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { B as BeforeAllListener, A as AfterAllListener, b as BeforeEachListener, d as AfterEachListener, e as TaskHook, O as OnTestFailedHandler, f as OnTestFinishedHandler, a as Test, g as Custom, S as Suite, h as SuiteHooks, T as Task, F as File, i as SuiteAPI, j as TestAPI, k as SuiteCollector } from './tasks-D_Ah6OyC.js';
-export { D as DoneCallback, E as ExtendedContext, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as InferFixturesTypes, R as RunMode, q as RuntimeContext, r as SequenceHooks, s as SequenceSetupFiles, t as SuiteFactory, u as TaskBase, v as TaskContext, w as TaskCustomOptions, x as TaskMeta, y as TaskPopulated, z as TaskResult, G as TaskResultPack, J as TaskState, K as TestContext, L as TestFunction, M as TestOptions, U as Use } from './tasks-D_Ah6OyC.js';
+import { B as BeforeAllListener, A as AfterAllListener, b as BeforeEachListener, d as AfterEachListener, e as TaskHook, O as OnTestFailedHandler, f as OnTestFinishedHandler, a as Test, g as Custom, S as Suite, h as SuiteHooks, T as Task, F as File, i as SuiteAPI, j as TestAPI, k as SuiteCollector } from './tasks-DaEhEbK_.js';
+export { D as DoneCallback, E as ExtendedContext, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as InferFixturesTypes, R as RunMode, q as RuntimeContext, r as SequenceHooks, s as SequenceSetupFiles, t as SuiteFactory, u as TaskBase, v as TaskContext, w as TaskCustomOptions, x as TaskMeta, y as TaskPopulated, z as TaskResult, G as TaskResultPack, J as TaskState, K as TestContext, L as TestFunction, M as TestOptions, U as Use } from './tasks-DaEhEbK_.js';
 import { Awaitable } from '@vitest/utils';
-import { VitestRunner, FileSpec } from './types.js';
+import { VitestRunner, FileSpecification } from './types.js';
 export { CancelReason, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource } from './types.js';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils/diff';
@@ -126,8 +126,8 @@ declare function setHooks(key: Suite, hooks: SuiteHooks): void;
 declare function getHooks(key: Suite): SuiteHooks;
 
 declare function updateTask(task: Task, runner: VitestRunner): void;
-declare function startTests(specs: string[] | FileSpec[], runner: VitestRunner): Promise<File[]>;
-declare function publicCollect(specs: string[] | FileSpec[], runner: VitestRunner): Promise<File[]>;
+declare function startTests(specs: string[] | FileSpecification[], runner: VitestRunner): Promise<File[]>;
+declare function publicCollect(specs: string[] | FileSpecification[], runner: VitestRunner): Promise<File[]>;
 
 /**
  * Creates a suite of tests, allowing for grouping and hierarchical organization of tests.
@@ -256,4 +256,4 @@ declare function createTaskCollector(fn: (...args: any[]) => any, context?: Reco
 
 declare function getCurrentTest<T extends Test | undefined>(): T;
 
-export { AfterAllListener, AfterEachListener, BeforeAllListener, BeforeEachListener, Custom, TestAPI as CustomAPI, File, FileSpec, OnTestFailedHandler, OnTestFinishedHandler, Suite, SuiteAPI, SuiteCollector, SuiteHooks, Task, TaskHook, Test, TestAPI, VitestRunner, afterAll, afterEach, beforeAll, beforeEach, publicCollect as collectTests, createTaskCollector, describe, getCurrentSuite, getCurrentTest, getFn, getHooks, it, onTestFailed, onTestFinished, setFn, setHooks, startTests, suite, test, updateTask };
+export { AfterAllListener, AfterEachListener, BeforeAllListener, BeforeEachListener, Custom, TestAPI as CustomAPI, File, FileSpecification, OnTestFailedHandler, OnTestFinishedHandler, Suite, SuiteAPI, SuiteCollector, SuiteHooks, Task, TaskHook, Test, TestAPI, VitestRunner, afterAll, afterEach, beforeAll, beforeEach, publicCollect as collectTests, createTaskCollector, describe, getCurrentSuite, getCurrentTest, getFn, getHooks, it, onTestFailed, onTestFinished, setFn, setHooks, startTests, suite, test, updateTask };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { getSafeTimers, isObject, createDefer, isNegativeNaN, format, objDisplay, objectAttr, toArray, assertTypes, shuffle } from '@vitest/utils';
 import { parseSingleStack } from '@vitest/utils/source-map';
-import { c as createChainable, b as createFileTask, a as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, l as limitConcurrency, p as partitionSuiteChildren, n as hasTests, m as hasFailed } from './chunk-tasks.js';
+import { c as createChainable, b as createFileTask, a as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, l as limitConcurrency, p as partitionSuiteChildren, o as hasTests, n as hasFailed } from './chunk-tasks.js';
 import { processError } from '@vitest/utils/error';
 export { processError } from '@vitest/utils/error';
 import 'pathe';
@@ -37,7 +37,6 @@ function withTimeout(fn, timeout, isHook = false) {
   const { setTimeout, clearTimeout } = getSafeTimers();
   return function runWithTimeout(...args) {
     return Promise.race([
-      fn(...args),
       new Promise((resolve, reject) => {
         var _a;
         const timer = setTimeout(() => {
@@ -45,6 +44,9 @@ function withTimeout(fn, timeout, isHook = false) {
           reject(new Error(makeTimeoutMsg(isHook, timeout)));
         }, timeout);
         (_a = timer.unref) == null ? void 0 : _a.call(timer);
+      }),
+      Promise.resolve(fn(...args)).then((result) => {
+        return new Promise((resolve) => setTimeout(resolve, 0, result));
       })
     ]);
   };

package/dist/{tasks-D_Ah6OyC.d.ts → tasks-DaEhEbK_.d.ts}

@@ -105,14 +105,6 @@ interface TaskPopulated extends TaskBase {
      * Whether the task should succeed if it fails. If the task fails, it will be marked as passed.
      */
     fails?: boolean;
-    /**
-     * Hooks that will run if the task fails. The order depends on the `sequence.hooks` option.
-     */
-    onFailed?: OnTestFailedHandler[];
-    /**
-     * Hooks that will run after the task finishes. The order depends on the `sequence.hooks` option.
-     */
-    onFinished?: OnTestFinishedHandler[];
     /**
      * Store promises (from async expects) to wait for them before finishing the test
      */
@@ -136,7 +128,7 @@ interface TaskResult {
     state: TaskState;
     /**
      * Errors that occurred during the task execution. It is possible to have several errors
-     * if `expect.soft()` failed multiple times.
+     * if `expect.soft()` failed multiple times or `retry` was triggered.
      */
     errors?: ErrorWithDiff[];
     /**
@@ -221,18 +213,13 @@ interface File extends Suite {
      * The time it took to import the setup file.
      */
     setupDuration?: number;
-    /**
-     * Whether the file is initiated without running any tests.
-     * This is done to populate state on the server side by Vitest.
-     */
-    local?: boolean;
 }
 interface Test<ExtraContext = object> extends TaskPopulated {
     type: 'test';
     /**
      * Test context that will be passed to the test function.
      */
-    context: TaskContext<Test> & ExtraContext & TestContext;
+    context: TestContext & ExtraContext;
 }
 /**
  * @deprecated Use `Test` instead. `type: 'custom'` is not used since 2.2
@@ -243,7 +230,7 @@ type Task = Test | Suite | File;
  * @deprecated Vitest doesn't provide `done()` anymore
  */
 type DoneCallback = (error?: any) => void;
-type TestFunction<ExtraContext = object> = (context: ExtendedContext<Test> & ExtraContext) => Awaitable<any> | void;
+type TestFunction<ExtraContext = object> = (context: TestContext & ExtraContext) => Awaitable<any> | void;
 type ExtractEachCallbackArgs<T extends ReadonlyArray<any>> = {
     1: [T[0]];
     2: [T[0], T[1]];
@@ -276,8 +263,8 @@ interface TestForFunctionReturn<Arg, Context> {
     (name: string | Function, options: TestCollectorOptions, fn: (args: Arg, context: Context) => Awaitable<void>): void;
 }
 interface TestForFunction<ExtraContext> {
-    <T>(cases: ReadonlyArray<T>): TestForFunctionReturn<T, ExtendedContext<Test> & ExtraContext>;
-    (strings: TemplateStringsArray, ...values: any[]): TestForFunctionReturn<any, ExtendedContext<Test> & ExtraContext>;
+    <T>(cases: ReadonlyArray<T>): TestForFunctionReturn<T, TestContext & ExtraContext>;
+    (strings: TemplateStringsArray, ...values: any[]): TestForFunctionReturn<any, TestContext & ExtraContext>;
 }
 interface TestCollectorCallable<C = object> {
     /**
@@ -362,7 +349,7 @@ type Use<T> = (value: T) => Promise<void>;
 type FixtureFn<T, K extends keyof T, ExtraContext> = (context: Omit<T, K> & ExtraContext, use: Use<T[K]>) => Promise<void>;
 type Fixture<T, K extends keyof T, ExtraContext = object> = ((...args: any) => any) extends T[K] ? T[K] extends any ? FixtureFn<T, K, Omit<ExtraContext, Exclude<keyof T, K>>> : never : T[K] | (T[K] extends any ? FixtureFn<T, K, Omit<ExtraContext, Exclude<keyof T, K>>> : never);
 type Fixtures<T extends Record<string, any>, ExtraContext = object> = {
-    [K in keyof T]: Fixture<T, K, ExtraContext & ExtendedContext<Test>> | [Fixture<T, K, ExtraContext & ExtendedContext<Test>>, FixtureOptions?];
+    [K in keyof T]: Fixture<T, K, ExtraContext & TestContext> | [Fixture<T, K, ExtraContext & TestContext>, FixtureOptions?];
 };
 type InferFixturesTypes<T> = T extends TestAPI<infer C> ? C : T;
 interface SuiteCollectorCallable<ExtraContext = object> {
@@ -395,10 +382,10 @@ interface AfterAllListener {
     (suite: Readonly<Suite | File>): Awaitable<unknown>;
 }
 interface BeforeEachListener<ExtraContext = object> {
-    (context: ExtendedContext<Test> & ExtraContext, suite: Readonly<Suite>): Awaitable<unknown>;
+    (context: TestContext & ExtraContext, suite: Readonly<Suite>): Awaitable<unknown>;
 }
 interface AfterEachListener<ExtraContext = object> {
-    (context: ExtendedContext<Test> & ExtraContext, suite: Readonly<Suite>): Awaitable<unknown>;
+    (context: TestContext & ExtraContext, suite: Readonly<Suite>): Awaitable<unknown>;
 }
 interface SuiteHooks<ExtraContext = object> {
     beforeAll: BeforeAllListener[];
@@ -424,7 +411,7 @@ interface TaskCustomOptions extends TestOptions {
      * If nothing is provided, the runner will try to get the function using `getFn(task)`.
      * If the runner cannot find the function, the task will be marked as failed.
      */
-    handler?: (context: TaskContext<Test>) => Awaitable<void>;
+    handler?: (context: TestContext) => Awaitable<void>;
 }
 interface SuiteCollector<ExtraContext = object> {
     readonly name: string;
@@ -447,11 +434,6 @@ interface RuntimeContext {
  * User's custom test context.
  */
 interface TestContext {
-}
-/**
- * Context that's always available in the test function.
- */
-interface TaskContext<Task extends Test = Test> {
     /**
      * Metadata of the current test
      */
@@ -470,9 +452,16 @@ interface TaskContext<Task extends Test = Test> {
      */
     skip: (note?: string) => void;
 }
-type ExtendedContext<T extends Test> = TaskContext<T> & TestContext;
-type OnTestFailedHandler = (context: ExtendedContext<Test>) => Awaitable<void>;
-type OnTestFinishedHandler = (context: ExtendedContext<Test>) => Awaitable<void>;
+/**
+ * Context that's always available in the test function.
+ * @deprecated use `TestContext` instead
+ */
+interface TaskContext extends TestContext {
+}
+/** @deprecated use `TestContext` instead */
+type ExtendedContext = TaskContext & TestContext;
+type OnTestFailedHandler = (context: TestContext) => Awaitable<void>;
+type OnTestFinishedHandler = (context: TestContext) => Awaitable<void>;
 interface TaskHook<HookListener> {
     (fn: HookListener, timeout?: number): void;
 }

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { DiffOptions } from '@vitest/utils/diff';
-import { r as SequenceHooks, s as SequenceSetupFiles, F as File, T as Task, a as Test, S as Suite, G as TaskResultPack, v as TaskContext, E as ExtendedContext } from './tasks-D_Ah6OyC.js';
-export { A as AfterAllListener, d as AfterEachListener, B as BeforeAllListener, b as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, q as RuntimeContext, i as SuiteAPI, k as SuiteCollector, t as SuiteFactory, h as SuiteHooks, u as TaskBase, w as TaskCustomOptions, e as TaskHook, x as TaskMeta, y as TaskPopulated, z as TaskResult, J as TaskState, j as TestAPI, K as TestContext, L as TestFunction, M as TestOptions, U as Use } from './tasks-D_Ah6OyC.js';
+import { r as SequenceHooks, s as SequenceSetupFiles, F as File, T as Task, a as Test, S as Suite, G as TaskResultPack, K as TestContext } from './tasks-DaEhEbK_.js';
+export { A as AfterAllListener, d as AfterEachListener, B as BeforeAllListener, b as BeforeEachListener, g as Custom, j as CustomAPI, D as DoneCallback, E as ExtendedContext, l as Fixture, m as FixtureFn, n as FixtureOptions, o as Fixtures, H as HookCleanupCallback, p as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, f as OnTestFinishedHandler, R as RunMode, q as RuntimeContext, i as SuiteAPI, k as SuiteCollector, t as SuiteFactory, h as SuiteHooks, u as TaskBase, v as TaskContext, w as TaskCustomOptions, e as TaskHook, x as TaskMeta, y as TaskPopulated, z as TaskResult, J as TaskState, j as TestAPI, L as TestFunction, M as TestOptions, U as Use } from './tasks-DaEhEbK_.js';
 import '@vitest/utils';
 
 /**
@@ -30,7 +30,10 @@ interface VitestRunnerConfig {
     includeTaskLocation?: boolean;
     diffOptions?: DiffOptions;
 }
-interface FileSpec {
+/**
+ * Possible options to run a single file in a test.
+ */
+interface FileSpecification {
     filepath: string;
     testLocations: number[] | undefined;
 }
@@ -118,11 +121,9 @@ interface VitestRunner {
      * Called when new context for a test is defined. Useful if you want to add custom properties to the context.
      * If you only want to define custom context, consider using "beforeAll" in "setupFiles" instead.
      *
-     * This method is called for both "test" and "custom" handlers.
-     *
-     * @see https://vitest.dev/advanced/runner.html#your-task-function
+     * @see https://vitest.dev/advanced/runner#your-task-function
      */
-    extendTaskContext?: <T extends Test>(context: TaskContext<T>) => ExtendedContext<T>;
+    extendTaskContext?: (context: TestContext) => TestContext;
     /**
      * Called when test and setup files are imported. Can be called in two situations: when collecting tests and when importing setup files.
      */
@@ -141,4 +142,4 @@ interface VitestRunner {
     pool?: string;
 }
 
-export { type CancelReason, ExtendedContext, File, type FileSpec, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskContext, TaskResultPack, Test, type VitestRunner, type VitestRunnerConfig, type VitestRunnerConstructor, type VitestRunnerImportSource };
+export { type CancelReason, File, type FileSpecification, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskResultPack, Test, TestContext, type VitestRunner, type VitestRunnerConfig, type VitestRunnerConstructor, type VitestRunnerImportSource };

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_Ah6OyC.js';
-export { C as ChainableFunction, c as createChainable } from './tasks-D_Ah6OyC.js';
+import { S as Suite, F as File, T as Task, a as Test } from './tasks-DaEhEbK_.js';
+export { C as ChainableFunction, c as createChainable } from './tasks-DaEhEbK_.js';
 import { Arrayable } from '@vitest/utils';
 
 /**
@@ -10,6 +10,12 @@ 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;
+/**
+ * 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
+ * @param projectName The name of the test project
+ */
+declare function generateFileHash(file: string, projectName: string | undefined): string;
 
 /**
  * Return a function for running multiple async operations with limited concurrency.
@@ -35,4 +41,4 @@ declare function getNames(task: Task): string[];
 declare function getFullName(task: Task, separator?: string): string;
 declare function getTestName(task: Task, separator?: string): string;
 
-export { calculateSuiteHash, createFileTask, generateHash, getFullName, getNames, getSuites, getTasks, getTestName, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, isTestCase, limitConcurrency, partitionSuiteChildren, someTasksAreOnly };
+export { calculateSuiteHash, createFileTask, generateFileHash, generateHash, getFullName, getNames, getSuites, getTasks, getTestName, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, isTestCase, limitConcurrency, partitionSuiteChildren, someTasksAreOnly };

package/dist/utils.js

@@ -1,4 +1,4 @@
-export { a as calculateSuiteHash, c as createChainable, b as createFileTask, g as generateHash, d as getFullName, e as getNames, f as getSuites, h as getTasks, j as getTestName, k as getTests, m as hasFailed, n as hasTests, i as interpretTaskModes, o as isAtomTest, q as isTestCase, l as limitConcurrency, p as partitionSuiteChildren, s as someTasksAreOnly } from './chunk-tasks.js';
+export { a as calculateSuiteHash, c as createChainable, b as createFileTask, g as generateFileHash, d as generateHash, e as getFullName, f as getNames, h as getSuites, j as getTasks, k as getTestName, m as getTests, n as hasFailed, o as hasTests, i as interpretTaskModes, q as isAtomTest, r as isTestCase, l as limitConcurrency, p as partitionSuiteChildren, s as someTasksAreOnly } from './chunk-tasks.js';
 import '@vitest/utils/error';
 import 'pathe';
 import '@vitest/utils';

package/package.json

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