Update TypeScript compiler to 2.4.0

Author: ivanbuhov

package.json

@@ -41,7 +41,7 @@
     "@types/source-map": "^0.1.29",
     "chrome-remote-debug-protocol": "git://github.com/roblourens/chrome-remote-debug-protocol.git",
     "mocha": "^2.4.5",
-    "typescript": "^2.0.6",
+    "typescript": "^2.4.0",
     "vsce": "^1.18.0",
     "vscode": "^1.0.3",
     "vscode-debugadapter-testsupport": "^1.7.0"

src/debug-adapter/adapter/sourceMaps/sourceMaps.ts

@@ -395,7 +395,7 @@ export class SourceMaps implements ISourceMaps {
             });
         } else {
             contentsP = new Promise((resolve, reject) => {
-                FS.readFile(mapPath, (err, data) => {
+                FS.readFile(mapPath, 'utf8', (err, data) => {
                     if (err) {
                         Services.logger().log(`SourceMaps.createSourceMap: Could not read map from ${mapPath}`);
                         resolve(null);

src/debug-adapter/connection/iosConnection.ts

@@ -179,11 +179,22 @@ export class IosConnection implements INSDebugConnection {
     }
 
     public debugger_setBreakpoint(location: WebKitProtocol.Debugger.Location, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointResponse> {
-        return this.sendMessage('Debugger.setBreakpoint', <WebKitProtocol.Debugger.SetBreakpointParams>{ location, options: { condition: condition }});
+        return <Promise<WebKitProtocol.Debugger.SetBreakpointResponse>>(this.sendMessage('Debugger.setBreakpoint', <WebKitProtocol.Debugger.SetBreakpointParams>{
+            location,
+            options: { condition }
+        }));
     }
 
     public debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number, condition: string, ignoreCount: number): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse> {
-        return this.sendMessage('Debugger.setBreakpointByUrl', <WebKitProtocol.Debugger.SetBreakpointByUrlParams>{ url: url, lineNumber: lineNumber, columnNumber: 0 /* a columnNumber different from 0 confuses the debugger */, options: { condition: condition, ignoreCount: ignoreCount }});
+        return <Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse>>(this.sendMessage('Debugger.setBreakpointByUrl', <WebKitProtocol.Debugger.SetBreakpointByUrlParams>{
+            url,
+            lineNumber,
+            columnNumber: 0 /* a columnNumber different from 0 confuses the debugger */,
+            options: {
+                condition,
+                ignoreCount
+            }
+        }));
     }
 
     public debugger_removeBreakpoint(breakpointId: string): Promise<WebKitProtocol.Response> {
@@ -211,23 +222,37 @@ export class IosConnection implements INSDebugConnection {
     }
 
     public debugger_evaluateOnCallFrame(callFrameId: string, expression: string, objectGroup = 'dummyObjectGroup', returnByValue?: boolean): Promise<WebKitProtocol.Debugger.EvaluateOnCallFrameResponse> {
-        return this.sendMessage('Debugger.evaluateOnCallFrame', <WebKitProtocol.Debugger.EvaluateOnCallFrameParams>{ callFrameId, expression, objectGroup, returnByValue });
+        return <Promise<WebKitProtocol.Debugger.EvaluateOnCallFrameResponse>>(this.sendMessage('Debugger.evaluateOnCallFrame', <WebKitProtocol.Debugger.EvaluateOnCallFrameParams>{
+            callFrameId,
+            expression,
+            objectGroup,
+            returnByValue
+        }));
     }
 
     public debugger_setPauseOnExceptions(state: string): Promise<WebKitProtocol.Response> {
         return this.sendMessage('Debugger.setPauseOnExceptions', <WebKitProtocol.Debugger.SetPauseOnExceptionsParams>{ state });
     }
 
     public debugger_getScriptSource(scriptId: WebKitProtocol.Debugger.ScriptId): Promise<WebKitProtocol.Debugger.GetScriptSourceResponse> {
-        return this.sendMessage('Debugger.getScriptSource', <WebKitProtocol.Debugger.GetScriptSourceParams>{ scriptId });
+        return <Promise<WebKitProtocol.Debugger.GetScriptSourceResponse>>(this.sendMessage('Debugger.getScriptSource', <WebKitProtocol.Debugger.GetScriptSourceParams>{ scriptId }));
     }
 
     public runtime_getProperties(objectId: string, ownProperties: boolean, accessorPropertiesOnly: boolean): Promise<WebKitProtocol.Runtime.GetPropertiesResponse> {
-        return this.sendMessage('Runtime.getProperties', <WebKitProtocol.Runtime.GetPropertiesParams>{ objectId, ownProperties, accessorPropertiesOnly });
+        return <Promise<WebKitProtocol.Runtime.GetPropertiesResponse>>(this.sendMessage('Runtime.getProperties', <WebKitProtocol.Runtime.GetPropertiesParams>{
+            objectId,
+            ownProperties,
+            accessorPropertiesOnly
+        }));
     }
 
     public runtime_evaluate(expression: string, objectGroup = 'dummyObjectGroup', contextId?: number, returnByValue = false): Promise<WebKitProtocol.Runtime.EvaluateResponse> {
-        return this.sendMessage('Runtime.evaluate', <WebKitProtocol.Runtime.EvaluateParams>{ expression, objectGroup, contextId, returnByValue });
+        return <Promise<WebKitProtocol.Runtime.EvaluateResponse>>(this.sendMessage('Runtime.evaluate', <WebKitProtocol.Runtime.EvaluateParams>{
+            expression,
+            objectGroup,
+            contextId,
+            returnByValue
+        }));
     }
 
     private sendMessage(method: string, params?: any): Promise<WebKitProtocol.Response> {

src/ipc/extensionClient.ts

@@ -49,7 +49,7 @@ export class ExtensionClient {
     }
 
     public getInitSettings(): Promise<extProtocol.InitSettingsResult> {
-        return this.callRemoteMethod('getInitSettings');
+        return <Promise<extProtocol.InitSettingsResult>>(this.callRemoteMethod('getInitSettings'));
     }
 
     public analyticsLaunchDebugger(args: extProtocol.AnalyticsLaunchDebuggerArgs): Promise<any> {
@@ -61,6 +61,6 @@ export class ExtensionClient {
     }
 
     public selectTeam(): Promise<{ id: string, name: string }> {
-        return this.callRemoteMethod('selectTeam');
+        return <Promise<{ id: string, name: string }>>(this.callRemoteMethod('selectTeam'));
     }
 }

src/ipc/extensionServer.ts

@@ -83,7 +83,7 @@ export class ExtensionServer {
                 vscode.window.showQuickPick(quickPickItems)
                     .then(val => resolve({
                             id: val.description,
-                            label: val.label
+                            name: val.label
                         }));
             } else {
                 resolve();

src/tests/scenario.ts

@@ -59,7 +59,7 @@ export class Scenario {
             emulator: emulator,
             tnsArgs: process.env.DeviceId ? ['--device', process.env.DeviceId] : []
         };
-        return args;
+        return <DebugProtocol.LaunchRequestArguments>args;
     }
 
     public static getDefaultAttachArgs(platform: string, appRoot: string, emulator: boolean): DebugProtocol.LaunchRequestArguments {
@@ -71,14 +71,14 @@ export class Scenario {
             emulator: emulator,
             tnsArgs: process.env.DeviceId ? ['--device', process.env.DeviceId] : []
         };
-        return args;
+        return <DebugProtocol.LaunchRequestArguments>args;
     }
 
     constructor(client: NsDebugClient) {
         this.client = client;
 
         this.initializedEvent = this.client.onNextTime('initialized');
-        this.firstStoppedEvent = this.client.onNextTime('stopped');
+        this.firstStoppedEvent = <Promise<DebugProtocol.StoppedEvent>>this.client.onNextTime('stopped');
 
         this.initializeRequest = this.started.then(() => {
             return this.client.initializeRequest(this.initializeRequestArgs || Scenario.getDefaultInitArgs());