@vitest/runner 0.34.4 → 0.34.6

package/dist/index.js

@@ -5,6 +5,7 @@ import { createChainable, generateHash, calculateSuiteHash, someTasksAreOnly, in
 import { relative } from 'pathe';
 
 const fnMap = /* @__PURE__ */ new WeakMap();
+const fixtureMap = /* @__PURE__ */ new WeakMap();
 const hooksMap = /* @__PURE__ */ new WeakMap();
 function setFn(key, fn) {
   fnMap.set(key, fn);
@@ -12,6 +13,12 @@ function setFn(key, fn) {
 function getFn(key) {
   return fnMap.get(key);
 }
+function setFixture(key, fixture) {
+  fixtureMap.set(key, fixture);
+}
+function getFixture(key) {
+  return fixtureMap.get(key);
+}
 function setHooks(key, hooks) {
   hooksMap.set(key, hooks);
 }
@@ -103,28 +110,70 @@ function mergeContextFixtures(fixtures, context = {}) {
   });
   return context;
 }
-function withFixtures(fn, fixtures, context) {
-  if (!fixtures.length)
-    return () => fn(context);
-  const usedProps = getUsedProps(fn);
-  if (!usedProps.length)
-    return () => fn(context);
-  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();
+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);
+    const usedProps = getUsedProps(fn);
+    if (!usedProps.length)
+      return fn(context);
+    const usedFixtures = fixtures.filter(({ prop }) => usedProps.includes(prop));
+    const pendingFixtures = resolveDeps(usedFixtures);
+    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();
+        } 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 = []) {
   fixtures.forEach((fixture) => {
@@ -252,8 +301,9 @@ function createSuiteCollector(name, factory = () => {
       value: context,
       enumerable: false
     });
+    setFixture(context, this.fixtures);
     setFn(test3, withTimeout(
-      this.fixtures ? withFixtures(fn, this.fixtures, context) : () => fn(context),
+      withFixtures(fn, context),
       (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
     ));
     tasks.push(test3);
@@ -626,7 +676,7 @@ async function runTest(test, runner) {
             test.result.state = "pass";
         }
       } catch (e) {
-        failTask(test.result, e);
+        failTask(test.result, e, runner.config.diffOptions);
       }
       if (test.pending || ((_e = test.result) == null ? void 0 : _e.state) === "skip") {
         test.mode = "skip";
@@ -638,7 +688,7 @@ async function runTest(test, runner) {
         await callSuiteHook(test.suite, test, "afterEach", runner, [test.context, test.suite]);
         await callCleanupHooks(beforeEachCleanups);
       } catch (e) {
-        failTask(test.result, e);
+        failTask(test.result, e, runner.config.diffOptions);
       }
       if (test.result.state === "pass")
         break;
@@ -668,7 +718,7 @@ async function runTest(test, runner) {
   await ((_g = runner.onAfterRunTest) == null ? void 0 : _g.call(runner, test));
   updateTask(test, runner);
 }
-function failTask(result, err) {
+function failTask(result, err, diffOptions) {
   if (err instanceof PendingError) {
     result.state = "skip";
     return;
@@ -676,7 +726,7 @@ function failTask(result, err) {
   result.state = "fail";
   const errors = Array.isArray(err) ? err : [err];
   for (const e of errors) {
-    const error = processError(e);
+    const error = processError(e, diffOptions);
     result.error ?? (result.error = error);
     result.errors ?? (result.errors = []);
     result.errors.push(error);
@@ -734,13 +784,14 @@ async function runSuite(suite, runner) {
         }
       }
     } catch (e) {
-      failTask(suite.result, e);
+      failTask(suite.result, e, runner.config.diffOptions);
     }
     try {
+      await callFixtureCleanup(suite.id);
       await callSuiteHook(suite, suite, "afterAll", runner, [suite]);
       await callCleanupHooks(beforeAllCleanups);
     } catch (e) {
-      failTask(suite.result, e);
+      failTask(suite.result, e, runner.config.diffOptions);
     }
     if (suite.mode === "run") {
       if (!hasTests(suite)) {
@@ -805,10 +856,10 @@ function afterAll(fn, timeout) {
   return getCurrentSuite().on("afterAll", withTimeout(fn, timeout ?? getDefaultHookTimeout(), true));
 }
 function beforeEach(fn, timeout) {
-  return getCurrentSuite().on("beforeEach", withTimeout(fn, timeout ?? getDefaultHookTimeout(), true));
+  return getCurrentSuite().on("beforeEach", withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true));
 }
 function afterEach(fn, timeout) {
-  return getCurrentSuite().on("afterEach", withTimeout(fn, timeout ?? getDefaultHookTimeout(), true));
+  return getCurrentSuite().on("afterEach", withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true));
 }
 const onTestFailed = createTestHook("onTestFailed", (test, handler) => {
   test.onFailed || (test.onFailed = []);

package/dist/types.d.ts

@@ -2,6 +2,48 @@ import { t as SequenceHooks, u as SequenceSetupFiles, F as File, a as Test, S as
 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 '@vitest/utils';
 
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+declare type CompareKeys =
+  | ((a: string, b: string) => number)
+  | null
+  | undefined;
+
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+type DiffOptionsColor = (arg: string) => string;
+interface DiffOptions {
+    aAnnotation?: string;
+    aColor?: DiffOptionsColor;
+    aIndicator?: string;
+    bAnnotation?: string;
+    bColor?: DiffOptionsColor;
+    bIndicator?: string;
+    changeColor?: DiffOptionsColor;
+    changeLineTrailingSpaceColor?: DiffOptionsColor;
+    commonColor?: DiffOptionsColor;
+    commonIndicator?: string;
+    commonLineTrailingSpaceColor?: DiffOptionsColor;
+    contextLines?: number;
+    emptyFirstOrLastLinePlaceholder?: string;
+    expand?: boolean;
+    includeChangeCounts?: boolean;
+    omitAnnotationLines?: boolean;
+    patchColor?: DiffOptionsColor;
+    compareKeys?: CompareKeys;
+}
+
 interface VitestRunnerConfig {
     root: string;
     setupFiles: string[] | string;
@@ -23,6 +65,7 @@ interface VitestRunnerConfig {
     testTimeout: number;
     hookTimeout: number;
     retry: number;
+    diffOptions?: DiffOptions;
 }
 type VitestRunnerImportSource = 'collect' | 'setup';
 interface VitestRunnerConstructor {

package/dist/utils.js

@@ -50,8 +50,7 @@ function interpretTaskModes(suite, namePattern, onlyMode, parentIsOnly, allowOnl
   }
 }
 function getTaskFullName(task) {
-  const fullName = task.suite ? getTaskFullName(task.suite) : null;
-  return fullName ? `${fullName} ${task.name}` : task.name;
+  return `${task.suite ? `${getTaskFullName(task.suite)} ` : ""}${task.name}`;
 }
 function someTasksAreOnly(suite) {
   return suite.tasks.some((t) => t.mode === "only" || t.type === "suite" && someTasksAreOnly(t));

package/package.json

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