fix(coverage): correct coverageConfigDefaults values and types (#9940)

Arthie · web-flow · commit b3c992cb29ed · 2026-03-25T14:07:11.000+02:00
diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts
@@ -1,9 +1,9 @@
 import type {
   BenchmarkUserOptions,
-  CoverageV8Options,
-  ResolvedCoverageOptions,
+  CoverageOptions,
   UserConfig,
 } from './node/types/config'
+import type { FieldsWithDefaultValues } from './node/types/coverage'
 import os from 'node:os'
 import { isAgent, isCI } from './utils/env'
 
@@ -25,7 +25,7 @@ export const benchmarkConfigDefaults: Required<
 }
 
 // These are the generic defaults for coverage. Providers may also set some provider specific defaults.
-export const coverageConfigDefaults: ResolvedCoverageOptions = {
+export const coverageConfigDefaults: Required<Pick<CoverageOptions, FieldsWithDefaultValues>> = {
   provider: 'v8',
   enabled: false,
   clean: true,
@@ -34,17 +34,25 @@ export const coverageConfigDefaults: ResolvedCoverageOptions = {
   exclude: [],
   reportOnFailure: false,
   reporter: [
-    ['text', {}],
-    ['html', {}],
-    ['clover', {}],
-    ['json', {}],
+    'text',
+    'html',
+    'clover',
+    'json',
   ],
   allowExternal: false,
   excludeAfterRemap: false,
   processingConcurrency: Math.min(
     20,
     os.availableParallelism?.() ?? os.cpus().length,
   ),
+  ignoreClassMethods: [],
+  skipFull: false,
+  watermarks: {
+    statements: [50, 80],
+    functions: [50, 80],
+    branches: [50, 80],
+    lines: [50, 80],
+  },
 }
 
 export const fakeTimersDefaults: NonNullable<UserConfig['fakeTimers']> = {
@@ -78,7 +86,7 @@ export const configDefaults: Readonly<{
   css: {
     include: never[]
   }
-  coverage: CoverageV8Options
+  coverage: CoverageOptions
   fakeTimers: import('@sinonjs/fake-timers').FakeTimerInstallOpts
   maxConcurrency: number
   dangerouslyIgnoreUnhandledErrors: boolean
@@ -95,7 +103,7 @@ export const configDefaults: Readonly<{
   isolate: true,
   watch: !isCI && process.stdin.isTTY && !isAgent,
   globals: false,
-  environment: 'node' as const,
+  environment: 'node',
   clearMocks: false,
   restoreMocks: false,
   mockReset: false,
@@ -116,7 +124,7 @@ export const configDefaults: Readonly<{
   css: {
     include: [],
   },
-  coverage: coverageConfigDefaults as CoverageV8Options,
+  coverage: coverageConfigDefaults,
   fakeTimers: fakeTimersDefaults,
   maxConcurrency: 5,
   dangerouslyIgnoreUnhandledErrors: false,
diff --git a/packages/vitest/src/node/config/resolveConfig.ts b/packages/vitest/src/node/config/resolveConfig.ts
@@ -8,7 +8,7 @@ import type {
   ResolvedConfig,
   UserConfig,
 } from '../types/config'
-import type { BaseCoverageOptions, CoverageReporterWithOptions } from '../types/coverage'
+import type { CoverageOptions, CoverageReporterWithOptions } from '../types/coverage'
 import crypto from 'node:crypto'
 import { pathToFileURL } from 'node:url'
 import { slash, toArray } from '@vitest/utils/helpers'
@@ -970,7 +970,7 @@ export function isBrowserEnabled(config: ResolvedConfig): boolean {
   return Boolean(config.browser?.enabled)
 }
 
-export function resolveCoverageReporters(configReporters: NonNullable<BaseCoverageOptions['reporter']>): CoverageReporterWithOptions[] {
+export function resolveCoverageReporters(configReporters: NonNullable<CoverageOptions['reporter']>): CoverageReporterWithOptions[] {
   // E.g. { reporter: "html" }
   if (!Array.isArray(configReporters)) {
     return [[configReporters, {}]]
diff --git a/packages/vitest/src/node/coverage.ts b/packages/vitest/src/node/coverage.ts
@@ -1,7 +1,7 @@
 import type { CoverageMap } from 'istanbul-lib-coverage'
 import type { TransformResult } from 'vite'
 import type { Vitest } from '../node/core'
-import type { BaseCoverageOptions, CoverageModuleLoader, CoverageProvider, ReportContext, ResolvedCoverageOptions } from '../node/types/coverage'
+import type { CoverageModuleLoader, CoverageOptions, CoverageProvider, ReportContext, ResolvedCoverageOptions } from '../node/types/coverage'
 import type { SerializedCoverageConfig } from '../runtime/config'
 import type { AfterSuiteRunMeta } from '../types/general'
 import type { TestProject } from './project'
@@ -778,7 +778,7 @@ function resolveGlobThresholds(
 
 function assertConfigurationModule(config: unknown): asserts config is {
   test: {
-    coverage: { thresholds: NonNullable<BaseCoverageOptions['thresholds']> }
+    coverage: { thresholds: NonNullable<CoverageOptions['thresholds']> }
   }
 } {
   try {
diff --git a/packages/vitest/src/node/types/coverage.ts b/packages/vitest/src/node/types/coverage.ts
@@ -96,7 +96,7 @@ export type CoverageReporterWithOptions<
 export type CoverageProviderName = 'v8' | 'istanbul' | 'custom' | undefined
 
 /** Fields that have default values. Internally these will always be defined. */
-type FieldsWithDefaultValues
+export type FieldsWithDefaultValues
   = | 'provider'
     | 'enabled'
     | 'clean'
@@ -106,6 +106,11 @@ type FieldsWithDefaultValues
     | 'reportOnFailure'
     | 'allowExternal'
     | 'processingConcurrency'
+    | 'reporter'
+    | 'excludeAfterRemap'
+    | 'ignoreClassMethods'
+    | 'skipFull'
+    | 'watermarks'
 
 export type ResolvedCoverageOptions
   = CoverageOptions
@@ -276,8 +281,6 @@ export interface CoverageOptions {
   /**
    * Collect coverage only for files changed since a specified commit or branch.
    * Inherits the default value from `test.changed`.
-   *
-   * @default false
    */
   changed?: boolean | string
 
diff --git a/test/config/test/public.test.ts b/test/config/test/public.test.ts
@@ -1,4 +1,4 @@
-import type { BaseCoverageOptions } from 'vitest/node'
+import type { CoverageOptions } from 'vitest/node'
 import { resolve } from 'pathe'
 import { expect, test } from 'vitest'
 import { resolveConfig } from 'vitest/node'
@@ -106,7 +106,7 @@ test.for([
     expected: 'custom-html-dir',
   },
 ] satisfies {
-  options: BaseCoverageOptions
+  options: CoverageOptions
   expected?: string
 }[])('coverage.htmlDir inference: $options', async ({ options, expected }) => {
   const { vitestConfig } = await resolveConfig({
diff --git a/test/coverage-test/test/configuration-options.test-d.ts b/test/coverage-test/test/configuration-options.test-d.ts
@@ -91,6 +91,16 @@ test('provider module', () => {
             reportOnFailure: true,
             allowExternal: true,
             processingConcurrency: 1,
+            excludeAfterRemap: false,
+            ignoreClassMethods: [],
+            skipFull: true,
+            watermarks: {
+              statements: [80, 95],
+              functions: [80, 95],
+              branches: [80, 95],
+              lines: [80, 95],
+            },
+
           }
         },
         clean(_?: boolean) {},
