strongly typed partial profiles wip

tabby-local/src/components/localProfileSettings.component.ts

@@ -10,7 +10,7 @@ import { ProfileSettingsComponent } from 'tabby-core'
 @Component({
     template: require('./localProfileSettings.component.pug'),
 })
-export class LocalProfileSettingsComponent implements ProfileSettingsComponent {
+export class LocalProfileSettingsComponent implements ProfileSettingsComponent<LocalProfile> {
     profile: LocalProfile
 
     constructor (

tabby-local/src/profiles.ts

@@ -1,12 +1,12 @@
 import deepClone from 'clone-deep'
 import { Injectable, Inject } from '@angular/core'
-import { ProfileProvider, Profile, NewTabParameters, ConfigService, SplitTabComponent, AppService } from 'tabby-core'
+import { ProfileProvider, NewTabParameters, ConfigService, SplitTabComponent, AppService, PartialProfile } from 'tabby-core'
 import { TerminalTabComponent } from './components/terminalTab.component'
 import { LocalProfileSettingsComponent } from './components/localProfileSettings.component'
-import { ShellProvider, Shell, SessionOptions } from './api'
+import { ShellProvider, Shell, SessionOptions, LocalProfile } from './api'
 
 @Injectable({ providedIn: 'root' })
-export class LocalProfilesService extends ProfileProvider {
+export class LocalProfilesService extends ProfileProvider<LocalProfile> {
     id = 'local'
     name = 'Local'
     settingsComponent = LocalProfileSettingsComponent
@@ -34,7 +34,7 @@ export class LocalProfilesService extends ProfileProvider {
         super()
     }
 
-    async getBuiltinProfiles (): Promise<Profile[]> {
+    async getBuiltinProfiles (): Promise<PartialProfile<LocalProfile>[]> {
         return (await this.getShells()).map(shell => ({
             id: `local:${shell.id}`,
             type: 'local',
@@ -45,20 +45,20 @@ export class LocalProfilesService extends ProfileProvider {
         }))
     }
 
-    async getNewTabParameters (profile: Profile): Promise<NewTabParameters<TerminalTabComponent>> {
+    async getNewTabParameters (profile: PartialProfile<LocalProfile>): Promise<NewTabParameters<TerminalTabComponent>> {
         profile = deepClone(profile)
 
         if (!profile.options?.cwd) {
             if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) {
                 profile.options ??= {}
-                profile.options.cwd = await this.app.activeTab.session.getWorkingDirectory()
+                profile.options.cwd = await this.app.activeTab.session.getWorkingDirectory() ?? undefined
             }
             if (this.app.activeTab instanceof SplitTabComponent) {
                 const focusedTab = this.app.activeTab.getFocusedTab()
 
                 if (focusedTab instanceof TerminalTabComponent && focusedTab.session) {
                     profile.options ??= {}
-                    profile.options.cwd = await focusedTab.session.getWorkingDirectory()
+                    profile.options!.cwd = await focusedTab.session.getWorkingDirectory() ?? undefined
                 }
             }
         }
@@ -84,7 +84,7 @@ export class LocalProfilesService extends ProfileProvider {
         }
     }
 
-    getDescription (profile: Profile): string {
-        return profile.options?.command
+    getDescription (profile: PartialProfile<LocalProfile>): string {
+        return profile.options?.command ?? ''
     }
 }

tabby-local/src/services/terminal.service.ts

@@ -1,6 +1,6 @@
 import * as fs from 'mz/fs'
 import { Injectable } from '@angular/core'
-import { Logger, LogService, ConfigService, ProfilesService } from 'tabby-core'
+import { Logger, LogService, ConfigService, ProfilesService, PartialProfile } from 'tabby-core'
 import { TerminalTabComponent } from '../components/terminalTab.component'
 import { LocalProfile } from '../api'
 
@@ -17,40 +17,42 @@ export class TerminalService {
         this.logger = log.create('terminal')
     }
 
-    async getDefaultProfile (): Promise<LocalProfile> {
+    async getDefaultProfile (): Promise<PartialProfile<LocalProfile>> {
         const profiles = await this.profilesService.getProfiles()
         let profile = profiles.find(x => x.id === this.config.store.terminal.profile)
         if (!profile) {
             profile = profiles.filter(x => x.type === 'local' && x.isBuiltin)[0]
         }
-        return profile as LocalProfile
+        return profile as PartialProfile<LocalProfile>
     }
 
     /**
      * Launches a new terminal with a specific shell and CWD
      * @param pause Wait for a keypress when the shell exits
      */
-    async openTab (profile?: LocalProfile|null, cwd?: string|null, pause?: boolean): Promise<TerminalTabComponent> {
+    async openTab (profile?: PartialProfile<LocalProfile>|null, cwd?: string|null, pause?: boolean): Promise<TerminalTabComponent> {
         if (!profile) {
             profile = await this.getDefaultProfile()
         }
 
-        cwd = cwd ?? profile.options.cwd
+        const fullProfile = this.profilesService.getConfigProxyForProfile(profile)
+
+        cwd = cwd ?? fullProfile.options.cwd
 
         if (cwd && !fs.existsSync(cwd)) {
             console.warn('Ignoring non-existent CWD:', cwd)
             cwd = null
         }
 
-        this.logger.info(`Starting profile ${profile.name}`, profile)
+        this.logger.info(`Starting profile ${fullProfile.name}`, fullProfile)
         const options = {
-            ...profile.options,
+            ...fullProfile.options,
             pauseAfterExit: pause,
             cwd: cwd ?? undefined,
         }
 
         return (await this.profilesService.openNewTabForProfile({
-            ...profile,
+            ...fullProfile,
             options,
         })) as TerminalTabComponent
     }