chore: Upgrade to Typescript ~2.6.1 (#355)

DominicKramer · web-flow · commit cdee56fda520 · 2017-11-06T10:37:33.000-08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "request": "^2.81.0",
     "source-map-support": "^0.4.15",
     "tslint": "^5.4.3",
-    "typescript": "2.4.1"
+    "typescript": "~2.6.1"
   },
   "dependencies": {
     "@google-cloud/common": "^0.13.3",
diff --git a/src/agent/debuglet.ts b/src/agent/debuglet.ts
@@ -24,6 +24,7 @@ import * as dns from 'dns';
 import * as fs from 'fs';
 
 import * as metadata from 'gcp-metadata';
+import * as request from 'request';
 
 import * as _ from 'lodash';
 import * as path from 'path';
@@ -420,20 +421,20 @@ export class Debuglet extends EventEmitter {
     }
   }
 
-  static getProjectIdFromMetadata(): Promise<string> {
+  static getProjectIdFromMetadata() {
     return new Promise<string>((resolve, reject) => {
       metadata.project(
-          'project-id', (err: Error, res: any, projectId: string) => {
+          'project-id', (err, res, projectId) => {
             err ? reject(err) : resolve(projectId);
           });
     });
   }
 
-  static getClusterNameFromMetadata(): Promise<string> {
+  static getClusterNameFromMetadata() {
     return new Promise<string>((resolve, reject) => {
       metadata.instance(
           'attributes/cluster-name',
-          (err: Error, res: any, clusterName: string) => {
+          (err, res, clusterName) => {
             err ? reject(err) : resolve(clusterName);
           });
     });
@@ -535,7 +536,7 @@ export class Debuglet extends EventEmitter {
       that.logger.info('Fetching breakpoints');
       // TODO: Address the case when `that.debuggee` is `null`.
       that.controller.listBreakpoints(
-          (that.debuggee as Debuggee), function(err: Error, response, body) {
+          (that.debuggee as Debuggee), function(err, response, body) {
             if (err) {
               that.logger.error(
                   'Unable to fetch breakpoints – stopping fetcher', err);
diff --git a/src/agent/io/scanner.ts b/src/agent/io/scanner.ts
@@ -151,7 +151,7 @@ function computeStats(
   fileList.forEach(function(filename) {
     statsForFile(
         filename, shouldHash,
-        function(err: Error, fileStats: FileStats|undefined) {
+        function(err: Error|null, fileStats?: FileStats) {
           if (err) {
             callback(err);
             return;
diff --git a/src/agent/state/legacy-state.ts b/src/agent/state/legacy-state.ts
@@ -372,7 +372,7 @@ class StateResolver {
    * @returns {Array<Object>} - returns an array containing data about selected
    *  variables
    */
-  resolveLocalsList_(frame: v8.FrameMirror): v8.ScopeMirror[] {
+  resolveLocalsList_(frame: v8.FrameMirror): stackdriver.Variable[] {
     const self = this;
     const usedNames: {[name: string]: boolean} = {};
     const makeMirror = this.ctx.MakeMirror;
@@ -397,40 +397,43 @@ class StateResolver {
       scopes = allScopes.slice(0, -2);
     }
 
-    return flatten(scopes.map(function(scope: v8.ScopeMirror) {
-             return transform(
-                 // TODO: Update this so that `locals` is not of type `any[]`.
-                 scope.details().object(),
-                 function(locals: any[], value, name: string) {
-                   const trg = makeMirror(value);
-                   if (!usedNames[name]) {
-                     // It's a valid variable that belongs in the locals list
-                     // and wasn't discovered at a lower-scope
-                     usedNames[name] = true;
-                     // TODO: Determine how to not have an explicit down cast to
-                     // ValueMirror
-                     locals.push(self.resolveVariable_(
-                         name, trg as v8.ValueMirror, false));
-                   }  // otherwise another same-named variable occured at a
-                      // lower scope
-                   return locals;
-                 },
-                 []);
-           }))
-        .concat((function() {
-          // The frame receiver is the 'this' context that is present during
-          // invocation. Check to see whether a receiver context is substantive,
-          // (invocations may be bound to null) if so: store in the locals list
-          // under the name 'context' which is used by the Chrome DevTools.
-          const ctx = frame.details().receiver();
-          if (ctx) {
-            // TODO: Determine how to not have an explicit down cast to
-            // ValueMirror
-            return [self.resolveVariable_(
-                'context', makeMirror(ctx) as v8.ValueMirror, false)];
-          }
-          return [];
-        }()));
+    const fromScopes: stackdriver.Variable[][] = scopes.map(function(scope: v8.ScopeMirror) {
+      return transform(
+          // TODO: Update this so that `locals` is not of type `any[]`.
+          scope.details().object(),
+          function(locals: stackdriver.Variable[], value, name: string) {
+            const trg = makeMirror(value);
+            if (!usedNames[name]) {
+              // It's a valid variable that belongs in the locals list
+              // and wasn't discovered at a lower-scope
+              usedNames[name] = true;
+              // TODO: Determine how to not have an explicit down cast to
+              // ValueMirror
+              locals.push(self.resolveVariable_(
+                  name, trg as v8.ValueMirror, false));
+            }  // otherwise another same-named variable occured at a
+               // lower scope
+            return locals;
+          },
+          []);
+    });
+
+    function resolveFromReceiver(): stackdriver.Variable[] {
+      // The frame receiver is the 'this' context that is present during
+      // invocation. Check to see whether a receiver context is substantive,
+      // (invocations may be bound to null) if so: store in the locals list
+      // under the name 'context' which is used by the Chrome DevTools.
+      const ctx = frame.details().receiver();
+      if (ctx) {
+        // TODO: Determine how to not have an explicit down cast to
+        // ValueMirror
+        return [self.resolveVariable_(
+            'context', makeMirror(ctx) as v8.ValueMirror, false)];
+      }
+      return [];
+    }
+
+    return flatten(fromScopes).concat(resolveFromReceiver());
   }
 
   /**
diff --git a/test/test-controller.ts b/test/test-controller.ts
@@ -57,9 +57,10 @@ describe('Controller API', function() {
       const controller = new Controller(fakeDebug);
       // TODO: Determine if this type signature is correct.
       controller.register(
-          debuggee, function(err: Error|null, result: {debuggee: Debuggee}) {
+          debuggee, function(err, result) {
             assert(!err, 'not expecting an error');
-            assert.equal(result.debuggee.id, 'fake-debuggee');
+            assert.ok(result);
+            assert.equal(result!.debuggee.id, 'fake-debuggee');
             scope.done();
             done();
           });
@@ -79,11 +80,12 @@ describe('Controller API', function() {
          });
          const controller = new Controller(fakeDebug);
          controller.register(
-             debuggee, function(err: Error, result: {debuggee: Debuggee}) {
+             debuggee, function(err, result) {
                // TODO: Fix this incorrect method signature.
                (assert as any).ifError(err, 'not expecting an error');
-               assert.equal(result.debuggee.id, 'fake-debuggee');
-               assert.ok(result.debuggee.isDisabled);
+               assert.ok(result);
+               assert.equal(result!.debuggee.id, 'fake-debuggee');
+               assert.ok(result!.debuggee.isDisabled);
                scope.done();
                done();
              });
@@ -231,12 +233,11 @@ describe('Controller API', function() {
         // TODO: Determine if the response parameter should be used.
         controller.listBreakpoints(
             debuggee,
-            function(
-                err: Error|null, response: http.ServerResponse,
-                result: stackdriver.ListBreakpointsResponse) {
+            function(err, response, result) {
               assert(!err, 'not expecting an error');
-              assert(result.breakpoints, 'should have a breakpoints property');
-              const bps = result.breakpoints;
+              assert.ok(result);
+              assert(result!.breakpoints, 'should have a breakpoints property');
+              const bps = result!.breakpoints;
               assert.deepEqual(bps, breakpoints, 'breakpoints mismatch');
               scope.done();
               done();
diff --git a/test/test-max-data-size.ts b/test/test-max-data-size.ts
@@ -75,10 +75,10 @@ describe('maxDataSize', function() {
       location: breakpointInFoo.location
     } as stackdriver.Breakpoint;
     // TODO: Determine how to remove this cast to any.
-    api.set(bp, function(err1: Error) {
+    api.set(bp, function(err1) {
       assert.ifError(err1);
       // TODO: Determine how to remove this cast to any.
-      api.wait(bp, function(err2: Error) {
+      api.wait(bp, function(err2?: Error) {
         assert.ifError(err2);
         // TODO: Determine how to remove this cast to any.
         assert(bp.variableTable.some(function(v) {
@@ -109,9 +109,9 @@ describe('maxDataSize', function() {
       id: breakpointInFoo.id,
       location: breakpointInFoo.location
     } as stackdriver.Breakpoint;
-    api.set(bp, function(err1: Error) {
+    api.set(bp, function(err1) {
       assert.ifError(err1);
-      api.wait(bp, function(err2: Error) {
+      api.wait(bp, function(err2?: Error) {
         assert.ifError(err2);
         // TODO: Determine how to remove this cast to any.
         // TODO: The function supplied to reduce is of the wrong type.
diff --git a/test/test-v8debugapi.ts b/test/test-v8debugapi.ts
@@ -49,23 +49,26 @@ function stateIsClean(api: DebugApi): boolean {
   return true;
 }
 
-function validateVariable(variable: stackdriver.Variable): void {
-  if (variable.name) {
-    assert.equal(typeof variable.name, 'string');
-  }
-  if (variable.value) {
-    assert.equal(typeof variable.value, 'string');
-  }
-  if (variable.type) {
-    assert.equal(typeof variable.type, 'string');
-  }
-  if (variable.members) {
-    variable.members.forEach(validateVariable);
-  }
-  if (variable.varTableIndex) {
-    assert.ok(
-        Number.isInteger(variable.varTableIndex) &&
-        variable.varTableIndex >= 0 && variable.varTableIndex <= MAX_INT);
+function validateVariable(variable: stackdriver.Variable|null): void {
+  assert.ok(variable);
+  if (variable) {
+    if (variable.name) {
+      assert.equal(typeof variable.name, 'string');
+    }
+    if (variable.value) {
+      assert.equal(typeof variable.value, 'string');
+    }
+    if (variable.type) {
+      assert.equal(typeof variable.type, 'string');
+    }
+    if (variable.members) {
+      variable.members.forEach(validateVariable);
+    }
+    if (variable.varTableIndex) {
+      assert.ok(
+          Number.isInteger(variable.varTableIndex) &&
+          variable.varTableIndex >= 0 && variable.varTableIndex <= MAX_INT);
+    }
   }
 }
 
