@vitest/runner 1.0.0-beta.2 → 1.0.0-beta.4

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, a as Test, C as Custom } from './tasks-54dc134a.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-54dc134a.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-0309a91e.js';
+export { D as DoneCallback, E as ExtendedContext, r as Fixture, q as FixtureFn, s as Fixtures, t as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, w as RuntimeContext, z as SequenceHooks, A as SequenceSetupFiles, S as Suite, v as SuiteFactory, j as TaskBase, y as TaskContext, u as TaskCustomOptions, l as TaskMeta, k as TaskPopulated, m as TaskResult, n as TaskResultPack, i as TaskState, x as TestContext, o as TestFunction, p as TestOptions, U as Use } from './tasks-0309a91e.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
 

package/dist/index.js

@@ -105,12 +105,12 @@ function mergeContextFixtures(fixtures, context = {}) {
     if (fixture.isFn) {
       const usedProps = getUsedProps(fixture.value);
       if (usedProps.length)
-        fixture.deps = context.fixtures.filter(({ index, prop }) => index !== fixture.index && usedProps.includes(prop));
+        fixture.deps = context.fixtures.filter(({ prop }) => prop !== fixture.prop && usedProps.includes(prop));
     }
   });
   return context;
 }
-const fixtureValueMap = /* @__PURE__ */ new Map();
+const fixtureValueMaps = /* @__PURE__ */ new Map();
 let cleanupFnArray = new Array();
 async function callFixtureCleanup() {
   for (const cleanup of cleanupFnArray.reverse())
@@ -128,8 +128,13 @@ function withFixtures(fn, testContext) {
     const usedProps = getUsedProps(fn);
     if (!usedProps.length)
       return fn(context);
+    if (!fixtureValueMaps.get(context))
+      fixtureValueMaps.set(context, /* @__PURE__ */ new Map());
+    const fixtureValueMap = fixtureValueMaps.get(context);
     const usedFixtures = fixtures.filter(({ prop }) => usedProps.includes(prop));
     const pendingFixtures = resolveDeps(usedFixtures);
+    if (!pendingFixtures.length)
+      return fn(context);
     let cursor = 0;
     return new Promise((resolve, reject) => {
       async function use(fixtureValue) {
@@ -225,9 +230,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);
   }
 );
@@ -523,7 +538,6 @@ async function collectTests(paths, runner) {
       const error = processError(e);
       file.result = {
         state: "fail",
-        error,
         errors: [error]
       };
     }
@@ -535,14 +549,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;
@@ -700,11 +706,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;
     }
   }
@@ -722,7 +726,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);
   }
@@ -737,7 +740,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);
@@ -790,9 +793,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)) {
@@ -803,7 +805,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) {
@@ -820,7 +822,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-54dc134a.d.ts → tasks-0309a91e.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>>;
@@ -157,14 +153,11 @@ type TestAPI<ExtraContext = {}> = ChainableTestAPI<ExtraContext> & ExtendedAPI<E
         [K in keyof T | keyof ExtraContext]: K extends keyof T ? T[K] : K extends keyof ExtraContext ? ExtraContext[K] : never;
     }>;
 };
-type FixtureType<T> = T extends (context: any, use: (fixture: infer F) => any) => any ? F : T;
-type Fixture<T, K extends keyof T, OnlyFunction, ExtraContext = {}, V = FixtureType<T[K]>, FN = (context: {
-    [P in keyof T | keyof ExtraContext as P extends K ? P extends keyof ExtraContext ? P : never : P]: K extends P ? K extends keyof ExtraContext ? ExtraContext[K] : V : P extends keyof T ? T[P] : never;
-} & TestContext, use: (fixture: V) => Promise<void>) => Promise<void>> = OnlyFunction extends true ? FN : (FN | V);
+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 = {}> = ((...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 = {}> = {
-    [K in keyof T]: Fixture<T, K, false, ExtraContext>;
-} | {
-    [K in keyof T]: Fixture<T, K, true, ExtraContext>;
+    [K in keyof T]: Fixture<T, K, ExtraContext & ExtendedContext<Test>>;
 };
 type InferFixturesTypes<T> = T extends TestAPI<infer C> ? C : T;
 type ChainableSuiteAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'sequential' | 'only' | 'skip' | 'todo' | 'shuffle', [
@@ -238,4 +231,4 @@ type OnTestFailedHandler = (result: TaskResult) => Awaitable<void>;
 type SequenceHooks = 'stack' | 'list' | 'parallel';
 type SequenceSetupFiles = 'list' | 'parallel';
 
-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 };
+export { type SequenceSetupFiles as A, 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 Use as U, 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 FixtureFn as q, type Fixture as r, type Fixtures as s, type HookCleanupCallback as t, type TaskCustomOptions as u, type SuiteFactory as v, type RuntimeContext as w, type TestContext as x, type TaskContext as y, type SequenceHooks 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-54dc134a.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-54dc134a.js';
+import { z as SequenceHooks, A as SequenceSetupFiles, F as File, k as TaskPopulated, S as Suite, n as TaskResultPack, a as Test, C as Custom, y as TaskContext, E as ExtendedContext } from './tasks-0309a91e.js';
+export { g as CustomAPI, D as DoneCallback, r as Fixture, q as FixtureFn, s as Fixtures, t as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, R as RunMode, w as RuntimeContext, d as SuiteAPI, f as SuiteCollector, v as SuiteFactory, h as SuiteHooks, T as Task, j as TaskBase, u as TaskCustomOptions, l as TaskMeta, m as TaskResult, i as TaskState, e as TestAPI, x as TestContext, o as TestFunction, p as TestOptions, U as Use } from './tasks-0309a91e.js';
 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-54dc134a.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-54dc134a.js';
+import { S as Suite, T as Task, a as Test, C as Custom } from './tasks-0309a91e.js';
+export { b as ChainableFunction, c as createChainable } from './tasks-0309a91e.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.2",
+  "version": "1.0.0-beta.4",
   "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.2"
+    "@vitest/utils": "1.0.0-beta.4"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",