@vitest/runner 3.0.0 → 3.0.2

package/dist/chunk-tasks.js

@@ -49,8 +49,8 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
         }
       }
       let hasLocationMatch = parentMatchedWithLocation;
-      if (testLocations !== void 0 && testLocations.length !== 0) {
-        if (t.location && (testLocations == null ? void 0 : testLocations.includes(t.location.line))) {
+      if (testLocations !== undefined && testLocations.length !== 0) {
+        if (t.location && (testLocations == null ? undefined : testLocations.includes(t.location.line))) {
           t.mode = "run";
           matchedLocations.push(t.location.line);
           hasLocationMatch = true;
@@ -81,16 +81,16 @@ function interpretTaskModes(file, namePattern, testLocations, onlyMode, parentIs
     }
   };
   traverseSuite(file, parentIsOnly, false);
-  const nonMatching = testLocations == null ? void 0 : testLocations.filter((loc) => !matchedLocations.includes(loc));
+  const nonMatching = testLocations == null ? undefined : testLocations.filter((loc) => !matchedLocations.includes(loc));
   if (nonMatching && nonMatching.length !== 0) {
     const message = nonMatching.length === 1 ? `line ${nonMatching[0]}` : `lines ${nonMatching.join(", ")}`;
-    if (file.result === void 0) {
+    if (file.result === undefined) {
       file.result = {
         state: "fail",
         errors: []
       };
     }
-    if (file.result.errors === void 0) {
+    if (file.result.errors === undefined) {
       file.result.errors = [];
     }
     file.result.errors.push(
@@ -171,7 +171,7 @@ function createFileTask(filepath, root, projectName, pool) {
     tasks: [],
     meta: /* @__PURE__ */ Object.create(null),
     projectName,
-    file: void 0,
+    file: undefined,
     pool
   };
   file.file = file;
@@ -271,16 +271,16 @@ function hasFailed(suite) {
   return toArray(suite).some(
     (s) => {
       var _a;
-      return ((_a = s.result) == null ? void 0 : _a.state) === "fail" || s.type === "suite" && hasFailed(s.tasks);
+      return ((_a = s.result) == null ? undefined : _a.state) === "fail" || s.type === "suite" && hasFailed(s.tasks);
     }
   );
 }
 function getNames(task) {
   const names = [task.name];
   let current = task;
-  while (current == null ? void 0 : current.suite) {
+  while (current == null ? undefined : current.suite) {
     current = current.suite;
-    if (current == null ? void 0 : current.name) {
+    if (current == null ? undefined : current.name) {
       names.unshift(current.name);
     }
   }

package/dist/index.js

@@ -16,13 +16,14 @@ class PendingError extends Error {
   taskId;
 }
 
+const now$2 = Date.now;
 const collectorContext = {
   tasks: [],
   currentSuite: null
 };
 function collectTask(task) {
   var _a;
-  (_a = collectorContext.currentSuite) == null ? void 0 : _a.tasks.push(task);
+  (_a = collectorContext.currentSuite) == null ? undefined : _a.tasks.push(task);
 }
 async function runWithSuite(suite, fn) {
   const prev = collectorContext.currentSuite;
@@ -36,19 +37,42 @@ function withTimeout(fn, timeout, isHook = false) {
   }
   const { setTimeout, clearTimeout } = getSafeTimers();
   return function runWithTimeout(...args) {
-    return Promise.race([
-      new Promise((resolve, reject) => {
-        var _a;
-        const timer = setTimeout(() => {
-          clearTimeout(timer);
-          reject(new Error(makeTimeoutMsg(isHook, timeout)));
-        }, timeout);
-        (_a = timer.unref) == null ? void 0 : _a.call(timer);
-      }),
-      Promise.resolve(fn(...args)).then((result) => {
-        return new Promise((resolve) => setTimeout(resolve, 0, result));
-      })
-    ]);
+    const startTime = now$2();
+    return new Promise((resolve_, reject_) => {
+      var _a;
+      const timer = setTimeout(() => {
+        clearTimeout(timer);
+        reject(new Error(makeTimeoutMsg(isHook, timeout)));
+      }, timeout);
+      (_a = timer.unref) == null ? undefined : _a.call(timer);
+      function resolve(result) {
+        clearTimeout(timer);
+        resolve_(result);
+      }
+      function reject(error) {
+        clearTimeout(timer);
+        reject_(error);
+      }
+      try {
+        const result = fn(...args);
+        if (typeof result === "object" && result != null && typeof result.then === "function") {
+          result.then(
+            (result2) => {
+              if (now$2() - startTime >= timeout) {
+                reject(new Error(makeTimeoutMsg(isHook, timeout)));
+              } else {
+                resolve(result2);
+              }
+            },
+            reject
+          );
+        } else {
+          resolve(result);
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
   };
 }
 function createTestContext(test, runner) {
@@ -74,7 +98,7 @@ function createTestContext(test, runner) {
       withTimeout(handler, timeout ?? runner.config.hookTimeout, true)
     );
   };
-  return ((_a = runner.extendTaskContext) == null ? void 0 : _a.call(runner, context)) || context;
+  return ((_a = runner.extendTaskContext) == null ? undefined : _a.call(runner, context)) || context;
 }
 function makeTimeoutMsg(isHook, timeout) {
   return `${isHook ? "Hook" : "Test"} timed out in ${timeout}ms.
@@ -151,7 +175,7 @@ function withFixtures(fn, testContext) {
       return fn({});
     }
     const fixtures = getFixture(context);
-    if (!(fixtures == null ? void 0 : fixtures.length)) {
+    if (!(fixtures == null ? undefined : fixtures.length)) {
       return fn(context);
     }
     const usedProps = getUsedProps(fn);
@@ -408,12 +432,12 @@ function createSuiteCollector(name, factory = () => {
     const task2 = {
       id: "",
       name: name2,
-      suite: void 0,
+      suite: undefined,
       each: options.each,
       fails: options.fails,
-      context: void 0,
+      context: undefined,
       type: "test",
-      file: void 0,
+      file: undefined,
       retry: options.retry ?? runner.config.retry,
       repeats: options.repeats,
       mode: options.only ? "only" : options.skip ? "skip" : options.todo ? "todo" : "run",
@@ -423,7 +447,7 @@ function createSuiteCollector(name, factory = () => {
     if (options.concurrent || !options.sequential && runner.config.sequence.concurrent) {
       task2.concurrent = true;
     }
-    task2.shuffle = suiteOptions == null ? void 0 : suiteOptions.shuffle;
+    task2.shuffle = suiteOptions == null ? undefined : suiteOptions.shuffle;
     const context = createTestContext(task2, runner);
     Object.defineProperty(task2, "context", {
       value: context,
@@ -435,7 +459,7 @@ function createSuiteCollector(name, factory = () => {
         task2,
         withTimeout(
           withAwaitAsyncAssertions(withFixtures(handler, context), task2),
-          (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
+          (options == null ? undefined : options.timeout) ?? runner.config.testTimeout
         )
       );
     }
@@ -457,8 +481,8 @@ function createSuiteCollector(name, factory = () => {
     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);
+    options.concurrent = this.concurrent || !this.sequential && (options == null ? undefined : options.concurrent);
+    options.sequential = this.sequential || !this.concurrent && (options == null ? undefined : options.sequential);
     const test3 = task(formatName(name2), {
       ...this,
       ...options,
@@ -491,11 +515,11 @@ function createSuiteCollector(name, factory = () => {
       name,
       mode,
       each,
-      file: void 0,
-      shuffle: suiteOptions == null ? void 0 : suiteOptions.shuffle,
+      file: undefined,
+      shuffle: suiteOptions == null ? undefined : suiteOptions.shuffle,
       tasks: [],
       meta: /* @__PURE__ */ Object.create(null),
-      concurrent: suiteOptions == null ? void 0 : suiteOptions.concurrent
+      concurrent: suiteOptions == null ? undefined : suiteOptions.concurrent
     };
     if (runner && includeLocation && runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
@@ -542,7 +566,7 @@ function withAwaitAsyncAssertions(fn, task) {
     const fnResult = await fn(...args);
     if (task.promises) {
       const result = await Promise.allSettled(task.promises);
-      const errors = result.map((r) => r.status === "rejected" ? r.reason : void 0).filter(Boolean);
+      const errors = result.map((r) => r.status === "rejected" ? r.reason : undefined).filter(Boolean);
       if (errors.length) {
         throw errors;
       }
@@ -562,9 +586,9 @@ function createSuite() {
     const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
     const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
     options = {
-      ...currentSuite == null ? void 0 : currentSuite.options,
+      ...currentSuite == null ? undefined : currentSuite.options,
       ...options,
-      shuffle: this.shuffle ?? options.shuffle ?? ((_a = currentSuite == null ? void 0 : currentSuite.options) == null ? void 0 : _a.shuffle) ?? (runner == null ? void 0 : runner.config.sequence.shuffle)
+      shuffle: this.shuffle ?? options.shuffle ?? ((_a = currentSuite == null ? undefined : currentSuite.options) == null ? undefined : _a.shuffle) ?? (runner == null ? undefined : runner.config.sequence.shuffle)
     };
     const isConcurrent = isConcurrentSpecified || options.concurrent && !isSequentialSpecified;
     const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
@@ -609,7 +633,7 @@ function createSuite() {
           }
         }
       });
-      this.setContext("each", void 0);
+      this.setContext("each", undefined);
     };
   };
   suiteFn.for = function(cases, ...args) {
@@ -664,7 +688,7 @@ function createTaskCollector(fn, context) {
           }
         }
       });
-      this.setContext("each", void 0);
+      this.setContext("each", undefined);
     };
   };
   taskFn.for = function(cases, ...args) {
@@ -695,7 +719,7 @@ function createTaskCollector(fn, context) {
       context || {},
       (key) => {
         var _a, _b;
-        return (_b = (_a = getRunner()).injectValue) == null ? void 0 : _b.call(_a, key);
+        return (_b = (_a = getRunner()).injectValue) == null ? undefined : _b.call(_a, key);
       }
     );
     return createTest(function fn2(name, optionsOrFn, optionsOrTest) {
@@ -747,7 +771,7 @@ function formatTitle(template, items, idx) {
       (_, 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
+          truncate: (_b = (_a = runner == null ? undefined : runner.config) == null ? undefined : _a.chaiConfig) == null ? undefined : _b.truncateThreshold
         });
       }
     );
@@ -866,10 +890,10 @@ async function collectTests(specs, runner) {
   const config = runner.config;
   for (const spec of specs) {
     const filepath = typeof spec === "string" ? spec : spec.filepath;
-    const testLocations = typeof spec === "string" ? void 0 : spec.testLocations;
+    const testLocations = typeof spec === "string" ? undefined : spec.testLocations;
     const file = createFileTask(filepath, config.root, config.name, runner.pool);
     file.shuffle = config.sequence.shuffle;
-    (_a = runner.onCollectStart) == null ? void 0 : _a.call(runner, file);
+    (_a = runner.onCollectStart) == null ? undefined : _a.call(runner, file);
     clearCollectorContext(filepath, runner);
     try {
       const setupFiles = toArray(config.setupFiles);
@@ -911,7 +935,7 @@ async function collectTests(specs, runner) {
     calculateSuiteHash(file);
     file.tasks.forEach((task) => {
       var _a2;
-      if (((_a2 = task.suite) == null ? void 0 : _a2.id) === "") {
+      if (((_a2 = task.suite) == null ? undefined : _a2.id) === "") {
         delete task.suite;
       }
     });
@@ -1056,7 +1080,7 @@ async function sendTasksUpdate(runner) {
     const taskPacks = Array.from(packs).map(([id, task]) => {
       return [id, task[0], task[1]];
     });
-    const p = (_a = runner.onTaskUpdate) == null ? void 0 : _a.call(runner, taskPacks, eventsPacks);
+    const p = (_a = runner.onTaskUpdate) == null ? undefined : _a.call(runner, taskPacks, eventsPacks);
     eventsPacks.length = 0;
     packs.clear();
     return p;
@@ -1074,11 +1098,11 @@ async function callCleanupHooks(cleanups) {
 }
 async function runTest(test, runner) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  await ((_a = runner.onBeforeRunTask) == null ? void 0 : _a.call(runner, test));
+  await ((_a = runner.onBeforeRunTask) == null ? undefined : _a.call(runner, test));
   if (test.mode !== "run" && test.mode !== "queued") {
     return;
   }
-  if (((_b = test.result) == null ? void 0 : _b.state) === "fail") {
+  if (((_b = test.result) == null ? undefined : _b.state) === "fail") {
     updateTask("test-failed-early", test, runner);
     return;
   }
@@ -1134,11 +1158,11 @@ async function runTest(test, runner) {
       } catch (e) {
         failTask(test.result, e, runner.config.diffOptions);
       }
-      if (((_e = test.result) == null ? void 0 : _e.pending) || ((_f = test.result) == null ? void 0 : _f.state) === "skip") {
+      if (((_e = test.result) == null ? undefined : _e.pending) || ((_f = test.result) == null ? undefined : _f.state) === "skip") {
         test.mode = "skip";
-        test.result = { state: "skip", note: (_g = test.result) == null ? void 0 : _g.note, pending: true };
+        test.result = { state: "skip", note: (_g = test.result) == null ? undefined : _g.note, pending: true };
         updateTask("test-finished", test, runner);
-        setCurrentTest(void 0);
+        setCurrentTest(undefined);
         return;
       }
       try {
@@ -1165,8 +1189,8 @@ async function runTest(test, runner) {
           runner.config.sequence.hooks
         );
       }
-      test.onFailed = void 0;
-      test.onFinished = void 0;
+      test.onFailed = undefined;
+      test.onFinished = undefined;
       if (test.result.state === "pass") {
         break;
       }
@@ -1184,12 +1208,12 @@ async function runTest(test, runner) {
       test.result.errors = [error];
     } else {
       test.result.state = "pass";
-      test.result.errors = void 0;
+      test.result.errors = undefined;
     }
   }
-  setCurrentTest(void 0);
+  setCurrentTest(undefined);
   test.result.duration = now() - start;
-  await ((_i = runner.onAfterRunTask) == null ? void 0 : _i.call(runner, test));
+  await ((_i = runner.onAfterRunTask) == null ? undefined : _i.call(runner, test));
   updateTask("test-finished", test, runner);
 }
 function failTask(result, err, diffOptions) {
@@ -1219,8 +1243,8 @@ function markTasksAsSkipped(suite, runner) {
 }
 async function runSuite(suite, runner) {
   var _a, _b, _c, _d;
-  await ((_a = runner.onBeforeRunSuite) == null ? void 0 : _a.call(runner, suite));
-  if (((_b = suite.result) == null ? void 0 : _b.state) === "fail") {
+  await ((_a = runner.onBeforeRunSuite) == null ? undefined : _a.call(runner, suite));
+  if (((_b = suite.result) == null ? undefined : _b.state) === "fail") {
     markTasksAsSkipped(suite, runner);
     updateTask("suite-failed-early", suite, runner);
     return;
@@ -1289,7 +1313,7 @@ async function runSuite(suite, runner) {
     if (suite.mode === "run" || suite.mode === "queued") {
       if (!runner.config.passWithNoTests && !hasTests(suite)) {
         suite.result.state = "fail";
-        if (!((_c = suite.result.errors) == null ? void 0 : _c.length)) {
+        if (!((_c = suite.result.errors) == null ? undefined : _c.length)) {
           const error = processError(
             new Error(`No test found in suite ${suite.name}`)
           );
@@ -1303,7 +1327,7 @@ async function runSuite(suite, runner) {
     }
     suite.result.duration = now() - start;
     updateTask("suite-finished", suite, runner);
-    await ((_d = runner.onAfterRunSuite) == null ? void 0 : _d.call(runner, suite));
+    await ((_d = runner.onAfterRunSuite) == null ? undefined : _d.call(runner, suite));
   }
 }
 let limitMaxConcurrency;
@@ -1319,7 +1343,7 @@ async function runFiles(files, runner) {
   limitMaxConcurrency ?? (limitMaxConcurrency = limitConcurrency(runner.config.maxConcurrency));
   for (const file of files) {
     if (!file.tasks.length && !runner.config.passWithNoTests) {
-      if (!((_b = (_a = file.result) == null ? void 0 : _a.errors) == null ? void 0 : _b.length)) {
+      if (!((_b = (_a = file.result) == null ? undefined : _a.errors) == null ? undefined : _b.length)) {
         const error = processError(
           new Error(`No test suite found in file ${file.filepath}`)
         );
@@ -1335,21 +1359,21 @@ async function runFiles(files, runner) {
 async function startTests(specs, runner) {
   var _a, _b, _c, _d;
   const paths = specs.map((f) => typeof f === "string" ? f : f.filepath);
-  await ((_a = runner.onBeforeCollect) == null ? void 0 : _a.call(runner, paths));
+  await ((_a = runner.onBeforeCollect) == null ? undefined : _a.call(runner, paths));
   const files = await collectTests(specs, runner);
-  await ((_b = runner.onCollected) == null ? void 0 : _b.call(runner, files));
-  await ((_c = runner.onBeforeRunFiles) == null ? void 0 : _c.call(runner, files));
+  await ((_b = runner.onCollected) == null ? undefined : _b.call(runner, files));
+  await ((_c = runner.onBeforeRunFiles) == null ? undefined : _c.call(runner, files));
   await runFiles(files, runner);
-  await ((_d = runner.onAfterRunFiles) == null ? void 0 : _d.call(runner, files));
+  await ((_d = runner.onAfterRunFiles) == null ? undefined : _d.call(runner, files));
   await sendTasksUpdate(runner);
   return files;
 }
 async function publicCollect(specs, runner) {
   var _a, _b;
   const paths = specs.map((f) => typeof f === "string" ? f : f.filepath);
-  await ((_a = runner.onBeforeCollect) == null ? void 0 : _a.call(runner, paths));
+  await ((_a = runner.onBeforeCollect) == null ? undefined : _a.call(runner, paths));
   const files = await collectTests(specs, runner);
-  await ((_b = runner.onCollected) == null ? void 0 : _b.call(runner, files));
+  await ((_b = runner.onCollected) == null ? undefined : _b.call(runner, files));
   return files;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -38,8 +38,8 @@
     "dist"
   ],
   "dependencies": {
-    "pathe": "^2.0.0",
-    "@vitest/utils": "3.0.0"
+    "pathe": "^2.0.1",
+    "@vitest/utils": "3.0.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",