vitest 2.1.5 → 2.2.0-beta.1

package/dist/browser.d.ts

@@ -1,10 +1,10 @@
-import { C as CoverageProvider, b as CoverageProviderModule } from './chunks/reporters.D7Jzd9GS.js';
-import { a as SerializedCoverageConfig, S as SerializedConfig } from './chunks/config.Cy0C388Z.js';
+import { b as CoverageProvider, c as CoverageProviderModule } from './chunks/reporters.B_9uUTGW.js';
+import { a as SerializedCoverageConfig, S as SerializedConfig } from './chunks/config.CPguQ7J1.js';
 import * as spy$1 from '@vitest/spy';
-import { DiffOptions } from '@vitest/expect';
+import * as _vitest_utils_diff from '@vitest/utils/diff';
 import { VitestExecutor } from './execute.js';
 export { collectTests, processError, startTests } from '@vitest/runner';
-import './chunks/environment.LoooBwUu.js';
+import './chunks/environment.CT0jpO-1.js';
 import 'node:stream';
 import 'vite';
 import '@vitest/utils';
@@ -21,7 +21,7 @@ import 'tinybench';
 import '@vitest/snapshot/manager';
 import 'node:fs';
 import '@vitest/snapshot/environment';
-import './chunks/worker.tN5KGIih.js';
+import './chunks/worker.9VY11NZs.js';
 import 'node:vm';
 import '@vitest/mocker';
 import './chunks/mocker.cRtM890J.js';
@@ -57,7 +57,7 @@ declare function takeCoverageInsideWorker(options: SerializedCoverageConfig | un
 declare function stopCoverageInsideWorker(options: SerializedCoverageConfig | undefined, loader: Loader): Promise<unknown>;
 
 declare function setupCommonEnv(config: SerializedConfig): Promise<void>;
-declare function loadDiffConfig(config: SerializedConfig, executor: VitestExecutor): Promise<DiffOptions | undefined>;
+declare function loadDiffConfig(config: SerializedConfig, executor: VitestExecutor): Promise<_vitest_utils_diff.SerializedDiffOptions | undefined>;
 declare function loadSnapshotSerializers(config: SerializedConfig, executor: VitestExecutor): Promise<void>;
 
 export { spy as SpyModule, getCoverageProvider, loadDiffConfig, loadSnapshotSerializers, setupCommonEnv, startCoverageInsideWorker, stopCoverageInsideWorker, takeCoverageInsideWorker };

package/dist/browser.js

@@ -1,6 +1,6 @@
 export { g as getCoverageProvider, s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/coverage.BoMDb1ip.js';
 export { s as SpyModule } from './chunks/spy.Cf_4R5Oe.js';
-export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv } from './chunks/setup-common.Dj6BZI3u.js';
+export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv } from './chunks/setup-common.BfGt8K-K.js';
 export { collectTests, processError, startTests } from '@vitest/runner';
 import '@vitest/spy';
 import '@vitest/snapshot';

package/dist/chunks/{base.BZZh4cSm.js → base.BS0HhLXd.js}

@@ -24,7 +24,7 @@ async function runBaseTests(method, state) {
   ctx.files.forEach((i) => state.moduleCache.delete(i));
   const [executor, { run }] = await Promise.all([
     startViteNode({ state, requestStubs: getDefaultRequestStubs() }),
-    import('./runBaseTests.3qpJUEJM.js')
+    import('./runBaseTests.B7hcVT-s.js')
   ]);
   await run(
     method,

package/dist/chunks/{cac.DWAW3Uh5.js → cac.Z91LBqmg.js}

@@ -618,7 +618,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "2.1.5";
+var version = "2.2.0-beta.1";
 
 const apiConfig = (port) => ({
   port: {
@@ -1121,9 +1121,58 @@ const cliOptionsConfig = {
     argument: "<times>"
   },
   diff: {
-    description: "Path to a diff config that will be used to generate diff interface",
+    description: "DiffOptions object or a path to a module which exports DiffOptions object",
     argument: "<path>",
-    normalize: true
+    subcommands: {
+      aAnnotation: {
+        description: "Annotation for expected lines (default: `Expected`)",
+        argument: "<annotation>"
+      },
+      aIndicator: {
+        description: "Indicator for expected lines (default: `-`)",
+        argument: "<indicator>"
+      },
+      bAnnotation: {
+        description: "Annotation for received lines (default: `Received`)",
+        argument: "<annotation>"
+      },
+      bIndicator: {
+        description: "Indicator for received lines (default: `+`)",
+        argument: "<indicator>"
+      },
+      commonIndicator: {
+        description: "Indicator for common lines (default: ` `)",
+        argument: "<indicator>"
+      },
+      contextLines: {
+        description: "Number of lines of context to show around each change (default: `5`)",
+        argument: "<lines>"
+      },
+      emptyFirstOrLastLinePlaceholder: {
+        description: 'Placeholder for an empty first or last line (default: `""`)',
+        argument: "<placeholder>"
+      },
+      expand: {
+        description: "Expand all common lines (default: `true`)"
+      },
+      includeChangeCounts: {
+        description: "Include comparison counts in diff output (default: `false`)"
+      },
+      omitAnnotationLines: {
+        description: "Omit annotation lines from the output (default: `false`)"
+      },
+      printBasicPrototype: {
+        description: "Print basic prototype Object and Array (default: `true`)"
+      },
+      truncateThreshold: {
+        description: "Number of lines to show before and after each change (default: `0`)",
+        argument: "<threshold>"
+      },
+      truncateAnnotation: {
+        description: "Annotation for truncated lines (default: `... Diff result is truncated`)",
+        argument: "<annotation>"
+      }
+    }
   },
   exclude: {
     description: "Additional file globs to be excluded from test",
@@ -1502,7 +1551,7 @@ async function start(mode, cliFilters, options) {
   } catch {
   }
   try {
-    const { startVitest } = await import('./cli-api.BtqJwSCh.js').then(function (n) { return n.e; });
+    const { startVitest } = await import('./cli-api.DVJJMJHj.js').then(function (n) { return n.e; });
     const ctx = await startVitest(mode, cliFilters.map(normalize), normalizeCliOptions(options));
     if (!ctx?.shouldKeepServer()) {
       await ctx?.exit();
@@ -1533,7 +1582,7 @@ async function collect(mode, cliFilters, options) {
   } catch {
   }
   try {
-    const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.BtqJwSCh.js').then(function (n) { return n.e; });
+    const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.DVJJMJHj.js').then(function (n) { return n.e; });
     const ctx = await prepareVitest(mode, {
       ...normalizeCliOptions(options),
       watch: false,

package/dist/chunks/{cli-api.BtqJwSCh.js → cli-api.DVJJMJHj.js}

@@ -8,12 +8,12 @@ import { f as findUp, p as prompt } from './index.BJDntFik.js';
 import { searchForWorkspaceRoot, version, createServer, mergeConfig } from 'vite';
 import { A as API_PATH, c as configFiles, a as defaultBrowserPort, w as workspacesFiles, d as defaultPort } from './constants.fzPh7AOq.js';
 import { SnapshotManager } from '@vitest/snapshot/manager';
-import { i as isPackageExists, e as requireMicromatch, V as VitestCache, f as configDefaults, m as mm, b as resolveConfig, h as isBrowserEnabled, w as wildcardPatternToRegExp, g as getFilePoolName, j as createPool, a as resolveApiServerConfig, c as coverageConfigDefaults, s as stdout } from './resolveConfig.RxKrDli4.js';
+import { i as isPackageExists, e as requireMicromatch, V as VitestCache, f as configDefaults, m as mm, b as resolveConfig, h as isBrowserEnabled, w as wildcardPatternToRegExp, g as getFilePoolName, j as createPool, a as resolveApiServerConfig, c as coverageConfigDefaults, s as stdout } from './resolveConfig.CQIc6fe7.js';
 import { ViteNodeRunner } from 'vite-node/client';
 import { ViteNodeServer } from 'vite-node/server';
-import { v as version$1 } from './cac.DWAW3Uh5.js';
+import { v as version$1 } from './cac.Z91LBqmg.js';
 import { c as createBirpc } from './index.68735LiX.js';
-import { s as stringify, p as parse, R as ReportersMap, h as BenchmarkReportsMap, f as TestModule, g as TestSuite, e as TestCase, j as generateCodeFrame, i as TestProject, L as Logger, k as BlobReporter, r as readBlobs } from './index.DsZFoqi9.js';
+import { s as stringify, p as parse, R as ReportersMap, h as BenchmarkReportsMap, f as TestModule, g as TestSuite, e as TestCase, j as generateCodeFrame, i as TestProject, L as Logger, k as BlobReporter, r as readBlobs } from './index.DLRzErGF.js';
 import require$$0$2 from 'stream';
 import require$$0 from 'zlib';
 import require$$0$1 from 'buffer';
@@ -5219,6 +5219,7 @@ class StateManager {
         task.mode = "skip";
         task.result ??= { state: "skip" };
         task.result.state = "skip";
+        task.result.note = _err.note;
       }
       return;
     }
@@ -8559,6 +8560,7 @@ function serializeConfig(config, coreConfig, viteConfig) {
     pool: config.pool,
     expect: config.expect,
     snapshotSerializers: config.snapshotSerializers,
+    // TODO: non serializable function?
     diff: config.diff,
     retry: config.retry,
     disableConsoleIntercept: config.disableConsoleIntercept,
@@ -9905,7 +9907,8 @@ class WorkspaceProject {
     for (const globalSetupFile of this._globalSetups) {
       const teardown = await globalSetupFile.setup?.({
         provide: (key, value) => this.provide(key, value),
-        config: this.config
+        config: this.config,
+        onTestsRerun: (cb) => this.ctx.onTestsRerun(cb)
       });
       if (teardown == null || !!globalSetupFile.teardown) {
         continue;
@@ -10417,6 +10420,7 @@ class Vitest {
   _onClose = [];
   _onSetServer = [];
   _onCancelListeners = [];
+  _onUserTestsRerun = [];
   async setServer(options, server, cliOptions) {
     this.unregisterWatcher?.();
     clearTimeout(this._rerunTimer);
@@ -10431,6 +10435,7 @@ class Vitest {
     this.coverageProvider = void 0;
     this.runningPromise = void 0;
     this._cachedSpecs.clear();
+    this._onUserTestsRerun = [];
     const resolved = resolveConfig(this.mode, options, server.config, this.logger);
     this.server = server;
     this.config = resolved;
@@ -10862,7 +10867,10 @@ class Vitest {
       const filteredFiles = await this.globTestFiles([this.filenamePattern]);
       files = files.filter((file) => filteredFiles.some((f) => f[1] === file));
     }
-    await this.report("onWatcherRerun", files, trigger);
+    await Promise.all([
+      this.report("onWatcherRerun", files, trigger),
+      ...this._onUserTestsRerun.map((fn) => fn(files))
+    ]);
     await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)), allTestsRun);
     await this.report("onWatcherStart", this.state.getFiles(files));
   }
@@ -10954,7 +10962,10 @@ class Vitest {
       this.changedTests.clear();
       const triggerIds = new Set(triggerId.map((id) => relative(this.config.root, id)));
       const triggerLabel = Array.from(triggerIds).join(", ");
-      await this.report("onWatcherRerun", files, triggerLabel);
+      await Promise.all([
+        this.report("onWatcherRerun", files, triggerLabel),
+        ...this._onUserTestsRerun.map((fn) => fn(files))
+      ]);
       await this.runFiles(files.flatMap((file) => this.getProjectsByTestFile(file)), false);
       await this.report("onWatcherStart", this.state.getFiles(files));
     }, WATCHER_DEBOUNCE);
@@ -11227,6 +11238,9 @@ class Vitest {
   onClose(fn) {
     this._onClose.push(fn);
   }
+  onTestsRerun(fn) {
+    this._onUserTestsRerun.push(fn);
+  }
 }
 
 async function VitestPlugin(options = {}, ctx = new Vitest("test")) {

package/dist/chunks/{config.Cy0C388Z.d.ts → config.CPguQ7J1.d.ts}

@@ -2,6 +2,7 @@ import { PrettyFormatOptions } from '@vitest/pretty-format';
 import { SequenceHooks, SequenceSetupFiles } from '@vitest/runner';
 import { SnapshotUpdateState } from '@vitest/snapshot';
 import { SnapshotEnvironment } from '@vitest/snapshot/environment';
+import { SerializedDiffOptions } from '@vitest/utils/diff';
 
 /**
  * Names of clock methods that may be faked by install.
@@ -154,7 +155,7 @@ interface SerializedConfig {
         showDiff?: boolean;
         truncateThreshold?: number;
     } | undefined;
-    diff: string | undefined;
+    diff: string | SerializedDiffOptions | undefined;
     retry: number;
     includeTaskLocation: boolean | undefined;
     inspect: boolean | string | undefined;

package/dist/chunks/{environment.LoooBwUu.d.ts → environment.CT0jpO-1.d.ts}

@@ -36,6 +36,7 @@ interface ModuleGraphData {
     inlined: string[];
 }
 type OnServerRestartHandler = (reason?: string) => Promise<void> | void;
+type OnTestsRerunHandler = (testFiles: string[]) => Promise<void> | void;
 interface ProvidedContext {
 }
 
@@ -171,4 +172,4 @@ interface ResolvedTestEnvironment {
     options: Record<string, any> | null;
 }
 
-export type { AfterSuiteRunMeta as A, Constructable as C, Environment as E, HappyDOMOptions as H, JSDOMOptions as J, ModuleGraphData as M, Nullable as N, OnServerRestartHandler as O, ProvidedContext as P, ResolvedTestEnvironment as R, TransformMode as T, UserConsoleLog as U, VmEnvironmentReturn as V, EnvironmentReturn as a, Awaitable as b, Arrayable as c, ArgumentsType as d, MutableArray as e, EnvironmentOptions as f, ModuleCache as g };
+export type { AfterSuiteRunMeta as A, Constructable as C, Environment as E, HappyDOMOptions as H, JSDOMOptions as J, ModuleGraphData as M, Nullable as N, OnServerRestartHandler as O, ProvidedContext as P, ResolvedTestEnvironment as R, TransformMode as T, UserConsoleLog as U, VmEnvironmentReturn as V, EnvironmentReturn as a, Awaitable as b, Arrayable as c, ArgumentsType as d, MutableArray as e, EnvironmentOptions as f, ModuleCache as g, OnTestsRerunHandler as h };

package/dist/chunks/{globals.D8ZVAdXd.js → globals.BCGEw6ON.js}

@@ -1,6 +1,6 @@
 import { g as globalApis } from './constants.fzPh7AOq.js';
-import { V as VitestIndex } from './index.ckWaX2gY.js';
-import './vi.DgezovHB.js';
+import { V as VitestIndex } from './index.DD5eTY2y.js';
+import './vi.BlPttogV.js';
 import '@vitest/expect';
 import '@vitest/runner';
 import '@vitest/runner/utils';

package/dist/chunks/{index.nEwtF0bu.js → index.BjjsHdBb.js}

@@ -3,7 +3,7 @@ import { resolve } from 'node:path';
 import { t as takeCoverageInsideWorker } from './coverage.BoMDb1ip.js';
 import { distDir } from '../path.js';
 import { r as rpc } from './rpc.C3q9uwRX.js';
-import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.Dj6BZI3u.js';
+import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.BfGt8K-K.js';
 import { g as getWorkerState } from './utils.C8RiOc4B.js';
 
 function setupChaiConfig(config) {

package/dist/chunks/{index.ckWaX2gY.js → index.DD5eTY2y.js}

@@ -1,5 +1,4 @@
-import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.DgezovHB.js';
-import { g as getWorkerState } from './utils.C8RiOc4B.js';
+import { c as createExpect, a as globalExpect, i as inject, v as vi, b as vitest } from './vi.BlPttogV.js';
 import { i as isFirstRun, a as runOnce } from './run-once.2ogXb3JV.js';
 import { b as bench } from './benchmark.Cdu9hjj4.js';
 import { expectTypeOf } from 'expect-type';
@@ -7,11 +6,6 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed,
 import * as chai from 'chai';
 import { assert, should } from 'chai';
 
-function inject(key) {
-  const workerState = getWorkerState();
-  return workerState.providedContext[key];
-}
-
 function getRunningMode() {
   return process.env.VITEST_MODE === "WATCH" ? "watch" : "run";
 }
@@ -51,4 +45,4 @@ var VitestIndex = /*#__PURE__*/Object.freeze({
   vitest: vitest
 });
 
-export { VitestIndex as V, isWatchMode as a, assertType as b, getRunningMode as g, inject as i };
+export { VitestIndex as V, assertType as a, getRunningMode as g, isWatchMode as i };

package/dist/chunks/{index.DsZFoqi9.js → index.DLRzErGF.js}

@@ -170,9 +170,22 @@ class TestCase extends ReportedTaskImplementation {
       return void 0;
     }
     const state = result.state === "fail" ? "failed" : result.state === "pass" ? "passed" : "skipped";
+    if (state === "skipped") {
+      return {
+        state,
+        note: result.note,
+        errors: void 0
+      };
+    }
+    if (state === "passed") {
+      return {
+        state,
+        errors: result.errors
+      };
+    }
     return {
       state,
-      errors: result.errors
+      errors: result.errors || []
     };
   }
   /**
@@ -2403,8 +2416,10 @@ function isWide(x) {
 		|| x === 0x25FE
 		|| x === 0x2614
 		|| x === 0x2615
+		|| x >= 0x2630 && x <= 0x2637
 		|| x >= 0x2648 && x <= 0x2653
 		|| x === 0x267F
+		|| x >= 0x268A && x <= 0x268F
 		|| x === 0x2693
 		|| x === 0x26A1
 		|| x === 0x26AA
@@ -2445,11 +2460,10 @@ function isWide(x) {
 		|| x >= 0x3099 && x <= 0x30FF
 		|| x >= 0x3105 && x <= 0x312F
 		|| x >= 0x3131 && x <= 0x318E
-		|| x >= 0x3190 && x <= 0x31E3
+		|| x >= 0x3190 && x <= 0x31E5
 		|| x >= 0x31EF && x <= 0x321E
 		|| x >= 0x3220 && x <= 0x3247
-		|| x >= 0x3250 && x <= 0x4DBF
-		|| x >= 0x4E00 && x <= 0xA48C
+		|| x >= 0x3250 && x <= 0xA48C
 		|| x >= 0xA490 && x <= 0xA4C6
 		|| x >= 0xA960 && x <= 0xA97C
 		|| x >= 0xAC00 && x <= 0xD7A3
@@ -2463,7 +2477,7 @@ function isWide(x) {
 		|| x === 0x16FF1
 		|| x >= 0x17000 && x <= 0x187F7
 		|| x >= 0x18800 && x <= 0x18CD5
-		|| x >= 0x18D00 && x <= 0x18D08
+		|| x >= 0x18CFF && x <= 0x18D08
 		|| x >= 0x1AFF0 && x <= 0x1AFF3
 		|| x >= 0x1AFF5 && x <= 0x1AFFB
 		|| x === 0x1AFFD
@@ -2474,6 +2488,8 @@ function isWide(x) {
 		|| x === 0x1B155
 		|| x >= 0x1B164 && x <= 0x1B167
 		|| x >= 0x1B170 && x <= 0x1B2FB
+		|| x >= 0x1D300 && x <= 0x1D356
+		|| x >= 0x1D360 && x <= 0x1D376
 		|| x === 0x1F004
 		|| x === 0x1F0CF
 		|| x === 0x1F18E
@@ -2517,11 +2533,10 @@ function isWide(x) {
 		|| x >= 0x1F93C && x <= 0x1F945
 		|| x >= 0x1F947 && x <= 0x1F9FF
 		|| x >= 0x1FA70 && x <= 0x1FA7C
-		|| x >= 0x1FA80 && x <= 0x1FA88
-		|| x >= 0x1FA90 && x <= 0x1FABD
-		|| x >= 0x1FABF && x <= 0x1FAC5
-		|| x >= 0x1FACE && x <= 0x1FADB
-		|| x >= 0x1FAE0 && x <= 0x1FAE8
+		|| x >= 0x1FA80 && x <= 0x1FA89
+		|| x >= 0x1FA8F && x <= 0x1FAC6
+		|| x >= 0x1FACE && x <= 0x1FADC
+		|| x >= 0x1FADF && x <= 0x1FAE9
 		|| x >= 0x1FAF0 && x <= 0x1FAF8
 		|| x >= 0x20000 && x <= 0x2FFFD
 		|| x >= 0x30000 && x <= 0x3FFFD;
@@ -3875,7 +3890,8 @@ function renderTree$1(tasks, options, level = 0, maxRows) {
       suffix += c.dim(` (${tests.length})`);
     }
     if (task.mode === "skip" || task.mode === "todo") {
-      suffix += ` ${c.dim(c.gray("[skipped]"))}`;
+      const note = task.result?.note || "skipped";
+      suffix += ` ${c.dim(c.gray(`[${note}]`))}`;
     }
     if (task.type === "test" && task.result?.repeatCount && task.result.repeatCount > 0) {
       suffix += c.yellow(` (repeat x${task.result.repeatCount})`);
@@ -4311,7 +4327,7 @@ class JsonReporter {
     this.ctx = ctx;
     this.start = Date.now();
   }
-  async logTasks(files) {
+  async logTasks(files, coverageMap) {
     const suites = getSuites(files);
     const numTotalTestSuites = suites.length;
     const tests = getTests(files);
@@ -4394,12 +4410,13 @@ class JsonReporter {
       snapshot: this.ctx.snapshot.summary,
       startTime: this.start,
       success,
-      testResults
+      testResults,
+      coverageMap
     };
     await this.writeReport(JSON.stringify(result));
   }
-  async onFinished(files = this.ctx.state.getFiles()) {
-    await this.logTasks(files);
+  async onFinished(files = this.ctx.state.getFiles(), _errors = [], coverageMap) {
+    await this.logTasks(files, coverageMap);
   }
   /**
    * Writes the report to an output file if specified in the config,
@@ -4829,6 +4846,9 @@ class VerboseReporter extends DefaultReporter {
             ` ${Math.floor(task.result.heap / 1024 / 1024)} MB heap used`
           );
         }
+        if (task.result?.note) {
+          title += c.dim(c.gray(` [${task.result.note}]`));
+        }
         this.ctx.logger.log(title);
         if (task.result.state === "fail") {
           task.result.errors?.forEach((error) => {

package/dist/chunks/{reporters.D7Jzd9GS.d.ts → reporters.B_9uUTGW.d.ts}

@@ -1,13 +1,14 @@
 import * as _vitest_runner from '@vitest/runner';
 import { File, TaskResultPack, Task, Test, Suite, CancelReason, Custom, TaskMeta, SequenceHooks, SequenceSetupFiles } from '@vitest/runner';
-import { b as Awaitable, U as UserConsoleLog, P as ProvidedContext, A as AfterSuiteRunMeta, c as Arrayable$1, f as EnvironmentOptions, d as ArgumentsType, O as OnServerRestartHandler } from './environment.LoooBwUu.js';
+import { b as Awaitable, U as UserConsoleLog, P as ProvidedContext, A as AfterSuiteRunMeta, c as Arrayable$1, f as EnvironmentOptions, d as ArgumentsType, O as OnServerRestartHandler, h as OnTestsRerunHandler } from './environment.CT0jpO-1.js';
 import { Writable } from 'node:stream';
 import * as vite from 'vite';
 import { ViteDevServer, TransformResult as TransformResult$1, ServerOptions, DepOptimizationConfig, AliasOptions, UserConfig as UserConfig$1, ConfigEnv } from 'vite';
 import { ParsedStack, Awaitable as Awaitable$1, ErrorWithDiff, TestError, Arrayable } from '@vitest/utils';
-import { S as SerializedConfig, F as FakeTimerInstallOpts } from './config.Cy0C388Z.js';
+import { S as SerializedConfig, F as FakeTimerInstallOpts } from './config.CPguQ7J1.js';
 import { PrettyFormatOptions } from '@vitest/pretty-format';
 import { SnapshotSummary, SnapshotStateOptions } from '@vitest/snapshot';
+import { SerializedDiffOptions } from '@vitest/utils/diff';
 import { RawSourceMap, ViteNodeServerOptions } from 'vite-node';
 import * as chai from 'chai';
 import { StackTraceParserOptions } from '@vitest/utils/source-map';
@@ -805,6 +806,10 @@ interface TestResultSkipped {
      * Skipped tests have no errors.
      */
     errors: undefined;
+    /**
+     * A custom note.
+     */
+    note: string | undefined;
 }
 interface TestDiagnostic {
     /**
@@ -927,6 +932,110 @@ declare class HangingProcessReporter implements Reporter {
     onProcessTimeout(): void;
 }
 
+interface CoverageSummaryData {
+    lines: Totals;
+    statements: Totals;
+    branches: Totals;
+    functions: Totals;
+}
+
+declare class CoverageSummary {
+    constructor(data: CoverageSummary | CoverageSummaryData);
+    merge(obj: CoverageSummary): CoverageSummary;
+    toJSON(): CoverageSummaryData;
+    isEmpty(): boolean;
+    data: CoverageSummaryData;
+    lines: Totals;
+    statements: Totals;
+    branches: Totals;
+    functions: Totals;
+}
+
+interface CoverageMapData {
+    [key: string]: FileCoverage | FileCoverageData;
+}
+
+declare class CoverageMap {
+    constructor(data: CoverageMapData | CoverageMap);
+    addFileCoverage(pathOrObject: string | FileCoverage | FileCoverageData): void;
+    files(): string[];
+    fileCoverageFor(filename: string): FileCoverage;
+    filter(callback: (key: string) => boolean): void;
+    getCoverageSummary(): CoverageSummary;
+    merge(data: CoverageMapData | CoverageMap): void;
+    toJSON(): CoverageMapData;
+    data: CoverageMapData;
+}
+
+interface Location {
+    line: number;
+    column: number;
+}
+
+interface Range {
+    start: Location;
+    end: Location;
+}
+
+interface BranchMapping {
+    loc: Range;
+    type: string;
+    locations: Range[];
+    line: number;
+}
+
+interface FunctionMapping {
+    name: string;
+    decl: Range;
+    loc: Range;
+    line: number;
+}
+
+interface FileCoverageData {
+    path: string;
+    statementMap: { [key: string]: Range };
+    fnMap: { [key: string]: FunctionMapping };
+    branchMap: { [key: string]: BranchMapping };
+    s: { [key: string]: number };
+    f: { [key: string]: number };
+    b: { [key: string]: number[] };
+}
+
+interface Totals {
+    total: number;
+    covered: number;
+    skipped: number;
+    pct: number;
+}
+
+interface Coverage {
+    covered: number;
+    total: number;
+    coverage: number;
+}
+
+declare class FileCoverage implements FileCoverageData {
+    constructor(data: string | FileCoverage | FileCoverageData);
+    merge(other: FileCoverageData): void;
+    getBranchCoverageByLine(): { [line: number]: Coverage };
+    getLineCoverage(): { [line: number]: number };
+    getUncoveredLines(): number[];
+    resetHits(): void;
+    computeBranchTotals(): Totals;
+    computeSimpleTotals(): Totals;
+    toSummary(): CoverageSummary;
+    toJSON(): object;
+
+    data: FileCoverageData;
+    path: string;
+    statementMap: { [key: string]: Range };
+    fnMap: { [key: string]: FunctionMapping };
+    branchMap: { [key: string]: BranchMapping };
+    s: { [key: string]: number };
+    f: { [key: string]: number };
+    b: { [key: string]: number[] };
+}
+
 type Status = 'passed' | 'failed' | 'skipped' | 'pending' | 'todo' | 'disabled';
 type Milliseconds = number;
 interface Callsite {
@@ -965,6 +1074,7 @@ interface JsonTestResults {
     success: boolean;
     testResults: Array<JsonTestResult>;
     snapshot: SnapshotSummary;
+    coverageMap?: CoverageMap | null | undefined;
 }
 interface JsonOptions$1 {
     outputFile?: string;
@@ -975,8 +1085,8 @@ declare class JsonReporter implements Reporter {
     options: JsonOptions$1;
     constructor(options: JsonOptions$1);
     onInit(ctx: Vitest): void;
-    protected logTasks(files: File[]): Promise<void>;
-    onFinished(files?: File[]): Promise<void>;
+    protected logTasks(files: File[], coverageMap?: CoverageMap | null): Promise<void>;
+    onFinished(files?: File[], _errors?: unknown[], coverageMap?: unknown): Promise<void>;
     /**
      * Writes the report to an output file if specified in the config,
      * or logs it to the console otherwise.
@@ -1764,6 +1874,10 @@ interface DepsOptions {
 type InlineReporter = Reporter;
 type ReporterName = BuiltinReporters | 'html' | (string & {});
 type ReporterWithOptions<Name extends ReporterName = ReporterName> = Name extends keyof BuiltinReporterOptions ? BuiltinReporterOptions[Name] extends never ? [Name, object] : [Name, Partial<BuiltinReporterOptions[Name]>] : [Name, Record<string, unknown>];
+interface ResolveSnapshotPathHandlerContext {
+    config: SerializedConfig;
+}
+type ResolveSnapshotPathHandler = (testPath: string, snapExtension: string, context: ResolveSnapshotPathHandlerContext) => string;
 interface InlineConfig {
     /**
      * Name of the project. Will be used to display in the reporter.
@@ -2049,7 +2163,7 @@ interface InlineConfig {
     /**
      * Path to a module which has a default export of diff config.
      */
-    diff?: string;
+    diff?: string | SerializedDiffOptions;
     /**
      * Paths to snapshot serializer modules.
      */
@@ -2057,7 +2171,7 @@ interface InlineConfig {
     /**
      * Resolve custom snapshot path
      */
-    resolveSnapshotPath?: (path: string, extension: string) => string;
+    resolveSnapshotPath?: ResolveSnapshotPathHandler;
     /**
      * Path to a custom snapshot environment module that has a default export of `SnapshotEnvironment` object.
      */
@@ -2390,7 +2504,7 @@ interface UserConfig extends InlineConfig {
 interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'browser' | 'coverage' | 'testNamePattern' | 'related' | 'api' | 'reporters' | 'resolveSnapshotPath' | 'benchmark' | 'shard' | 'cache' | 'sequence' | 'typecheck' | 'runner' | 'poolOptions' | 'pool' | 'cliExclude' | 'diff' | 'setupFiles' | 'snapshotEnvironment' | 'bail'> {
     mode: VitestRunMode;
     base?: string;
-    diff?: string;
+    diff?: string | SerializedDiffOptions;
     bail?: number;
     setupFiles: string[];
     snapshotEnvironment?: string;
@@ -2685,6 +2799,7 @@ declare class Vitest {
     private _onClose;
     private _onSetServer;
     private _onCancelListeners;
+    private _onUserTestsRerun;
     setServer(options: UserConfig, server: ViteDevServer, cliOptions: UserConfig): Promise<void>;
     provide<T extends keyof ProvidedContext & string>(key: T, value: ProvidedContext[T]): void;
     /**
@@ -2767,6 +2882,7 @@ declare class Vitest {
     onAfterSetServer(fn: OnServerRestartHandler): void;
     onCancel(fn: (reason: CancelReason) => void): void;
     onClose(fn: () => void): void;
+    onTestsRerun(fn: OnTestsRerunHandler): void;
 }
 
-export { type HTMLOptions as $, type ApiConfig as A, type BaseCoverageOptions as B, type CoverageProvider as C, type DepsOptimizationOptions as D, type ResolvedConfig as E, type ProjectConfig as F, type BenchmarkUserOptions as G, type VitestOptions as H, type InlineConfig as I, WorkspaceProject as J, type TestSequencer as K, Logger as L, type WorkspaceSpec as M, TestModule as N, type ModuleDiagnostic as O, type Pool as P, VitestPackageInstaller as Q, type ResolvedCoverageOptions as R, type SerializedTestSpecification as S, type TscErrorInfo as T, type UserWorkspaceConfig as U, Vitest as V, type WorkspaceProjectConfiguration as W, type ProcessPool as X, getFilePoolName as Y, TestProject as Z, type SerializedTestProject as _, type ReportContext as a, type JsonOptions$1 as a0, type JUnitOptions as a1, TestCase as a2, TestSuite as a3, type TaskOptions as a4, TestCollection as a5, type TestDiagnostic as a6, type TestResult as a7, type TestResultFailed as a8, type TestResultPassed as a9, VerboseReporter as aA, BaseReporter as aB, TestFile as aC, type FileDiagnostic as aD, ReportersMap as aE, type BuiltinReporters as aF, type BuiltinReporterOptions as aG, type JsonAssertionResult as aH, type JsonTestResult as aI, type JsonTestResults as aJ, BenchmarkReportsMap as aK, type BenchmarkBuiltinReporters as aL, type TestResultSkipped as aa, type TestSequencerConstructor as ab, TestSpecification as ac, type BrowserBuiltinProvider as ad, type BrowserCommand as ae, type BrowserCommandContext as af, type BrowserOrchestrator as ag, type BrowserProvider as ah, type BrowserProviderInitializationOptions as ai, type BrowserProviderModule as aj, type BrowserProviderOptions as ak, type BrowserServer as al, type BrowserServerState as am, type BrowserServerStateContext as an, type CDPSession as ao, type ResolvedBrowserOptions as ap, type ResolvedProjectConfig as aq, BasicReporter as ar, DefaultReporter as as, DotReporter as at, GithubActionsReporter as au, HangingProcessReporter as av, JsonReporter as aw, JUnitReporter as ax, TapFlatReporter as ay, TapReporter as az, type CoverageProviderModule as b, type CoverageV8Options as c, type UserProjectConfigFn as d, type UserProjectConfigExport as e, type VitestEnvironment as f, type RawErrsMap as g, type CollectLineNumbers as h, type CollectLines as i, type RootAndTarget as j, type Context as k, type CoverageReporter as l, type CoverageProviderName as m, type CoverageOptions as n, type CoverageIstanbulOptions as o, type CustomProviderOptions as p, type Reporter as q, type BrowserScript as r, type BrowserConfigOptions as s, type BuiltinEnvironment as t, type PoolOptions as u, type CSSModuleScopeStrategy as v, type VitestRunMode as w, type TransformModePatterns as x, type TypecheckConfig as y, type UserConfig as z };
+export { type SerializedTestProject as $, type ApiConfig as A, type BaseCoverageOptions as B, CoverageMap as C, type DepsOptimizationOptions as D, type UserConfig as E, type ResolvedConfig as F, type ProjectConfig as G, type BenchmarkUserOptions as H, type InlineConfig as I, type VitestOptions as J, WorkspaceProject as K, Logger as L, type TestSequencer as M, type WorkspaceSpec as N, TestModule as O, type Pool as P, type ModuleDiagnostic as Q, type ResolvedCoverageOptions as R, type SerializedTestSpecification as S, type TscErrorInfo as T, type UserWorkspaceConfig as U, Vitest as V, type WorkspaceProjectConfiguration as W, VitestPackageInstaller as X, type ProcessPool as Y, getFilePoolName as Z, TestProject as _, type ReportContext as a, type HTMLOptions as a0, type JsonOptions$1 as a1, type JUnitOptions as a2, TestCase as a3, TestSuite as a4, type TaskOptions as a5, TestCollection as a6, type TestDiagnostic as a7, type TestResult as a8, type TestResultFailed as a9, JUnitReporter as aA, TapFlatReporter as aB, TapReporter as aC, VerboseReporter as aD, BaseReporter as aE, TestFile as aF, type FileDiagnostic as aG, ReportersMap as aH, type BuiltinReporters as aI, type BuiltinReporterOptions as aJ, type JsonAssertionResult as aK, type JsonTestResult as aL, type JsonTestResults as aM, BenchmarkReportsMap as aN, type BenchmarkBuiltinReporters as aO, type TestResultPassed as aa, type TestResultSkipped as ab, type TestSequencerConstructor as ac, TestSpecification as ad, type BrowserBuiltinProvider as ae, type BrowserCommand as af, type BrowserCommandContext as ag, type BrowserOrchestrator as ah, type BrowserProvider as ai, type BrowserProviderInitializationOptions as aj, type BrowserProviderModule as ak, type BrowserProviderOptions as al, type BrowserServer as am, type BrowserServerState as an, type BrowserServerStateContext as ao, type CDPSession as ap, type ResolvedBrowserOptions as aq, type ResolvedProjectConfig as ar, type ResolveSnapshotPathHandler as as, type ResolveSnapshotPathHandlerContext as at, BasicReporter as au, DefaultReporter as av, DotReporter as aw, GithubActionsReporter as ax, HangingProcessReporter as ay, JsonReporter as az, type CoverageProvider as b, type CoverageProviderModule as c, type CoverageV8Options as d, type UserProjectConfigFn as e, type UserProjectConfigExport as f, type VitestEnvironment as g, type RawErrsMap as h, type CollectLineNumbers as i, type CollectLines as j, type RootAndTarget as k, type Context as l, type CoverageReporter as m, type CoverageProviderName as n, type CoverageOptions as o, type CoverageIstanbulOptions as p, type CustomProviderOptions as q, type Reporter as r, type BrowserScript as s, type BrowserConfigOptions as t, type BuiltinEnvironment as u, type PoolOptions as v, type CSSModuleScopeStrategy as w, type VitestRunMode as x, type TransformModePatterns as y, type TypecheckConfig as z };