@vitest/runner 0.34.5 → 0.34.7

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 SuiteHooks, O as OnTestFailedHandler, a as Test } from './tasks-e594cd24.js';
-export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, R as RunMode, r as RuntimeContext, t as SequenceHooks, u as SequenceSetupFiles, S as Suite, q as SuiteFactory, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, l as TaskResultPack, h as TaskState, s as TestContext, m as TestFunction, n as TestOptions } from './tasks-e594cd24.js';
+import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as SuiteHooks, O as OnTestFailedHandler, a as Test } from './tasks-d7d578d8.js';
+export { D as DoneCallback, o as Fixture, p as Fixtures, q as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, s as RuntimeContext, u as SequenceHooks, v as SequenceSetupFiles, S as Suite, r as SuiteFactory, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, l as TaskResultPack, h as TaskState, t as TestContext, m as TestFunction, n as TestOptions } from './tasks-d7d578d8.js';
 import { Awaitable } from '@vitest/utils';
 
 declare function updateTask(task: Task, runner: VitestRunner): void;

package/dist/index.js

@@ -110,11 +110,26 @@ 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;
+  for (const cleanup of cleanupFnArray.reverse())
+    await cleanup();
+  fixtureCleanupFnMap.delete(id);
+}
 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);
@@ -124,19 +139,40 @@ function withFixtures(fn, testContext) {
     const usedFixtures = fixtures.filter(({ prop }) => usedProps.includes(prop));
     const pendingFixtures = resolveDeps(usedFixtures);
     let cursor = 0;
-    async function use(fixtureValue) {
-      const { prop } = pendingFixtures[cursor++];
-      context[prop] = fixtureValue;
-      if (cursor < pendingFixtures.length)
-        await next();
-      else
-        await fn(context);
-    }
-    async function next() {
-      const { value } = pendingFixtures[cursor];
-      typeof value === "function" ? await value(context, use) : await use(value);
-    }
-    return next();
+    return new Promise((resolve, reject) => {
+      async function use(fixtureValue) {
+        const fixture = pendingFixtures[cursor++];
+        context[fixture.prop] = fixtureValue;
+        if (!fixtureValueMap.has(fixture)) {
+          fixtureValueMap.set(fixture, fixtureValue);
+          cleanupFnArray.unshift(() => {
+            fixtureValueMap.delete(fixture);
+          });
+        }
+        if (cursor < pendingFixtures.length) {
+          await next();
+        } else {
+          try {
+            resolve(await fn(context));
+          } catch (err) {
+            reject(err);
+          }
+          return new Promise((resolve2) => {
+            cleanupFnArray.push(resolve2);
+          });
+        }
+      }
+      async function next() {
+        const fixture = pendingFixtures[cursor];
+        const { isFn, value } = fixture;
+        if (fixtureValueMap.has(fixture))
+          return use(fixtureValueMap.get(fixture));
+        else
+          return isFn ? value(context, use) : use(value);
+      }
+      const setupFixturePromise = next();
+      cleanupFnArray.unshift(() => setupFixturePromise);
+    });
   };
 }
 function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtures = []) {
@@ -751,6 +787,7 @@ 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) {

package/dist/{tasks-e594cd24.d.ts → tasks-d7d578d8.d.ts}

@@ -133,11 +133,16 @@ type TestAPI<ExtraContext = {}> = ChainableTestAPI<ExtraContext> & {
         [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 Fixtures<T extends Record<string, any>, ExtraContext = {}> = {
-    [K in keyof T]: T[K] | ((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] : never : P extends keyof T ? T[P] : never;
-    } & TestContext, use: (fixture: T[K]) => Promise<void>) => Promise<void>);
+    [K in keyof T]: Fixture<T, K, false, ExtraContext>;
+} | {
+    [K in keyof T]: Fixture<T, K, true, ExtraContext>;
 };
+type InferFixturesTypes<T> = T extends TestAPI<infer C> ? C : T;
 type ChainableSuiteAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'sequential' | 'only' | 'skip' | 'todo' | 'shuffle', [
     name: string | Function,
     factory?: SuiteFactory<ExtraContext>,
@@ -200,4 +205,4 @@ type OnTestFailedHandler = (result: TaskResult) => Awaitable<void>;
 type SequenceHooks = 'stack' | 'list' | 'parallel';
 type SequenceSetupFiles = 'list' | 'parallel';
 
-export { ChainableFunction as C, DoneCallback as D, File as F, HookListener as H, OnTestFailedHandler as O, RunMode as R, Suite as S, Task as T, Test as a, TaskCustom as b, createChainable as c, SuiteAPI as d, TestAPI as e, SuiteCollector as f, SuiteHooks as g, TaskState as h, TaskBase as i, TaskMeta as j, TaskResult as k, TaskResultPack as l, TestFunction as m, TestOptions as n, Fixtures as o, HookCleanupCallback as p, SuiteFactory as q, RuntimeContext as r, TestContext as s, SequenceHooks as t, SequenceSetupFiles as u };
+export { ChainableFunction as C, DoneCallback as D, File as F, HookListener as H, InferFixturesTypes as I, OnTestFailedHandler as O, RunMode as R, Suite as S, Task as T, Test as a, TaskCustom as b, createChainable as c, SuiteAPI as d, TestAPI as e, SuiteCollector as f, SuiteHooks as g, TaskState as h, TaskBase as i, TaskMeta as j, TaskResult as k, TaskResultPack as l, TestFunction as m, TestOptions as n, Fixture as o, Fixtures as p, HookCleanupCallback as q, SuiteFactory as r, RuntimeContext as s, TestContext as t, SequenceHooks as u, SequenceSetupFiles as v };

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { t as SequenceHooks, u as SequenceSetupFiles, F as File, a as Test, S as Suite, l as TaskResultPack, s as TestContext } from './tasks-e594cd24.js';
-export { D as DoneCallback, o as Fixtures, p as HookCleanupCallback, H as HookListener, O as OnTestFailedHandler, R as RunMode, r as RuntimeContext, d as SuiteAPI, f as SuiteCollector, q as SuiteFactory, g as SuiteHooks, T as Task, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, h as TaskState, e as TestAPI, m as TestFunction, n as TestOptions } from './tasks-e594cd24.js';
+import { u as SequenceHooks, v as SequenceSetupFiles, F as File, a as Test, S as Suite, l as TaskResultPack, t as TestContext } from './tasks-d7d578d8.js';
+export { D as DoneCallback, o as Fixture, p as Fixtures, q as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, R as RunMode, s as RuntimeContext, d as SuiteAPI, f as SuiteCollector, r as SuiteFactory, g as SuiteHooks, T as Task, i as TaskBase, b as TaskCustom, j as TaskMeta, k as TaskResult, h as TaskState, e as TestAPI, m as TestFunction, n as TestOptions } from './tasks-d7d578d8.js';
 import '@vitest/utils';
 
 /**

package/dist/utils.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "0.34.5",
+  "version": "0.34.7",
   "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": "0.34.5"
+    "@vitest/utils": "0.34.7"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",