@vitest/runner 2.1.1 → 2.1.3

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 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, B as BeforeAllListener, A as AfterAllListener, h as BeforeEachListener, i as AfterEachListener, j as TaskHook, O as OnTestFailedHandler, k as OnTestFinishedHandler, a as Test, C as Custom, S as Suite, l as SuiteHooks } from './tasks--RurNSkd.js';
-export { D as DoneCallback, L as ExtendedContext, w as Fixture, v as FixtureFn, u as FixtureOptions, x as Fixtures, y as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, G as RuntimeContext, M as SequenceHooks, N as SequenceSetupFiles, E as SuiteFactory, n as TaskBase, K as TaskContext, z as TaskCustomOptions, p as TaskMeta, o as TaskPopulated, q as TaskResult, r as TaskResultPack, m as TaskState, J as TestContext, s as TestFunction, t as TestOptions, U as Use } from './tasks--RurNSkd.js';
+import { T as Task, F as File, d as SuiteAPI, e as TestAPI, f as SuiteCollector, g as CustomAPI, B as BeforeAllListener, A as AfterAllListener, h as BeforeEachListener, i as AfterEachListener, j as TaskHook, O as OnTestFailedHandler, k as OnTestFinishedHandler, a as Test, C as Custom, S as Suite, l as SuiteHooks } from './tasks-SNKRxoD7.js';
+export { D as DoneCallback, L as ExtendedContext, w as Fixture, v as FixtureFn, u as FixtureOptions, x as Fixtures, y as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, R as RunMode, G as RuntimeContext, M as SequenceHooks, N as SequenceSetupFiles, E as SuiteFactory, n as TaskBase, K as TaskContext, z as TaskCustomOptions, p as TaskMeta, o as TaskPopulated, q as TaskResult, r as TaskResultPack, m as TaskState, J as TestContext, s as TestFunction, t as TestOptions, U as Use } from './tasks-SNKRxoD7.js';
 import { Awaitable } from '@vitest/utils';
 export { processError } from '@vitest/utils/error';
 import '@vitest/utils/diff';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { getSafeTimers, isObject, createDefer, isNegativeNaN, format, objDisplay, objectAttr, toArray, shuffle } from '@vitest/utils';
+import { getSafeTimers, isObject, createDefer, isNegativeNaN, format, objDisplay, objectAttr, toArray, shuffle, assertTypes } from '@vitest/utils';
 import { processError } from '@vitest/utils/error';
 export { processError } from '@vitest/utils/error';
 import { l as createChainable, a as createFileTask, c as calculateSuiteHash, s as someTasksAreOnly, i as interpretTaskModes, m as limitConcurrency, p as partitionSuiteChildren, h as hasTests, j as hasFailed } from './chunk-tasks.js';
@@ -224,7 +224,11 @@ function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtur
   return pendingFixtures;
 }
 function getUsedProps(fn) {
-  const match = fn.toString().match(/[^(]*\(([^)]*)/);
+  let fnString = fn.toString();
+  if (/__async\(this, (?:null|arguments|\[[_0-9, ]*\]), function\*/.test(fnString)) {
+    fnString = fnString.split("__async(this,")[1];
+  }
+  const match = fnString.match(/[^(]*\(([^)]*)/);
   if (!match) {
     return [];
   }
@@ -544,11 +548,13 @@ function createSuite() {
       factoryOrOptions,
       optionsOrFactory
     );
+    const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
+    const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
     if (currentSuite == null ? void 0 : currentSuite.options) {
       options = { ...currentSuite.options, ...options };
     }
-    const isConcurrent = options.concurrent || this.concurrent && !this.sequential;
-    const isSequential = options.sequential || this.sequential && !this.concurrent;
+    const isConcurrent = isConcurrentSpecified || options.concurrent && !isSequentialSpecified;
+    const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
     options.concurrent = isConcurrent && !isSequential;
     options.sequential = isSequential && !isConcurrent;
     return createSuiteCollector(
@@ -1017,6 +1023,24 @@ async function runTest(test, runner) {
       } catch (e) {
         failTask(test.result, e, runner.config.diffOptions);
       }
+      try {
+        await callTaskHooks(test, test.onFinished || [], "stack");
+      } catch (e) {
+        failTask(test.result, e, runner.config.diffOptions);
+      }
+      if (test.result.state === "fail") {
+        try {
+          await callTaskHooks(
+            test,
+            test.onFailed || [],
+            runner.config.sequence.hooks
+          );
+        } catch (e) {
+          failTask(test.result, e, runner.config.diffOptions);
+        }
+      }
+      delete test.onFailed;
+      delete test.onFinished;
       if (test.result.state === "pass") {
         break;
       }
@@ -1027,22 +1051,6 @@ async function runTest(test, runner) {
       updateTask(test, runner);
     }
   }
-  try {
-    await callTaskHooks(test, test.onFinished || [], "stack");
-  } catch (e) {
-    failTask(test.result, e, runner.config.diffOptions);
-  }
-  if (test.result.state === "fail") {
-    try {
-      await callTaskHooks(
-        test,
-        test.onFailed || [],
-        runner.config.sequence.hooks
-      );
-    } catch (e) {
-      failTask(test.result, e, runner.config.diffOptions);
-    }
-  }
   if (test.fails) {
     if (test.result.state === "pass") {
       const error = processError(new Error("Expect test to fail"));
@@ -1102,13 +1110,18 @@ async function runSuite(suite, runner) {
     suite.result.state = "todo";
   } else {
     try {
-      beforeAllCleanups = await callSuiteHook(
-        suite,
-        suite,
-        "beforeAll",
-        runner,
-        [suite]
-      );
+      try {
+        beforeAllCleanups = await callSuiteHook(
+          suite,
+          suite,
+          "beforeAll",
+          runner,
+          [suite]
+        );
+      } catch (e) {
+        markTasksAsSkipped(suite, runner);
+        throw e;
+      }
       if (runner.runSuite) {
         await runner.runSuite(suite);
       } else {
@@ -1211,24 +1224,28 @@ function getDefaultHookTimeout() {
   return getRunner().config.hookTimeout;
 }
 function beforeAll(fn, timeout) {
+  assertTypes(fn, '"beforeAll" callback', ["function"]);
   return getCurrentSuite().on(
     "beforeAll",
     withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
   );
 }
 function afterAll(fn, timeout) {
+  assertTypes(fn, '"afterAll" callback', ["function"]);
   return getCurrentSuite().on(
     "afterAll",
     withTimeout(fn, timeout ?? getDefaultHookTimeout(), true)
   );
 }
 function beforeEach(fn, timeout) {
+  assertTypes(fn, '"beforeEach" callback', ["function"]);
   return getCurrentSuite().on(
     "beforeEach",
     withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true)
   );
 }
 function afterEach(fn, timeout) {
+  assertTypes(fn, '"afterEach" callback', ["function"]);
   return getCurrentSuite().on(
     "afterEach",
     withTimeout(withFixtures(fn), timeout ?? getDefaultHookTimeout(), true)
@@ -1254,6 +1271,7 @@ const onTestFinished = createTestHook(
 );
 function createTestHook(name, handler) {
   return (fn, timeout) => {
+    assertTypes(fn, `"${name}" callback`, ["function"]);
     const current = getCurrentTest();
     if (!current) {
       throw new Error(`Hook ${name}() can only be called inside a test`);

package/dist/{tasks--RurNSkd.d.ts → tasks-SNKRxoD7.d.ts}

@@ -432,8 +432,14 @@ interface RuntimeContext {
     tasks: (SuiteCollector | Test)[];
     currentSuite: SuiteCollector | null;
 }
+/**
+ * User's custom test context.
+ */
 interface TestContext {
 }
+/**
+ * Context that's always available in the test function.
+ */
 interface TaskContext<Task extends Custom | Test = Custom | Test> {
     /**
      * Metadata of the current test

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import { M as SequenceHooks, N as SequenceSetupFiles, F as File, T as Task, a as Test, C as Custom, S as Suite, r as TaskResultPack, K as TaskContext, L as ExtendedContext } from './tasks--RurNSkd.js';
-export { A as AfterAllListener, i as AfterEachListener, B as BeforeAllListener, h as BeforeEachListener, g as CustomAPI, D as DoneCallback, w as Fixture, v as FixtureFn, u as FixtureOptions, x as Fixtures, y as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, k as OnTestFinishedHandler, R as RunMode, G as RuntimeContext, d as SuiteAPI, f as SuiteCollector, E as SuiteFactory, l as SuiteHooks, n as TaskBase, z as TaskCustomOptions, j as TaskHook, p as TaskMeta, o as TaskPopulated, q as TaskResult, m as TaskState, e as TestAPI, J as TestContext, s as TestFunction, t as TestOptions, U as Use } from './tasks--RurNSkd.js';
+import { M as SequenceHooks, N as SequenceSetupFiles, F as File, T as Task, a as Test, C as Custom, S as Suite, r as TaskResultPack, K as TaskContext, L as ExtendedContext } from './tasks-SNKRxoD7.js';
+export { A as AfterAllListener, i as AfterEachListener, B as BeforeAllListener, h as BeforeEachListener, g as CustomAPI, D as DoneCallback, w as Fixture, v as FixtureFn, u as FixtureOptions, x as Fixtures, y as HookCleanupCallback, H as HookListener, I as InferFixturesTypes, O as OnTestFailedHandler, k as OnTestFinishedHandler, R as RunMode, G as RuntimeContext, d as SuiteAPI, f as SuiteCollector, E as SuiteFactory, l as SuiteHooks, n as TaskBase, z as TaskCustomOptions, j as TaskHook, p as TaskMeta, o as TaskPopulated, q as TaskResult, m as TaskState, e as TestAPI, J as TestContext, s as TestFunction, t as TestOptions, U as Use } from './tasks-SNKRxoD7.js';
 import { DiffOptions } from '@vitest/utils/diff';
 import '@vitest/utils';
 

package/dist/utils.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "pathe": "^1.1.2",
-    "@vitest/utils": "2.1.1"
+    "@vitest/utils": "2.1.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",