From 8695003c7445eeddbd897abbadeb22f9bd8c47bc Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 1 Feb 2021 11:40:49 +0100 Subject: [PATCH] lint --- terminus-serial/src/api.ts | 14 +++++++------- terminus-ssh/src/components/sshTab.component.ts | 2 +- .../src/api/baseTerminalTab.component.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/terminus-serial/src/api.ts b/terminus-serial/src/api.ts index 1754c707..8c3c852f 100644 --- a/terminus-serial/src/api.ts +++ b/terminus-serial/src/api.ts @@ -42,8 +42,8 @@ export interface SerialPortInfo { description?: string } -export type InputMode = null | 'readline' -export type NewlineMode = null | 'cr' | 'lf' | 'crlf' +export type InputMode = null | 'readline' // eslint-disable-line @typescript-eslint/no-type-alias +export type NewlineMode = null | 'cr' | 'lf' | 'crlf' // eslint-disable-line @typescript-eslint/no-type-alias export class SerialSession extends BaseSession { scripts?: LoginScript[] @@ -69,7 +69,7 @@ export class SerialSession extends BaseSession { terminal: true, } as any) this.inputReadlineOutStream.on('data', data => { - if (this.connection.inputMode == 'readline') { + if (this.connection.inputMode === 'readline') { this.emitOutput(data) } }) @@ -97,7 +97,7 @@ export class SerialSession extends BaseSession { } write (data: Buffer): void { - if (this.connection.inputMode == 'readline') { + if (this.connection.inputMode === 'readline') { this.inputReadlineInStream.write(data) } else { this.onInput(data) @@ -163,7 +163,7 @@ export class SerialSession extends BaseSession { } private onOutputSettled () { - if (this.connection.inputMode == 'readline' && !this.inputPromptVisible) { + if (this.connection.inputMode === 'readline' && !this.inputPromptVisible) { this.resetInputPrompt() } } @@ -177,7 +177,7 @@ export class SerialSession extends BaseSession { private onOutput (data: Buffer) { const dataString = data.toString() - if (this.connection.inputMode == 'readline') { + if (this.connection.inputMode === 'readline') { if (this.inputPromptVisible) { clearLine(this.inputReadlineOutStream, 0) this.inputPromptVisible = false @@ -194,7 +194,7 @@ export class SerialSession extends BaseSession { let cmd = '' if (script.isRegex) { const re = new RegExp(script.expect, 'g') - if (dataString.match(re)) { + if (re.test(dataString)) { cmd = dataString.replace(re, script.send) match = true found = true diff --git a/terminus-ssh/src/components/sshTab.component.ts b/terminus-ssh/src/components/sshTab.component.ts index 8d9665d7..82d82b57 100644 --- a/terminus-ssh/src/components/sshTab.component.ts +++ b/terminus-ssh/src/components/sshTab.component.ts @@ -141,7 +141,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent { } } - protected attachSessionHandlers () { + protected attachSessionHandlers (): void { const session = this.session! super.attachSessionHandlers() this.attachSessionHandler(session.destroyed$.subscribe(() => { diff --git a/terminus-terminal/src/api/baseTerminalTab.component.ts b/terminus-terminal/src/api/baseTerminalTab.component.ts index 0073c098..a31b938f 100644 --- a/terminus-terminal/src/api/baseTerminalTab.component.ts +++ b/terminus-terminal/src/api/baseTerminalTab.component.ts @@ -569,7 +569,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit ] } - setSession (session: BaseSession|null, destroyOnSessionClose = false) { + setSession (session: BaseSession|null, destroyOnSessionClose = false): void { if (session) { if (this.session) { this.setSession(null) @@ -583,7 +583,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit } } - protected attachSessionHandler (subscription: Subscription) { + protected attachSessionHandler (subscription: Subscription): void { this.sessionHandlers.push(subscription) } @@ -614,7 +614,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit })) } - protected detachSessionHandlers () { + protected detachSessionHandlers (): void { for (const s of this.sessionHandlers) { s.unsubscribe() }