refactor: rename onWatcherRerun to onTestsRerun

Author: sheremet-va

docs/config/index.md

@@ -1094,8 +1094,8 @@ Since Vitest 2.2.0, you can define a custom callback function to be called when
 ```ts
 import type { GlobalSetupContext } from 'vitest/node'
 
-export default function setup({ onWatcherRerun }: GlobalSetupContext) {
-  onWatcherRerun(async () => {
+export default function setup({ onTestsRerun }: GlobalSetupContext) {
+  onTestsRerun(async () => {
     await restartDb()
   })
 }

packages/vitest/src/node/core.ts

@@ -3,7 +3,7 @@ import type { Writable } from 'node:stream'
 import type { ViteDevServer } from 'vite'
 import type { defineWorkspace } from 'vitest/config'
 import type { SerializedCoverageConfig } from '../runtime/config'
-import type { ArgumentsType, OnServerRestartHandler, OnWatcherRerunHandler, ProvidedContext, UserConsoleLog } from '../types/general'
+import type { ArgumentsType, OnServerRestartHandler, OnTestsRerunHandler, ProvidedContext, UserConsoleLog } from '../types/general'
 import type { ProcessPool, WorkspaceSpec } from './pool'
 import type { TestSpecification } from './spec'
 import type { ResolvedConfig, UserConfig, VitestRunMode } from './types/config'
@@ -102,7 +102,7 @@ export class Vitest {
   private _onClose: (() => Awaited<unknown>)[] = []
   private _onSetServer: OnServerRestartHandler[] = []
   private _onCancelListeners: ((reason: CancelReason) => Promise<void> | void)[] = []
-  private _onUserWatcherRerun: OnWatcherRerunHandler[] = []
+  private _onUserTestsRerun: OnTestsRerunHandler[] = []
 
   async setServer(options: UserConfig, server: ViteDevServer, cliOptions: UserConfig) {
     this.unregisterWatcher?.()
@@ -114,7 +114,7 @@ export class Vitest {
     this.coverageProvider = undefined
     this.runningPromise = undefined
     this._cachedSpecs.clear()
-    this._onUserWatcherRerun = []
+    this._onUserTestsRerun = []
 
     const resolved = resolveConfig(this.mode, options, server.config, this.logger)
 
@@ -695,7 +695,7 @@ export class Vitest {
 
     await Promise.all([
       this.report('onWatcherRerun', files, trigger),
-      ...this._onUserWatcherRerun.map(fn => fn(files)),
+      ...this._onUserTestsRerun.map(fn => fn(files)),
     ])
     await this.runFiles(files.flatMap(file => this.getProjectsByTestFile(file)), allTestsRun)
 
@@ -820,7 +820,7 @@ export class Vitest {
       const triggerLabel = Array.from(triggerIds).join(', ')
       await Promise.all([
         this.report('onWatcherRerun', files, triggerLabel),
-        ...this._onUserWatcherRerun.map(fn => fn(files)),
+        ...this._onUserTestsRerun.map(fn => fn(files)),
       ])
 
       await this.runFiles(files.flatMap(file => this.getProjectsByTestFile(file)), false)
@@ -1159,7 +1159,7 @@ export class Vitest {
     this._onClose.push(fn)
   }
 
-  onWatcherRerun(fn: OnWatcherRerunHandler): void {
-    this._onUserWatcherRerun.push(fn)
+  onTestsRerun(fn: OnTestsRerunHandler): void {
+    this._onUserTestsRerun.push(fn)
   }
 }

packages/vitest/src/node/globalSetup.ts

@@ -1,5 +1,5 @@
 import type { ViteNodeRunner } from 'vite-node/client'
-import type { OnWatcherRerunHandler, ProvidedContext } from '../types/general'
+import type { OnTestsRerunHandler, ProvidedContext } from '../types/general'
 import type { ResolvedConfig } from './types/config'
 import { toArray } from '@vitest/utils'
 
@@ -9,7 +9,7 @@ export interface GlobalSetupContext {
     key: T,
     value: ProvidedContext[T]
   ) => void
-  onWatcherRerun: (cb: OnWatcherRerunHandler) => void
+  onTestsRerun: (cb: OnTestsRerunHandler) => void
 }
 
 export interface GlobalSetupFile {

packages/vitest/src/node/workspace.ts

@@ -170,7 +170,7 @@ export class WorkspaceProject {
       const teardown = await globalSetupFile.setup?.({
         provide: (key, value) => this.provide(key, value),
         config: this.config,
-        onWatcherRerun: cb => this.ctx.onWatcherRerun(cb),
+        onTestsRerun: cb => this.ctx.onTestsRerun(cb),
       })
       if (teardown == null || !!globalSetupFile.teardown) {
         continue

packages/vitest/src/public/node.ts

@@ -128,7 +128,7 @@ export type {
 
 export type {
   OnServerRestartHandler,
-  OnWatcherRerunHandler,
+  OnTestsRerunHandler,
 } from '../types/general'
 
 export { createDebugger } from '../utils/debugger'

packages/vitest/src/types/general.ts

@@ -46,5 +46,5 @@ export interface ModuleGraphData {
 }
 
 export type OnServerRestartHandler = (reason?: string) => Promise<void> | void
-export type OnWatcherRerunHandler = (testFiles: string[]) => Promise<void> | void
+export type OnTestsRerunHandler = (testFiles: string[]) => Promise<void> | void
 export interface ProvidedContext {}

test/watch/fixtures/global-setup.ts

@@ -4,9 +4,9 @@ const calls: string[] = [];
 
 (globalThis as any).__CALLS = calls
 
-export default ({ onWatcherRerun }: GlobalSetupContext) => {
+export default ({ onTestsRerun }: GlobalSetupContext) => {
   calls.push('start')
-  onWatcherRerun(() => {
+  onTestsRerun(() => {
     calls.push('rerun')
   })
   return () => {