vitest 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/chunks/{constants.DnKduX2e.js → constants.CXzqaLmq.js}

@@ -9,7 +9,6 @@ const extraInlineDeps = [
 	/vite\w*\/dist\/client\/env.mjs/
 ];
 const CONFIG_NAMES = ["vitest.config", "vite.config"];
-const WORKSPACES_NAMES = ["vitest.workspace", "vitest.projects"];
 const CONFIG_EXTENSIONS = [
 	".ts",
 	".mts",
@@ -19,8 +18,6 @@ const CONFIG_EXTENSIONS = [
 	".cjs"
 ];
 const configFiles = CONFIG_NAMES.flatMap((name) => CONFIG_EXTENSIONS.map((ext) => name + ext));
-const WORKSPACES_EXTENSIONS = [...CONFIG_EXTENSIONS, ".json"];
-const workspacesFiles = WORKSPACES_NAMES.flatMap((name) => WORKSPACES_EXTENSIONS.map((ext) => name + ext));
 const globalApis = [
 	"suite",
 	"test",
@@ -41,4 +38,4 @@ const globalApis = [
 	"onTestFailed"
 ];
 
-export { API_PATH as A, defaultPort as a, defaultInspectPort as b, configFiles as c, defaultBrowserPort as d, extraInlineDeps as e, globalApis as g, workspacesFiles as w };
+export { API_PATH as A, defaultPort as a, defaultInspectPort as b, configFiles as c, defaultBrowserPort as d, extraInlineDeps as e, globalApis as g };

package/dist/chunks/{coverage.BjMqihzx.js → coverage.OOpN1tMC.js}

@@ -16,7 +16,7 @@ import assert from 'node:assert';
 import v8 from 'node:v8';
 import { format, inspect } from 'node:util';
 import { version, mergeConfig } from 'vite';
-import { c as configFiles, w as workspacesFiles, e as extraInlineDeps, d as defaultBrowserPort, b as defaultInspectPort, a as defaultPort } from './constants.DnKduX2e.js';
+import { c as configFiles, e as extraInlineDeps, d as defaultBrowserPort, b as defaultInspectPort, a as defaultPort } from './constants.CXzqaLmq.js';
 import { a as isWindows } from './env.D4Lgay0q.js';
 import * as nodeos from 'node:os';
 import nodeos__default from 'node:os';
@@ -24,7 +24,7 @@ import { isatty } from 'node:tty';
 import EventEmitter from 'node:events';
 import { c as createBirpc } from './index.B521nVV-.js';
 import Tinypool$1, { Tinypool } from 'tinypool';
-import { w as wrapSerializableConfig, a as Typechecker } from './typechecker.CVytUJuF.js';
+import { w as wrapSerializableConfig, a as Typechecker } from './typechecker.CMNPqJOo.js';
 import { MessageChannel } from 'node:worker_threads';
 import { hasFailed } from '@vitest/runner/utils';
 import { rootDir } from '../path.js';
@@ -3438,9 +3438,7 @@ class BaseSequencer {
 	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;
+		const [shardStart, shardEnd] = this.calculateShardRange(files.length, index, count);
 		return [...files].map((spec) => {
 			const fullPath = resolve$1(slash(config.root), slash(spec.moduleId));
 			const specPath = fullPath?.slice(config.root.length);
@@ -3473,6 +3471,20 @@ class BaseSequencer {
 			return bState.duration - aState.duration;
 		});
 	}
+	// Calculate distributed shard range [start, end] distributed equally
+	calculateShardRange(filesCount, index, count) {
+		const baseShardSize = Math.floor(filesCount / count);
+		const remainderTestFilesCount = filesCount % count;
+		if (remainderTestFilesCount >= index) {
+			const shardSize = baseShardSize + 1;
+			const shardStart = shardSize * (index - 1);
+			const shardEnd = shardSize * index;
+			return [shardStart, shardEnd];
+		}
+		const shardStart = remainderTestFilesCount * (baseShardSize + 1) + (index - remainderTestFilesCount - 1) * baseShardSize;
+		const shardEnd = shardStart + baseShardSize;
+		return [shardStart, shardEnd];
+	}
 }
 
 class RandomSequencer extends BaseSequencer {
@@ -3642,7 +3654,6 @@ function resolveConfig$1(vitest, options, viteConfig) {
 		...resolved.include,
 		resolved.config && slash$1(resolved.config),
 		...configFiles,
-		...workspacesFiles,
 		"**/virtual:*",
 		"**/__x00__*",
 		"**/node_modules/**"
@@ -3683,7 +3694,11 @@ function resolveConfig$1(vitest, options, viteConfig) {
 	resolved.attachmentsDir = resolve$1(resolved.root, resolved.attachmentsDir ?? ".vitest-attachments");
 	if (resolved.snapshotEnvironment) resolved.snapshotEnvironment = resolvePath(resolved.snapshotEnvironment, resolved.root);
 	resolved.testNamePattern = resolved.testNamePattern ? resolved.testNamePattern instanceof RegExp ? resolved.testNamePattern : new RegExp(resolved.testNamePattern) : void 0;
-	if (resolved.snapshotFormat && "plugins" in resolved.snapshotFormat) resolved.snapshotFormat.plugins = [];
+	if (resolved.snapshotFormat && "plugins" in resolved.snapshotFormat) {
+		resolved.snapshotFormat.plugins = [];
+		// TODO: support it via separate config (like DiffOptions) or via `Function.toString()`
+		if (typeof resolved.snapshotFormat.compareKeys === "function") throw new TypeError(`"snapshotFormat.compareKeys" function is not supported.`);
+	}
 	const UPDATE_SNAPSHOT = resolved.update || process.env.UPDATE_SNAPSHOT;
 	resolved.snapshotOptions = {
 		expand: resolved.expandSnapshotDiff ?? false,
@@ -3755,9 +3770,6 @@ function resolveConfig$1(vitest, options, viteConfig) {
 		["vmForks", "maxForks"]
 	];
 	for (const [poolOptionKey, workerOptionKey] of poolForksOptions) if (resolved.poolOptions?.[poolOptionKey]?.[workerOptionKey]) resolved.poolOptions[poolOptionKey][workerOptionKey] = resolveInlineWorkerOption(resolved.poolOptions[poolOptionKey][workerOptionKey]);
-	if (typeof resolved.workspace === "string")
- // if passed down from the CLI and it's relative, resolve relative to CWD
-	resolved.workspace = typeof options.workspace === "string" && options.workspace[0] === "." ? resolve$1(process.cwd(), options.workspace) : resolvePath(resolved.workspace, resolved.root);
 	if (!builtinPools.includes(resolved.pool)) resolved.pool = resolvePath(resolved.pool, resolved.root);
 	if (mode === "benchmark") {
 		resolved.benchmark = {
@@ -3948,6 +3960,7 @@ class BaseCoverageProvider {
 	coverageFiles = /* @__PURE__ */ new Map();
 	pendingPromises = [];
 	coverageFilesDirectory;
+	roots = [];
 	_initialize(ctx) {
 		this.ctx = ctx;
 		if (ctx.version !== this.version) ctx.logger.warn(c.yellow(`Loaded ${c.inverse(c.yellow(` vitest@${ctx.version} `))} and ${c.inverse(c.yellow(` @vitest/coverage-${this.name}@${this.version} `))}.
@@ -3971,44 +3984,55 @@ Update your dependencies and make sure the versions match.`));
 		const shard = this.ctx.config.shard;
 		const tempDirectory = `.tmp${shard ? `-${shard.index}-${shard.count}` : ""}`;
 		this.coverageFilesDirectory = resolve$1(this.options.reportsDirectory, tempDirectory);
+		// If --project filter is set pick only roots of resolved projects
+		this.roots = ctx.config.project?.length ? [...new Set(ctx.projects.map((project) => project.config.root))] : [ctx.config.root];
 	}
 	/**
 	* Check if file matches `coverage.include` but not `coverage.exclude`
 	*/
-	isIncluded(_filename) {
+	isIncluded(_filename, root) {
+		const roots = root ? [root] : this.roots;
 		const filename = slash(_filename);
 		const cacheHit = this.globCache.get(filename);
 		if (cacheHit !== void 0) return cacheHit;
 		// File outside project root with default allowExternal
-		if (this.options.allowExternal === false && !filename.startsWith(this.ctx.config.root)) {
+		if (this.options.allowExternal === false && roots.every((root) => !filename.startsWith(root))) {
 			this.globCache.set(filename, false);
 			return false;
 		}
-		const options = {
-			contains: true,
-			dot: true,
-			cwd: this.ctx.config.root,
-			ignore: this.options.exclude
-		};
 		// By default `coverage.include` matches all files, except "coverage.exclude"
 		const glob = this.options.include || "**";
-		const included = pm.isMatch(filename, glob, options) && existsSync(cleanUrl(filename));
+		let included = roots.some((root) => {
+			const options = {
+				contains: true,
+				dot: true,
+				cwd: root,
+				ignore: this.options.exclude
+			};
+			return pm.isMatch(filename, glob, options);
+		});
+		included &&= existsSync(cleanUrl(filename));
 		this.globCache.set(filename, included);
 		return included;
 	}
-	async getUntestedFiles(testedFiles) {
-		if (this.options.include == null) return [];
-		let includedFiles = await glob(this.options.include, {
-			cwd: this.ctx.config.root,
+	async getUntestedFilesByRoot(testedFiles, include, root) {
+		let includedFiles = await glob(include, {
+			cwd: root,
 			ignore: [...this.options.exclude, ...testedFiles.map((file) => slash(file))],
 			absolute: true,
 			dot: true,
 			onlyFiles: true
 		});
 		// Run again through picomatch as tinyglobby's exclude pattern is different ({ "exclude": ["math"] } should ignore "src/math.ts")
-		includedFiles = includedFiles.filter((file) => this.isIncluded(file));
+		includedFiles = includedFiles.filter((file) => this.isIncluded(file, root));
 		if (this.ctx.config.changed) includedFiles = (this.ctx.config.related || []).filter((file) => includedFiles.includes(file));
-		return includedFiles.map((file) => slash(path.resolve(this.ctx.config.root, file)));
+		return includedFiles.map((file) => slash(path.resolve(root, file)));
+	}
+	async getUntestedFiles(testedFiles) {
+		if (this.options.include == null) return [];
+		const rootMapper = this.getUntestedFilesByRoot.bind(this, testedFiles, this.options.include);
+		const matrix = await Promise.all(this.roots.map(rootMapper));
+		return matrix.flatMap((files) => files);
 	}
 	createCoverageMap() {
 		throw new Error("BaseReporter's createCoverageMap was not overwritten");
@@ -4268,7 +4292,9 @@ Update your dependencies and make sure the versions match.`));
 			root: project.config.root,
 			isBrowserEnabled: project.isBrowserEnabled(),
 			vitenode: project.vitenode
-		})), {
+		})), 
+		// Check core last as it will match all files anyway
+{
 			root: ctx.config.root,
 			vitenode: ctx.vitenode,
 			isBrowserEnabled: ctx.getRootProject().isBrowserEnabled()

package/dist/chunks/{coverage.d.S9RMNXIe.d.ts → coverage.d.CNYjU4GF.d.ts}

@@ -2,7 +2,7 @@ import { ModuleExecutionInfo } from 'vite-node/client';
 
 interface RuntimeCoverageModuleLoader {
 	executeId: (id: string) => Promise<{
-		default: RuntimeCoverageProviderModule
+		default: RuntimeCoverageProviderModule;
 	}>;
 	isBrowser?: boolean;
 	moduleExecutionInfo?: ModuleExecutionInfo;
@@ -16,19 +16,19 @@ interface RuntimeCoverageProviderModule {
 	* Executed before tests are run in the worker thread.
 	*/
 	startCoverage?: (runtimeOptions: {
-		isolate: boolean
+		isolate: boolean;
 	}) => unknown | Promise<unknown>;
 	/**
 	* Executed on after each run in the worker thread. Possible to return a payload passed to the provider
 	*/
 	takeCoverage?: (runtimeOptions?: {
-		moduleExecutionInfo?: ModuleExecutionInfo
+		moduleExecutionInfo?: ModuleExecutionInfo;
 	}) => unknown | Promise<unknown>;
 	/**
 	* Executed after all tests have been run in the worker thread.
 	*/
 	stopCoverage?: (runtimeOptions: {
-		isolate: boolean
+		isolate: boolean;
 	}) => unknown | Promise<unknown>;
 }
 

package/dist/chunks/{creator.GK6I-cL4.js → creator.CJNzQTzZ.js}

@@ -5,7 +5,7 @@ import { detectPackageManager, installPackage } from './index.D3XRDfWc.js';
 import { p as prompt, f as findUp } from './index.X0nbfr6-.js';
 import { x } from 'tinyexec';
 import c from 'tinyrainbow';
-import { c as configFiles } from './constants.DnKduX2e.js';
+import { c as configFiles } from './constants.CXzqaLmq.js';
 import 'node:process';
 import 'node:url';
 import './_commonjsHelpers.BFTU3MAI.js';
@@ -50,7 +50,7 @@ const vueExample = {
 defineProps({
   name: String
 })
-</script>
+<\/script>
 
 <template>
   <div>
@@ -63,7 +63,7 @@ defineProps({
 defineProps<{
   name: string
 }>()
-</script>
+<\/script>
 
 <template>
   <div>
@@ -89,14 +89,14 @@ const svelteExample = {
 	js: `
 <script>
   export let name
-</script>
+<\/script>
 
 <h1>Hello {name}!</h1>
 `,
 	ts: `
 <script lang="ts">
   export let name: string
-</script>
+<\/script>
 
 <h1>Hello {name}!</h1>
 `,

package/dist/chunks/{environment.d.CUq4cUgQ.d.ts → environment.d.Bhm9oc0v.d.ts}

@@ -30,7 +30,7 @@ interface EnvironmentReturn {
 }
 interface VmEnvironmentReturn {
 	getVmContext: () => {
-		[key: string]: any
+		[key: string]: any;
 	};
 	teardown: () => Awaitable<void>;
 }

package/dist/chunks/{execute.B7h3T_Hc.js → execute.Dt-pCVcL.js}

@@ -207,7 +207,7 @@ const prefixedBuiltins = new Set([
 const NODE_BUILTIN_NAMESPACE = "node:";
 function isNodeBuiltin(id) {
 	if (prefixedBuiltins.has(id)) return true;
-	return builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(NODE_BUILTIN_NAMESPACE.length) : id);
+	return builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(5) : id);
 }
 
 const spyModulePath = resolve$1(distDir, "spy.js");

package/dist/chunks/{global.d.CVbXEflG.d.ts → global.d.DAhT2emn.d.ts}

@@ -1,8 +1,8 @@
 import { PromisifyAssertion, Tester, ExpectStatic } from '@vitest/expect';
 import { Plugin } from '@vitest/pretty-format';
 import { SnapshotState } from '@vitest/snapshot';
-import { B as BenchmarkResult } from './benchmark.d.BwvBVTda.js';
-import { U as UserConsoleLog } from './environment.d.CUq4cUgQ.js';
+import { B as BenchmarkResult } from './benchmark.d.DAaHLpsq.js';
+import { U as UserConsoleLog } from './environment.d.Bhm9oc0v.js';
 
 declare global {
 	// eslint-disable-next-line ts/no-namespace

package/dist/chunks/{globals.Cxal6MLI.js → globals.Dgo-vS5G.js}

@@ -1,6 +1,6 @@
-import { g as globalApis } from './constants.DnKduX2e.js';
-import { V as VitestIndex } from './index.BWf_gE5n.js';
-import './vi.bdSIJ99Y.js';
+import { g as globalApis } from './constants.CXzqaLmq.js';
+import { V as VitestIndex } from './index.D1_MsKEt.js';
+import './vi.CA0EPI9Y.js';
 import '@vitest/expect';
 import '@vitest/runner';
 import '@vitest/runner/utils';

package/dist/chunks/{index.a-yuRg2G.js → index.Bz6b0Ib7.js}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, promises } from 'node:fs';
 import { mkdir, writeFile, readdir, stat, readFile } from 'node:fs/promises';
 import { resolve, dirname, isAbsolute, relative, basename, normalize } from 'pathe';
-import { g as getOutputFile, h as hasFailedSnapshot, T as TypeCheckError } from './typechecker.CVytUJuF.js';
+import { g as getOutputFile, h as hasFailedSnapshot, T as TypeCheckError } from './typechecker.CMNPqJOo.js';
 import { performance as performance$1 } from 'node:perf_hooks';
 import { getTestName, getFullName, hasFailed, getTests, getSuites, getTasks } from '@vitest/runner/utils';
 import { slash, toArray, isPrimitive, inspect, positionToOffset, lineSplitRE } from '@vitest/utils';
@@ -772,6 +772,7 @@ class WindowRenderer {
 	renderInterval = void 0;
 	renderScheduled = false;
 	windowHeight = 0;
+	started = false;
 	finished = false;
 	cleanups = [];
 	constructor(options) {
@@ -789,9 +790,9 @@ class WindowRenderer {
 			this.flushBuffer();
 			this.stop();
 		});
-		this.start();
 	}
 	start() {
+		this.started = true;
 		this.finished = false;
 		this.renderInterval = setInterval(() => this.schedule(), this.options.interval).unref();
 	}
@@ -865,7 +866,7 @@ class WindowRenderer {
 		const original = stream.write;
 		// @ts-expect-error -- not sure how 2 overloads should be typed
 		stream.write = (chunk, _, callback) => {
-			if (chunk) if (this.finished) this.write(chunk.toString(), type);
+			if (chunk) if (this.finished || !this.started) this.write(chunk.toString(), type);
 			else this.buffer.push({
 				type,
 				message: chunk.toString()
@@ -1341,7 +1342,7 @@ function printErrorInner(error, project, options) {
 		stack: String(error)
 	};
 	if (!e) {
-		const error = new Error("unknown error");
+		const error = /* @__PURE__ */ new Error("unknown error");
 		e = {
 			message: e ?? error.message,
 			stack: error.stack

package/dist/chunks/{index.BWf_gE5n.js → index.D1_MsKEt.js}

@@ -1,4 +1,4 @@
-import { c as createExpect, a as globalExpect, i as inject, v as vi, b as vitest } from './vi.bdSIJ99Y.js';
+import { c as createExpect, a as globalExpect, i as inject, v as vi, b as vitest } from './vi.CA0EPI9Y.js';
 import { b as bench } from './benchmark.CYdenmiT.js';
 import { expectTypeOf } from 'expect-type';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';

package/dist/chunks/{index.CJvUWPky.js → index.D3SKT3tv.js}

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import { getTasks, getFullName, getTests } from '@vitest/runner/utils';
 import * as pathe from 'pathe';
 import c from 'tinyrainbow';
-import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName } from './index.a-yuRg2G.js';
+import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName } from './index.Bz6b0Ib7.js';
 import { stripVTControlCharacters } from 'node:util';
 import { notNullish } from '@vitest/utils';
 

package/dist/chunks/{index.D-VkfKhf.js → index.Dppt57hu.js}

@@ -1,6 +1,6 @@
 import * as chai from 'chai';
 import { resolve } from 'node:path';
-import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.D7ZqXFx-.js';
+import { l as loadDiffConfig, b as loadSnapshotSerializers, t as takeCoverageInsideWorker } from './setup-common.Ebx5x0eP.js';
 import { distDir } from '../path.js';
 import { r as rpc } from './rpc.CsFtxqeq.js';
 import { g as getWorkerState } from './utils.XdZDrNZV.js';

package/dist/chunks/{plugin.d.NmsBIHuT.d.ts → plugin.d.CKCmge5g.d.ts}

@@ -1,4 +1,4 @@
-import { V as Vitest, T as TestProject, a as TestProjectConfiguration } from './reporters.d.BbsDWlO9.js';
+import { V as Vitest, T as TestProject, a as TestProjectConfiguration } from './reporters.d.BBuiUFDc.js';
 
 interface VitestPluginContext {
 	vitest: Vitest;