@vitest/runner 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/chunk-tasks.js

@@ -19,6 +19,33 @@ function partitionSuiteChildren(suite) {
   return tasksGroups;
 }
 
+function limitConcurrency(concurrency = Infinity) {
+  let count = 0;
+  let head;
+  let tail;
+  const finish = () => {
+    count--;
+    if (head) {
+      head[0]();
+      head = head[1];
+      tail = head && tail;
+    }
+  };
+  return (func, ...args) => {
+    return new Promise((resolve) => {
+      if (count++ < concurrency) {
+        resolve();
+      } else if (tail) {
+        tail = tail[1] = [resolve];
+      } else {
+        head = tail = [resolve];
+      }
+    }).then(() => {
+      return func(...args);
+    }).finally(finish);
+  };
+}
+
 function interpretTaskModes(suite, namePattern, onlyMode, parentIsOnly, allowOnly) {
   const suiteIsOnly = parentIsOnly || suite.mode === "only";
   suite.tasks.forEach((t) => {
@@ -106,7 +133,7 @@ function calculateSuiteHash(parent) {
     }
   });
 }
-function createFileTask(filepath, root, projectName) {
+function createFileTask(filepath, root, projectName, pool) {
   const path = relative(root, filepath);
   const file = {
     id: generateHash(`${path}${projectName || ""}`),
@@ -117,7 +144,8 @@ function createFileTask(filepath, root, projectName) {
     tasks: [],
     meta: /* @__PURE__ */ Object.create(null),
     projectName,
-    file: void 0
+    file: void 0,
+    pool
   };
   file.file = file;
   return file;
@@ -212,4 +240,4 @@ function getNames(task) {
   return names;
 }
 
-export { createFileTask as a, isAtomTest as b, calculateSuiteHash as c, getTests as d, getTasks as e, getSuites as f, generateHash as g, hasTests as h, interpretTaskModes as i, hasFailed as j, getNames as k, createChainable as l, partitionSuiteChildren as p, someTasksAreOnly as s };
+export { createFileTask as a, isAtomTest as b, calculateSuiteHash as c, getTests as d, getTasks as e, getSuites as f, generateHash as g, hasTests as h, interpretTaskModes as i, hasFailed as j, getNames as k, createChainable as l, limitConcurrency as m, partitionSuiteChildren as p, someTasksAreOnly as s };

package/dist/index.d.ts

@@ -1,13 +1,14 @@
 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-BP89OzIP.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-BP89OzIP.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-UPEJyRVL.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-UPEJyRVL.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils/diff';
 
 declare function updateTask(task: Task, runner: VitestRunner): void;
 declare function startTests(paths: string[], runner: VitestRunner): Promise<File[]>;
+declare function publicCollect(paths: string[], runner: VitestRunner): Promise<File[]>;
 
 declare const suite: SuiteAPI;
 declare const test: TestAPI;
@@ -30,4 +31,4 @@ declare function getHooks(key: Suite): SuiteHooks;
 
 declare function getCurrentTest<T extends Test | Custom | undefined>(): T;
 
-export { Custom, CustomAPI, File, OnTestFailedHandler, OnTestFinishedHandler, Suite, SuiteAPI, SuiteCollector, SuiteHooks, Task, Test, TestAPI, VitestRunner, afterAll, afterEach, beforeAll, beforeEach, createTaskCollector, describe, getCurrentSuite, getCurrentTest, getFn, getHooks, it, onTestFailed, onTestFinished, setFn, setHooks, startTests, suite, test, updateTask };
+export { Custom, CustomAPI, File, OnTestFailedHandler, OnTestFinishedHandler, Suite, SuiteAPI, SuiteCollector, SuiteHooks, Task, 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,8 +1,7 @@
-import limit from 'p-limit';
 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 { l as createChainable, a as createFileTask, c as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, p as partitionSuiteChildren, h as hasTests, j as hasFailed } from './chunk-tasks.js';
+import { l as createChainable, a as createFileTask, c as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, m as limitConcurrency, p as partitionSuiteChildren, h as hasTests, j as hasFailed } from './chunk-tasks.js';
 import { parseSingleStack } from '@vitest/utils/source-map';
 import 'pathe';
 
@@ -733,7 +732,7 @@ async function collectTests(paths, runner) {
   const files = [];
   const config = runner.config;
   for (const filepath of paths) {
-    const file = createFileTask(filepath, config.root, config.name);
+    const file = createFileTask(filepath, config.root, config.name, runner.pool);
     (_a = runner.onCollectStart) == null ? void 0 : _a.call(runner, file);
     clearCollectorContext(filepath, runner);
     try {
@@ -892,7 +891,7 @@ async function callCleanupHooks(cleanups) {
   );
 }
 async function runTest(test, runner) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   await ((_a = runner.onBeforeRunTask) == null ? void 0 : _a.call(runner, test));
   if (test.mode !== "run") {
     return;
@@ -967,6 +966,11 @@ async function runTest(test, runner) {
         setCurrentTest(void 0);
         return;
       }
+      try {
+        await ((_f = runner.onTaskFinished) == null ? void 0 : _f.call(runner, test));
+      } catch (e) {
+        failTask(test.result, e, runner.config.diffOptions);
+      }
       try {
         await callSuiteHook(suite, test, "afterEach", runner, [
           test.context,
@@ -1015,7 +1019,7 @@ async function runTest(test, runner) {
   }
   setCurrentTest(void 0);
   test.result.duration = now() - start;
-  await ((_f = runner.onAfterRunTask) == null ? void 0 : _f.call(runner, test));
+  await ((_g = runner.onAfterRunTask) == null ? void 0 : _g.call(runner, test));
   updateTask(test, runner);
 }
 function failTask(result, err, diffOptions) {
@@ -1132,7 +1136,7 @@ async function runSuiteChild(c, runner) {
 }
 async function runFiles(files, runner) {
   var _a, _b;
-  limitMaxConcurrency ?? (limitMaxConcurrency = limit(runner.config.maxConcurrency));
+  limitMaxConcurrency ?? (limitMaxConcurrency = limitConcurrency(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)) {
@@ -1159,6 +1163,13 @@ async function startTests(paths, runner) {
   await sendTasksUpdate(runner);
   return files;
 }
+async function publicCollect(paths, runner) {
+  var _a, _b;
+  await ((_a = runner.onBeforeCollect) == null ? void 0 : _a.call(runner, paths));
+  const files = await collectTests(paths, runner);
+  await ((_b = runner.onCollected) == null ? void 0 : _b.call(runner, files));
+  return files;
+}
 
 function getDefaultHookTimeout() {
   return getRunner().config.hookTimeout;
@@ -1211,4 +1222,4 @@ function createTestHook(name, handler) {
   };
 }
 
-export { afterAll, afterEach, beforeAll, beforeEach, createTaskCollector, describe, getCurrentSuite, getCurrentTest, getFn, getHooks, it, onTestFailed, onTestFinished, setFn, setHooks, startTests, suite, test, updateTask };
+export { afterAll, afterEach, beforeAll, beforeEach, publicCollect as collectTests, createTaskCollector, describe, getCurrentSuite, getCurrentTest, getFn, getHooks, it, onTestFailed, onTestFinished, setFn, setHooks, startTests, suite, test, updateTask };

package/dist/{tasks-BP89OzIP.d.ts → tasks-UPEJyRVL.d.ts}

@@ -75,6 +75,7 @@ interface Suite extends TaskBase {
     tasks: Task[];
 }
 interface File extends Suite {
+    pool?: string;
     filepath: string;
     projectName: string | undefined;
     collectDuration?: number;

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-BP89OzIP.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-BP89OzIP.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-UPEJyRVL.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-UPEJyRVL.js';
 import { DiffOptions } from '@vitest/utils/diff';
 import '@vitest/utils';
 
@@ -62,6 +62,10 @@ interface VitestRunner {
         retry: number;
         repeats: number;
     }) => unknown;
+    /**
+     * When the task has finished running, but before cleanup hooks are called
+     */
+    onTaskFinished?: (test: Task) => unknown;
     /**
      * Called after result and state are set.
      */
@@ -120,6 +124,10 @@ interface VitestRunner {
      * Publicly available configuration.
      */
     config: VitestRunnerConfig;
+    /**
+     * The name of the current pool. Can affect how stack trace is inferred on the server side.
+     */
+    pool?: string;
 }
 
 export { type CancelReason, Custom, ExtendedContext, File, SequenceHooks, SequenceSetupFiles, Suite, Task, TaskContext, TaskResultPack, Test, 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, C as Custom } from './tasks-BP89OzIP.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-BP89OzIP.js';
+import { S as Suite, F as File, T as Task, a as Test, C as Custom } from './tasks-UPEJyRVL.js';
+export { b as ChainableFunction, c as createChainable } from './tasks-UPEJyRVL.js';
 import { Arrayable } from '@vitest/utils';
 
 /**
@@ -9,7 +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;
+declare function createFileTask(filepath: string, root: string, projectName: string, pool?: string): File;
 
 /**
  * Partition in tasks groups by consecutive concurrent
@@ -24,4 +24,9 @@ declare function hasTests(suite: Arrayable<Suite>): boolean;
 declare function hasFailed(suite: Arrayable<Task>): boolean;
 declare function getNames(task: Task): string[];
 
-export { calculateSuiteHash, createFileTask, generateHash, getNames, getSuites, getTasks, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, partitionSuiteChildren, someTasksAreOnly };
+/**
+ * Return a function for running multiple async operations with limited concurrency.
+ */
+declare function limitConcurrency(concurrency?: number): <Args extends unknown[], T>(func: (...args: Args) => PromiseLike<T> | T, ...args: Args) => Promise<T>;
+
+export { calculateSuiteHash, createFileTask, generateHash, getNames, getSuites, getTasks, getTests, hasFailed, hasTests, interpretTaskModes, isAtomTest, limitConcurrency, partitionSuiteChildren, someTasksAreOnly };

package/dist/utils.js

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