chore(gax): resolves linter warnings in gax

core/packages/gax/src/apitypes.ts

@@ -35,10 +35,7 @@ export interface GRPCCallResult {
 // when it might be useful for users.
 export interface RequestType {
   [index: string]:
-    | string
-    | number
-    | RequestType
-    | Array<string | number | RequestType>;
+    string | number | RequestType | Array<string | number | RequestType>;
 }
 export type ResponseType = {} | null;
 export type NextPageRequestType = {
@@ -85,10 +82,7 @@ export type BiDiStreamingCall = (
   options: {},
 ) => Duplex & GRPCCallResult;
 export type GRPCCall =
-  | UnaryCall
-  | ServerStreamingCall
-  | ClientStreamingCall
-  | BiDiStreamingCall;
+  UnaryCall | ServerStreamingCall | ClientStreamingCall | BiDiStreamingCall;
 
 // GAX wraps gRPC calls so that the wrapper functions return either a
 // cancellable promise, or a stream (also cancellable!)

core/packages/gax/src/fallbackServiceStub.ts

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import type {Response as NodeFetchResponse} from 'node-fetch' with {'resolution-mode': 'import'};
+import type {Response as NodeFetchResponse} from 'node-fetch' with {
+  'resolution-mode': 'import',
+};
 
 import {AuthClient, GoogleAuth, gaxios} from 'google-auth-library';
 import * as serializer from 'proto3-json-serializer';
@@ -35,8 +37,7 @@
 // - https://github.com/node-fetch/node-fetch#custom-agent
 // - https://github.com/googleapis/gax-nodejs/pull/1534
 let agentOption:
-  | ((parsedUrl: {protocol: string}) => HttpAgent | HttpsAgent)
-  | null = null;
+  ((parsedUrl: {protocol: string}) => HttpAgent | HttpsAgent) | null = null;
 if (isNodeJS()) {
   const http = require('http');
   const https = require('https');
@@ -418,7 +419,7 @@
                 // state, as the handlers below do.
                 if (err && (timedOut || !cancelRequested)) {
                   if (callback) {
                     callback(err);
                   }
                   streamArrayParser.emit('error', err);
                 }
@@ -430,12 +431,12 @@
               Promise.resolve(response.ok),
               response.arrayBuffer(),
             ])
               .then(([ok, buffer]: [boolean, Buffer | ArrayBuffer]) => {
                 const response = responseDecoder(rpc, ok, buffer);
                 callback!(null, response);
                 return;
               })
               .catch((err: Error) => {
                 // The deadline can expire after the response headers arrive but
                 // before the body is fully read, which rejects here rather than
                 // in the outer handler.
@@ -458,7 +459,7 @@
                   // state we recorded.
                   if (timedOut || !cancelRequested) {
                     if (callback) {
                       callback(callErr);
                     }
                     streamArrayParser.emit('error', callErr);
                   }
@@ -516,12 +517,12 @@
             // nobody is listening to any more.
             if (timedOut || !cancelRequested) {
               if (callback) {
                 callback(err);
               }
               streamArrayParser.emit('error', err);
             }
           } else if (callback) {
             callback(err);
           } else {
             throw err;
           }

core/packages/gax/src/iamService.ts

@@ -381,15 +381,13 @@ export class IamClient {
    *
    * The client will no longer be usable and all future behavior is undefined.
    */
-  close(): Promise<void> {
+  async close(): Promise<void> {
     this.initialize().catch(console.error);
     if (!this._terminated) {
-      return this.iamPolicyStub!.then(stub => {
-        this._terminated = true;
-        stub.close();
-      });
+      const stub = await this.iamPolicyStub!;
+      this._terminated = true;
+      stub.close();
     }
-    return Promise.resolve();
   }
 }
 export interface IamClient {

core/packages/gax/src/locationService.ts

@@ -518,15 +518,13 @@ export class LocationsClient {
    * The client will no longer be usable and all future behavior is undefined.
    * @returns {Promise} A promise that resolves when the client is closed.
    */
-  close(): Promise<void> {
+  async close(): Promise<void> {
     this.initialize().catch(console.error);
     if (!this._terminated) {
-      return this.locationsStub!.then(stub => {
-        this._terminated = true;
-        stub.close();
-      });
+      const stub = await this.locationsStub!;
+      this._terminated = true;
+      stub.close();
     }
-    return Promise.resolve();
   }
 }
 

core/packages/gax/src/longRunningCalls/longrunning.ts

@@ -197,10 +197,10 @@
       },
       (err: Error) => {
         if (callback) {
           callback(err);
           return;
         }
-        return Promise.reject(err);
+        throw err;
       },
     );
 

core/packages/gax/src/paginationCalls/pagedApiCaller.ts

@@ -21,8 +21,8 @@ import {
   SimpleCallbackFunction,
   UnaryCall,
   RequestType,
+  APICallback,
 } from '../apitypes';
-import {APICallback} from '../apitypes';
 import {OngoingCall, OngoingCallPromise} from '../call';
 import {CallOptions} from '../gax';
 import {GoogleError} from '../googleError';
@@ -164,10 +164,13 @@ export class PagedApiCaller implements APICaller {
     const maxResults = settings.maxResults || -1;
 
     const resourceCollector = new ResourceCollector(apiCall, maxResults);
-    resourceCollector.processAllPages(request).then(
-      resources => ongoingCall.callback(null, resources),
-      err => ongoingCall.callback(err),
-    );
+    resourceCollector
+      .processAllPages(request)
+      .then(resources => {
+        ongoingCall.callback(null, resources);
+        return null;
+      })
+      .catch(err => ongoingCall.callback(err));
   }
 
   fail(ongoingCall: OngoingCallPromise, err: GoogleError): void {

core/packages/gax/src/streamingCalls/streaming.ts

@@ -16,14 +16,22 @@
 
 /* This file describes the gRPC-streaming. */
 
-import {Duplex, DuplexOptions, Readable, Stream, Writable} from 'stream';
+import {
+  Duplex,
+  DuplexOptions,
+  Readable,
+  Stream,
+  Writable,
+  PassThrough,
+} from 'stream';
 
 import {
   APICallback,
   CancellableStream,
   GRPCCallResult,
   RequestType,
   SimpleCallbackFunction,
+  ResponseType,
 } from '../apitypes';
 import {
   RetryOptions,
@@ -32,8 +40,6 @@ import {
 } from '../gax';
 import {GoogleError} from '../googleError';
 import {Status} from '../status';
-import {PassThrough} from 'stream';
-import {ResponseType} from '../apitypes';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const duplexify: DuplexifyConstructor = require('duplexify');
 // eslint-disable-next-line @typescript-eslint/no-var-requires

core/packages/gax/src/transcoding.ts

@@ -137,7 +137,9 @@ function validateUriPath(propertyName: string, value: string): void {
     // valid domain-scoped resource segments (e.g. projects/example.com:project-id).
     const segments = value.split('/');
     if (segments.some(segment => segment === '.' || segment === '..')) {
-      throw new Error(`Value for ${propertyName} must not contain segments that are exactly . or ..`);
+      throw new Error(
+        `Value for ${propertyName} must not contain segments that are exactly . or ..`,
+      );
     }
   }
 }
@@ -164,7 +166,9 @@ export function buildQueryStringComponents(
     } else {
       resultList.push(
         `${prefix}${encodeWithoutSlashes(key)}=${encodeWithoutSlashes(
-          requestValue === null || requestValue === undefined ? 'null' : requestValue.toString(),
+          requestValue === null || requestValue === undefined
+            ? 'null'
+            : requestValue.toString(),
         )}`,
       );
     }
@@ -187,7 +191,7 @@ export function buildQueryStringComponents(
 export function encodeWithSlashes(str: string): string {
   return encodeURIComponent(str).replace(
     /[!'()*]/g, // Characters preserved by encodeURIComponent
-    character => '%' + character.charCodeAt(0).toString(16).toUpperCase()
+    character => '%' + character.charCodeAt(0).toString(16).toUpperCase(),
   );
 }