chore: update packages and linting (#473)

Author: JustinBeckwith

package.json

@@ -16,15 +16,15 @@
   ],
   "scripts": {
     "docs": "compodoc src/",
-    "lint": "eslint '**/*.js' && gts check",
+    "lint": "gts check",
     "presystem-test": "npm run compile",
     "system-test": "MOCHA_THROW_DEPRECATION=false c8 mocha build/system-test",
     "presamples-test": "npm run compile",
     "samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
     "test": "c8 mocha --recursive build/test/unit",
     "clean": "gts clean",
     "compile": "tsc -p .",
-    "fix": "gts fix && eslint --fix '**/*.js'",
+    "fix": "gts fix",
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "license-check": "jsgl --local .",
@@ -67,10 +67,6 @@
     "chai": "^4.2.0",
     "codecov": "^3.5.0",
     "delay": "^4.3.0",
-    "eslint": "^6.0.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.1.0",
     "express": "^4.17.1",
     "gts": "^2.0.0",
     "hapi": "^18.1.0",
@@ -88,7 +84,6 @@
     "mocha": "^7.1.1",
     "nock": "^12.0.0",
     "post-install-check": "0.0.1",
-    "prettier": "^1.18.2",
     "proxyquire": "^2.1.0",
     "restify": "^8.3.3",
     "typescript": "^3.8.3",

src/index.ts

@@ -32,7 +32,7 @@ import * as restifyInterface from './interfaces/restify';
 import {createLogger} from './logger';
 import * as manualRequestExtractor from './request-extractors/manual';
 
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type RestifyRequestHandler = (req: any, res: any, next: Function) => any;
 
 /**
@@ -106,7 +106,8 @@ export class ErrorReporting {
   private _client!: AuthClient;
   // the `err` argument can be anything, including `null` and `undefined`
   report!: (
-    err: any, // tslint:disable-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    err: any,
     request?: manualRequestExtractor.Request,
     additionalMessage?: string | {},
     callback?: manualInterface.Callback | {} | string
@@ -118,11 +119,11 @@ export class ErrorReporting {
     version?: string;
   };
   express!: (err: {}, req: {}, res: {}, next: Function) => void;
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   restify!: (server: any) => RestifyRequestHandler | RestifyRequestHandler[];
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   koa!: (context: any, next: {}) => IterableIterator<{}>;
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   koa2!: (context: any, next: Function) => Promise<void>;
 
   constructor(initConfiguration?: ConfigurationOptions) {

src/interfaces/hapi.ts

@@ -77,29 +77,23 @@ export function makeHapiPlugin(client: RequestHandler, config: Configuration) {
    * @returns {Undefined} - returns the execution of the next callback
    */
   function hapiRegisterFunction(
-    server: any, // tslint:disable-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    server: any,
     options: {},
     next?: Function
   ) {
     if (server) {
       if (server.events && server.events.on) {
         // Hapi 17 is being used
-        server.events.on(
-          'log',
-          (event: {error?: {}; channel: string}, tags: {}) => {
-            if (event.error && event.channel === 'app') {
-              client.sendError(hapiErrorHandler(event.error));
-            }
+        server.events.on('log', (event: {error?: {}; channel: string}) => {
+          if (event.error && event.channel === 'app') {
+            client.sendError(hapiErrorHandler(event.error));
           }
-        );
+        });
 
         server.events.on(
           'request',
-          (
-            request: hapi.Request,
-            event: {error?: {}; channel: string},
-            tags: {}
-          ) => {
+          (request: hapi.Request, event: {error?: {}; channel: string}) => {
             if (event.error && event.channel === 'error') {
               client.sendError(hapiErrorHandler(event.error, request));
             }
@@ -113,7 +107,7 @@ export function makeHapiPlugin(client: RequestHandler, config: Configuration) {
         }
 
         if (is.function(server.ext)) {
-          // tslint:disable-next-line no-any
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           server.ext('onPreResponse', (request: hapi.Request, reply: any) => {
             if (
               is.object(request) &&

src/interfaces/koa.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {Middleware, Request, Response} from 'koa';
+import {Request, Response} from 'koa';
 
 import {ErrorMessage} from '../classes/error-message';
 import {Configuration} from '../configuration';
@@ -40,7 +40,7 @@ export function koaErrorHandler(client: RequestHandler, config: Configuration) {
    * @param {Function} next - the result of the request handlers to yield
    * @returns {Undefined} does not return anything
    */
-  return function*(
+  return function* (
     this: {request: Request; response: Response},
     next: Function
   ) {

src/interfaces/manual.ts

@@ -28,7 +28,7 @@ export type Callback = (
   body: {}
 ) => void;
 
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyError = any;
 
 /**

src/populate-error-message.ts

@@ -39,7 +39,7 @@ export interface PopulatedObject {
  * @returns {Undefined} - does not return a value
  */
 // the `ob` argument can be anything, including `null` and `undefined`
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function populateErrorMessage(ob: any, em: ErrorMessage) {
   if (ob === null || ob === undefined) {
     em.setMessage(buildStackTrace('' + ob));

system-test/.eslintrc.yml

@@ -153,10 +153,7 @@ describe('Request/Response lifecycle mocking', () => {
   });
 
   beforeEach(() => {
-    env
-      .setProjectId()
-      .setKeyFilename()
-      .setProduction();
+    env.setProjectId().setKeyFilename().setProduction();
     fakeService = nock(
       'https://clouderrorreporting.googleapis.com/v1beta1/projects/' +
         process.env.GCLOUD_PROJECT
@@ -179,7 +176,7 @@ describe('Request/Response lifecycle mocking', () => {
     env.restoreProcessToOriginalState();
   });
 
-  it('Should fail when receiving non-retryable errors', function(this, done) {
+  it('Should fail when receiving non-retryable errors', function (this, done) {
     this.timeout(5000);
     client.sendError({} as ErrorMessage, (err, response) => {
       assert(err instanceof Error);
@@ -193,7 +190,7 @@ describe('Request/Response lifecycle mocking', () => {
     });
   });
 
-  it('Should retry when receiving retryable errors', function(this, done) {
+  it('Should retry when receiving retryable errors', function (this, done) {
     this.timeout(25000);
     let tries = 0;
     const intendedTries = 4;
@@ -212,10 +209,7 @@ describe('Request/Response lifecycle mocking', () => {
     'Should provide the key as a query string on outgoing requests when ' +
       'using an API key',
     done => {
-      env
-        .sterilizeProcess()
-        .setProjectId()
-        .setProduction();
+      env.sterilizeProcess().setProjectId().setProduction();
       const key = env.apiKey;
       const logger = createLogger({logLevel: 5});
       const client = new RequestHandler(
@@ -256,7 +250,7 @@ describe('Client creation', () => {
   it(
     'Should not throw on initialization when using only project id as a ' +
       'runtime argument',
-    function(this, done) {
+    function (this, done) {
       env.sterilizeProcess().setKeyFilename();
       const logger = createLogger({logLevel: 5});
       const cfg = new Configuration(
@@ -284,11 +278,8 @@ describe('Client creation', () => {
   it(
     'Should not throw on initialization when using only project id as an ' +
       'env variable',
-    function(this, done) {
-      env
-        .sterilizeProcess()
-        .setProjectId()
-        .setKeyFilename();
+    function (this, done) {
+      env.sterilizeProcess().setProjectId().setKeyFilename();
       const logger = createLogger({logLevel: 5});
       const cfg = new Configuration({reportMode: 'always'}, logger);
       this.timeout(10000);
@@ -309,7 +300,7 @@ describe('Client creation', () => {
   it(
     'Should not throw on initialization when using only project number as ' +
       'a runtime argument',
-    function(this, done) {
+    function (this, done) {
       env.sterilizeProcess().setKeyFilename();
       const logger = createLogger({logLevel: 5});
       const cfg = new Configuration(
@@ -337,11 +328,8 @@ describe('Client creation', () => {
   it(
     'Should not throw on initialization when using only project number as ' +
       'an env variable',
-    function(this, done) {
-      env
-        .sterilizeProcess()
-        .setKeyFilename()
-        .setProjectNumber();
+    function (this, done) {
+      env.sterilizeProcess().setKeyFilename().setProjectNumber();
       const logger = createLogger({logLevel: 5});
       const cfg = new Configuration({reportMode: 'always'}, logger);
       this.timeout(10000);
@@ -376,10 +364,7 @@ describe('Expected Behavior', () => {
   });
 
   it('Should callback with an error with a configuration that cannot report errors', done => {
-    env
-      .sterilizeProcess()
-      .setKeyFilename()
-      .setProjectId();
+    env.sterilizeProcess().setKeyFilename().setProjectId();
     process.env.NODE_ENV = 'null';
     const logger = createLogger({logLevel: 5, reportMode: 'production'});
     const client = new RequestHandler(
@@ -461,7 +446,8 @@ describe('error-reporting', () => {
     // interfering with existing listeners of the 'unhandledRejection' event.
     assert.strictEqual(process.listenerCount('unhandledRejection'), 0);
     oldLogger = console.error;
-    console.error = function(this, ...args: any[]) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    console.error = function (this, ...args: any[]) {
       const text = util.format(null, args);
       oldLogger(text);
       logOutput += text;
@@ -579,15 +565,16 @@ describe('error-reporting', () => {
     const context = rep.serviceContext;
     assert.ok(
       context,
-      `Expected the error item's representative to have a context`
+      "Expected the error item's representative to have a context"
     );
     assert.strictEqual(context.service, SERVICE);
     assert.strictEqual(context.version, VERSION);
   }
 
   // the `errOb` argument can be anything, including `null` and `undefined`
   async function verifyReporting(
-    errOb: any, // tslint:disable-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    errOb: any,
     messageTest: (message: string) => void,
     maxCount: number,
     timeout: number
@@ -638,7 +625,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is a string', async function(this) {
+  it('Should correctly publish an error that is a string', async function (this) {
     this.timeout(TIMEOUT);
     const errorId = buildName('with-string');
     await verifyReporting(
@@ -651,7 +638,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is undefined', async function(this) {
+  it('Should correctly publish an error that is undefined', async function (this) {
     this.timeout(TIMEOUT);
     await verifyReporting(
       undefined,
@@ -663,7 +650,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is null', async function(this) {
+  it('Should correctly publish an error that is null', async function (this) {
     this.timeout(TIMEOUT);
     await verifyReporting(
       null,
@@ -675,7 +662,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is a plain object', async function(this) {
+  it('Should correctly publish an error that is a plain object', async function (this) {
     this.timeout(TIMEOUT);
     await verifyReporting(
       {someKey: 'someValue'},
@@ -687,7 +674,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is a number', async function(this) {
+  it('Should correctly publish an error that is a number', async function (this) {
     this.timeout(TIMEOUT);
     const num = new Date().getTime();
     await verifyReporting(
@@ -700,7 +687,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish an error that is of an unknown type', async function(this) {
+  it('Should correctly publish an error that is of an unknown type', async function (this) {
     this.timeout(TIMEOUT);
     const bool = true;
     await verifyReporting(
@@ -713,7 +700,7 @@ describe('error-reporting', () => {
     );
   });
 
-  it('Should correctly publish errors using an error builder', async function(this) {
+  it('Should correctly publish errors using an error builder', async function (this) {
     this.timeout(TIMEOUT);
     const errorId = buildName('with-error-builder');
     // Use an IIFE with the name `definitionSiteFunction` to use later to
@@ -749,7 +736,7 @@ describe('error-reporting', () => {
     await callingSiteFunction();
   });
 
-  it('Should report unhandledRejections if enabled', async function(this) {
+  it('Should report unhandledRejections if enabled', async function (this) {
     this.timeout(TIMEOUT);
     reinitialize({reportUnhandledRejections: true});
     const rejectValue = buildName('report-promise-rejection');
@@ -772,7 +759,7 @@ describe('error-reporting', () => {
     assert.notStrictEqual(logOutput.indexOf(expected), -1);
   });
 
-  it('Should not report unhandledRejections if disabled', async function(this) {
+  it('Should not report unhandledRejections if disabled', async function (this) {
     this.timeout(TIMEOUT);
     reinitialize({reportUnhandledRejections: false});
     const rejectValue = buildName('do-not-report-promise-rejection');

system-test/error-reporting.ts

@@ -18,10 +18,8 @@ const errorHandler = new ErrorReporting();
 
 const server = new Hapi.Server({port: 3000});
 
-// eslint-disable-next-line no-console
 const log = console.log;
-
-// eslint-disable-next-line no-console
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const error = console.error;
 
 server.route({