Skip to content

Commit cab34bb

Browse files
authored
fix(coverage): derive ignoreNode AST type from installed parser (#11958)
1 parent 4bc4f86 commit cab34bb

2 files changed

Lines changed: 29 additions & 4 deletions

File tree

‎packages/coverage-v8/src/provider.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
import type { CoverageMap } from '@vitest/istanbul-lib-coverage'
22
import type { ProxifiedModule } from 'magicast'
33
import type { Profiler } from 'node:inspector'
4-
import type { CoverageProvider, ReportContext, TestProject, Vite, Vitest } from 'vitest/node'
4+
import type {
5+
CoverageProvider,
6+
CoverageV8Options,
7+
ReportContext,
8+
TestProject,
9+
Vite,
10+
Vitest,
11+
} from 'vitest/node'
512
import { existsSync, promises as fs } from 'node:fs'
613
import { fileURLToPath } from 'node:url'
714
// @ts-expect-error -- untyped
@@ -25,6 +32,8 @@ export interface ScriptCoverageWithOffset extends Profiler.ScriptCoverage {
2532
isExtendedContext?: boolean
2633
}
2734

35+
type AstNode = Parameters<NonNullable<CoverageV8Options['ignoreNode']>>[0]
36+
2837
interface RawCoverage {
2938
result: ScriptCoverageWithOffset[]
3039
}
@@ -244,7 +253,7 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
244253
return {}
245254
}
246255

247-
return (await astV8ToIstanbul<Vite.ESTree.Node>({
256+
return (await astV8ToIstanbul<AstNode>({
248257
code: result.code,
249258
sourceMap: result.map,
250259
ast,

‎packages/vitest/src/node/types/coverage.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { ReportOptions } from '@vitest/istanbul-lib-report'
22
import type { Arrayable } from '@vitest/utils'
3-
import type { DevEnvironment, ESTree, TransformResult as ViteTransformResult } from 'vite'
3+
import type { DevEnvironment, parseAstAsync, TransformResult as ViteTransformResult } from 'vite'
44
import type { AfterSuiteRunMeta } from '../../types/general'
55
import type {
66
RuntimeCoverageModuleLoader,
@@ -12,6 +12,22 @@ import type { TestSpecification } from '../test-specification'
1212
type TransformResult = string | Partial<ViteTransformResult> | undefined | null | void
1313
type CoverageResults = unknown
1414

15+
// Vite 6 and 7 parse with Rollup, Vite 8 with Rolldown. Collect node types from whichever parser is installed.
16+
type AstNode = CollectNodes<Awaited<ReturnType<typeof parseAstAsync>>>
17+
type CollectNodes<T, Depth extends unknown[] = []> = Depth['length'] extends 8
18+
? T
19+
: CollectNodes<T | ChildNodes<T>, [...Depth, unknown]>
20+
type ChildNodes<T> = T extends unknown
21+
? Extract<
22+
{
23+
[K in keyof T]: NonNullable<T[K]> extends readonly (infer U)[]
24+
? NonNullable<U>
25+
: NonNullable<T[K]>
26+
}[keyof T],
27+
{ type: string }
28+
>
29+
: never
30+
1531
export interface CoverageProvider {
1632
name: string
1733

@@ -302,7 +318,7 @@ export interface CoverageOptions {
302318
* ```
303319
*/
304320
ignoreNode?: (
305-
node: ESTree.Node,
321+
node: AstNode,
306322
type: 'function' | 'statement' | 'branch',
307323
) => boolean | 'ignore-this-and-nested-nodes' | void
308324

0 commit comments

Comments
 (0)