Skip to content

Commit 65f1b33

Browse files
nadyaAnadyaA
committed
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
1 parent 454e341 commit 65f1b33

12 files changed

+56
-76
lines changed

‎lib/commands/debug.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
await this.$platformService.trackProjectType(this.$projectData);
2525

2626
if (this.$options.start) {
27-
return this.$debugLiveSyncService.printDebugInformation(await this.debugService.debug<string[]>(debugData, debugOptions));
27+
return this.$debugLiveSyncService.printDebugInformation(await this.debugService.debug(debugData, debugOptions));
2828
}
2929

3030
this.$config.debugLivesync = true;
3131

3232
await this.$devicesService.detectCurrentlyAttachedDevices();
3333

34-
const devices = this.$devicesService.getDeviceInstances();
3534
// Now let's take data for each device:
35+
const devices = this.$devicesService.getDeviceInstances();
3636
const deviceDescriptors: ILiveSyncDeviceInfo[] = devices.filter(d => !this.platform || d.deviceInfo.platform === this.platform)
3737
.map(d => {
3838
const info: ILiveSyncDeviceInfo = {
@@ -91,10 +91,7 @@
9191
}
9292

9393
if (this.$devicesService.deviceCount > 1) {
94-
// Starting debugger on emulator.
95-
this.$options.emulator = true;
96-
97-
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);
94+
this.$errors.failWithoutHelp("Multiple devices found! To debug on specific device please select device with --device option.");
9895
}
9996

10097
return true;

‎lib/common

‎lib/definitions/debug.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ interface IDebugServiceBase extends NodeJS.EventEmitter {
9696
* @param {IDebugOptions} debugOptions Describe possible options to modify the behaivor of the debug operation, for example stop on the first line.
9797
* @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.
9898
*/
99-
debug<T>(debugData: IDebugData, debugOptions: IDebugOptions): Promise<T>;
99+
debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string>;
100100
}
101101

102102
interface IDebugService {

‎lib/definitions/livesync.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ interface IDebugLiveSyncService extends ILiveSyncService {
174174
* @param {string[]} information Array of information to be printed. Note that false-like values will be stripped from the array.
175175
* @returns {void}
176176
*/
177-
printDebugInformation(information: string[]): void;
177+
printDebugInformation(information: string): void;
178178
}
179179

180180
interface ILiveSyncWatchInfo {

‎lib/services/android-debug-service.ts

+7-8
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
1818
this._device = newDevice;
1919
}
2020

21-
constructor(private $devicesService: Mobile.IDevicesService,
21+
constructor(protected $devicesService: Mobile.IDevicesService,
2222
private $errors: IErrors,
2323
private $logger: ILogger,
2424
private $config: IConfiguration,
2525
private $androidDeviceDiscovery: Mobile.IDeviceDiscovery,
2626
private $androidProcessService: Mobile.IAndroidProcessService,
2727
private $net: INet) {
28-
super();
28+
super($devicesService);
2929
}
3030

31-
public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
31+
public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
3232
return debugOptions.emulator
3333
? this.debugOnEmulator(debugData, debugOptions)
3434
: this.debugOnDevice(debugData, debugOptions);
@@ -49,7 +49,7 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
4949
return;
5050
}
5151

52-
private async debugOnEmulator(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
52+
private async debugOnEmulator(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
5353
// Assure we've detected the emulator as device
5454
// For example in case deployOnEmulator had stated new emulator instance
5555
// we need some time to detect it. Let's force detection.
@@ -82,7 +82,7 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
8282
return this.device.adb.executeCommand(["forward", `tcp:${local}`, `localabstract:${remote}`]);
8383
}
8484

85-
private async debugOnDevice(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
85+
private async debugOnDevice(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
8686
let packageFile = "";
8787

8888
if (!debugOptions.start && !debugOptions.emulator) {
@@ -94,9 +94,8 @@ class AndroidDebugService extends DebugServiceBase implements IPlatformDebugServ
9494

9595
let action = (device: Mobile.IAndroidDevice): Promise<string> => this.debugCore(device, packageFile, debugData.applicationIdentifier, debugOptions);
9696

97-
const result = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
98-
99-
return _.map(result, r => r.result);
97+
const deviceActionResult = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
98+
return deviceActionResult[0].result;
10099
}
101100

102101
private async debugCore(device: Mobile.IAndroidDevice, packageFile: string, packageName: string, debugOptions: IDebugOptions): Promise<string> {

‎lib/services/debug-service-base.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { EventEmitter } from "events";
22

33
export abstract class DebugServiceBase extends EventEmitter implements IPlatformDebugService {
4+
constructor(protected $devicesService: Mobile.IDevicesService) { super(); }
5+
46
public abstract get platform(): string;
57

6-
public abstract async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]>;
8+
public abstract async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string>;
79

810
public abstract async debugStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<void>;
911

@@ -12,7 +14,8 @@ export abstract class DebugServiceBase extends EventEmitter implements IPlatform
1214
protected getCanExecuteAction(deviceIdentifier: string): (device: Mobile.IDevice) => boolean {
1315
return (device: Mobile.IDevice): boolean => {
1416
if (deviceIdentifier) {
15-
return device.deviceInfo.identifier === deviceIdentifier;
17+
return device.deviceInfo.identifier === deviceIdentifier
18+
|| device.deviceInfo.identifier === this.$devicesService.getDeviceByDeviceOption().deviceInfo.identifier;
1619
} else {
1720
return true;
1821
}

‎lib/services/debug-service.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class DebugService extends EventEmitter implements IDebugService {
3636
// For now we can only check if app is running on Android.
3737
// After we find a way to check on iOS we should use it here.
3838
const isAppRunning = true;
39-
let result: string[];
39+
let result: string;
4040
debugOptions.chrome = true;
4141

4242
const debugService = this.getDebugService(device);
@@ -59,9 +59,9 @@ export class DebugService extends EventEmitter implements IDebugService {
5959
this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
6060
}
6161

62-
result = await debugService.debug<string[]>(debugData, debugOptions);
62+
result = await debugService.debug(debugData, debugOptions);
6363
} else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {
64-
result = await debugService.debug<string[]>(debugData, debugOptions);
64+
result = await debugService.debug(debugData, debugOptions);
6565
}
6666

6767
return _.first(result);

‎lib/services/ios-debug-service.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
2121
private _childProcess: ChildProcess;
2222
private _socketProxy: any;
2323

24-
constructor(private $platformService: IPlatformService,
24+
constructor(protected $devicesService: Mobile.IDevicesService,
25+
private $platformService: IPlatformService,
2526
private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices,
26-
private $devicesService: Mobile.IDevicesService,
2727
private $childProcess: IChildProcess,
2828
private $logger: ILogger,
2929
private $errors: IErrors,
@@ -32,7 +32,7 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
3232
private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
3333
private $processService: IProcessService,
3434
private $socketProxyFactory: ISocketProxyFactory) {
35-
super();
35+
super($devicesService);
3636
this.$processService.attachToProcessExitSignals(this, this.debugStop);
3737
this.$socketProxyFactory.on(CONNECTION_ERROR_EVENT_NAME, (e: Error) => this.emit(CONNECTION_ERROR_EVENT_NAME, e));
3838
}
@@ -41,7 +41,7 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
4141
return "ios";
4242
}
4343

44-
public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
44+
public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
4545
if (debugOptions.debugBrk && debugOptions.start) {
4646
this.$errors.failWithoutHelp("Expected exactly one of the --debug-brk or --start options.");
4747
}
@@ -52,9 +52,9 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
5252

5353
if (debugOptions.emulator) {
5454
if (debugOptions.start) {
55-
return [await this.emulatorStart(debugData, debugOptions)];
55+
return await this.emulatorStart(debugData, debugOptions);
5656
} else {
57-
return [await this.emulatorDebugBrk(debugData, debugOptions)];
57+
return await this.emulatorDebugBrk(debugData, debugOptions);
5858
}
5959
} else {
6060
if (debugOptions.start) {
@@ -149,7 +149,7 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
149149
return result;
150150
}
151151

152-
private async deviceDebugBrk(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
152+
private async deviceDebugBrk(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
153153
await this.$devicesService.initialize({ platform: this.platform, deviceId: debugData.deviceIdentifier });
154154
const action = async (device: iOSDevice.IOSDevice) => {
155155
if (device.isEmulator) {
@@ -171,20 +171,20 @@ class IOSDebugService extends DebugServiceBase implements IPlatformDebugService
171171
return result;
172172
};
173173

174-
const results = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
175-
return _.map(results, r => r.result);
174+
const deviceActionResult = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
175+
return deviceActionResult[0].result;
176176
}
177177

178178
private async debugBrkCore(device: Mobile.IiOSDevice, debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
179179
await this.$iOSSocketRequestExecutor.executeLaunchRequest(device.deviceInfo.identifier, TIMEOUT_SECONDS, TIMEOUT_SECONDS, debugData.applicationIdentifier, debugOptions.debugBrk);
180180
return this.wireDebuggerClient(debugData, debugOptions, device);
181181
}
182182

183-
private async deviceStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string[]> {
183+
private async deviceStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
184184
await this.$devicesService.initialize({ platform: this.platform, deviceId: debugData.deviceIdentifier });
185185
const action = async (device: Mobile.IiOSDevice) => device.isEmulator ? await this.emulatorStart(debugData, debugOptions) : await this.deviceStartCore(device, debugData, debugOptions);
186-
const results = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
187-
return _.map(results, r => r.result);
186+
const deviceActionResult = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
187+
return deviceActionResult[0].result;
188188
}
189189

190190
private async deviceStartCore(device: Mobile.IiOSDevice, debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {

‎lib/services/livesync/debug-livesync-service.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class DebugLiveSyncService extends LiveSyncService implements IDebugLiveS
5252
await this.$platformService.trackProjectType(this.$projectData);
5353

5454
if (this.$options.start) {
55-
return this.printDebugInformation(await debugService.debug<string[]>(debugData, debugOptions));
55+
return this.printDebugInformation(await debugService.debug(debugData, debugOptions));
5656
}
5757

5858
const deviceAppData = liveSyncResultInfo.deviceAppData;
@@ -66,14 +66,13 @@ export class DebugLiveSyncService extends LiveSyncService implements IDebugLiveS
6666
const buildConfig: IBuildConfig = _.merge({ buildForDevice: !deviceAppData.device.isEmulator }, deployOptions);
6767
debugData.pathToAppPackage = this.$platformService.lastOutputPath(debugService.platform, buildConfig, projectData);
6868

69-
this.printDebugInformation(await debugService.debug<string[]>(debugData, debugOptions));
69+
this.printDebugInformation(await debugService.debug(debugData, debugOptions));
7070
}
7171

72-
public printDebugInformation(information: string[]): void {
73-
information = information.filter(i => !!i);
74-
_.each(information, i => {
75-
this.$logger.info(`To start debugging, open the following URL in Chrome:${EOL}${i}${EOL}`.cyan);
76-
});
72+
public printDebugInformation(information: string): void {
73+
if (!!information) {
74+
this.$logger.info(`To start debugging, open the following URL in Chrome:${EOL}${information}${EOL}`.cyan);
75+
}
7776
}
7877
}
7978

‎package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@
8181
},
8282
"analyze": true,
8383
"devDependencies": {
84-
"@types/chai": "3.4.34",
85-
"@types/chai-as-promised": "0.0.29",
84+
"@types/chai": "4.0.1",
85+
"@types/chai-as-promised": "0.0.31",
8686
"@types/chokidar": "1.6.0",
8787
"@types/node": "6.0.61",
8888
"@types/qr-image": "3.2.0",
89-
"@types/request": "0.0.42",
89+
"@types/request": "0.0.45",
9090
"@types/semver": "^5.3.31",
9191
"@types/source-map": "0.5.0",
92-
"chai": "3.5.0",
93-
"chai-as-promised": "6.0.0",
92+
"chai": "4.0.2",
93+
"chai-as-promised": "7.0.0",
9494
"grunt": "1.0.1",
9595
"grunt-contrib-clean": "1.0.0",
9696
"grunt-contrib-copy": "1.0.0",
@@ -103,7 +103,7 @@
103103
"should": "7.0.2",
104104
"source-map-support": "^0.4.14",
105105
"tslint": "5.4.3",
106-
"typescript": "2.3.4"
106+
"typescript": "2.4.1"
107107
},
108108
"license": "Apache-2.0",
109109
"engines": {

‎test/plugins-service.ts

+9-27
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ async function addPluginWhenExpectingToFail(testInjector: IInjector, plugin: str
137137

138138
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
139139
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
140-
return [{
141-
name: ""
142-
}];
140+
return <any[]>[{ name: "" }];
143141
};
144142
pluginsService.ensureAllDependenciesAreInstalled = () => {
145143
return Promise.resolve();
@@ -210,9 +208,7 @@ describe("Plugins service", () => {
210208

211209
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
212210
pluginsService.getAllInstalledPlugins = async (projData: IProjectData) => {
213-
return [{
214-
name: "plugin1"
215-
}];
211+
return <any[]>[{ name: "plugin1" }];
216212
};
217213

218214
mockBeginCommand(testInjector, "Exception: " + 'Plugin "plugin1" is already installed.');
@@ -260,9 +256,7 @@ describe("Plugins service", () => {
260256
let projectData: IProjectData = testInjector.resolve("projectData");
261257
projectData.initializeProjectData();
262258
pluginsService.getAllInstalledPlugins = async (projData: IProjectData) => {
263-
return [{
264-
name: ""
265-
}];
259+
return <any[]>[{ name: "" }];
266260
};
267261

268262
// Mock platformsData
@@ -285,9 +279,7 @@ describe("Plugins service", () => {
285279

286280
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
287281
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
288-
return [{
289-
name: ""
290-
}];
282+
return <any[]>[{ name: "" }];
291283
};
292284

293285
let commandsService = testInjector.resolve(CommandsService);
@@ -320,9 +312,7 @@ describe("Plugins service", () => {
320312

321313
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
322314
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
323-
return [{
324-
name: ""
325-
}];
315+
return <any[]>[{ name: "" }];
326316
};
327317

328318
let commandsService = testInjector.resolve(CommandsService);
@@ -368,9 +358,7 @@ describe("Plugins service", () => {
368358

369359
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
370360
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
371-
return [{
372-
name: ""
373-
}];
361+
return <any[]>[{ name: "" }];
374362
};
375363

376364
let commandsService = testInjector.resolve(CommandsService);
@@ -411,9 +399,7 @@ describe("Plugins service", () => {
411399

412400
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
413401
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
414-
return [{
415-
name: ""
416-
}];
402+
return <any[]>[{ name: "" }];
417403
};
418404

419405
// Mock options
@@ -451,9 +437,7 @@ describe("Plugins service", () => {
451437

452438
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
453439
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
454-
return [{
455-
name: ""
456-
}];
440+
return <any[]>[{ name: "" }];
457441
};
458442

459443
// Mock options
@@ -494,9 +478,7 @@ describe("Plugins service", () => {
494478
// Mock plugins service
495479
let pluginsService: IPluginsService = testInjector.resolve("pluginsService");
496480
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
497-
return [{
498-
name: ""
499-
}];
481+
return <any[]>[{ name: "" }];
500482
};
501483

502484
let appDestinationDirectoryPath = path.join(projectFolder, "platforms", "android");

‎test/stubs.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export class ErrorsStub implements IErrors {
206206
}
207207

208208
export class NpmInstallationManagerStub implements INpmInstallationManager {
209-
async install(packageName: string, pathToSave?: string, version?: string): Promise<string> {
209+
async install(packageName: string, pathToSave?: string, options?: INpmInstallOptions ): Promise<string> {
210210
return Promise.resolve("");
211211
}
212212

@@ -477,7 +477,7 @@ function unexpected(msg: string): Error {
477477
}
478478

479479
export class DebugServiceStub extends EventEmitter implements IPlatformDebugService {
480-
public async debug(): Promise<string[]> {
480+
public async debug(): Promise<string> {
481481
return;
482482
}
483483

0 commit comments

Comments
 (0)