@vitest/runner 0.34.5 → 0.34.6

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/package.json

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