@@ -9,7 +9,7 @@ import { createDefer } from '@vitest/utils'
99import { Typechecker } from '../../typecheck/typechecker'
1010import { groupBy } from '../../utils/base'
1111
12- export function createTypecheckPool ( ctx : Vitest ) : ProcessPool {
12+ export function createTypecheckPool ( vitest : Vitest ) : ProcessPool {
1313 const promisesMap = new WeakMap < TestProject , DeferPromise < void > > ( )
1414 const rerunTriggered = new WeakSet < TestProject > ( )
1515
@@ -20,11 +20,11 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
2020 const checker = project . typechecker !
2121
2222 const { packs, events } = checker . getTestPacksAndEvents ( )
23- await ctx . _testRun . updated ( packs , events )
23+ await vitest . _testRun . updated ( packs , events )
2424
2525 if ( ! project . config . typecheck . ignoreSourceErrors ) {
2626 sourceErrors . forEach ( error =>
27- ctx . state . catchError ( error , 'Unhandled Source Error' ) ,
27+ vitest . state . catchError ( error , 'Unhandled Source Error' ) ,
2828 )
2929 }
3030
@@ -33,19 +33,19 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
3333 if ( processError ) {
3434 const error = new Error ( checker . getOutput ( ) )
3535 error . stack = ''
36- ctx . state . catchError ( error , 'Typecheck Error' )
36+ vitest . state . catchError ( error , 'Typecheck Error' )
3737 }
3838
3939 promisesMap . get ( project ) ?. resolve ( )
4040
4141 rerunTriggered . delete ( project )
4242
4343 // triggered by TSC watcher, not Vitest watcher, so we need to emulate what Vitest does in this case
44- if ( ctx . config . watch && ! ctx . runningPromise ) {
45- await ctx . report ( 'onFinished' , files , [ ] )
46- await ctx . report ( 'onWatcherStart' , files , [
44+ if ( vitest . config . watch && ! vitest . runningPromise ) {
45+ await vitest . report ( 'onFinished' , files , [ ] )
46+ await vitest . report ( 'onWatcherStart' , files , [
4747 ...( project . config . typecheck . ignoreSourceErrors ? [ ] : sourceErrors ) ,
48- ...ctx . state . getUnhandledErrors ( ) ,
48+ ...vitest . state . getUnhandledErrors ( ) ,
4949 ] )
5050 }
5151 }
@@ -65,19 +65,19 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
6565 checker . onParseStart ( async ( ) => {
6666 const files = checker . getTestFiles ( )
6767 for ( const file of files ) {
68- await ctx . _testRun . enqueued ( project , file )
68+ await vitest . _testRun . enqueued ( project , file )
6969 }
70- await ctx . _testRun . collected ( project , files )
70+ await vitest . _testRun . collected ( project , files )
7171 } )
7272
7373 checker . onParseEnd ( result => onParseEnd ( project , result ) )
7474
7575 checker . onWatcherRerun ( async ( ) => {
7676 rerunTriggered . add ( project )
7777
78- if ( ! ctx . runningPromise ) {
79- ctx . state . clearErrors ( )
80- await ctx . report (
78+ if ( ! vitest . runningPromise ) {
79+ vitest . state . clearErrors ( )
80+ await vitest . report (
8181 'onWatcherRerun' ,
8282 files ,
8383 'File change detected. Triggering rerun.' ,
@@ -88,15 +88,14 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
8888
8989 const testFiles = checker . getTestFiles ( )
9090 for ( const file of testFiles ) {
91- await ctx . _testRun . enqueued ( project , file )
91+ await vitest . _testRun . enqueued ( project , file )
9292 }
93- await ctx . _testRun . collected ( project , testFiles )
93+ await vitest . _testRun . collected ( project , testFiles )
9494
9595 const { packs, events } = checker . getTestPacksAndEvents ( )
96- await ctx . _testRun . updated ( packs , events )
96+ await vitest . _testRun . updated ( packs , events )
9797 } )
9898
99- await checker . prepare ( )
10099 return checker
101100 }
102101
@@ -118,7 +117,7 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
118117 checker . setFiles ( files )
119118 await checker . collectTests ( )
120119 const testFiles = checker . getTestFiles ( )
121- ctx . state . collectFiles ( project , testFiles )
120+ vitest . state . collectFiles ( project , testFiles )
122121 }
123122 }
124123
@@ -147,9 +146,9 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
147146 if ( project . typechecker && ! triggered ) {
148147 const testFiles = project . typechecker . getTestFiles ( )
149148 for ( const file of testFiles ) {
150- await ctx . _testRun . enqueued ( project , file )
149+ await vitest . _testRun . enqueued ( project , file )
151150 }
152- await ctx . _testRun . collected ( project , testFiles )
151+ await vitest . _testRun . collected ( project , testFiles )
153152 await onParseEnd ( project , project . typechecker . getResult ( ) )
154153 continue
155154 }
@@ -166,7 +165,7 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
166165 runTests,
167166 collectTests,
168167 async close ( ) {
169- const promises = ctx . projects . map ( project =>
168+ const promises = vitest . projects . map ( project =>
170169 project . typechecker ?. stop ( ) ,
171170 )
172171 await Promise . all ( promises )
0 commit comments