@vitest/runner 2.0.0-beta.1 → 2.0.0-beta.10

package/dist/chunk-tasks.js

@@ -1,4 +1,5 @@
 import { processError } from '@vitest/utils/error';
+import { relative } from 'pathe';
 import { toArray } from '@vitest/utils';
 
 function partitionSuiteChildren(suite) {
@@ -91,6 +92,22 @@ function calculateSuiteHash(parent) {
       calculateSuiteHash(t);
   });
 }
+function createFileTask(filepath, root, projectName) {
+  const path = relative(root, filepath);
+  const file = {
+    id: generateHash(`${path}${projectName || ""}`),
+    name: path,
+    type: "suite",
+    mode: "run",
+    filepath,
+    tasks: [],
+    meta: /* @__PURE__ */ Object.create(null),
+    projectName,
+    file: void 0
+  };
+  file.file = file;
+  return file;
+}
 
 function createChainable(keys, fn) {
   function create(context) {
@@ -170,4 +187,4 @@ function getNames(task) {
   return names;
 }
 
-export { getTests as a, getTasks as b, calculateSuiteHash as c, getSuites as d, hasFailed as e, getNames as f, generateHash as g, hasTests as h, interpretTaskModes as i, createChainable as j, partitionSuiteChildren as p, someTasksAreOnly as s };
+export { createFileTask as a, getTests as b, calculateSuiteHash as c, getTasks as d, getSuites as e, hasFailed as f, generateHash as g, hasTests as h, interpretTaskModes as i, getNames as j, createChainable as k, partitionSuiteChildren as p, someTasksAreOnly as s };

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

package/dist/index.js

@@ -1,10 +1,10 @@
 import limit from 'p-limit';
-import { getSafeTimers, isObject, createDefer, format, objDisplay, objectAttr, toArray, shuffle } from '@vitest/utils';
+import { getSafeTimers, isObject, createDefer, isNegativeNaN, format, objDisplay, objectAttr, toArray, shuffle } from '@vitest/utils';
 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 { k as createChainable, a as createFileTask, c as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, p as partitionSuiteChildren, h as hasTests, f as hasFailed } from './chunk-tasks.js';
 import { parseSingleStack } from '@vitest/utils/source-map';
+import 'pathe';
 
 const fnMap = /* @__PURE__ */ new WeakMap();
 const fixtureMap = /* @__PURE__ */ new WeakMap();
@@ -207,12 +207,17 @@ function getUsedProps(fn) {
   const args = splitByComma(match[1]);
   if (!args.length)
     return [];
-  const first = args[0];
+  let first = args[0];
+  if ("__VITEST_FIXTURE_INDEX__" in fn) {
+    first = args[fn.__VITEST_FIXTURE_INDEX__];
+    if (!first)
+      return [];
+  }
   if (!(first.startsWith("{") && first.endsWith("}")))
     throw new Error(`The first argument inside a fixture must use object destructuring pattern, e.g. ({ test } => {}). Instead, received "${first}".`);
   const _first = first.slice(1, -1).replace(/\s/g, "");
   const props = splitByComma(_first).map((prop) => {
-    return prop.replace(/\:.*|\=.*/g, "");
+    return prop.replace(/:.*|=.*/g, "");
   });
   const last = props.at(-1);
   if (last && last.startsWith("..."))
@@ -414,7 +419,8 @@ function createSuiteCollector(name, factory = () => {
       file: void 0,
       shuffle,
       tasks: [],
-      meta: /* @__PURE__ */ Object.create(null)
+      meta: /* @__PURE__ */ Object.create(null),
+      concurrent: suiteOptions == null ? void 0 : suiteOptions.concurrent
     };
     if (runner && includeLocation && runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
@@ -462,8 +468,10 @@ function createSuite() {
     );
     if (currentSuite == null ? void 0 : currentSuite.options)
       options = { ...currentSuite.options, ...options };
-    options.concurrent = this.concurrent || !this.sequential && (options == null ? void 0 : options.concurrent);
-    options.sequential = this.sequential || !this.concurrent && (options == null ? void 0 : options.sequential);
+    const isConcurrent = options.concurrent || this.concurrent && !this.sequential;
+    const isSequential = options.sequential || this.sequential && !this.concurrent;
+    options.concurrent = isConcurrent && !isSequential;
+    options.sequential = isSequential && !isConcurrent;
     return createSuiteCollector(formatName(name), factory, mode, this.shuffle, this.each, options);
   }
   suiteFn.each = function(cases, ...args) {
@@ -523,6 +531,21 @@ function createTaskCollector(fn, context) {
       this.setContext("each", void 0);
     };
   };
+  taskFn.for = function(cases, ...args) {
+    const test2 = this.withContext();
+    if (Array.isArray(cases) && args.length)
+      cases = formatTemplateString(cases, args);
+    return (name, optionsOrFn, fnOrOptions) => {
+      const _name = formatName(name);
+      const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
+      cases.forEach((item, idx) => {
+        const handlerWrapper = (ctx) => handler(item, ctx);
+        handlerWrapper.__VITEST_FIXTURE_INDEX__ = 1;
+        handlerWrapper.toString = () => handler.toString();
+        test2(formatTitle(_name, toArray(item), idx), options, handlerWrapper);
+      });
+    };
+  };
   taskFn.skipIf = function(condition) {
     return condition ? this.skip : this;
   };
@@ -554,10 +577,22 @@ function formatTitle(template, items, idx) {
     template = template.replace(/%%/g, "__vitest_escaped_%__").replace(/%#/g, `${idx}`).replace(/__vitest_escaped_%__/g, "%%");
   }
   const count = template.split("%").length - 1;
+  if (template.includes("%f")) {
+    const placeholders = template.match(/%f/g) || [];
+    placeholders.forEach((_, i) => {
+      if (isNegativeNaN(items[i]) || Object.is(items[i], -0)) {
+        let occurrence = 0;
+        template = template.replace(/%f/g, (match) => {
+          occurrence++;
+          return occurrence === i + 1 ? "-%f" : match;
+        });
+      }
+    });
+  }
   let formatted = format(template, ...items.slice(0, count));
   if (isObject(items[0])) {
     formatted = formatted.replace(
-      /\$([$\w_.]+)/g,
+      /\$([$\w.]+)/g,
       // https://github.com/chaijs/chai/pull/1490
       (_, key) => {
         var _a, _b;
@@ -613,22 +648,12 @@ async function runSetupFiles(config, runner) {
 
 const now$1 = Date.now;
 async function collectTests(paths, runner) {
+  var _a;
   const files = [];
   const config = runner.config;
   for (const filepath of paths) {
-    const path = relative(config.root, filepath);
-    const file = {
-      id: generateHash(`${path}${config.name || ""}`),
-      name: path,
-      type: "suite",
-      mode: "run",
-      filepath,
-      tasks: [],
-      meta: /* @__PURE__ */ Object.create(null),
-      projectName: config.name,
-      file: void 0
-    };
-    file.file = file;
+    const file = createFileTask(filepath, config.root, config.name);
+    (_a = runner.onCollectStart) == null ? void 0 : _a.call(runner, file);
     clearCollectorContext(filepath, runner);
     try {
       const setupStart = now$1();
@@ -665,8 +690,8 @@ async function collectTests(paths, runner) {
     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) === "")
+      var _a2;
+      if (((_a2 = task.suite) == null ? void 0 : _a2.id) === "")
         delete task.suite;
     });
     files.push(file);
@@ -921,8 +946,7 @@ async function runSuite(suite, runner) {
       } else {
         for (let tasksGroup of partitionSuiteChildren(suite)) {
           if (tasksGroup[0].concurrent === true) {
-            const mutex = limit(runner.config.maxConcurrency);
-            await Promise.all(tasksGroup.map((c) => mutex(() => runSuiteChild(c, runner))));
+            await Promise.all(tasksGroup.map((c) => runSuiteChild(c, runner)));
           } else {
             const { sequence } = runner.config;
             if (sequence.shuffle || suite.shuffle) {
@@ -963,14 +987,16 @@ async function runSuite(suite, runner) {
     await ((_d = runner.onAfterRunSuite) == null ? void 0 : _d.call(runner, suite));
   }
 }
+let limitMaxConcurrency;
 async function runSuiteChild(c, runner) {
   if (c.type === "test" || c.type === "custom")
-    return runTest(c, runner);
+    return limitMaxConcurrency(() => runTest(c, runner));
   else if (c.type === "suite")
     return runSuite(c, runner);
 }
 async function runFiles(files, runner) {
   var _a, _b;
+  limitMaxConcurrency ?? (limitMaxConcurrency = limit(runner.config.maxConcurrency));
   for (const file of files) {
     if (!file.tasks.length && !runner.config.passWithNoTests) {
       if (!((_b = (_a = file.result) == null ? void 0 : _a.errors) == null ? void 0 : _b.length)) {

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

@@ -72,7 +72,7 @@ interface Suite extends TaskBase {
 }
 interface File extends Suite {
     filepath: string;
-    projectName: string;
+    projectName: string | undefined;
     collectDuration?: number;
     setupDuration?: number;
 }
@@ -114,6 +114,14 @@ interface TestEachFunction {
     <T>(cases: ReadonlyArray<T>): EachFunctionReturn<T[]>;
     (...args: [TemplateStringsArray, ...any]): EachFunctionReturn<any[]>;
 }
+interface TestForFunctionReturn<Arg, Context> {
+    (name: string | Function, fn: (arg: Arg, context: Context) => Awaitable<void>): void;
+    (name: string | Function, options: TestOptions, 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>;
+}
 interface TestCollectorCallable<C = {}> {
     /**
      * @deprecated Use options as the second argument instead
@@ -124,6 +132,7 @@ interface TestCollectorCallable<C = {}> {
 }
 type ChainableTestAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'sequential' | 'only' | 'skip' | 'todo' | 'fails', TestCollectorCallable<ExtraContext>, {
     each: TestEachFunction;
+    for: TestForFunction<ExtraContext>;
 }>;
 interface TestOptions {
     /**
@@ -145,7 +154,7 @@ interface TestOptions {
      */
     repeats?: number;
     /**
-     * Whether tests run concurrently.
+     * Whether suites and tests run concurrently.
      * Tests inherit `concurrent` from `describe()` and nested `describe()` will inherit from parent's `concurrent`.
      */
     concurrent?: boolean;

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-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 { 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-CcHkacEF.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-CcHkacEF.js';
 import { DiffOptions } from '@vitest/utils/diff';
 import '@vitest/utils';
 
@@ -37,6 +37,10 @@ interface VitestRunner {
      * First thing that's getting called before actually collecting and running tests.
      */
     onBeforeCollect?: (paths: string[]) => unknown;
+    /**
+     * Called after the file task was created but not collected yet.
+     */
+    onCollectStart?: (file: File) => unknown;
     /**
      * Called after collecting tests and before "onBeforeRun".
      */

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-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 { S as Suite, F as File, T as Task, a as Test, C as Custom } from './tasks-CcHkacEF.js';
+export { b as ChainableFunction, c as createChainable } from './tasks-CcHkacEF.js';
 import { Arrayable } from '@vitest/utils';
 
 /**
@@ -9,6 +9,7 @@ declare function interpretTaskModes(suite: Suite, namePattern?: string | RegExp,
 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): File;
 
 /**
  * Partition in tasks groups by consecutive concurrent
@@ -22,4 +23,4 @@ declare function hasTests(suite: Arrayable<Suite>): boolean;
 declare function hasFailed(suite: Arrayable<Task>): boolean;
 declare function getNames(task: Task): string[];
 
-export { calculateSuiteHash, generateHash, getNames, getSuites, getTasks, getTests, hasFailed, hasTests, interpretTaskModes, partitionSuiteChildren, someTasksAreOnly };
+export { calculateSuiteHash, createFileTask, generateHash, getNames, getSuites, getTasks, getTests, hasFailed, hasTests, interpretTaskModes, partitionSuiteChildren, someTasksAreOnly };

package/dist/utils.js

@@ -1,3 +1,4 @@
-export { c as calculateSuiteHash, j as createChainable, g as generateHash, f as getNames, d as getSuites, b as getTasks, a as getTests, e as hasFailed, h as hasTests, i as interpretTaskModes, p as partitionSuiteChildren, s as someTasksAreOnly } from './chunk-tasks.js';
+export { c as calculateSuiteHash, k as createChainable, a as createFileTask, g as generateHash, j as getNames, e as getSuites, d as getTasks, b as getTests, f as hasFailed, h as hasTests, i as interpretTaskModes, 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": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
   "dependencies": {
     "p-limit": "^5.0.0",
     "pathe": "^1.1.2",
-    "@vitest/utils": "2.0.0-beta.1"
+    "@vitest/utils": "2.0.0-beta.10"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",