From aacc6033099513f78bf410e8279390ab28c5a39c Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Thu, 24 Dec 2020 18:56:59 +0100 Subject: [PATCH] lint typescript-eslint/consistent-indexed-object-style --- .eslintrc.yml | 1 - terminus-core/src/api/configProvider.ts | 2 +- terminus-core/src/services/hostApp.service.ts | 2 +- terminus-core/src/services/touchbar.service.ts | 2 +- .../src/components/pluginsSettingsTab.component.ts | 4 ++-- terminus-ssh/src/api.ts | 2 +- .../src/components/editConnectionModal.component.ts | 6 +++--- terminus-ssh/src/components/sshSettingsTab.component.ts | 2 +- terminus-terminal/src/api/interfaces.ts | 2 +- terminus-terminal/src/services/sessions.service.ts | 2 +- terminus-terminal/src/shells/wsl.ts | 2 +- 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 4d0817ad..736b76a4 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -117,6 +117,5 @@ rules: '@typescript-eslint/prefer-enum-initializers': off '@typescript-eslint/no-implicit-any-catch': off '@typescript-eslint/member-ordering': off - '@typescript-eslint/consistent-indexed-object-style': off '@typescript-eslint/no-var-requires': off '@typescript-eslint/no-shadow': off diff --git a/terminus-core/src/api/configProvider.ts b/terminus-core/src/api/configProvider.ts index 7ed3b868..fb587824 100644 --- a/terminus-core/src/api/configProvider.ts +++ b/terminus-core/src/api/configProvider.ts @@ -33,5 +33,5 @@ export abstract class ConfigProvider { * } * ``` */ - platformDefaults: {[platform: string]: any} = {} + platformDefaults: Record = {} } diff --git a/terminus-core/src/services/hostApp.service.ts b/terminus-core/src/services/hostApp.service.ts index 4a93fc1e..325efe1e 100644 --- a/terminus-core/src/services/hostApp.service.ts +++ b/terminus-core/src/services/hostApp.service.ts @@ -258,7 +258,7 @@ export class HostAppService { /** * Notifies other windows of config file changes */ - broadcastConfigChange (configStore: {[k: string]: any}): void { + broadcastConfigChange (configStore: Record): void { this.electron.ipcRenderer.send('app:config-change', configStore) } diff --git a/terminus-core/src/services/touchbar.service.ts b/terminus-core/src/services/touchbar.service.ts index 10abd7c9..a4cd382d 100644 --- a/terminus-core/src/services/touchbar.service.ts +++ b/terminus-core/src/services/touchbar.service.ts @@ -12,7 +12,7 @@ export class TouchbarService { private tabsSegmentedControl: TouchBarSegmentedControl private buttonsSegmentedControl: TouchBarSegmentedControl private tabSegments: SegmentedControlSegment[] = [] - private nsImageCache: {[id: string]: NativeImage} = {} + private nsImageCache: Record = {} private constructor ( private app: AppService, diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts index a78d85ef..86030789 100644 --- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts +++ b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts @@ -19,8 +19,8 @@ export class PluginsSettingsTabComponent { @Input() availablePlugins$: Observable @Input() availablePluginsQuery$ = new BehaviorSubject('') @Input() availablePluginsReady = false - @Input() knownUpgrades: {[id: string]: PluginInfo|null} = {} - @Input() busy: {[id: string]: BusyState} = {} + @Input() knownUpgrades: Record = {} + @Input() busy: Record = {} @Input() erroredPlugin: string @Input() errorMessage: string diff --git a/terminus-ssh/src/api.ts b/terminus-ssh/src/api.ts index 7588d1bb..157ff42b 100644 --- a/terminus-ssh/src/api.ts +++ b/terminus-ssh/src/api.ts @@ -41,7 +41,7 @@ export interface SSHConnection { jumpHost?: string agentForward?: boolean warnOnClose?: boolean - algorithms?: {[t: string]: string[]} + algorithms?: Record } export enum PortForwardType { diff --git a/terminus-ssh/src/components/editConnectionModal.component.ts b/terminus-ssh/src/components/editConnectionModal.component.ts index 5ad18cc2..3b9eae61 100644 --- a/terminus-ssh/src/components/editConnectionModal.component.ts +++ b/terminus-ssh/src/components/editConnectionModal.component.ts @@ -15,9 +15,9 @@ export class EditConnectionModalComponent { connection: SSHConnection hasSavedPassword: boolean - supportedAlgorithms: {[id: string]: string[]} = {} - defaultAlgorithms: {[id: string]: string[]} = {} - algorithms: {[id: string]: {[a: string]: boolean}} = {} + supportedAlgorithms: Record = {} + defaultAlgorithms: Record = {} + algorithms: Record> = {} constructor ( public config: ConfigService, diff --git a/terminus-ssh/src/components/sshSettingsTab.component.ts b/terminus-ssh/src/components/sshSettingsTab.component.ts index 1b6538ca..645d0dd8 100644 --- a/terminus-ssh/src/components/sshSettingsTab.component.ts +++ b/terminus-ssh/src/components/sshSettingsTab.component.ts @@ -14,7 +14,7 @@ import { PromptModalComponent } from './promptModal.component' export class SSHSettingsTabComponent { connections: SSHConnection[] childGroups: SSHConnectionGroup[] - groupCollapsed: {[id: string]: boolean} = {} + groupCollapsed: Record = {} constructor ( public config: ConfigService, diff --git a/terminus-terminal/src/api/interfaces.ts b/terminus-terminal/src/api/interfaces.ts index e426a40a..80288d34 100644 --- a/terminus-terminal/src/api/interfaces.ts +++ b/terminus-terminal/src/api/interfaces.ts @@ -37,7 +37,7 @@ export interface Shell { name?: string command: string args?: string[] - env: {[id: string]: string} + env: Record /** * Base path to which shell's internal FS is relative diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index ec0a8e32..fac1c97e 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -331,7 +331,7 @@ export class Session extends BaseSession { /** @hidden */ @Injectable({ providedIn: 'root' }) export class SessionsService { - sessions: {[id: string]: BaseSession} = {} + sessions: Record = {} logger: Logger private lastID = 0 diff --git a/terminus-terminal/src/shells/wsl.ts b/terminus-terminal/src/shells/wsl.ts index 7ba58ed7..063d0836 100644 --- a/terminus-terminal/src/shells/wsl.ts +++ b/terminus-terminal/src/shells/wsl.ts @@ -16,7 +16,7 @@ try { // WSL Distribution List // https://docs.microsoft.com/en-us/windows/wsl/install-win10#install-your-linux-distribution-of-choice /* eslint-disable quote-props */ -const wslIconMap: { [key: string]: string } = { +const wslIconMap: Record = { 'Alpine': require('../icons/alpine.svg'), 'Debian': require('../icons/debian.svg'), 'kali-linux': require('../icons/linux.svg'),