@vitest/runner 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 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-3ea70b32.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-3ea70b32.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-rsXe_qLO.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-rsXe_qLO.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
+import '@vitest/utils/diff';
 
 declare function updateTask(task: Task, runner: VitestRunner): void;
 declare function startTests(paths: string[], runner: VitestRunner): Promise<File[]>;

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) {
@@ -162,7 +167,7 @@ function withFixtures(fn, testContext) {
         else
           return isFn ? value(context, use) : use(value);
       }
-      const setupFixturePromise = next();
+      const setupFixturePromise = next().catch(reject);
       cleanupFnArray.unshift(() => setupFixturePromise);
     });
   };
@@ -291,7 +296,7 @@ function createSuiteCollector(name, factory = () => {
       meta: options.meta ?? /* @__PURE__ */ Object.create(null)
     };
     const handler = options.handler;
-    if (options.concurrent || !sequential && (concurrent || runner.config.sequence.concurrent))
+    if (options.concurrent || !options.sequential && runner.config.sequence.concurrent)
       task2.concurrent = true;
     if (shuffle)
       task2.shuffle = true;
@@ -310,11 +315,13 @@ function createSuiteCollector(name, factory = () => {
     tasks.push(task2);
     return task2;
   };
-  const test2 = createTest(function(name2, fn = noop, options) {
+  const test2 = createTest(function(name2, fn = noop, options = {}) {
     if (typeof options === "number")
       options = { timeout: options };
     if (typeof suiteOptions === "object")
       options = Object.assign({}, suiteOptions, options);
+    options.concurrent = this.concurrent || !this.sequential && (options == null ? void 0 : options.concurrent);
+    options.sequential = this.sequential || !this.concurrent && (options == null ? void 0 : options.sequential);
     const test3 = task(
       formatName(name2),
       { ...this, ...options, handler: fn }
@@ -347,7 +354,8 @@ function createSuiteCollector(name, factory = () => {
       each,
       shuffle,
       tasks: [],
-      meta: /* @__PURE__ */ Object.create(null)
+      meta: /* @__PURE__ */ Object.create(null),
+      projectName: ""
     };
     setHooks(suite2, createSuiteHooks());
   }
@@ -376,14 +384,16 @@ function createSuiteCollector(name, factory = () => {
   return collector;
 }
 function createSuite() {
-  function suiteFn(name, factory, options) {
+  function suiteFn(name, factory, options = {}) {
     const mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
     const currentSuite = getCurrentSuite();
     if (typeof options === "number")
       options = { timeout: options };
     if (currentSuite == null ? void 0 : currentSuite.options)
       options = { ...currentSuite.options, ...options };
-    return createSuiteCollector(formatName(name), factory, mode, this.concurrent, this.sequence, this.shuffle, this.each, options);
+    options.concurrent = this.concurrent || !this.sequential && (options == null ? void 0 : options.concurrent);
+    options.sequential = this.sequential || !this.concurrent && (options == null ? void 0 : options.sequential);
+    return createSuiteCollector(formatName(name), factory, mode, this.concurrent, this.sequential, this.shuffle, this.each, options);
   }
   suiteFn.each = function(cases, ...args) {
     const suite2 = this.withContext();
@@ -433,7 +443,7 @@ function createTaskCollector(fn, context) {
     }, _context);
   };
   const _test = createChainable(
-    ["concurrent", "skip", "only", "todo", "fails"],
+    ["concurrent", "sequential", "skip", "only", "todo", "fails"],
     taskFn
   );
   if (context)
@@ -455,11 +465,11 @@ function formatTitle(template, items, idx) {
   if (isObject(items[0])) {
     formatted = formatted.replace(
       /\$([$\w_.]+)/g,
+      // https://github.com/chaijs/chai/pull/1490
       (_, key) => {
         var _a, _b;
         return objDisplay(objectAttr(items[0], key), { truncate: (_b = (_a = runner == null ? void 0 : runner.config) == null ? void 0 : _a.chaiConfig) == null ? void 0 : _b.truncateThreshold });
       }
-      // https://github.com/chaijs/chai/pull/1490
     );
   }
   return formatted;

package/dist/{tasks-3ea70b32.d.ts → tasks-rsXe_qLO.d.ts}

@@ -68,7 +68,7 @@ interface Suite extends TaskBase {
     type: 'suite';
     tasks: Task[];
     filepath?: string;
-    projectName?: string;
+    projectName: string;
 }
 interface File extends Suite {
     filepath: string;
@@ -110,7 +110,7 @@ interface TestEachFunction {
     <T>(cases: ReadonlyArray<T>): (name: string | Function, fn: (...args: T[]) => Awaitable<void>, options?: number | TestOptions) => void;
     (...args: [TemplateStringsArray, ...any]): (name: string | Function, fn: (...args: any[]) => Awaitable<void>, options?: number | TestOptions) => void;
 }
-type ChainableTestAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'only' | 'skip' | 'todo' | 'fails', [
+type ChainableTestAPI<ExtraContext = {}> = ChainableFunction<'concurrent' | 'sequential' | 'only' | 'skip' | 'todo' | 'fails', [
     name: string | Function,
     fn?: TestFunction<ExtraContext>,
     options?: number | TestOptions
@@ -137,6 +137,16 @@ interface TestOptions {
      * @default 0
      */
     repeats?: number;
+    /**
+     * Whether tests run concurrently.
+     * Tests inherit `concurrent` from `describe()` and nested `describe()` will inherit from parent's `concurrent`.
+     */
+    concurrent?: boolean;
+    /**
+     * Whether tests run sequentially.
+     * Tests inherit `sequential` from `describe()` and nested `describe()` will inherit from parent's `sequential`.
+     */
+    sequential?: boolean;
 }
 interface ExtendedAPI<ExtraContext> {
     each: TestEachFunction;
@@ -153,14 +163,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', [
@@ -234,4 +241,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,49 +1,8 @@
-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-3ea70b32.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-3ea70b32.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-rsXe_qLO.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-rsXe_qLO.js';
+import { DiffOptions } from '@vitest/utils/diff';
 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;

package/dist/utils.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -18,15 +18,15 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./utils": {
       "types": "./dist/utils.d.ts",
-      "import": "./dist/utils.js"
+      "default": "./dist/utils.js"
     },
     "./types": {
       "types": "./dist/types.d.ts",
-      "import": "./dist/types.js"
+      "default": "./dist/types.js"
     },
     "./*": "./*"
   },
@@ -34,13 +34,13 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "*.d.ts"
+    "*.d.ts",
+    "dist"
   ],
   "dependencies": {
-    "p-limit": "^4.0.0",
+    "p-limit": "^5.0.0",
     "pathe": "^1.1.1",
-    "@vitest/utils": "1.0.0-beta.3"
+    "@vitest/utils": "1.0.0-beta.5"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",