@vitest/runner 1.5.3 → 2.0.0-beta.1

package/dist/chunk-tasks.js

@@ -160,11 +160,13 @@ function hasFailed(suite) {
 function getNames(task) {
   const names = [task.name];
   let current = task;
-  while ((current == null ? void 0 : current.suite) || (current == null ? void 0 : current.file)) {
-    current = current.suite || current.file;
+  while (current == null ? void 0 : current.suite) {
+    current = current.suite;
     if (current == null ? void 0 : current.name)
       names.unshift(current.name);
   }
+  if (current !== task.file)
+    names.unshift(task.file.name);
   return names;
 }
 

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-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 { 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-Ck0GpLiZ.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-Ck0GpLiZ.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils/diff';

package/dist/index.js

@@ -271,9 +271,15 @@ function getTestFilepath() {
 function getRunner() {
   return runner;
 }
+function createDefaultSuite(runner2) {
+  const config = runner2.config.sequence;
+  const api = config.shuffle ? suite.shuffle : suite;
+  return api("", { concurrent: config.concurrent }, () => {
+  });
+}
 function clearCollectorContext(filepath, currentRunner) {
   if (!defaultSuite)
-    defaultSuite = currentRunner.config.sequence.shuffle ? suite.shuffle("") : currentRunner.config.sequence.concurrent ? suite.concurrent("") : suite("");
+    defaultSuite = createDefaultSuite(currentRunner);
   runner = currentRunner;
   currentTestFilepath = filepath;
   collectorContext.tasks.length = 0;
@@ -331,6 +337,7 @@ function createSuiteCollector(name, factory = () => {
       fails: options.fails,
       context: void 0,
       type: "custom",
+      file: void 0,
       retry: options.retry ?? runner.config.retry,
       repeats: options.repeats,
       mode: options.only ? "only" : options.skip ? "skip" : options.todo ? "todo" : "run",
@@ -404,10 +411,10 @@ function createSuiteCollector(name, factory = () => {
       name,
       mode,
       each,
+      file: void 0,
       shuffle,
       tasks: [],
-      meta: /* @__PURE__ */ Object.create(null),
-      projectName: ""
+      meta: /* @__PURE__ */ Object.create(null)
     };
     if (runner && includeLocation && runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
@@ -426,6 +433,8 @@ function createSuiteCollector(name, factory = () => {
     initSuite(false);
   }
   async function collect(file) {
+    if (!file)
+      throw new TypeError("File is required to collect tasks.");
     factoryQueue.length = 0;
     if (factory)
       await runWithSuite(collector, () => factory(test2));
@@ -436,8 +445,7 @@ function createSuiteCollector(name, factory = () => {
     suite2.tasks = allChildren;
     allChildren.forEach((task2) => {
       task2.suite = suite2;
-      if (file)
-        task2.file = file;
+      task2.file = file;
     });
     return suite2;
   }
@@ -470,9 +478,14 @@ function createSuite() {
         optionsOrFn,
         fnOrOptions
       );
+      const fnFirst = typeof optionsOrFn === "function";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
-        arrayOnlyCases ? suite2(formatTitle(_name, items, idx), options, () => handler(...items)) : suite2(formatTitle(_name, items, idx), options, () => handler(i));
+        if (fnFirst) {
+          arrayOnlyCases ? suite2(formatTitle(_name, items, idx), () => handler(...items), options) : suite2(formatTitle(_name, items, idx), () => handler(i), options);
+        } else {
+          arrayOnlyCases ? suite2(formatTitle(_name, items, idx), options, () => handler(...items)) : suite2(formatTitle(_name, items, idx), options, () => handler(i));
+        }
       });
       this.setContext("each", void 0);
     };
@@ -498,9 +511,14 @@ function createTaskCollector(fn, context) {
         optionsOrFn,
         fnOrOptions
       );
+      const fnFirst = typeof optionsOrFn === "function";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
-        arrayOnlyCases ? test2(formatTitle(_name, items, idx), options, () => handler(...items)) : test2(formatTitle(_name, items, idx), options, () => handler(i));
+        if (fnFirst) {
+          arrayOnlyCases ? test2(formatTitle(_name, items, idx), () => handler(...items), options) : test2(formatTitle(_name, items, idx), () => handler(i), options);
+        } else {
+          arrayOnlyCases ? test2(formatTitle(_name, items, idx), options, () => handler(...items)) : test2(formatTitle(_name, items, idx), options, () => handler(i));
+        }
       });
       this.setContext("each", void 0);
     };
@@ -607,8 +625,10 @@ async function collectTests(paths, runner) {
       filepath,
       tasks: [],
       meta: /* @__PURE__ */ Object.create(null),
-      projectName: config.name
+      projectName: config.name,
+      file: void 0
     };
+    file.file = file;
     clearCollectorContext(filepath, runner);
     try {
       const setupStart = now$1();
@@ -617,20 +637,22 @@ async function collectTests(paths, runner) {
       file.setupDuration = collectStart - setupStart;
       await runner.importFile(filepath, "collect");
       const defaultTasks = await getDefaultSuite().collect(file);
-      setHooks(file, getHooks(defaultTasks));
+      const fileHooks = createSuiteHooks();
+      mergeHooks(fileHooks, getHooks(defaultTasks));
       for (const c of [...defaultTasks.tasks, ...collectorContext.tasks]) {
-        if (c.type === "test") {
-          file.tasks.push(c);
-        } else if (c.type === "custom") {
-          file.tasks.push(c);
-        } else if (c.type === "suite") {
+        if (c.type === "test" || c.type === "custom" || c.type === "suite") {
           file.tasks.push(c);
         } else if (c.type === "collector") {
           const suite = await c.collect(file);
-          if (suite.name || suite.tasks.length)
+          if (suite.name || suite.tasks.length) {
+            mergeHooks(fileHooks, getHooks(suite));
             file.tasks.push(suite);
+          }
+        } else {
+          c;
         }
       }
+      setHooks(file, fileHooks);
       file.collectDuration = now$1() - collectStart;
     } catch (e) {
       const error = processError(e);
@@ -642,10 +664,22 @@ async function collectTests(paths, runner) {
     calculateSuiteHash(file);
     const hasOnlyTasks = someTasksAreOnly(file);
     interpretTaskModes(file, config.testNamePattern, hasOnlyTasks, false, config.allowOnly);
+    file.tasks.forEach((task) => {
+      var _a;
+      if (((_a = task.suite) == null ? void 0 : _a.id) === "")
+        delete task.suite;
+    });
     files.push(file);
   }
   return files;
 }
+function mergeHooks(baseHooks, hooks) {
+  for (const _key in hooks) {
+    const key = _key;
+    baseHooks[key].push(...hooks[key]);
+  }
+  return baseHooks;
+}
 
 const now = Date.now;
 function updateSuiteHookState(suite, name, state, runner) {
@@ -679,9 +713,10 @@ async function callTaskHooks(task, hooks, sequence) {
 async function callSuiteHook(suite, currentTask, name, runner, args) {
   const sequence = runner.config.sequence.hooks;
   const callbacks = [];
-  if (name === "beforeEach" && suite.suite) {
+  const parentSuite = "filepath" in suite ? null : suite.suite || suite.file;
+  if (name === "beforeEach" && parentSuite) {
     callbacks.push(
-      ...await callSuiteHook(suite.suite, currentTask, name, runner, args)
+      ...await callSuiteHook(parentSuite, currentTask, name, runner, args)
     );
   }
   updateSuiteHookState(currentTask, name, "run", runner);
@@ -693,9 +728,9 @@ async function callSuiteHook(suite, currentTask, name, runner, args) {
       callbacks.push(await hook(...args));
   }
   updateSuiteHookState(currentTask, name, "pass", runner);
-  if (name === "afterEach" && suite.suite) {
+  if (name === "afterEach" && parentSuite) {
     callbacks.push(
-      ...await callSuiteHook(suite.suite, currentTask, name, runner, args)
+      ...await callSuiteHook(parentSuite, currentTask, name, runner, args)
     );
   }
   return callbacks;
@@ -753,6 +788,7 @@ async function runTest(test, runner) {
   };
   updateTask(test, runner);
   setCurrentTest(test);
+  const suite = test.suite || test.file;
   const repeats = test.repeats ?? 0;
   for (let repeatCount = 0; repeatCount <= repeats; repeatCount++) {
     const retry = test.retry ?? 0;
@@ -761,7 +797,7 @@ async function runTest(test, runner) {
       try {
         await ((_c = runner.onBeforeTryTask) == null ? void 0 : _c.call(runner, test, { retry: retryCount, repeats: repeatCount }));
         test.result.repeatCount = repeatCount;
-        beforeEachCleanups = await callSuiteHook(test.suite, test, "beforeEach", runner, [test.context, test.suite]);
+        beforeEachCleanups = await callSuiteHook(suite, test, "beforeEach", runner, [test.context, suite]);
         if (runner.runTask) {
           await runner.runTask(test);
         } else {
@@ -794,7 +830,7 @@ async function runTest(test, runner) {
         return;
       }
       try {
-        await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
+        await callSuiteHook(suite, test, "afterEach", runner, [test.context, suite]);
         await callCleanupHooks(beforeEachCleanups);
         await callFixtureCleanup(test.context);
       } catch (e) {

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

@@ -31,7 +31,6 @@ interface TaskBase {
     concurrent?: boolean;
     shuffle?: boolean;
     suite?: Suite;
-    file?: File;
     result?: TaskResult;
     retry?: number;
     repeats?: number;
@@ -41,7 +40,7 @@ interface TaskBase {
     };
 }
 interface TaskPopulated extends TaskBase {
-    suite: Suite;
+    file: File;
     pending?: boolean;
     result?: TaskResult;
     fails?: boolean;
@@ -67,13 +66,13 @@ interface TaskResult {
 }
 type TaskResultPack = [id: string, result: TaskResult | undefined, meta: TaskMeta];
 interface Suite extends TaskBase {
+    file: File;
     type: 'suite';
     tasks: Task[];
-    filepath?: string;
-    projectName: string;
 }
 interface File extends Suite {
     filepath: string;
+    projectName: string;
     collectDuration?: number;
     setupDuration?: number;
 }
@@ -242,7 +241,7 @@ interface SuiteCollector<ExtraContext = {}> {
     test: TestAPI<ExtraContext>;
     tasks: (Suite | Custom<ExtraContext> | Test<ExtraContext> | SuiteCollector<ExtraContext>)[];
     task: (name: string, options?: TaskCustomOptions) => Custom<ExtraContext>;
-    collect: (file?: File) => Promise<Suite>;
+    collect: (file: File) => Promise<Suite>;
     clear: () => void;
     on: <T extends keyof SuiteHooks<ExtraContext>>(name: T, ...fn: SuiteHooks<ExtraContext>[T]) => void;
 }

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-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 { 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-Ck0GpLiZ.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-Ck0GpLiZ.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-K5XERDtv.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-K5XERDtv.js';
+import { S as Suite, T as Task, a as Test, C as Custom } from './tasks-Ck0GpLiZ.js';
+export { b as ChainableFunction, c as createChainable } from './tasks-Ck0GpLiZ.js';
 import { Arrayable } from '@vitest/utils';
 
 /**

package/package.json

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