Update TS to latest release (#2928)

* Update TS to latest release

Fix correcponding tests

* Update TS to 2.4

 *Update dependencies
 *Fix errors due to new TS rules
 *Change debug on device logic - there wil be no multiple devicxes debug supported.
 *Update lib reference

Author: Nadezhda Atanasova

lib/commands/debug.ts

@@ -24,15 +24,15 @@
 		await this.$platformService.trackProjectType(this.$projectData);
 
 		if (this.$options.start) {
-			return this.$debugLiveSyncService.printDebugInformation(await this.debugService.debug<string[]>(debugData, debugOptions));
+			return this.$debugLiveSyncService.printDebugInformation(await this.debugService.debug(debugData, debugOptions));
 		}
 
 		this.$config.debugLivesync = true;
 
 		await this.$devicesService.detectCurrentlyAttachedDevices();
 
-		const devices = this.$devicesService.getDeviceInstances();
 		// Now let's take data for each device:
+		const devices = this.$devicesService.getDeviceInstances();
 		const deviceDescriptors: ILiveSyncDeviceInfo[] = devices.filter(d => !this.platform || d.deviceInfo.platform === this.platform)
 			.map(d => {
 				const info: ILiveSyncDeviceInfo = {
@@ -91,10 +91,7 @@
 		}
 
 		if (this.$devicesService.deviceCount > 1) {
-			// Starting debugger on emulator.
-			this.$options.emulator = true;
-
-			this.$logger.warn("Multiple devices found! Starting debugger on emulator. If you want to debug on specific device please select device with --device option.".yellow.bold);
+			this.$errors.failWithoutHelp("Multiple devices found! To debug on specific device please select device with --device option.");
 		}
 
 		return true;

lib/common

@@ -79,7 +79,7 @@ export class LiveSyncPaths {
 	static FULLSYNC_DIR_NAME = "fullsync";
 	static IOS_DEVICE_PROJECT_ROOT_PATH = "Library/Application Support/LiveSync";
 	static IOS_DEVICE_SYNC_ZIP_PATH = "Library/Application Support/LiveSync/sync.zip";
-};
+}
 export const ANGULAR_NAME = "angular";
 export const TYPESCRIPT_NAME = "typescript";
 export const BUILD_OUTPUT_EVENT_NAME = "buildOutput";

lib/constants.ts

@@ -96,7 +96,7 @@ interface IDebugServiceBase extends NodeJS.EventEmitter {
 	 * @param {IDebugOptions} debugOptions Describe possible options to modify the behaivor of the debug operation, for example stop on the first line.
 	 * @returns {Promise<T>} Array of URLs that can be used for debugging or a string representing a single url that can be used for debugging.
 	 */
-	debug<T>(debugData: IDebugData, debugOptions: IDebugOptions): Promise<T>;
+	debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string>;
 }
 
 interface IDebugService {

lib/definitions/debug.d.ts

@@ -174,7 +174,7 @@ interface IDebugLiveSyncService extends ILiveSyncService {
 	 * @param {string[]} information Array of information to be printed. Note that false-like values will be stripped from the array.
 	 * @returns {void}
 	 */
-	printDebugInformation(information: string[]): void;
+	printDebugInformation(information: string): void;
 }
 
 interface ILiveSyncWatchInfo {

lib/definitions/livesync.d.ts

@@ -18,17 +18,17 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
 		this._device = newDevice;
 	}
 
-	constructor(private $devicesService: Mobile.IDevicesService,
+	constructor(protected $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $config: IConfiguration,
 		private $androidDeviceDiscovery: Mobile.IDeviceDiscovery,
 		private $androidProcessService: Mobile.IAndroidProcessService,
 		private $net: INet) {
-		super();
+		super($devicesService);
 	}
 
-	public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
+	public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		return debugOptions.emulator
 			? this.debugOnEmulator(debugData, debugOptions)
 			: this.debugOnDevice(debugData, debugOptions);
@@ -49,7 +49,7 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
 		return;
 	}
 
-	private async debugOnEmulator(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
+	private async debugOnEmulator(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		// Assure we've detected the emulator as device
 		// For example in case deployOnEmulator had stated new emulator instance
 		// we need some time to detect it. Let's force detection.
@@ -82,7 +82,7 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
 		return this.device.adb.executeCommand(["forward", `tcp:${local}`, `localabstract:${remote}`]);
 	}
 
-	private async debugOnDevice(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
+	private async debugOnDevice(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		let packageFile = "";
 
 		if (!debugOptions.start && !debugOptions.emulator) {
@@ -94,9 +94,8 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
 
 		let action = (device: Mobile.IAndroidDevice): Promise<string> => this.debugCore(device, packageFile, debugData.applicationIdentifier, debugOptions);
 
-		const result = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
-
-		return _.map(result, r => r.result);
+		const deviceActionResult = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
+		return deviceActionResult[0].result;
 	}
 
 	private async debugCore(device: Mobile.IAndroidDevice, packageFile: string, packageName: string, debugOptions: IDebugOptions): Promise<string> {

lib/services/android-debug-service.ts

@@ -171,7 +171,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					this.$errors.failWithoutHelp(`Your project have installed ${dependency.name} version ${cleanedVerson} but Android platform requires version ${dependency.version}.`);
 				}
 			}
-		};
+		}
 	}
 
 	private cleanResValues(targetSdkVersion: number, projectData: IProjectData, frameworkVersion: string): void {

lib/services/android-project-service.ts

@@ -1,9 +1,11 @@
 import { EventEmitter } from "events";
 
 export abstract class DebugServiceBase extends EventEmitter implements IPlatformDebugService {
+	constructor(protected $devicesService: Mobile.IDevicesService) { super(); }
+
 	public abstract get platform(): string;
 
-	public abstract async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]>;
+	public abstract async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string>;
 
 	public abstract async debugStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<void>;
 
@@ -12,7 +14,8 @@ export abstract class DebugServiceBase extends EventEmitter implements IPlatform
 	protected getCanExecuteAction(deviceIdentifier: string): (device: Mobile.IDevice) => boolean {
 		return (device: Mobile.IDevice): boolean => {
 			if (deviceIdentifier) {
-				return device.deviceInfo.identifier === deviceIdentifier;
+				return device.deviceInfo.identifier === deviceIdentifier
+				|| device.deviceInfo.identifier === this.$devicesService.getDeviceByDeviceOption().deviceInfo.identifier;
 			} else {
 				return true;
 			}

lib/services/debug-service-base.ts

@@ -36,7 +36,7 @@ export class DebugService extends EventEmitter implements IDebugService {
 		// For now we can only check if app is running on Android.
 		// After we find a way to check on iOS we should use it here.
 		const isAppRunning = true;
-		let result: string[];
+		let result: string;
 		debugOptions.chrome = true;
 
 		const debugService = this.getDebugService(device);
@@ -59,9 +59,9 @@ export class DebugService extends EventEmitter implements IDebugService {
 				this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
 			}
 
-			result = await debugService.debug<string[]>(debugData, debugOptions);
+			result = await debugService.debug(debugData, debugOptions);
 		} else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {
-			result = await debugService.debug<string[]>(debugData, debugOptions);
+			result = await debugService.debug(debugData, debugOptions);
 		}
 
 		return _.first(result);

lib/services/debug-service.ts

@@ -56,7 +56,7 @@ export class InitService implements IInitService {
 
 						projectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE][platformData.frameworkPackageName] = _.extend(currentPlatformData, await this.getVersionData(platformData.frameworkPackageName));
 					}
-				};
+				}
 			}
 
 			let dependencies = projectData.dependencies;