chore: fix tslint errors after tslint update

Author: DimitarTachev

lib/common/file-system.ts

@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import * as path from "path";
+import { join, dirname, basename, resolve as pathResolve, extname, normalize } from "path";
 import * as minimatch from "minimatch";
 import * as injector from "./yok";
 import * as crypto from "crypto";
@@ -74,7 +74,7 @@ export class FileSystem implements IFileSystem {
 
 		let proc: string;
 		if ($hostInfo.isWindows) {
-			proc = path.join(__dirname, "resources/platform-tools/unzip/win32/unzip");
+			proc = join(__dirname, "resources/platform-tools/unzip/win32/unzip");
 		} else if ($hostInfo.isDarwin) {
 			proc = "unzip"; // darwin unzip is info-zip
 		} else if ($hostInfo.isLinux) {
@@ -98,11 +98,11 @@ export class FileSystem implements IFileSystem {
 	}
 
 	private findFileCaseInsensitive(file: string): string {
-		const dir = path.dirname(file);
-		const basename = path.basename(file);
+		const dir = dirname(file);
+		const baseName = basename(file);
 		const entries = this.readDirectory(dir);
-		const match = minimatch.match(entries, basename, { nocase: true, nonegate: true, nonull: true })[0];
-		const result = path.join(dir, match);
+		const match = minimatch.match(entries, baseName, { nocase: true, nonegate: true, nonull: true })[0];
+		const result = join(dir, match);
 		return result;
 	}
 
@@ -204,7 +204,7 @@ export class FileSystem implements IFileSystem {
 	}
 
 	public writeFile(filename: string, data: string | NodeBuffer, encoding?: string): void {
-		this.createDirectory(path.dirname(filename));
+		this.createDirectory(dirname(filename));
 		fs.writeFileSync(filename, data, { encoding: encoding });
 	}
 
@@ -218,7 +218,7 @@ export class FileSystem implements IFileSystem {
 		}
 
 		let stringifiedData;
-		if (path.basename(filename) === PACKAGE_JSON_FILE_NAME) {
+		if (basename(filename) === PACKAGE_JSON_FILE_NAME) {
 			let newline = EOL;
 			if (fs.existsSync(filename)) {
 				const existingFile = this.readText(filename);
@@ -233,11 +233,11 @@ export class FileSystem implements IFileSystem {
 	}
 
 	public copyFile(sourceFileName: string, destinationFileName: string): void {
-		if (path.resolve(sourceFileName) === path.resolve(destinationFileName)) {
+		if (pathResolve(sourceFileName) === pathResolve(destinationFileName)) {
 			return;
 		}
 
-		this.createDirectory(path.dirname(destinationFileName));
+		this.createDirectory(dirname(destinationFileName));
 
 		// MobileApplication.app is resolved as a directory on Mac,
 		// therefore we need to copy it recursively as it's not a single file.
@@ -284,8 +284,8 @@ export class FileSystem implements IFileSystem {
 		if (!this.exists(baseName)) {
 			return baseName;
 		}
-		const extension = path.extname(baseName);
-		const prefix = path.basename(baseName, extension);
+		const extension = extname(baseName);
+		const prefix = basename(baseName, extension);
 
 		for (let i = 2; ; ++i) {
 			const numberedName = prefix + i + extension;
@@ -301,8 +301,8 @@ export class FileSystem implements IFileSystem {
 	}
 
 	public isRelativePath(p: string): boolean {
-		const normal = path.normalize(p);
-		const absolute = path.resolve(p);
+		const normal = normalize(p);
+		const absolute = pathResolve(p);
 		return normal !== absolute;
 	}
 
@@ -357,7 +357,7 @@ export class FileSystem implements IFileSystem {
 
 		const contents = this.readDirectory(directoryPath);
 		for (let i = 0; i < contents.length; ++i) {
-			const file = path.join(directoryPath, contents[i]);
+			const file = join(directoryPath, contents[i]);
 			let stat: fs.Stats = null;
 			if (this.exists(file)) {
 				stat = this.getFsStats(file);
@@ -420,11 +420,11 @@ export class FileSystem implements IFileSystem {
 	}
 
 	public deleteEmptyParents(directory: string): void {
-		let parent = this.exists(directory) ? directory : path.dirname(directory);
+		let parent = this.exists(directory) ? directory : dirname(directory);
 
 		while (this.isEmptyDir(parent)) {
 			this.deleteDirectory(parent);
-			parent = path.dirname(parent);
+			parent = dirname(parent);
 		}
 	}
 

lib/common/helpers.ts

@@ -309,8 +309,8 @@ export function versionCompare(version1: string | IVersionData, version2: string
 }
 
 export function isInteractive(): boolean {
-	const isInteractive = isRunningInTTY() && !isCIEnvironment();
-	return isInteractive;
+	const result = isRunningInTTY() && !isCIEnvironment();
+	return result;
 }
 
 /**

lib/common/host-info.ts

@@ -54,12 +54,13 @@ export class HostInfo implements IHostInfo {
 
 		const systemProfileCommand = "system_profiler SPSoftwareDataType -detailLevel mini";
 		this.$logger.trace("Trying to get macOS version.");
+		let macOSVersion: string;
 		try {
 			const systemProfileOutput = await this.$childProcess.exec(systemProfileCommand);
 
 			const versionRegExp = /System Version:\s+?macOS\s+?(\d+\.\d+)(\.\d+)?\s+/g;
 			const regExpMatchers = versionRegExp.exec(systemProfileOutput);
-			const macOSVersion = regExpMatchers && regExpMatchers[1];
+			macOSVersion = regExpMatchers && regExpMatchers[1];
 			if (macOSVersion) {
 				this.$logger.trace(`macOS version based on system_profiler is ${macOSVersion}.`);
 				return macOSVersion;
@@ -75,7 +76,7 @@ export class HostInfo implements IHostInfo {
 		// So the version becomes "10.12" in this case.
 		const osRelease = this.$osInfo.release();
 		const majorVersion = osRelease && _.first(osRelease.split("."));
-		const macOSVersion = majorVersion && `10.${+majorVersion - 4}`;
+		macOSVersion = majorVersion && `10.${+majorVersion - 4}`;
 		this.$logger.trace(`macOS version based on os.release() (${osRelease}) is ${macOSVersion}.`);
 		return macOSVersion;
 	}

lib/common/http-client.ts

@@ -160,24 +160,24 @@ export class HttpClient implements Server.IHttpClient {
 						stuckRequestTimerId = null;
 					});
 				})
-				.on("response", (response: Server.IRequestResponseData) => {
-					cleanupRequestData.res = response;
+				.on("response", (responseData: Server.IRequestResponseData) => {
+					cleanupRequestData.res = responseData;
 					let lastChunkTimestamp = Date.now();
 					cleanupRequestData.stuckResponseIntervalId = setInterval(() => {
 						if (Date.now() - lastChunkTimestamp > HttpClient.STUCK_RESPONSE_CHECK_INTERVAL) {
 							this.setResponseResult(promiseActions, cleanupRequestData, { err: new Error(HttpClient.STUCK_RESPONSE_ERROR_MESSAGE) });
 						}
 					}, HttpClient.STUCK_RESPONSE_CHECK_INTERVAL);
-					const successful = helpers.isRequestSuccessful(response);
+					const successful = helpers.isRequestSuccessful(responseData);
 					if (!successful) {
 						pipeTo = undefined;
 					}
 
-					let responseStream = response;
+					let responseStream = responseData;
 					responseStream.on("data", (chunk: string) => {
 						lastChunkTimestamp = Date.now();
 					});
-					switch (response.headers["content-encoding"]) {
+					switch (responseData.headers["content-encoding"]) {
 						case "gzip":
 							responseStream = responseStream.pipe(zlib.createGunzip());
 							break;
@@ -188,8 +188,8 @@ export class HttpClient implements Server.IHttpClient {
 
 					if (pipeTo) {
 						pipeTo.on("finish", () => {
-							this.$logger.trace("httpRequest: Piping done. code = %d", response.statusCode.toString());
-							this.setResponseResult(promiseActions, cleanupRequestData, { response });
+							this.$logger.trace("httpRequest: Piping done. code = %d", responseData.statusCode.toString());
+							this.setResponseResult(promiseActions, cleanupRequestData, { response: responseData });
 						});
 
 						responseStream.pipe(pipeTo);
@@ -201,15 +201,15 @@ export class HttpClient implements Server.IHttpClient {
 						});
 
 						responseStream.on("end", () => {
-							this.$logger.trace("httpRequest: Done. code = %d", response.statusCode.toString());
+							this.$logger.trace("httpRequest: Done. code = %d", responseData.statusCode.toString());
 							const responseBody = data.join("");
 
 							if (successful) {
-								this.setResponseResult(promiseActions, cleanupRequestData, { body: responseBody, response });
+								this.setResponseResult(promiseActions, cleanupRequestData, { body: responseBody, response: responseData });
 							} else {
-								const errorMessage = this.getErrorMessage(response.statusCode, responseBody);
+								const errorMessage = this.getErrorMessage(responseData.statusCode, responseBody);
 								const err: any = new Error(errorMessage);
-								err.response = response;
+								err.response = responseData;
 								err.body = responseBody;
 								this.setResponseResult(promiseActions, cleanupRequestData, { err });
 							}

lib/common/mobile/android/android-application-manager.ts

@@ -1,6 +1,6 @@
 import { EOL } from "os";
 import { ApplicationManagerBase } from "../application-manager-base";
-import {TARGET_FRAMEWORK_IDENTIFIERS, LiveSyncPaths } from "../../constants";
+import { TARGET_FRAMEWORK_IDENTIFIERS, LiveSyncPaths } from "../../constants";
 import { hook, sleep, regExpEscape } from "../../helpers";
 import { cache } from "../../decorators";
 

lib/common/prompter.ts

@@ -22,33 +22,33 @@ export class Prompter implements IPrompter {
 			});
 		});
 		try {
-				this.muteStdout();
+			this.muteStdout();
 
-				if (!helpers.isInteractive()) {
-					if (_.some(questions, s => !s.default)) {
-						throw new Error("Console is not interactive and no default action specified.");
-					} else {
-						const result: any = {};
+			if (!helpers.isInteractive()) {
+				if (_.some(questions, s => !s.default)) {
+					throw new Error("Console is not interactive and no default action specified.");
+				} else {
+					const result: any = {};
 
-						_.each(questions, s => {
-							// Curly brackets needed because s.default() may return false and break the loop
-							result[s.name] = s.default();
-						});
+					_.each(questions, s => {
+						// Curly brackets needed because s.default() may return false and break the loop
+						result[s.name] = s.default();
+					});
 
-						return result;
-					}
-				} else {
-					const result = await prompt.prompt(questions);
 					return result;
 				}
+			} else {
+				const result = await prompt.prompt(questions);
+				return result;
+			}
 		} finally {
 			this.unmuteStdout();
 		}
 	}
 
-	public async getPassword(prompt: string, options?: IAllowEmpty): Promise<string> {
+	public async getPassword(message: string, options?: IAllowEmpty): Promise<string> {
 		const schema: prompt.Question = {
-			message: prompt,
+			message,
 			type: "password",
 			name: "password",
 			validate: (value: any) => {
@@ -61,14 +61,14 @@ export class Prompter implements IPrompter {
 		return result.password;
 	}
 
-	public async getString(prompt: string, options?: IPrompterOptions): Promise<string> {
+	public async getString(message: string, options?: IPrompterOptions): Promise<string> {
 		const schema: prompt.Question = {
-			message: prompt,
+			message,
 			type: "input",
 			name: "inputString",
 			validate: (value: any) => {
 				const doesNotAllowEmpty = options && _.has(options, "allowEmpty") && !options.allowEmpty;
-				return (doesNotAllowEmpty && !value) ? `${prompt} must be non-empty` : true;
+				return (doesNotAllowEmpty && !value) ? `${message} must be non-empty` : true;
 			},
 			default: options && options.defaultAction
 		};
@@ -109,12 +109,12 @@ export class Prompter implements IPrompter {
 		return result.userAnswer;
 	}
 
-	public async confirm(prompt: string, defaultAction?: () => boolean): Promise<boolean> {
+	public async confirm(message: string, defaultAction?: () => boolean): Promise<boolean> {
 		const schema = {
 			type: "confirm",
 			name: "prompt",
 			default: defaultAction,
-			message: prompt
+			message
 		};
 
 		const result = await this.get([schema]);

lib/common/services/messages-service.ts

@@ -1,12 +1,12 @@
 import * as util from "util";
-import * as path from "path";
+import { join } from "path";
 
 export class MessagesService implements IMessagesService {
 	private _pathsToMessageJsonFiles: string[] = null;
 	private _messageJsonFilesContentsCache: any[] = null;
 
 	private get pathToDefaultMessageJson(): string {
-		return path.join(__dirname, "..", "resources", "messages", "errorMessages.json");
+		return join(__dirname, "..", "resources", "messages", "errorMessages.json");
 	}
 
 	private get messageJsonFilesContents(): any[] {

lib/common/test/unit-tests/android-log-filter.ts

@@ -320,11 +320,11 @@ const androidApiLevel23MapForPid8141 = [
 
 describe("androidLogFilter", () => {
 
-	const assertFiltering = (inputData: string, expectedOutput: string, logLevel?: string, pid?: string) => {
+	const assertFiltering = (inputData: string, expectedOutput: string, _logLevel?: string, _pid?: string) => {
 		const testInjector = new Yok();
 		testInjector.register("loggingLevels", LoggingLevels);
 		const androidLogFilter = <Mobile.IPlatformLogFilter>testInjector.resolve(AndroidLogFilter);
-		const filteredData = androidLogFilter.filterData(inputData, { logLevel, applicationPid: pid });
+		const filteredData = androidLogFilter.filterData(inputData, { logLevel: _logLevel, applicationPid: _pid });
 		assert.deepEqual(filteredData, expectedOutput, `The actual result '${filteredData}' did NOT match expected output '${expectedOutput}'.`);
 	};
 

lib/common/test/unit-tests/ios-log-filter.ts

@@ -109,11 +109,11 @@ const iosTestData = [
 
 describe("iOSLogFilter", () => {
 
-	const assertFiltering = (inputData: string, expectedOutput: string, logLevel?: string, pid?: string) => {
+	const assertFiltering = (inputData: string, expectedOutput: string, _logLevel?: string, _pid?: string) => {
 		const testInjector = new Yok();
 		testInjector.register("loggingLevels", LoggingLevels);
 		const iOSLogFilter = <Mobile.IPlatformLogFilter>testInjector.resolve(IOSLogFilter);
-		const filteredData = iOSLogFilter.filterData(inputData, { logLevel, applicationPid: pid });
+		const filteredData = iOSLogFilter.filterData(inputData, { logLevel: _logLevel, applicationPid: _pid });
 		assert.deepEqual(filteredData, expectedOutput, `The actual result '${filteredData}' did NOT match expected output '${expectedOutput}'.`);
 	};