vitest 3.0.0-beta.3 → 3.0.0

package/dist/chunks/{resolveConfig.C1d7TK-U.js → resolveConfig.CSLLD33d.js}

@@ -1,4 +1,4 @@
-import { slash, createDefer, toArray } from '@vitest/utils';
+import { slash, createDefer, shuffle, toArray } from '@vitest/utils';
 import fs, { statSync, realpathSync, promises as promises$1 } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { builtinModules, createRequire } from 'node:module';
@@ -13,8 +13,10 @@ import c from 'tinyrainbow';
 import { e as extraInlineDeps, d as defaultPort, a as defaultBrowserPort, b as defaultInspectPort } from './constants.fzPh7AOq.js';
 import * as nodeos from 'node:os';
 import nodeos__default from 'node:os';
-import { h as hash, w as wrapSerializableConfig, T as Typechecker, i as isWindows, R as RandomSequencer, B as BaseSequencer } from './RandomSequencer.C6x84bNN.js';
+import { w as wrapSerializableConfig, a as Typechecker, b as isWindows } from './typechecker.BJMkWMXo.js';
 import { isCI, provider } from 'std-env';
+import crypto from 'node:crypto';
+import { isatty } from 'node:tty';
 import { g as getDefaultExportFromCjs } from './_commonjsHelpers.BFTU3MAI.js';
 import require$$0 from 'util';
 import require$$0$1 from 'path';
@@ -24,6 +26,7 @@ import Tinypool$1, { Tinypool } from 'tinypool';
 import { MessageChannel } from 'node:worker_threads';
 import { hasFailed } from '@vitest/runner/utils';
 import { rootDir } from '../path.js';
+import { slash as slash$1 } from 'vite-node/utils';
 
 function groupBy(collection, iteratee) {
   return collection.reduce((acc, item) => {
@@ -51,6 +54,8 @@ function wildcardPatternToRegExp(pattern) {
   return new RegExp(`^${regexp}`, "i");
 }
 
+const hash = crypto.hash ?? ((algorithm, data, outputEncoding) => crypto.createHash(algorithm).update(data).digest(outputEncoding));
+
 class FilesStatsCache {
   cache = /* @__PURE__ */ new Map();
   getStats(key) {
@@ -2709,9 +2714,9 @@ function requireToRegexRange () {
 	};
 
 	function collatePatterns(neg, pos, options) {
-	  let onlyNegative = filterPatterns(neg, pos, '-', false) || [];
-	  let onlyPositive = filterPatterns(pos, neg, '', false) || [];
-	  let intersected = filterPatterns(neg, pos, '-?', true) || [];
+	  let onlyNegative = filterPatterns(neg, pos, '-', false);
+	  let onlyPositive = filterPatterns(pos, neg, '', false);
+	  let intersected = filterPatterns(neg, pos, '-?', true);
 	  let subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
 	  return subpatterns.join('|');
 	}
@@ -6600,7 +6605,7 @@ async function groupFilesByEnv(files) {
 const created = /* @__PURE__ */ new Set();
 const promises = /* @__PURE__ */ new Map();
 function createMethodsRPC(project, options = {}) {
-  const ctx = project.ctx;
+  const ctx = project.vitest;
   const cacheFs = options.cacheFs ?? false;
   return {
     snapshotSaved(snapshot) {
@@ -6658,38 +6663,40 @@ function createMethodsRPC(project, options = {}) {
     transform(id, environment) {
       return project.vitenode.transformModule(id, environment).catch(handleRollupError);
     },
-    onPathsCollected(paths) {
-      ctx.state.collectPaths(paths);
-      return ctx.report("onPathsCollected", paths);
-    },
-    onQueued(file) {
-      ctx.state.collectFiles(project, [file]);
-      const testModule = ctx.state.getReportedEntity(file);
-      return ctx.report("onTestModuleQueued", testModule);
+    async onQueued(file) {
+      if (options.collect) {
+        ctx.state.collectFiles(project, [file]);
+      } else {
+        await ctx._testRun.enqueued(project, file);
+      }
     },
-    onCollected(files) {
-      ctx.state.collectFiles(project, files);
-      return ctx.report("onCollected", files);
+    async onCollected(files) {
+      if (options.collect) {
+        ctx.state.collectFiles(project, files);
+      } else {
+        await ctx._testRun.collected(project, files);
+      }
     },
     onAfterSuiteRun(meta) {
       ctx.coverageProvider?.onAfterSuiteRun(meta);
     },
-    onTaskUpdate(packs) {
-      ctx.state.updateTasks(packs);
-      return ctx.report("onTaskUpdate", packs);
+    async onTaskUpdate(packs, events) {
+      if (options.collect) {
+        ctx.state.updateTasks(packs);
+      } else {
+        await ctx._testRun.updated(packs, events);
+      }
     },
-    onUserConsoleLog(log) {
-      ctx.state.updateUserLog(log);
-      ctx.report("onUserConsoleLog", log);
+    async onUserConsoleLog(log) {
+      if (options.collect) {
+        ctx.state.updateUserLog(log);
+      } else {
+        await ctx._testRun.log(log);
+      }
     },
     onUnhandledError(err, type) {
       ctx.state.catchError(err, type);
     },
-    onFinished(files) {
-      const errors = ctx.state.getUnhandledErrors();
-      ctx._checkUnhandledErrors(errors);
-      return ctx.report("onFinished", files, errors);
-    },
     onCancel(reason) {
       ctx.cancelCurrentRun(reason);
     },
@@ -6716,7 +6723,7 @@ function handleRollupError(e) {
   throw e;
 }
 
-function createChildProcessChannel$1(project) {
+function createChildProcessChannel$1(project, collect = false) {
   const emitter = new EventEmitter();
   const cleanup = () => emitter.removeAllListeners();
   const events = { message: "message", response: "response" };
@@ -6724,7 +6731,7 @@ function createChildProcessChannel$1(project) {
     onMessage: (callback) => emitter.on(events.message, callback),
     postMessage: (message) => emitter.emit(events.response, message)
   };
-  const rpc = createBirpc(createMethodsRPC(project, { cacheFs: true }), {
+  const rpc = createBirpc(createMethodsRPC(project, { cacheFs: true, collect }), {
     eventNames: ["onCancel"],
     serialize: v8.serialize,
     deserialize: (v) => v8.deserialize(Buffer.from(v)),
@@ -6772,7 +6779,7 @@ function createForksPool(ctx, { execArgv, env }) {
     async function runFiles(project, config, files, environment, invalidates = []) {
       const paths = files.map((f) => f.filepath);
       ctx.state.clearFiles(project, paths);
-      const { channel, cleanup } = createChildProcessChannel$1(project);
+      const { channel, cleanup } = createChildProcessChannel$1(project, name === "collect");
       const workerId = ++id;
       const data = {
         pool: "forks",
@@ -6907,11 +6914,11 @@ function createForksPool(ctx, { execArgv, env }) {
   };
 }
 
-function createWorkerChannel$1(project) {
+function createWorkerChannel$1(project, collect) {
   const channel = new MessageChannel();
   const port = channel.port2;
   const workerPort = channel.port1;
-  const rpc = createBirpc(createMethodsRPC(project), {
+  const rpc = createBirpc(createMethodsRPC(project, { collect }), {
     eventNames: ["onCancel"],
     post(v) {
       port.postMessage(v);
@@ -6959,7 +6966,7 @@ function createThreadsPool(ctx, { execArgv, env }) {
     async function runFiles(project, config, files, environment, invalidates = []) {
       const paths = files.map((f) => f.filepath);
       ctx.state.clearFiles(project, paths);
-      const { workerPort, port } = createWorkerChannel$1(project);
+      const { workerPort, port } = createWorkerChannel$1(project, name === "collect");
       const workerId = ++id;
       const data = {
         pool: "threads",
@@ -7103,7 +7110,8 @@ function createTypecheckPool(ctx) {
   const rerunTriggered = /* @__PURE__ */ new WeakSet();
   async function onParseEnd(project, { files, sourceErrors }) {
     const checker = project.typechecker;
-    await ctx.report("onTaskUpdate", checker.getTestPacks());
+    const { packs, events } = checker.getTestPacksAndEvents();
+    await ctx._testRun.updated(packs, events);
     if (!project.config.typecheck.ignoreSourceErrors) {
       sourceErrors.forEach(
         (error) => ctx.state.catchError(error, "Unhandled Source Error")
@@ -7133,8 +7141,11 @@ function createTypecheckPool(ctx) {
     project.typechecker = checker;
     checker.setFiles(files);
     checker.onParseStart(async () => {
-      ctx.state.collectFiles(project, checker.getTestFiles());
-      await ctx.report("onCollected");
+      const files2 = checker.getTestFiles();
+      for (const file of files2) {
+        await ctx._testRun.enqueued(project, file);
+      }
+      await ctx._testRun.collected(project, files2);
     });
     checker.onParseEnd((result) => onParseEnd(project, result));
     checker.onWatcherRerun(async () => {
@@ -7148,9 +7159,13 @@ function createTypecheckPool(ctx) {
         );
       }
       await checker.collectTests();
-      ctx.state.collectFiles(project, checker.getTestFiles());
-      await ctx.report("onTaskUpdate", checker.getTestPacks());
-      await ctx.report("onCollected");
+      const testFiles = checker.getTestFiles();
+      for (const file of testFiles) {
+        await ctx._testRun.enqueued(project, file);
+      }
+      await ctx._testRun.collected(project, testFiles);
+      const { packs, events } = checker.getTestPacksAndEvents();
+      await ctx._testRun.updated(packs, events);
     });
     await checker.prepare();
     return checker;
@@ -7171,8 +7186,11 @@ function createTypecheckPool(ctx) {
       const checker = await createWorkspaceTypechecker(project, files);
       checker.setFiles(files);
       await checker.collectTests();
-      ctx.state.collectFiles(project, checker.getTestFiles());
-      await ctx.report("onCollected");
+      const testFiles = checker.getTestFiles();
+      for (const file of testFiles) {
+        await ctx._testRun.enqueued(project, file);
+      }
+      await ctx._testRun.collected(project, testFiles);
     }
   }
   async function runTests(specs) {
@@ -7196,8 +7214,11 @@ function createTypecheckPool(ctx) {
       });
       const triggered = await _p;
       if (project.typechecker && !triggered) {
-        ctx.state.collectFiles(project, project.typechecker.getTestFiles());
-        await ctx.report("onCollected");
+        const testFiles = project.typechecker.getTestFiles();
+        for (const file of testFiles) {
+          await ctx._testRun.enqueued(project, file);
+        }
+        await ctx._testRun.collected(project, testFiles);
         await onParseEnd(project, project.typechecker.getResult());
         continue;
       }
@@ -7285,7 +7306,7 @@ function stringToBytes(input, percentageReference) {
 }
 
 const suppressWarningsPath$1 = resolve$1(rootDir, "./suppress-warnings.cjs");
-function createChildProcessChannel(project) {
+function createChildProcessChannel(project, collect) {
   const emitter = new EventEmitter();
   const cleanup = () => emitter.removeAllListeners();
   const events = { message: "message", response: "response" };
@@ -7294,7 +7315,7 @@ function createChildProcessChannel(project) {
     postMessage: (message) => emitter.emit(events.response, message)
   };
   const rpc = createBirpc(
-    createMethodsRPC(project, { cacheFs: true }),
+    createMethodsRPC(project, { cacheFs: true, collect }),
     {
       eventNames: ["onCancel"],
       serialize: v8.serialize,
@@ -7348,7 +7369,7 @@ function createVmForksPool(ctx, { execArgv, env }) {
     async function runFiles(project, config, files, environment, invalidates = []) {
       const paths = files.map((f) => f.filepath);
       ctx.state.clearFiles(project, paths);
-      const { channel, cleanup } = createChildProcessChannel(project);
+      const { channel, cleanup } = createChildProcessChannel(project, name === "collect");
       const workerId = ++id;
       const data = {
         pool: "forks",
@@ -7431,11 +7452,11 @@ function getMemoryLimit$1(config) {
 }
 
 const suppressWarningsPath = resolve$1(rootDir, "./suppress-warnings.cjs");
-function createWorkerChannel(project) {
+function createWorkerChannel(project, collect) {
   const channel = new MessageChannel();
   const port = channel.port2;
   const workerPort = channel.port1;
-  const rpc = createBirpc(createMethodsRPC(project), {
+  const rpc = createBirpc(createMethodsRPC(project, { collect }), {
     eventNames: ["onCancel"],
     post(v) {
       port.postMessage(v);
@@ -7487,7 +7508,7 @@ function createVmThreadsPool(ctx, { execArgv, env }) {
     async function runFiles(project, config, files, environment, invalidates = []) {
       const paths = files.map((f) => f.filepath);
       ctx.state.clearFiles(project, paths);
-      const { workerPort, port } = createWorkerChannel(project);
+      const { workerPort, port } = createWorkerChannel(project, name === "collect");
       const workerId = ++id;
       const data = {
         pool: "vmThreads",
@@ -7634,6 +7655,7 @@ function createPool(ctx) {
         VITEST: "true",
         NODE_ENV: process.env.NODE_ENV || "test",
         VITEST_MODE: ctx.config.watch ? "WATCH" : "RUN",
+        FORCE_TTY: isatty(1) ? "true" : "",
         ...process.env,
         ...ctx.config.env
       }
@@ -7730,6 +7752,61 @@ function createPool(ctx) {
   };
 }
 
+class BaseSequencer {
+  ctx;
+  constructor(ctx) {
+    this.ctx = ctx;
+  }
+  // async so it can be extended by other sequelizers
+  async shard(files) {
+    const { config } = this.ctx;
+    const { index, count } = config.shard;
+    const shardSize = Math.ceil(files.length / count);
+    const shardStart = shardSize * (index - 1);
+    const shardEnd = shardSize * index;
+    return [...files].map((spec) => {
+      const fullPath = resolve(slash$1(config.root), slash$1(spec.moduleId));
+      const specPath = fullPath?.slice(config.root.length);
+      return {
+        spec,
+        hash: hash("sha1", specPath, "hex")
+      };
+    }).sort((a, b) => a.hash < b.hash ? -1 : a.hash > b.hash ? 1 : 0).slice(shardStart, shardEnd).map(({ spec }) => spec);
+  }
+  // async so it can be extended by other sequelizers
+  async sort(files) {
+    const cache = this.ctx.cache;
+    return [...files].sort((a, b) => {
+      const keyA = `${a.project.name}:${relative(this.ctx.config.root, a.moduleId)}`;
+      const keyB = `${b.project.name}:${relative(this.ctx.config.root, b.moduleId)}`;
+      const aState = cache.getFileTestResults(keyA);
+      const bState = cache.getFileTestResults(keyB);
+      if (!aState || !bState) {
+        const statsA = cache.getFileStats(keyA);
+        const statsB = cache.getFileStats(keyB);
+        if (!statsA || !statsB) {
+          return !statsA && statsB ? -1 : !statsB && statsA ? 1 : 0;
+        }
+        return statsB.size - statsA.size;
+      }
+      if (aState.failed && !bState.failed) {
+        return -1;
+      }
+      if (!aState.failed && bState.failed) {
+        return 1;
+      }
+      return bState.duration - aState.duration;
+    });
+  }
+}
+
+class RandomSequencer extends BaseSequencer {
+  async sort(files) {
+    const { sequence } = this.ctx.config;
+    return shuffle(files, sequence.seed);
+  }
+}
+
 function resolvePath(path, root) {
   return normalize(
     /* @__PURE__ */ resolveModule(path, { paths: [root] }) ?? resolve(root, path)
@@ -7889,15 +7966,22 @@ function resolveConfig(mode, options, viteConfig, logger) {
       ].join(""));
     }
   }
-  if (browser.enabled && !(browser.provider === "playwright" && browser.name === "chromium")) {
-    const browserConfig = { browser: { provider: browser.provider, name: browser.name } };
+  const playwrightChromiumOnly = browser.provider === "playwright" && (browser.name === "chromium" || browser.instances?.every((i) => i.browser === "chromium"));
+  if (browser.enabled && !playwrightChromiumOnly) {
+    const browserConfig = {
+      browser: {
+        provider: browser.provider,
+        name: browser.name,
+        instances: browser.instances
+      }
+    };
     if (resolved.coverage.enabled && resolved.coverage.provider === "v8") {
       throw new Error(
         `@vitest/coverage-v8 does not work with
 ${JSON.stringify(browserConfig, null, 2)}
 
 Use either:
-${JSON.stringify({ browser: { provider: "playwright", name: "chromium" } }, null, 2)}
+${JSON.stringify({ browser: { provider: "playwright", instances: [{ browser: "chromium" }] } }, null, 2)}
 
 ...or change your coverage provider to:
 ${JSON.stringify({ coverage: { provider: "istanbul" } }, null, 2)}
@@ -7911,7 +7995,7 @@ ${JSON.stringify({ coverage: { provider: "istanbul" } }, null, 2)}
 ${JSON.stringify(browserConfig, null, 2)}
 
 Use either:
-${JSON.stringify({ browser: { provider: "playwright", name: "chromium" } }, null, 2)}
+${JSON.stringify({ browser: { provider: "playwright", instances: [{ browser: "chromium" }] } }, null, 2)}
 
 ...or disable ${inspectOption}
 `
@@ -7976,6 +8060,7 @@ ${JSON.stringify({ browser: { provider: "playwright", name: "chromium" } }, null
       )}`
     )
   );
+  resolved.coverage.exclude.push(...resolved.include);
   resolved.forceRerunTriggers = [
     ...resolved.forceRerunTriggers,
     ...resolved.setupFiles
@@ -8383,4 +8468,4 @@ function resolveCoverageReporters(configReporters) {
   return resolvedReporters;
 }
 
-export { VitestCache as V, resolveConfig as a, resolveApiServerConfig as b, coverageConfigDefaults as c, createMethodsRPC as d, requireMicromatch as e, configDefaults as f, getFilePoolName as g, isBrowserEnabled as h, isPackageExists as i, groupBy as j, createPool as k, mm as m, resolveCoverageReporters as r, stdout as s, wildcardPatternToRegExp as w };
+export { BaseSequencer as B, RandomSequencer as R, VitestCache as V, resolveConfig as a, resolveApiServerConfig as b, coverageConfigDefaults as c, createMethodsRPC as d, requireMicromatch as e, configDefaults as f, getFilePoolName as g, hash as h, isPackageExists as i, isBrowserEnabled as j, groupBy as k, createPool as l, mm as m, resolveCoverageReporters as r, stdout as s, wildcardPatternToRegExp as w };

package/dist/chunks/{rpc.C3q9uwRX.js → rpc.TVf73xOu.js}

@@ -54,7 +54,6 @@ function createRuntimeRpc(options) {
       {
         eventNames: [
           "onUserConsoleLog",
-          "onFinished",
           "onCollected",
           "onCancel"
         ],

package/dist/chunks/{runBaseTests.qNWRkgHj.js → runBaseTests.C0T_TQwH.js}

@@ -1,23 +1,24 @@
 import { performance } from 'node:perf_hooks';
 import { startTests, collectTests } from '@vitest/runner';
-import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './index.BBoOXW-l.js';
+import { a as resolveSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './index.CUcwvygK.js';
 import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './coverage.BWeNbfBa.js';
-import { a as globalExpect, v as vi } from './vi.S4Fq8wSo.js';
+import { a as globalExpect, v as vi } from './vi.Da_PT3Vw.js';
 import { c as closeInspector } from './inspector.DKLceBVD.js';
 import { createRequire } from 'node:module';
 import timers from 'node:timers';
+import timersPromises from 'node:timers/promises';
 import util from 'node:util';
 import { getSafeTimers } from '@vitest/utils';
 import { KNOWN_ASSET_TYPES } from 'vite-node/constants';
 import { installSourcemapsSupport } from 'vite-node/source-map';
-import { V as VitestIndex } from './index.CkWmZCXU.js';
-import { s as setupCommonEnv } from './setup-common.Cp_bu5q3.js';
+import { V as VitestIndex } from './index.BQbxGbG9.js';
+import { s as setupCommonEnv } from './setup-common.D0zLenuv.js';
 import { g as getWorkerState, r as resetModules } from './utils.C8RiOc4B.js';
 import 'chai';
 import 'node:path';
 import '../path.js';
 import 'node:url';
-import './rpc.C3q9uwRX.js';
+import './rpc.TVf73xOu.js';
 import './index.68735LiX.js';
 import '@vitest/expect';
 import '@vitest/runner/utils';
@@ -61,7 +62,8 @@ async function setupGlobalEnv(config, { environment }, executor) {
   }
   globalThis.__vitest_required__ = {
     util,
-    timers
+    timers,
+    timersPromises
   };
   installSourcemapsSupport({
     getSourceMap: (source) => state.moduleCache.getSourceMap(source)
@@ -77,7 +79,7 @@ function resolveAsset(mod, url) {
   mod.exports = url;
 }
 async function setupConsoleLogSpy() {
-  const { createCustomConsole } = await import('./console.BYGVloWk.js');
+  const { createCustomConsole } = await import('./console.CN7AiMGV.js');
   globalThis.console = createCustomConsole();
 }
 async function withEnv({ environment }, options, fn) {

package/dist/chunks/{setup-common.Cp_bu5q3.js → setup-common.D0zLenuv.js}

@@ -13,7 +13,7 @@ async function setupCommonEnv(config) {
   globalSetup = true;
   setSafeTimers();
   if (config.globals) {
-    (await import('./globals.BFncSRNA.js')).registerApiGlobally();
+    (await import('./globals.C5RQxaV3.js')).registerApiGlobally();
   }
 }
 function setupDefines(defines) {