chore: update to es2020 taraget

Author: NathanWalker

lib/common/bootstrap.ts

@@ -1,5 +1,5 @@
-(<ICliGlobal>global)._ = require("lodash");
-(<ICliGlobal>global).$injector = require("./yok").injector;
+(<ICliGlobal><unknown>global)._ = require("lodash");
+(<ICliGlobal><unknown>global).$injector = require("./yok").injector;
 
 require("colors");
 $injector.require("errors", "./errors");

lib/common/declarations.d.ts

@@ -4,6 +4,12 @@ interface Object {
 
 interface IStringDictionary extends IDictionary<string> { }
 
+declare enum Platforms {
+  ios = 'ios',
+  android = 'android'
+}
+type SupportedPlatform = Platforms.ios | Platforms.android;
+
 /**
  * Describes iTunes Connect application types
  */
@@ -268,7 +274,7 @@ interface IReadFileOptions {
 	/**
 	 * Defines the encoding. Defaults to null.
 	 */
-	encoding: string;
+	encoding?: BufferEncoding | null;
 
 	/**
 	 * Defines file flags. Defaults to "r".
@@ -344,9 +350,9 @@ interface IFileSystem {
 	 * Reads the entire contents of a file.
 	 * @param {string} filename Path to the file that has to be read.
 	 * @param {string} @optional options Options used for reading the file - encoding and flags.
-	 * @returns {string|NodeBuffer} Content of the file as buffer. In case encoding is specified, the content is returned as string.
+	 * @returns {string|Buffer} Content of the file as buffer. In case encoding is specified, the content is returned as string.
 	 */
-	readFile(filename: string, options?: IReadFileOptions): string | NodeBuffer;
+	readFile(filename: string, options?: IReadFileOptions): string | Buffer;
 
 	/**
 	 * Reads the entire contents of a file and returns the result as string.
@@ -369,20 +375,20 @@ interface IFileSystem {
 	/**
 	 * Writes data to a file, replacing the file if it already exists. data can be a string or a buffer.
 	 * @param {string} filename Path to file to be created.
-	 * @param {string | NodeBuffer} data Data to be written to file.
+	 * @param {string | Buffer} data Data to be written to file.
 	 * @param {string} encoding @optional File encoding, defaults to utf8.
 	 * @returns {void}
 	 */
-	writeFile(filename: string, data: string | NodeBuffer, encoding?: string): void;
+	writeFile(filename: string, data: string | Buffer, encoding?: string): void;
 
 	/**
 	 * Appends data to a file, creating the file if it does not yet exist. Data can be a string or a buffer.
 	 * @param {string} filename Path to file to be created.
-	 * @param {string | NodeBuffer} data Data to be appended to file.
+	 * @param {string | Buffer} data Data to be appended to file.
 	 * @param {string} encoding @optional File encoding, defaults to utf8.
 	 * @returns {void}
 	 */
-	appendFile(filename: string, data: string | NodeBuffer, encoding?: string): void;
+	appendFile(filename: string, data: string | Buffer, encoding?: string): void;
 
 	/**
 	 * Writes JSON data to file.

lib/common/errors.ts

@@ -11,7 +11,7 @@ function Exception() {
 
 Exception.prototype = new Error();
 
-function resolveCallStack(error: Error): string {
+async function resolveCallStack(error: Error): Promise<string> {
 	const stackLines: string[] = error.stack.split("\n");
 	const parsed = _.map(stackLines, (line: string): any => {
 		let match = line.match(/^\s*at ([^(]*) \((.*?):([0-9]+):([0-9]+)\)$/);
@@ -28,9 +28,9 @@ function resolveCallStack(error: Error): string {
 		return line;
 	});
 
-	const fs = require("fs");
+  const fs = require("fs");
 
-	const remapped = _.map(parsed, (parsedLine) => {
+	const remapped = await Promise.all(_.map(parsed, async (parsedLine) => {
 		if (_.isString(parsedLine)) {
 			return parsedLine;
 		}
@@ -47,15 +47,16 @@ function resolveCallStack(error: Error): string {
 
 		const mapData = JSON.parse(fs.readFileSync(mapFileName).toString());
 
-		const consumer = new SourceMapConsumer(mapData);
-		const sourcePos = consumer.originalPositionFor({ line: line, column: column });
-		if (sourcePos && sourcePos.source) {
-			const source = path.join(path.dirname(fileName), sourcePos.source);
-			return util.format("    at %s (%s:%s:%s)", functionName, source, sourcePos.line, sourcePos.column);
-		}
-
-		return util.format("    at %s (%s:%s:%s)", functionName, fileName, line, column);
-	});
+		return await SourceMapConsumer.with(mapData, mapFileName, (consumer) => {
+      const sourcePos = consumer.originalPositionFor({ line: line, column: column });
+      if (sourcePos && sourcePos.source) {
+        const source = path.join(path.dirname(fileName), sourcePos.source);
+        return util.format("    at %s (%s:%s:%s)", functionName, source, sourcePos.line, sourcePos.column);
+      }
+  
+      return util.format("    at %s (%s:%s:%s)", functionName, fileName, line, column);
+    });
+	}));
 
 	let outputMessage = remapped.join("\n");
 
@@ -73,7 +74,7 @@ export function installUncaughtExceptionListener(actionOnException?: () => void)
 			let callstack = err.stack;
 			if (callstack) {
 				try {
-					callstack = resolveCallStack(err);
+					callstack = await resolveCallStack(err);
 				} catch (err) {
 					console.error("Error while resolving callStack:", err);
 				}
@@ -178,7 +179,7 @@ export class Errors implements IErrors {
 			const logger = this.$injector.resolve("logger");
 			const loggerLevel: string = logger.getLevel().toUpperCase();
 			const printCallStack = this.printCallStack || loggerLevel === "TRACE" || loggerLevel === "DEBUG";
-			const message = printCallStack ? resolveCallStack(ex) : isInteractive() ? `\x1B[31;1m${ex.message}\x1B[0m` : ex.message;
+			const message = printCallStack ? await resolveCallStack(ex) : isInteractive() ? `\x1B[31;1m${ex.message}\x1B[0m` : ex.message;
 
 			if (ex.printOnStdout) {
 				logger.info(message);

lib/common/file-system.ts

@@ -7,8 +7,8 @@ import * as shelljs from "shelljs";
 import { parseJson } from "./helpers";
 import { PACKAGE_JSON_FILE_NAME } from "../constants";
 import { EOL } from "os";
-import stringifyPackage = require("stringify-package");
-import detectNewline = require("detect-newline");
+import stringifyPackage from "stringify-package";
+import detectNewline from "detect-newline";
 
 // TODO: Add .d.ts for mkdirp module (or use it from @types repo).
 const mkdirp = require("mkdirp");
@@ -185,7 +185,7 @@ export class FileSystem implements IFileSystem {
 		options = options || { encoding: "utf8" };
 
 		if (_.isString(options)) {
-			options = { encoding: options };
+			options = { encoding: <BufferEncoding>options };
 		}
 
 		if (!options.encoding) {
@@ -210,11 +210,11 @@ export class FileSystem implements IFileSystem {
 			// clean any null or undefined data
 			data = '';
 		}
-		fs.writeFileSync(filename, data, { encoding: encoding });
+		fs.writeFileSync(filename, data, { encoding: <BufferEncoding>encoding });
 	}
 
 	public appendFile(filename: string, data: any, encoding?: string): void {
-		fs.appendFileSync(filename, data, { encoding: encoding });
+		fs.appendFileSync(filename, data, { encoding: <BufferEncoding>encoding });
 	}
 
 	public writeJson(filename: string, data: any, space?: string, encoding?: string): void {
@@ -257,18 +257,27 @@ export class FileSystem implements IFileSystem {
 
 	public createReadStream(path: string, options?: {
 		flags?: string;
-		encoding?: string;
-		fd?: number;
-		mode?: number;
-		bufferSize?: number;
+    encoding?: BufferEncoding;
+    fd?: number;
+    mode?: number;
+    autoClose?: boolean;
+    emitClose?: boolean;
+    start?: number;
+    end?: number;
+    highWaterMark?: number;
 	}): NodeJS.ReadableStream {
 		return fs.createReadStream(path, options);
 	}
 
 	public createWriteStream(path: string, options?: {
 		flags?: string;
-		encoding?: string;
-		string?: string;
+    encoding?: BufferEncoding;
+    fd?: number;
+    mode?: number;
+    autoClose?: boolean;
+    emitClose?: boolean;
+    start?: number;
+    highWaterMark?: number;
 	}): any {
 		return fs.createWriteStream(path, options);
 	}

lib/common/helpers.ts

@@ -273,7 +273,16 @@ export function getRelativeToRootPath(rootPath: string, filePath: string): strin
 	return relativeToRootPath;
 }
 
+let customIsInteractive: any;
+
+export function setIsInteractive(override?: () => boolean) {
+  customIsInteractive = override;
+}
+
 export function isInteractive(): boolean {
+  if (customIsInteractive) {
+    return customIsInteractive();
+  }
 	const result = isRunningInTTY() && !isCIEnvironment();
 	return result;
 }
@@ -406,12 +415,12 @@ export function parseJson(data: string): any {
 }
 
 // TODO: Use generic for predicatе predicate: (element: T|T[]) when TypeScript support this.
-export async function getFuturesResults<T>(promises: Promise<T | T[]>[], predicate: (element: any) => boolean): Promise<T[]> {
+export async function getFuturesResults<T>(promises: Promise<T | T[] | T[][]>[], predicate: (element: any) => boolean): Promise<T[] | T[][]> {
 	const results = await Promise.all(promises);
 
 	return _(results)
 		.filter(predicate)
-		.flatten<T>()
+		.flatten()
 		.value();
 }
 

lib/common/logger/appenders/cli-appender.ts

@@ -13,7 +13,7 @@ function cliAppender(layout: Function) {
 	return appender;
 }
 
-function configure(config: Log4JSAppenderConfiguration, layouts: any) {
+export function configure(config: Log4JSAppenderConfiguration, layouts: any) {
 	// the default layout for the appender
 	let layout = layouts.messagePassThroughLayout;
 
@@ -25,5 +25,3 @@ function configure(config: Log4JSAppenderConfiguration, layouts: any) {
 	// create a new appender instance
 	return cliAppender(layout);
 }
-
-exports.configure = configure;

lib/common/logger/appenders/emit-appender.ts

@@ -14,7 +14,7 @@ function emitAppender(layout: Function, emitter: EventEmitter) {
 	return appender;
 }
 
-function configure(config: Log4JSEmitAppenderConfiguration, layouts: any) {
+export function configure(config: Log4JSEmitAppenderConfiguration, layouts: any) {
 	if (!config.emitter) {
 		throw new Error("Emitter must be passed to emit-appender");
 	}
@@ -34,5 +34,3 @@ function configure(config: Log4JSEmitAppenderConfiguration, layouts: any) {
 	// create a new appender instance
 	return emitAppender(layout, config.emitter);
 }
-
-exports.configure = configure;

lib/common/mobile/android/logcat-helper.ts

@@ -1,4 +1,4 @@
-import byline = require("byline");
+import byline from "byline";
 import { DeviceAndroidDebugBridge } from "./device-android-debug-bridge";
 import { ChildProcess } from "child_process";
 import * as semver from "semver";

lib/common/mobile/ios/device/ios-device-operations.ts

@@ -1,7 +1,7 @@
 import { IOSDeviceLib as IOSDeviceLibModule } from "ios-device-lib";
 import { cache } from "../../../decorators";
 import { DEVICE_LOG_EVENT_NAME } from "../../../constants";
-import assert = require("assert");
+import assert from "assert";
 import { EventEmitter } from "events";
 
 export class IOSDeviceOperations extends EventEmitter implements IIOSDeviceOperations, IDisposable, IShouldDispose {

lib/common/mobile/mobile-core/android-device-discovery.ts

@@ -56,11 +56,11 @@ export class AndroidDeviceDiscovery extends DeviceDiscovery implements Mobile.IA
 		});
 
 		_(this._devices)
-			.reject(d => _.find(currentDevices, device => device.identifier === d.identifier && device.status === d.status))
+			.reject(d => <any>_.find(currentDevices, device => device.identifier === d.identifier && device.status === d.status))
 			.each((d: IAdbAndroidDeviceInfo) => this.deleteAndRemoveDevice(d.identifier));
 
 		await Promise.all(_(currentDevices)
-			.reject(d => _.find(this._devices, device => device.identifier === d.identifier && device.status === d.status))
+			.reject(d => <any>_.find(this._devices, device => device.identifier === d.identifier && device.status === d.status))
 			.map((d: IAdbAndroidDeviceInfo) => this.createAndAddDevice(d)).value());
 	}
 

lib/common/mobile/mobile-core/android-process-service.ts

@@ -101,7 +101,7 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 			.filter(deviceAppInfo => !!deviceAppInfo)
 			.groupBy(element => element.framework)
 			.map((group: Mobile.IDeviceApplicationInformation[]) => _.uniqBy(group, g => g.appIdentifier))
-			.flatten<Mobile.IDeviceApplicationInformation>()
+			.flatten()
 			.value();
 	}
 

lib/common/opener.ts

@@ -1,4 +1,4 @@
-import xopen = require("open");
+import xopen from "open";
 
 export class Opener implements IOpener {
 

lib/common/prompter.ts

@@ -78,11 +78,11 @@ export class Prompter implements IPrompter {
 	}
 
 	public async promptForChoice(promptMessage: string, choices: string[]): Promise<string> {
-		const schema: prompt.Question = {
+		const schema: prompt.Answers = {
 			message: promptMessage,
 			type: "list",
 			name: "userAnswer",
-			choices: choices
+			choices
 		};
 
 		const result = await this.get([schema]);

lib/common/services/help-service.ts

@@ -1,6 +1,6 @@
 import * as path from "path";
 import { EOL } from "os";
-import marked = require("marked");
+import marked from "marked";
 import { CommandsDelimiters } from "../constants";
 
 interface IHtmlPageGenerationData {

lib/common/services/lock-service.ts

@@ -93,7 +93,7 @@ export class LockService implements ILockService {
 
 		fileOpts.retriesObj = fileOpts.retriesObj || {};
 		if (fileOpts.retries) {
-			fileOpts.retriesObj.retries = fileOpts.retries;
+			fileOpts.retriesObj.retries = <number>fileOpts.retries;
 		}
 
 		if (fileOpts.retryWait) {

lib/common/services/net-service.ts

@@ -15,7 +15,7 @@ export class Net implements INet {
 		return new Promise<number>((resolve, reject) => {
 			let isResolved = false;
 			server.listen(0, () => {
-				const portUsed = server.address().port;
+				const portUsed = (<net.AddressInfo>server.address()).port;
 				server.close();
 
 				if (!isResolved) {

lib/common/services/project-files-manager.ts

@@ -1,4 +1,4 @@
-import minimatch = require("minimatch");
+import minimatch from "minimatch";
 import * as path from "path";
 import * as util from "util";
 

lib/common/test/test-bootstrap.ts

@@ -1,5 +1,5 @@
-(<ICliGlobal>global)._ = require("lodash");
-(<ICliGlobal>global).$injector = require("../yok").injector;
+(<ICliGlobal><unknown>global)._ = require("lodash");
+(<ICliGlobal><unknown>global).$injector = require("../yok").injector;
 $injector.require("hostInfo", "../host-info");
 $injector.register("config", {});
 
@@ -15,5 +15,5 @@ $injector.register("analyticsService", {
 });
 
 // Converts the js callstack to typescript
-import errors = require("../errors");
-errors.installUncaughtExceptionListener();
+import { installUncaughtExceptionListener } from "../errors";
+installUncaughtExceptionListener();