From 97c1e7df5a03aa5fa3bb1d6d26a4cdc9451c7e98 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Mon, 20 May 2019 19:17:56 -0400 Subject: [PATCH] Run linter --- packages/core/src/core.ts | 43 +++---- packages/core/src/interfaces.ts | 34 +++--- packages/core/src/internal.ts | 193 ++++++++++++++++---------------- 3 files changed, 137 insertions(+), 133 deletions(-) diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts index a9baa76d..af0fae37 100644 --- a/packages/core/src/core.ts +++ b/packages/core/src/core.ts @@ -1,6 +1,6 @@ -import im = require('./interfaces'); -import intm = require('./internal'); -import process = require('process'); +import im = require('./interfaces') +import intm = require('./internal') +import process = require('process') //----------------------------------------------------------------------- // Variables @@ -12,8 +12,8 @@ import process = require('process'); * @param val the value of the variable */ export function exportVariable(name: string, val: string) { - process.env[name] = val; - intm._issueCommand('set-variable', {'name': name}, val); + process.env[name] = val + intm._issueCommand('set-variable', {name: name}, val) } /** @@ -22,24 +22,25 @@ export function exportVariable(name: string, val: string) { * @param val value of the secret */ export function setSecret(name: string, val: string) { - exportVariable(name, val); - intm._issueCommand('set-secret', {}, val); -} + exportVariable(name, val) + intm._issueCommand('set-secret', {}, val) +} /** * Gets the value of an input. The value is also trimmed. - * + * * @param name name of the input to get * @param options optional. See InputOptions. * @returns string */ export function getInput(name: string, options?: im.InputOptions): string { - let val: string = process.env['INPUT_' + name.replace(' ', '_').toUpperCase()] || ''; - if (options && options.required && !val) { - throw new Error(`Input required and not supplied: ${name}`); - } + let val: string = + process.env['INPUT_' + name.replace(' ', '_').toUpperCase()] || '' + if (options && options.required && !val) { + throw new Error(`Input required and not supplied: ${name}`) + } - return val.trim(); + return val.trim() } //----------------------------------------------------------------------- @@ -50,17 +51,17 @@ export function getInput(name: string, options?: im.InputOptions): string { * Sets the action status to neutral */ export function setNeutral() { - process.exitCode = im.ExitCode.Neutral; + process.exitCode = im.ExitCode.Neutral } /** - * Sets the action status to failed. + * Sets the action status to failed. * When the action exits it will be with an exit code of 1 * @param message add error issue message */ export function setFailed(message: string) { - process.exitCode = im.ExitCode.Failure; - error(message); + process.exitCode = im.ExitCode.Failure + error(message) } //----------------------------------------------------------------------- @@ -72,7 +73,7 @@ export function setFailed(message: string) { * @param message debug message */ export function debug(message: string) { - intm._issueCommand('debug', {}, message); + intm._issueCommand('debug', {}, message) } /** @@ -80,7 +81,7 @@ export function debug(message: string) { * @param message error issue message */ export function error(message: string) { - intm._issue('error', message); + intm._issue('error', message) } /** @@ -88,5 +89,5 @@ export function error(message: string) { * @param message warning issue message */ export function warning(message: string) { - intm._issue('warning', message); + intm._issue('warning', message) } diff --git a/packages/core/src/interfaces.ts b/packages/core/src/interfaces.ts index bca96a40..247f8e99 100644 --- a/packages/core/src/interfaces.ts +++ b/packages/core/src/interfaces.ts @@ -2,26 +2,26 @@ * The code to exit an action */ export enum ExitCode { - /** - * A code indicating that the action was successful - */ - Success = 0, - - /** - * A code indicating that the action was a failure - */ - Failure = 1, - - /** - * A code indicating that the action is complete, but neither succeeded nor failed - */ - Neutral = 78 + /** + * A code indicating that the action was successful + */ + Success = 0, + + /** + * A code indicating that the action was a failure + */ + Failure = 1, + + /** + * A code indicating that the action is complete, but neither succeeded nor failed + */ + Neutral = 78 } /** * Interface for getInput options */ export interface InputOptions { - /** Optional. Whether the input is required. If required and not present, will throw. Defaults to false */ - required?: boolean; -} \ No newline at end of file + /** Optional. Whether the input is required. If required and not present, will throw. Defaults to false */ + required?: boolean +} diff --git a/packages/core/src/internal.ts b/packages/core/src/internal.ts index af00f9a9..8218a210 100644 --- a/packages/core/src/internal.ts +++ b/packages/core/src/internal.ts @@ -1,148 +1,151 @@ -import os = require('os'); +import os = require('os') - -/** +/** * Commands * * Command Format: * ##[name key=value;key=value]message - * + * * Examples: * ##[warning]This is the user warning message * ##[set-secret name=mypassword]definatelyNotAPassword! */ -export function _issueCommand(command: string, properties: any, message: string) { - var cmd = new _Command(command, properties, message); - _writeLine(cmd.toString()); +export function _issueCommand( + command: string, + properties: any, + message: string +) { + var cmd = new _Command(command, properties, message) + _writeLine(cmd.toString()) } export function _issue(name: string, message: string) { - _issueCommand(name, {}, message); + _issueCommand(name, {}, message) } -let CMD_PREFIX = '##['; +let CMD_PREFIX = '##[' export class _Command { - constructor(command: string, properties: any, message: string) { - if (!command) { - command = 'missing.command'; - } - - this.command = command; - this.properties = properties; - this.message = message; + constructor(command: string, properties: any, message: string) { + if (!command) { + command = 'missing.command' } - public command: string; - public message: string; - public properties: any; + this.command = command + this.properties = properties + this.message = message + } - public toString() { - var cmdStr = CMD_PREFIX + this.command; + public command: string + public message: string + public properties: any - if (this.properties && Object.keys(this.properties).length > 0) { - cmdStr += ' '; - for (var key in this.properties) { - if (this.properties.hasOwnProperty(key)) { - var val = this.properties[key]; - if (val) { - // safely append the val - avoid blowing up when attempting to - // call .replace() if message is not a string for some reason - cmdStr += key + '=' + escape('' + (val || '')) + ';'; - } - } - } + public toString() { + var cmdStr = CMD_PREFIX + this.command + + if (this.properties && Object.keys(this.properties).length > 0) { + cmdStr += ' ' + for (var key in this.properties) { + if (this.properties.hasOwnProperty(key)) { + var val = this.properties[key] + if (val) { + // safely append the val - avoid blowing up when attempting to + // call .replace() if message is not a string for some reason + cmdStr += key + '=' + escape('' + (val || '')) + ';' + } } - - cmdStr += ']'; - - // safely append the message - avoid blowing up when attempting to - // call .replace() if message is not a string for some reason - let message: string = '' + (this.message || ''); - cmdStr += escapedata(message); - - return cmdStr; + } } + + cmdStr += ']' + + // safely append the message - avoid blowing up when attempting to + // call .replace() if message is not a string for some reason + let message: string = '' + (this.message || '') + cmdStr += escapedata(message) + + return cmdStr + } } export function _commandFromString(commandLine: string) { - var preLen = CMD_PREFIX.length; - var lbPos = commandLine.indexOf('['); - var rbPos = commandLine.indexOf(']'); - if (lbPos == -1 || rbPos == -1 || rbPos - lbPos < 3) { - throw new Error('Invalid command brackets'); - } - var cmdInfo = commandLine.substring(lbPos + 1, rbPos); - var spaceIdx = cmdInfo.indexOf(' '); + var preLen = CMD_PREFIX.length + var lbPos = commandLine.indexOf('[') + var rbPos = commandLine.indexOf(']') + if (lbPos == -1 || rbPos == -1 || rbPos - lbPos < 3) { + throw new Error('Invalid command brackets') + } + var cmdInfo = commandLine.substring(lbPos + 1, rbPos) + var spaceIdx = cmdInfo.indexOf(' ') - var command = cmdInfo; - var properties: {[key: string]: string} = {}; + var command = cmdInfo + var properties: {[key: string]: string} = {} - if (spaceIdx > 0) { - command = cmdInfo.trim().substring(0, spaceIdx); - var propSection = cmdInfo.trim().substring(spaceIdx+1); + if (spaceIdx > 0) { + command = cmdInfo.trim().substring(0, spaceIdx) + var propSection = cmdInfo.trim().substring(spaceIdx + 1) - var propLines: string[] = propSection.split(';'); - propLines.forEach(function (propLine: string) { - propLine = propLine.trim(); - if (propLine.length > 0) { - var eqIndex = propLine.indexOf('='); - if (eqIndex == -1){ - throw new Error('Invalid property: ' + propLine); - } + var propLines: string[] = propSection.split(';') + propLines.forEach(function(propLine: string) { + propLine = propLine.trim() + if (propLine.length > 0) { + var eqIndex = propLine.indexOf('=') + if (eqIndex == -1) { + throw new Error('Invalid property: ' + propLine) + } - var key: string = propLine.substring(0, eqIndex); - var val: string = propLine.substring(eqIndex+1); + var key: string = propLine.substring(0, eqIndex) + var val: string = propLine.substring(eqIndex + 1) - properties[key] = unescape(val); - } - }); - } + properties[key] = unescape(val) + } + }) + } - let msg: string = unescapedata(commandLine.substring(rbPos + 1)); - var cmd = new _Command(command, properties, msg); - return cmd; + let msg: string = unescapedata(commandLine.substring(rbPos + 1)) + var cmd = new _Command(command, properties, msg) + return cmd } -function escapedata(s: string) : string { - return s.replace(/\r/g, '%0D') - .replace(/\n/g, '%0A'); +function escapedata(s: string): string { + return s.replace(/\r/g, '%0D').replace(/\n/g, '%0A') } -function unescapedata(s: string) : string { - return s.replace(/%0D/g, '\r') - .replace(/%0A/g, '\n'); +function unescapedata(s: string): string { + return s.replace(/%0D/g, '\r').replace(/%0A/g, '\n') } -function escape(s: string) : string { - return s.replace(/\r/g, '%0D') - .replace(/\n/g, '%0A') - .replace(/]/g, '%5D') - .replace(/;/g, '%3B'); +function escape(s: string): string { + return s + .replace(/\r/g, '%0D') + .replace(/\n/g, '%0A') + .replace(/]/g, '%5D') + .replace(/;/g, '%3B') } -function unescape(s: string) : string { - return s.replace(/%0D/g, '\r') - .replace(/%0A/g, '\n') - .replace(/%5D/g, ']') - .replace(/%3B/g, ';'); +function unescape(s: string): string { + return s + .replace(/%0D/g, '\r') + .replace(/%0A/g, '\n') + .replace(/%5D/g, ']') + .replace(/%3B/g, ';') } //----------------------------------------------------- // Streams: allow to override the stream //----------------------------------------------------- -let _outStream = process.stdout; -let _errStream = process.stderr; +let _outStream = process.stdout +let _errStream = process.stderr export function _writeLine(str: string): void { - _outStream.write(str + os.EOL); + _outStream.write(str + os.EOL) } export function _setStdStream(stdStream: NodeJS.WriteStream): void { - _outStream = stdStream; + _outStream = stdStream } export function _setErrStream(errStream: NodeJS.WriteStream): void { - _errStream = errStream; -} \ No newline at end of file + _errStream = errStream +}