@vitest/runner 1.0.1 → 1.0.2

package/dist/index.js

@@ -1,5 +1,5 @@
 import limit from 'p-limit';
-import { getSafeTimers, format, isObject, objDisplay, objectAttr, noop, toArray, shuffle } from '@vitest/utils';
+import { getSafeTimers, createDefer, 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';
@@ -135,41 +135,31 @@ function withFixtures(fn, testContext) {
     const pendingFixtures = resolveDeps(usedFixtures);
     if (!pendingFixtures.length)
       return fn(context);
-    let cursor = 0;
-    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();
+    async function resolveFixtures() {
+      for (const fixture of pendingFixtures) {
+        if (fixtureValueMap.has(fixture))
+          continue;
+        let resolvedValue;
+        if (fixture.isFn) {
+          const useFnArgPromise = createDefer();
+          fixture.value(context, async (useFnArg) => {
+            useFnArgPromise.resolve(useFnArg);
+            const teardownPromise = createDefer();
+            cleanupFnArray.push(teardownPromise.resolve);
+            await teardownPromise;
+          }).catch(useFnArgPromise.reject);
+          resolvedValue = await useFnArgPromise;
         } else {
-          try {
-            resolve(await fn(context));
-          } catch (err) {
-            reject(err);
-          }
-          return new Promise((resolve2) => {
-            cleanupFnArray.push(resolve2);
-          });
+          resolvedValue = fixture.value;
         }
+        context[fixture.prop] = resolvedValue;
+        fixtureValueMap.set(fixture, resolvedValue);
+        cleanupFnArray.unshift(() => {
+          fixtureValueMap.delete(fixture);
+        });
       }
-      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().catch(reject);
-      cleanupFnArray.unshift(() => setupFixturePromise);
-    });
+    }
+    return resolveFixtures().then(() => fn(context));
   };
 }
 function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtures = []) {
@@ -181,7 +171,7 @@ function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtur
       return;
     }
     if (depSet.has(fixture))
-      throw new Error("circular fixture dependency");
+      throw new Error(`Circular fixture dependency detected: ${fixture.prop} <- ${[...depSet].reverse().map((d) => d.prop).join(" <- ")}`);
     depSet.add(fixture);
     resolveDeps(fixture.deps, depSet, pendingFixtures);
     pendingFixtures.push(fixture);
@@ -198,14 +188,14 @@ function getUsedProps(fn) {
     return [];
   const first = args[0];
   if (!(first.startsWith("{") && first.endsWith("}")))
-    throw new Error("the first argument must use object destructuring pattern");
+    throw new Error(`The first argument inside a fixture must use object destructuring pattern, e.g. ({ test } => {}). Instead, received "${first}".`);
   const _first = first.slice(1, -1).replace(/\s/g, "");
   const props = splitByComma(_first).map((prop) => {
     return prop.replace(/\:.*|\=.*/g, "");
   });
   const last = props.at(-1);
   if (last && last.startsWith("..."))
-    throw new Error("Rest parameters are not supported");
+    throw new Error(`Rest parameters are not supported in fixtures, received "${last}".`);
   return props;
 }
 function splitByComma(s) {

package/package.json

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