refactor: typing ExecuteOptions

hi-ogawa · Oct 3, 2024 · 2447160 · 2447160
1 parent 0ce26a4
commit 2447160
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/packages/vitest/src/public/execute.ts b/packages/vitest/src/public/execute.ts
@@ -1 +1 @@
-export { VitestExecutor } from '../runtime/execute'
+export { VitestExecutor, ExecuteOptions } from '../runtime/execute'
diff --git a/packages/web-worker/src/runner.ts b/packages/web-worker/src/runner.ts
@@ -1,7 +1,8 @@
+import type { ExecuteOptions } from 'vitest/execute'
 import { VitestExecutor } from 'vitest/execute'
 
 export class InlineWorkerRunner extends VitestExecutor {
-  constructor(options: any, private context: any) {
+  constructor(options: ExecuteOptions, private context: any) {
     super(options)
   }
 

diff --git a/packages/web-worker/src/shared-worker.ts b/packages/web-worker/src/shared-worker.ts
@@ -135,7 +135,7 @@ export function createSharedWorkerConstructor(): typeof SharedWorker {
 
           return runner.executeFile(fsPath).then(() => {
             // worker should be new every time, invalidate its sub dependency
-            runnerOptions.moduleCache.invalidateSubDepTree([
+            runnerOptions.moduleCache!.invalidateSubDepTree([
               fsPath,
               runner.mocker.getMockPath(fsPath),
             ])

diff --git a/packages/web-worker/src/utils.ts b/packages/web-worker/src/utils.ts
@@ -2,6 +2,7 @@ import { readFileSync as _readFileSync } from 'node:fs'
 import type { WorkerGlobalState } from 'vitest'
 import ponyfillStructuredClone from '@ungap/structured-clone'
 import createDebug from 'debug'
+import type { ExecuteOptions } from 'vitest/execute'
 import type { CloneOption } from './types'
 
 // keep the reference in case it was mocked
@@ -79,7 +80,7 @@ export function createMessageEvent(
   }
 }
 
-export function getRunnerOptions(): any {
+export function getRunnerOptions(): ExecuteOptions {
   const state = getWorkerState()
   const { config, rpc, moduleCache } = state
 

diff --git a/packages/web-worker/src/worker.ts b/packages/web-worker/src/worker.ts
@@ -132,7 +132,7 @@ export function createWorkerConstructor(
 
           return runner.executeFile(fsPath).then(() => {
             // worker should be new every time, invalidate its sub dependency
-            runnerOptions.moduleCache.invalidateSubDepTree([
+            runnerOptions.moduleCache!.invalidateSubDepTree([
               fsPath,
               runner.mocker.getMockPath(fsPath),
             ])