chore(server): convert modes/run to typescript (cypress-io#23536)

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>

Author: flotwig

packages/data-context/src/actions/ProjectActions.ts

@@ -1,5 +1,5 @@
 import type { CodeGenType, MutationSetProjectPreferencesInGlobalCacheArgs, NexusGenObjects, NexusGenUnions } from '@packages/graphql/src/gen/nxs.gen'
-import type { InitializeProjectOptions, FoundBrowser, FoundSpec, LaunchOpts, OpenProjectLaunchOptions, Preferences, TestingType, ReceivedCypressOptions, AddProject, FullConfig, AllowedState } from '@packages/types'
+import type { InitializeProjectOptions, FoundBrowser, FoundSpec, LaunchOpts, OpenProjectLaunchOptions, Preferences, TestingType, ReceivedCypressOptions, AddProject, FullConfig, AllowedState, SpecWithRelativeRoot } from '@packages/types'
 import type { EventEmitter } from 'events'
 import execa from 'execa'
 import path from 'path'
@@ -40,7 +40,7 @@ export interface ProjectApiShape {
   setProjectPreferences(stated: AllowedState): void
   makeProjectSavedState(projectRoot: string): void
   getDevServer (): {
-    updateSpecs(specs: FoundSpec[]): void
+    updateSpecs(specs: SpecWithRelativeRoot[]): void
     start(options: {specs: Cypress.Spec[], config: FullConfig}): Promise<{port: number}>
     close(): void
     emitter: EventEmitter
@@ -313,7 +313,7 @@ export class ProjectActions {
     this.api.setPromptShown(slug)
   }
 
-  setSpecs (specs: FoundSpec[]) {
+  setSpecs (specs: SpecWithRelativeRoot[]) {
     this.ctx.project.setSpecs(specs)
     this.refreshSpecs(specs)
 
@@ -324,7 +324,7 @@ export class ProjectActions {
     this.ctx.emitter.specsChange()
   }
 
-  refreshSpecs (specs: FoundSpec[]) {
+  refreshSpecs (specs: SpecWithRelativeRoot[]) {
     this.ctx.lifecycleManager.git?.setSpecs(specs.map((s) => s.absolute))
   }
 

packages/data-context/src/sources/ProjectDataSource.ts

@@ -1,6 +1,6 @@
 import os from 'os'
 import chokidar from 'chokidar'
-import type { ResolvedFromConfig, RESOLVED_FROM, FoundSpec, TestingType } from '@packages/types'
+import type { ResolvedFromConfig, RESOLVED_FROM, TestingType, SpecWithRelativeRoot } from '@packages/types'
 import minimatch from 'minimatch'
 import _ from 'lodash'
 import path from 'path'
@@ -23,8 +23,6 @@ import type { ProjectShape } from '../data'
 import type { FindSpecs } from '../actions'
 import { getDefaultSpecFileName } from './migration/utils'
 
-export type SpecWithRelativeRoot = FoundSpec & { relativeToCommonRoot: string }
-
 interface MatchedSpecs {
   projectRoot: string
   testingType: Cypress.TestingType
@@ -199,7 +197,7 @@ export function getPathFromSpecPattern ({
 
 export class ProjectDataSource {
   private _specWatcher: FSWatcher | null = null
-  private _specs: FoundSpec[] = []
+  private _specs: SpecWithRelativeRoot[] = []
 
   constructor (private ctx: DataContext) {}
 
@@ -227,7 +225,7 @@ export class ProjectDataSource {
     return this._specs
   }
 
-  setSpecs (specs: FoundSpec[]) {
+  setSpecs (specs: SpecWithRelativeRoot[]) {
     this._specs = specs
   }
 
@@ -256,7 +254,7 @@ export class ProjectDataSource {
     configSpecPattern,
     excludeSpecPattern,
     additionalIgnorePattern,
-  }: FindSpecs<string[]>): Promise<FoundSpec[]> {
+  }: FindSpecs<string[]>): Promise<SpecWithRelativeRoot[]> {
     let specAbsolutePaths = await this.ctx.file.getFilesByGlob(
       projectRoot,
       specPattern, {

packages/server/lib/automation/automation.ts

@@ -184,7 +184,7 @@ export class Automation {
     }
   }
 
-  get = (fn: keyof AutomationMiddleware) => {
+  get = <K extends keyof AutomationMiddleware>(fn: K): AutomationMiddleware[K] => {
     return this.middleware[fn]
   }
 }

packages/server/lib/makeDataContext.ts

@@ -118,7 +118,7 @@ export function makeDataContext (options: MakeDataContextOptions): DataContext {
         return openProject.closeActiveProject()
       },
       getCurrentBrowser () {
-        return (openProject?.projectBase?.browser) ?? undefined
+        return (openProject?.getProject()?.browser) ?? undefined
       },
       getConfig () {
         return openProject.getConfig()

packages/server/lib/modes/index.ts

@@ -32,11 +32,11 @@ export = (mode, options) => {
     // a testingType, we default to e2e
     options.testingType = options.testingType || 'e2e'
 
-    return require('./run').run(options, loadingPromise)
+    return (require('./run') as typeof import('./run')).run(options, loadingPromise)
   }
 
   if (mode === 'interactive') {
     // Either launchpad or straight to e2e tests
-    return require('./interactive').run(options, loadingPromise)
+    return (require('./interactive') as typeof import('./interactive')).run(options, loadingPromise)
   }
 }