@vitest/runner 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 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, a as Test, C as Custom } from './tasks-b31a73cb.js';
-export { D as DoneCallback, E as ExtendedContext, q as Fixture, r as Fixtures, s as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, v as RuntimeContext, y as SequenceHooks, z as SequenceSetupFiles, S as Suite, u as SuiteFactory, j as TaskBase, x as TaskContext, t as TaskCustomOptions, l as TaskMeta, k as TaskPopulated, m as TaskResult, n as TaskResultPack, i as TaskState, w as TestContext, o as TestFunction, p as TestOptions } from './tasks-b31a73cb.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, a as Test, C as Custom } from './tasks-3ea70b32.js';
+export { D as DoneCallback, E as ExtendedContext, q as Fixture, r as Fixtures, s as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, v as RuntimeContext, y as SequenceHooks, z as SequenceSetupFiles, S as Suite, u as SuiteFactory, j as TaskBase, x as TaskContext, t as TaskCustomOptions, l as TaskMeta, k as TaskPopulated, m as TaskResult, n as TaskResultPack, i as TaskState, w as TestContext, o as TestFunction, p as TestOptions } from './tasks-3ea70b32.js';
 import { Awaitable } from '@vitest/utils';
+export { processError } from '@vitest/utils/error';
 
 declare function updateTask(task: Task, runner: VitestRunner): void;
 declare function startTests(paths: string[], runner: VitestRunner): Promise<File[]>;

package/dist/index.js

@@ -1,6 +1,7 @@
 import limit from 'p-limit';
 import { getSafeTimers, format, isObject, objDisplay, objectAttr, noop, toArray, shuffle } from '@vitest/utils';
 import { processError } from '@vitest/utils/error';
+export { processError } from '@vitest/utils/error';
 import { createChainable, generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, partitionSuiteChildren, hasTests, hasFailed } from './utils.js';
 import { relative } from 'pathe';
 
@@ -110,25 +111,17 @@ function mergeContextFixtures(fixtures, context = {}) {
   return context;
 }
 const fixtureValueMap = /* @__PURE__ */ new Map();
-const fixtureCleanupFnMap = /* @__PURE__ */ new Map();
-async function callFixtureCleanup(id) {
-  const cleanupFnArray = fixtureCleanupFnMap.get(id);
-  if (!cleanupFnArray)
-    return;
+let cleanupFnArray = new Array();
+async function callFixtureCleanup() {
   for (const cleanup of cleanupFnArray.reverse())
     await cleanup();
-  fixtureCleanupFnMap.delete(id);
+  cleanupFnArray = [];
 }
 function withFixtures(fn, testContext) {
   return (hookContext) => {
     const context = hookContext || testContext;
     if (!context)
       return fn({});
-    let cleanupFnArray = fixtureCleanupFnMap.get(context.task.suite.id);
-    if (!cleanupFnArray) {
-      cleanupFnArray = [];
-      fixtureCleanupFnMap.set(context.task.suite.id, cleanupFnArray);
-    }
     const fixtures = getFixture(context);
     if (!(fixtures == null ? void 0 : fixtures.length))
       return fn(context);
@@ -232,9 +225,19 @@ function splitByComma(s) {
   return result;
 }
 
+let _test;
+function setCurrentTest(test) {
+  _test = test;
+}
+function getCurrentTest() {
+  return _test;
+}
+
 const suite = createSuite();
 const test = createTest(
   function(name, fn, options) {
+    if (getCurrentTest())
+      throw new Error("Nested tests are not allowed");
     getCurrentSuite().test.fn.call(this, formatName(name), fn, options);
   }
 );
@@ -530,7 +533,6 @@ async function collectTests(paths, runner) {
       const error = processError(e);
       file.result = {
         state: "fail",
-        error,
         errors: [error]
       };
     }
@@ -542,14 +544,6 @@ async function collectTests(paths, runner) {
   return files;
 }
 
-let _test;
-function setCurrentTest(test) {
-  _test = test;
-}
-function getCurrentTest() {
-  return _test;
-}
-
 const now = Date.now;
 function updateSuiteHookState(suite, name, state, runner) {
   var _a;
@@ -688,6 +682,7 @@ async function runTest(test, runner) {
       try {
         await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
         await callCleanupHooks(beforeEachCleanups);
+        await callFixtureCleanup();
       } catch (e) {
         failTask(test.result, e, runner.config.diffOptions);
       }
@@ -706,11 +701,9 @@ async function runTest(test, runner) {
     if (test.result.state === "pass") {
       const error = processError(new Error("Expect test to fail"));
       test.result.state = "fail";
-      test.result.error = error;
       test.result.errors = [error];
     } else {
       test.result.state = "pass";
-      test.result.error = void 0;
       test.result.errors = void 0;
     }
   }
@@ -728,7 +721,6 @@ function failTask(result, err, diffOptions) {
   const errors = Array.isArray(err) ? err : [err];
   for (const e of errors) {
     const error = processError(e, diffOptions);
-    result.error ?? (result.error = error);
     result.errors ?? (result.errors = []);
     result.errors.push(error);
   }
@@ -743,7 +735,7 @@ function markTasksAsSkipped(suite, runner) {
   });
 }
 async function runSuite(suite, runner) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   await ((_a = runner.onBeforeRunSuite) == null ? void 0 : _a.call(runner, suite));
   if (((_b = suite.result) == null ? void 0 : _b.state) === "fail") {
     markTasksAsSkipped(suite, runner);
@@ -788,7 +780,6 @@ async function runSuite(suite, runner) {
       failTask(suite.result, e, runner.config.diffOptions);
     }
     try {
-      await callFixtureCleanup(suite.id);
       await callSuiteHook(suite, suite, "afterAll", runner, [suite]);
       await callCleanupHooks(beforeAllCleanups);
     } catch (e) {
@@ -797,9 +788,8 @@ async function runSuite(suite, runner) {
     if (suite.mode === "run") {
       if (!hasTests(suite)) {
         suite.result.state = "fail";
-        if (!suite.result.error) {
+        if (!((_c = suite.result.errors) == null ? void 0 : _c.length)) {
           const error = processError(new Error(`No test found in suite ${suite.name}`));
-          suite.result.error = error;
           suite.result.errors = [error];
         }
       } else if (hasFailed(suite)) {
@@ -810,7 +800,7 @@ async function runSuite(suite, runner) {
     }
     updateTask(suite, runner);
     suite.result.duration = now() - start;
-    await ((_c = runner.onAfterRunSuite) == null ? void 0 : _c.call(runner, suite));
+    await ((_d = runner.onAfterRunSuite) == null ? void 0 : _d.call(runner, suite));
   }
 }
 async function runSuiteChild(c, runner) {
@@ -827,7 +817,6 @@ async function runFiles(files, runner) {
         const error = processError(new Error(`No test suite found in file ${file.filepath}`));
         file.result = {
           state: "fail",
-          error,
           errors: [error]
         };
       }

package/dist/{tasks-b31a73cb.d.ts → tasks-3ea70b32.d.ts}

@@ -57,10 +57,6 @@ interface TaskResult {
     duration?: number;
     startTime?: number;
     heap?: number;
-    /**
-     * @deprecated Use "errors" instead
-     */
-    error?: ErrorWithDiff;
     errors?: ErrorWithDiff[];
     htmlError?: string;
     hooks?: Partial<Record<keyof SuiteHooks, TaskState>>;
@@ -238,4 +234,4 @@ type OnTestFailedHandler = (result: TaskResult) => Awaitable<void>;
 type SequenceHooks = 'stack' | 'list' | 'parallel';
 type SequenceSetupFiles = 'list' | 'parallel';
 
-export { Custom as C, DoneCallback as D, ExtendedContext as E, File as F, HookListener as H, InferFixturesTypes as I, OnTestFailedHandler as O, RunMode as R, Suite as S, Task as T, Test as a, ChainableFunction as b, createChainable as c, SuiteAPI as d, TestAPI as e, SuiteCollector as f, CustomAPI as g, SuiteHooks as h, TaskState as i, TaskBase as j, TaskPopulated as k, TaskMeta as l, TaskResult as m, TaskResultPack as n, TestFunction as o, TestOptions as p, Fixture as q, Fixtures as r, HookCleanupCallback as s, TaskCustomOptions as t, SuiteFactory as u, RuntimeContext as v, TestContext as w, TaskContext as x, SequenceHooks as y, SequenceSetupFiles as z };
+export { type Custom as C, type DoneCallback as D, type ExtendedContext as E, type File as F, type HookListener as H, type InferFixturesTypes as I, type OnTestFailedHandler as O, type RunMode as R, type Suite as S, type Task as T, type Test as a, type ChainableFunction as b, createChainable as c, type SuiteAPI as d, type TestAPI as e, type SuiteCollector as f, type CustomAPI as g, type SuiteHooks as h, type TaskState as i, type TaskBase as j, type TaskPopulated as k, type TaskMeta as l, type TaskResult as m, type TaskResultPack as n, type TestFunction as o, type TestOptions as p, type Fixture as q, type Fixtures as r, type HookCleanupCallback as s, type TaskCustomOptions as t, type SuiteFactory as u, type RuntimeContext as v, type TestContext as w, type TaskContext as x, type SequenceHooks as y, type SequenceSetupFiles as z };

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { y as SequenceHooks, z as SequenceSetupFiles, F as File, k as TaskPopulated, S as Suite, n as TaskResultPack, a as Test, C as Custom, x as TaskContext, E as ExtendedContext } from './tasks-b31a73cb.js';
-export { g as CustomAPI, D as DoneCallback, q as Fixture, r as Fixtures, s as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, R as RunMode, v as RuntimeContext, d as SuiteAPI, f as SuiteCollector, u as SuiteFactory, h as SuiteHooks, T as Task, j as TaskBase, t as TaskCustomOptions, l as TaskMeta, m as TaskResult, i as TaskState, e as TestAPI, w as TestContext, o as TestFunction, p as TestOptions } from './tasks-b31a73cb.js';
+import { y as SequenceHooks, z as SequenceSetupFiles, F as File, k as TaskPopulated, S as Suite, n as TaskResultPack, a as Test, C as Custom, x as TaskContext, E as ExtendedContext } from './tasks-3ea70b32.js';
+export { g as CustomAPI, D as DoneCallback, q as Fixture, r as Fixtures, s as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, R as RunMode, v as RuntimeContext, d as SuiteAPI, f as SuiteCollector, u as SuiteFactory, h as SuiteHooks, T as Task, j as TaskBase, t as TaskCustomOptions, l as TaskMeta, m as TaskResult, i as TaskState, e as TestAPI, w as TestContext, o as TestFunction, p as TestOptions } from './tasks-3ea70b32.js';
 import '@vitest/utils';
 
 /**
@@ -158,4 +158,4 @@ interface VitestRunner {
     config: VitestRunnerConfig;
 }
 
-export { CancelReason, Custom, ExtendedContext, File, SequenceHooks, SequenceSetupFiles, Suite, TaskContext, TaskPopulated, TaskResultPack, Test, VitestRunner, VitestRunnerConfig, VitestRunnerConstructor, VitestRunnerImportSource };
+export { type CancelReason, Custom, ExtendedContext, File, SequenceHooks, SequenceSetupFiles, Suite, TaskContext, TaskPopulated, TaskResultPack, Test, type VitestRunner, type VitestRunnerConfig, type VitestRunnerConstructor, type VitestRunnerImportSource };

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Suite, T as Task, a as Test, C as Custom } from './tasks-b31a73cb.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-b31a73cb.js';
+import { S as Suite, T as Task, a as Test, C as Custom } from './tasks-3ea70b32.js';
+export { b as ChainableFunction, c as createChainable } from './tasks-3ea70b32.js';
 import { Arrayable } from '@vitest/utils';
 
 /**

package/dist/utils.js

@@ -70,7 +70,6 @@ function checkAllowOnly(task, allowOnly) {
   const error = processError(new Error("[Vitest] Unexpected .only modifier. Remove it or pass --allowOnly argument to bypass this error"));
   task.result = {
     state: "fail",
-    error,
     errors: [error]
   };
 }
@@ -125,8 +124,8 @@ function isAtomTest(s) {
 }
 function getTests(suite) {
   const tests = [];
-  const suite_arr = toArray(suite);
-  for (const s of suite_arr) {
+  const arraySuites = toArray(suite);
+  for (const s of arraySuites) {
     if (isAtomTest(s)) {
       tests.push(s);
     } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
   "dependencies": {
     "p-limit": "^4.0.0",
     "pathe": "^1.1.1",
-    "@vitest/utils": "1.0.0-beta.1"
+    "@vitest/utils": "1.0.0-beta.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",