chore: upgrade @g-c/c, gts, and ts

package.json

@@ -55,7 +55,7 @@
     "@types/glob": "^5.0.32",
     "@types/is": "0.0.20",
     "@types/methods": "^1.1.0",
-    "@types/mocha": "^5.0.0",
+    "@types/mocha": "5.2.1",
     "@types/ncp": "^2.0.1",
     "@types/nock": "^9.1.2",
     "@types/node": "^10.0.9",
@@ -72,7 +72,7 @@
     "codecov": "^3.0.0",
     "express": "^4.15.2",
     "glob": "^7.0.3",
-    "gts": "^0.5.1",
+    "gts": "^0.7.1",
     "js-green-licenses": "^0.5.0",
     "jshint": "^2.9.1",
     "mocha": "^5.0.0",
@@ -89,10 +89,10 @@
     "timekeeper": "^2.0.0",
     "tmp": "0.0.33",
     "ts-node": "^6.0.0",
-    "typescript": "~2.7.2"
+    "typescript": "~2.9.2"
   },
   "dependencies": {
-    "@google-cloud/common": "^0.19.1",
+    "@google-cloud/common": "^0.20.0",
     "builtin-modules": "^2.0.0",
     "continuation-local-storage": "^3.2.1",
     "extend": "^3.0.0",
@@ -101,7 +101,7 @@
     "lodash.findindex": "^4.4.0",
     "lodash.isequal": "^4.0.0",
     "methods": "^1.1.1",
-    "require-in-the-middle": "^2.2.1",
+    "require-in-the-middle": "2.2.0",
     "semver": "^5.4.1",
     "shimmer": "^1.2.0",
     "uuid": "^3.0.1"

scripts/check-install.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'path';
 import { globP, ncpP, spawnP, tmpDirP } from './utils';
 
 /**

scripts/compile.ts

@@ -1,7 +1,7 @@
-import * as path from 'path';
+import path from 'path';
 import { forkP } from './utils';
-import * as ts from 'typescript';
-import * as semver from 'semver';
+import ts from 'typescript';
+import semver from 'semver';
 
 export interface CompileOptions {
   strict: boolean;

scripts/get-plugin-types.ts

@@ -20,7 +20,7 @@ export async function getPluginTypes() {
   const indexTs = (await readFileP(`${TYPES_DIRECTORY}/index.d.ts`, 'utf8') as string)
     .split('\n');
   for (const line of indexTs) {
-    const matches = line.match(/^import \* as .* from '\.\/(.+)';\s*\/\/\s*(.+)@(.+)$/);
+    const matches = line.match(/^import .* from '\.\/(.+)';\s*\/\/\s*(.+)@(.+)$/);
     if (!matches) {
       continue;
     }
@@ -34,7 +34,7 @@ export async function getPluginTypes() {
         cwd: installDir
       });
       await writeFileP(`${installDir}/index.ts`,
-        `import * as _ from '${name}'; export = _;\n`, 'utf8');
+        `import _ from '${name}'; export = _;\n`, 'utf8');
     }
   }
 }

scripts/init-test-fixtures.ts

@@ -1,8 +1,8 @@
-import * as path from 'path';
+import path from 'path';
 import { BUILD_DIRECTORY, globP, statP, ncpP, spawnP, readFileP, writeFileP, mkdirP } from './utils';
 import { readdir } from 'fs';
-import * as pify from 'pify';
-import * as semver from 'semver';
+import pify from 'pify';
+import semver from 'semver';
 
 const readdirP: (path: string) => Promise<string[]> = pify(readdir);
 

scripts/report-coverage.ts

@@ -1,6 +1,6 @@
 import { BUILD_DIRECTORY, nodule, readFileP, forkP, spawnP } from './utils';
-import * as path from 'path';
-import * as pify from 'pify';
+import path from 'path';
+import pify from 'pify';
 
 export async function reportCoverage() {
   await forkP(nodule('.bin/codecov'), [], {

scripts/run-tests.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'path';
 import { globP, forkP } from './utils';
 
 export interface Options {

scripts/utils.ts

@@ -1,11 +1,11 @@
 import { mkdir, Stats, stat, readFile, writeFile } from 'fs';
-import * as glob from 'glob';
+import glob from 'glob';
 import { ncp } from 'ncp';
-import * as path from 'path';
-import * as pify from 'pify';
+import path from 'path';
+import pify from 'pify';
 import { ChildProcess, ForkOptions, fork, SpawnOptions, spawn } from 'child_process';
-import * as once from 'once';
-import * as tmp from 'tmp';
+import once from 'once';
+import tmp from 'tmp';
 
 export const BUILD_DIRECTORY = 'build';
 

src/cls.ts

@@ -16,7 +16,7 @@
 
 import {Logger} from '@google-cloud/common';
 import {EventEmitter} from 'events';
-import * as semver from 'semver';
+import semver from 'semver';
 
 import {AsyncHooksCLS} from './cls/async-hooks';
 import {AsyncListenerCLS} from './cls/async-listener';
@@ -83,7 +83,9 @@ export enum TraceCLSMechanism {
 /**
  * Configuration options passed to the TraceCLS constructor.
  */
-export interface TraceCLSConfig { mechanism: TraceCLSMechanism; }
+export interface TraceCLSConfig {
+  mechanism: TraceCLSMechanism;
+}
 
 interface CLSConstructor {
   new(defaultContext: RootContext): CLS<RootContext>;

src/cls/async-hooks.ts

@@ -16,9 +16,9 @@
 
 // This file calls require('async_hooks') in the AsyncHooksCLS constructor,
 // rather than upon module load.
-import * as asyncHooksModule from 'async_hooks';
+import asyncHooksModule from 'async_hooks';
 import {EventEmitter} from 'events';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 
 import {CLS, Func} from './base';
 

src/cls/async-listener.ts

@@ -16,7 +16,7 @@
 
 // This module requires continuation-local-storage in the AsyncListenerCLS
 // constructor, rather than upon module load.
-import * as clsModule from 'continuation-local-storage';
+import clsModule from 'continuation-local-storage';
 import {EventEmitter} from 'events';
 
 import {CLS, Func} from './base';

src/config.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import * as path from 'path';
+import path from 'path';
 
 const pluginDirectory =
     path.join(path.resolve(__dirname, '..'), 'src', 'plugins');

src/index.ts

@@ -18,10 +18,10 @@ const filesLoadedBeforeTrace = Object.keys(require.cache);
 
 // This file's top-level imports must not transitively depend on modules that
 // do I/O, or continuation-local-storage will not work.
-import * as semver from 'semver';
+import semver from 'semver';
 import {Config, defaultConfig} from './config';
-import * as extend from 'extend';
-import * as path from 'path';
+import extend from 'extend';
+import path from 'path';
 import * as PluginTypes from './plugin-types';
 import {tracing, Tracing, NormalizedConfig} from './tracing';
 import {Singleton, FORCE_NEW, Forceable} from './util';

src/plugin-types.ts

@@ -22,7 +22,9 @@ import {TraceLabels} from './trace-labels';
 export type Func<T> = (...args: any[]) => T;
 
 // Defines an interface for storing Trace-Agent related data on patched modules.
-export interface TraceAgentExtension { _google_trace_patched: boolean; }
+export interface TraceAgentExtension {
+  _google_trace_patched: boolean;
+}
 
 /**
  * Represents a trace span.

src/plugins/plugin-connect.ts

@@ -15,7 +15,7 @@
  */
 
 import {IncomingMessage, ServerResponse} from 'http';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 import {parse as urlParse} from 'url';
 
 import {PluginTypes} from '..';

src/plugins/plugin-express.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import * as httpMethods from 'methods';
-import * as shimmer from 'shimmer';
+import httpMethods from 'methods';
+import shimmer from 'shimmer';
 
 import {PluginTypes} from '..';
 

src/plugins/plugin-hapi.ts

@@ -15,7 +15,7 @@
  */
 
 import {IncomingMessage, ServerResponse} from 'http';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 import {parse as urlParse} from 'url';
 
 import {PluginTypes} from '..';

src/plugins/plugin-http.ts

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import * as httpModule from 'http';
+import httpModule from 'http';
 import {Agent, ClientRequest, ClientRequestArgs, get, request} from 'http';
-import * as httpsModule from 'https';
-import * as is from 'is';
-import * as semver from 'semver';
-import * as shimmer from 'shimmer';
-import * as url from 'url';
+import httpsModule from 'https';
+import is from 'is';
+import semver from 'semver';
+import shimmer from 'shimmer';
+import url from 'url';
 
 import {Plugin, TraceAgent} from '../plugin-types';
 

src/plugins/plugin-http2.ts

@@ -17,8 +17,8 @@
 import {EventEmitter} from 'events';
 // This is imported only for types. Generated .js file should NOT load 'http2'.
 // `http2` must be used only in type annotations, not in expressions.
-import * as http2 from 'http2';
-import * as shimmer from 'shimmer';
+import http2 from 'http2';
+import shimmer from 'shimmer';
 import {URL} from 'url';
 
 import {TraceAgent} from '../plugin-types';

src/plugins/plugin-koa.ts

@@ -15,7 +15,7 @@
  */
 
 import {IncomingMessage, ServerResponse} from 'http';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 import {parse as urlParse} from 'url';
 
 import {PluginTypes} from '..';

src/plugins/plugin-pg.ts

@@ -15,7 +15,7 @@
  */
 
 import {EventEmitter} from 'events';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 import {Readable} from 'stream';
 
 import {Patch, Plugin, Span} from '../plugin-types';

src/plugins/plugin-restify.ts

@@ -15,7 +15,7 @@
  */
 
 import {ServerResponse} from 'http';
-import * as shimmer from 'shimmer';
+import shimmer from 'shimmer';
 import {parse as urlParse} from 'url';
 
 import {PluginTypes} from '..';

src/plugins/types/index.d.ts

@@ -27,13 +27,13 @@
  * contain dots.
  */
 
-import * as connect_3 from './connect_3'; // connect@3
-import * as express_4 from './express_4'; // express@4
-import * as hapi_16 from './hapi_16'; // hapi@16
-import * as hapi_17 from './hapi_17'; // hapi@17
-import * as koa_2 from './koa_2'; // koa@2
-import * as pg_7 from './pg_7'; // pg@7
-import * as restify_5 from './restify_5'; // restify@5
+import connect_3 from './connect_3'; // connect@3
+import express_4 from './express_4'; // express@4
+import hapi_16 from './hapi_16'; // hapi@16
+import hapi_17 from './hapi_17'; // hapi@17
+import koa_2 from './koa_2'; // koa@2
+import pg_7 from './pg_7'; // pg@7
+import restify_5 from './restify_5'; // restify@5
 
 //---other imports---//
 

src/span-data.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import * as crypto from 'crypto';
-import * as util from 'util';
+import crypto from 'crypto';
+import util from 'util';
 
 import {Constants, SpanType} from './constants';
 import * as types from './plugin-types';

src/trace-api.ts

@@ -15,9 +15,9 @@
  */
 
 import {Logger} from '@google-cloud/common';
-import * as is from 'is';
-import * as semver from 'semver';
-import * as uuid from 'uuid';
+import is from 'is';
+import semver from 'semver';
+import uuid from 'uuid';
 
 import {cls, RootContext} from './cls';
 import {Constants, SpanType} from './constants';

src/trace-plugin-loader.ts

@@ -15,15 +15,13 @@
  */
 
 import {Logger} from '@google-cloud/common';
-import Module = require('module');
-import * as hook from 'require-in-the-middle';
-import * as path from 'path';
-import * as semver from 'semver';
-import * as shimmer from 'shimmer';
-import * as util from './util';
-import * as builtinModules from 'builtin-modules';
+import builtinModules from 'builtin-modules';
+import path from 'path';
+import hook from 'require-in-the-middle';
+import semver from 'semver';
+
+import {Intercept, Patch, Plugin} from './plugin-types';
 import {TraceAgent, TraceAgentConfig} from './trace-api';
-import {Patch, Intercept, Plugin, Instrumentation} from './plugin-types';
 import {Singleton} from './util';
 
 /**

src/trace-writer.ts

@@ -18,8 +18,7 @@ import * as common from '@google-cloud/common';
 import {AxiosError} from 'axios';
 import * as gcpMetadata from 'gcp-metadata';
 import {OutgoingHttpHeaders} from 'http';
-import * as os from 'os';
-import * as util from 'util';
+import os from 'os';
 
 import {Constants} from './constants';
 import {SpanKind, Trace} from './trace';
@@ -46,7 +45,9 @@ export interface TraceWriterConfig extends common.GoogleAuthOptions {
   serviceContext: {service?: string; version?: string; minorVersion?: string;};
 }
 
-export interface LabelObject { [key: string]: string; }
+export interface LabelObject {
+  [key: string]: string;
+}
 
 /**
  * A class representing a service that publishes traces in the background.

src/tracing.ts

@@ -15,8 +15,8 @@
  */
 
 import {Logger, logger} from '@google-cloud/common';
-import * as path from 'path';
-import * as semver from 'semver';
+import path from 'path';
+import semver from 'semver';
 
 import {cls, TraceCLSConfig, TraceCLSMechanism} from './cls';
 import {CLSMechanism, Config, defaultConfig} from './config';

src/util.ts

@@ -15,7 +15,7 @@
  */
 
 import {Logger} from '@google-cloud/common';  // for types only.
-import * as path from 'path';
+import path from 'path';
 
 // This symbol must be exported (for now).
 // See: https://github.com/Microsoft/TypeScript/issues/20080

test/nocks.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import * as nock from 'nock';
+import nock from 'nock';
 
 const accept = () => true;