@vitest/runner 1.0.0-beta.4 → 1.0.0-beta.6

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-0309a91e.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-0309a91e.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

@@ -167,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);
     });
   };
@@ -296,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;
@@ -315,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 }
@@ -352,7 +354,8 @@ function createSuiteCollector(name, factory = () => {
       each,
       shuffle,
       tasks: [],
-      meta: /* @__PURE__ */ Object.create(null)
+      meta: /* @__PURE__ */ Object.create(null),
+      projectName: ""
     };
     setHooks(suite2, createSuiteHooks());
   }
@@ -381,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();
@@ -429,8 +434,12 @@ function createTaskCollector(fn, context) {
       this.setContext("each", void 0);
     };
   };
-  taskFn.skipIf = (condition) => condition ? test.skip : test;
-  taskFn.runIf = (condition) => condition ? test : test.skip;
+  taskFn.skipIf = function(condition) {
+    return condition ? this.skip : this;
+  };
+  taskFn.runIf = function(condition) {
+    return condition ? this : this.skip;
+  };
   taskFn.extend = function(fixtures) {
     const _context = mergeContextFixtures(fixtures, context);
     return createTest(function fn2(name, fn2, options) {
@@ -438,7 +447,7 @@ function createTaskCollector(fn, context) {
     }, _context);
   };
   const _test = createChainable(
-    ["concurrent", "skip", "only", "todo", "fails"],
+    ["concurrent", "sequential", "skip", "only", "todo", "fails"],
     taskFn
   );
   if (context)
@@ -460,11 +469,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;
@@ -791,7 +800,7 @@ async function runSuite(suite, runner) {
       failTask(suite.result, e, runner.config.diffOptions);
     }
     if (suite.mode === "run") {
-      if (!hasTests(suite)) {
+      if (!runner.config.passWithNoTests && !hasTests(suite)) {
         suite.result.state = "fail";
         if (!((_c = suite.result.errors) == null ? void 0 : _c.length)) {
           const error = processError(new Error(`No test found in suite ${suite.name}`));

package/dist/{tasks-0309a91e.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;

package/dist/types.d.ts

@@ -1,49 +1,8 @@
-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-0309a91e.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-0309a91e.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-0309a91e.js';
-export { b as ChainableFunction, c as createChainable } from './tasks-0309a91e.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.4",
+  "version": "1.0.0-beta.6",
   "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.4"
+    "@vitest/utils": "1.0.0-beta.6"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",