refactor: type fixes and some light housekeeping

package.json

@@ -45,8 +45,8 @@
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "proto": "npm run proto:pubsub",
-    "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -",
-    "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -",
+    "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -i long -o proto/pubsub.d.ts -",
+    "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -i long -o proto/iam.d.ts -",
     "proto-types": "mkdir -p proto && npm run proto:pubsub && npm run proto:iam",
     "docs-test": "linkinator docs -r --skip www.googleapis.com",
     "predocs-test": "npm run docs"

proto/iam.d.ts

@@ -1,4 +1,5 @@
 import * as $protobuf from "protobufjs";
+import * as long from "long";
 /** Namespace google. */
 export namespace google {
 

proto/pubsub.d.ts

@@ -1,4 +1,5 @@
 import * as $protobuf from "protobufjs";
+import * as long from "long";
 /** Namespace google. */
 export namespace google {
 

src/iam.ts

@@ -147,12 +147,10 @@ export class IAM {
    * });
    */
   getPolicy(
-      gaxOptsOrCallback?: CallOptions|GetPolicyCallback,
+      optsOrCallback?: CallOptions|GetPolicyCallback,
       callback?: GetPolicyCallback): Promise<GetPolicyResponse>|void {
-    const gaxOpts =
-        typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {};
-    callback =
-        typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback;
+    const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     const reqOpts = {
       resource: this.id,
@@ -230,16 +228,14 @@ export class IAM {
    * });
    */
   setPolicy(
-      policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback,
+      policy: Policy, optsOrCallback?: CallOptions|SetPolicyCallback,
       callback?: SetPolicyCallback): Promise<SetPolicyResponse>|void {
     if (!(typeof policy === 'object')) {
       throw new Error('A policy object is required.');
     }
 
-    const gaxOpts =
-        typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {};
-    callback =
-        typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback;
+    const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     const reqOpts = {
       resource: this.id,
@@ -341,17 +337,15 @@ export class IAM {
    */
   testPermissions(
       permissions: string|string[],
-      gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback,
+      optsOrCallback?: CallOptions|TestIamPermissionsCallback,
       callback?: TestIamPermissionsCallback):
       Promise<TestIamPermissionsResponse>|void {
     if (!Array.isArray(permissions) && !(typeof permissions === 'string')) {
       throw new Error('Permissions are required.');
     }
 
-    const gaxOpts =
-        typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {};
-    callback =
-        typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback;
+    const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     const reqOpts = {
       resource: this.id,

src/index.ts

@@ -83,5 +83,5 @@ export {Attributes, PublishCallback} from './publisher';
 export {PageOptions, GetSnapshotsCallback, GetSnapshotsResponse, GetSubscriptionsCallback, GetSubscriptionsResponse, GetTopicsCallback, GetTopicsResponse, EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, PubSub} from './pubsub';
 export {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot';
 export {Message} from './subscriber';
-export {SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription';
+export {PushConfig, SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription';
 export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, Topic} from './topic';

src/pubsub.ts

@@ -432,17 +432,15 @@ export class PubSub {
    * });
    */
   createTopic(
-      name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback,
+      name: string, optsOrCallback?: CallOptions|CreateTopicCallback,
       callback?: CreateTopicCallback): Promise<CreateTopicResponse>|void {
     const topic = this.topic(name);
     const reqOpts = {
       name: topic.name,
     };
 
-    const gaxOpts =
-        typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {};
-    callback =
-        typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback;
+    const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     this.request<google.pubsub.v1.ITopic>(
         {
@@ -535,25 +533,26 @@ export class PubSub {
    * });
    */
   getSnapshots(
-      optionsOrCallback?: PageOptions|GetSnapshotsCallback,
+      optsOrCallback?: PageOptions|GetSnapshotsCallback,
       callback?: GetSnapshotsCallback): void|Promise<GetSnapshotsResponse> {
-    const self = this;
-    const options =
-        typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
-    callback =
-        typeof optionsOrCallback === 'function' ? optionsOrCallback : callback;
+    const options = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
+
     const reqOpts = Object.assign(
         {
           project: 'projects/' + this.projectId,
         },
         options);
+
     delete reqOpts.gaxOpts;
     delete reqOpts.autoPaginate;
+
     const gaxOpts = Object.assign(
         {
           autoPaginate: options.autoPaginate,
         },
         options.gaxOpts);
+
     this.request<
         google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>(
         {
@@ -567,7 +566,7 @@ export class PubSub {
 
           if (rawSnapshots) {
             snapshots = rawSnapshots.map(snapshot => {
-              const snapshotInstance = self.snapshot(snapshot.name!);
+              const snapshotInstance = this.snapshot(snapshot.name!);
               snapshotInstance.metadata = snapshot;
               return snapshotInstance;
             });
@@ -578,7 +577,7 @@ export class PubSub {
   }
 
   getSubscriptions(options?: GetSubscriptionsOptions):
-      Promise<google.pubsub.v1.IListSubscriptionsResponse>;
+      Promise<GetSubscriptionsResponse>;
   getSubscriptions(callback: GetSubscriptionsCallback): void;
   getSubscriptions(
       options: GetSubscriptionsOptions,
@@ -641,14 +640,11 @@ export class PubSub {
    * });
    */
   getSubscriptions(
-      optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback,
+      optsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback,
       callback?: GetSubscriptionsCallback):
-      void|Promise<google.pubsub.v1.IListSubscriptionsResponse> {
-    const self = this;
-    const options =
-        typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
-    callback =
-        typeof optionsOrCallback === 'function' ? optionsOrCallback : callback;
+      void|Promise<GetSubscriptionsResponse> {
+    const options = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     let topic = options.topic;
     if (topic) {
@@ -685,7 +681,7 @@ export class PubSub {
 
           if (rawSubs) {
             subscriptions = rawSubs.map(sub => {
-              const subscriptionInstance = self.subscription(sub.name!);
+              const subscriptionInstance = this.subscription(sub.name!);
               subscriptionInstance.metadata = sub;
               return subscriptionInstance;
             });
@@ -756,26 +752,26 @@ export class PubSub {
    * });
    */
   getTopics(
-      optionsOrCallback?: PageOptions|GetTopicsCallback,
+      optsOrCallback?: PageOptions|GetTopicsCallback,
       callback?: GetTopicsCallback): void|Promise<GetTopicsResponse> {
-    const self = this;
-    const options =
-        typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
-    callback =
-        typeof optionsOrCallback === 'function' ? optionsOrCallback : callback;
+    const options = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     const reqOpts = Object.assign(
         {
           project: 'projects/' + this.projectId,
         },
         options);
+
     delete reqOpts.gaxOpts;
     delete reqOpts.autoPaginate;
+
     const gaxOpts = Object.assign(
         {
           autoPaginate: options.autoPaginate,
         },
         options.gaxOpts);
+
     this.request<google.pubsub.v1.Topic, google.pubsub.v1.IListTopicsResponse>(
         {
           client: 'PublisherClient',
@@ -788,7 +784,7 @@ export class PubSub {
 
           if (rawTopics) {
             topics = rawTopics.map(topic => {
-              const topicInstance = self.topic(topic.name);
+              const topicInstance = this.topic(topic.name);
               topicInstance.metadata = topic;
               return topicInstance;
             });
@@ -853,14 +849,13 @@ export class PubSub {
    * @param {function} [callback] The callback function.
    */
   request<T, R = void>(config: RequestConfig, callback: RequestCallback<T, R>) {
-    const self = this;
     this.getClient_(config, (err, client) => {
       if (err) {
         callback(err);
         return;
       }
       let reqOpts = extend(true, {}, config.reqOpts);
-      reqOpts = replaceProjectIdToken(reqOpts, self.projectId);
+      reqOpts = replaceProjectIdToken(reqOpts, this.projectId);
       client![config.method](reqOpts, config.gaxOpts, callback);
     });
   }

src/snapshot.ts

@@ -28,8 +28,8 @@ export type CreateSnapshotCallback =
     ResourceCallback<Snapshot, google.pubsub.v1.ISnapshot>;
 export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot];
 
-export type SeekCallback = RequestCallback<google.pubsub.v1.ISnapshot>;
-export type SeekResponse = [google.pubsub.v1.ISnapshot];
+export type SeekCallback = RequestCallback<google.pubsub.v1.ISeekResponse>;
+export type SeekResponse = [google.pubsub.v1.ISeekResponse];
 
 /**
  * A Snapshot object will give you access to your Cloud Pub/Sub snapshot.
@@ -134,14 +134,14 @@ export class Snapshot {
     const reqOpts = {
       snapshot: this.name,
     };
-    callback = callback || util.noop;
+
     this.parent.request<google.protobuf.Empty>(
         {
           client: 'SubscriberClient',
           method: 'deleteSnapshot',
           reqOpts,
         },
-        callback);
+        callback!);
   }
 
   /*@
@@ -193,18 +193,18 @@ export class Snapshot {
    * });
    */
   create(
-      gaxOpts?: CallOptions|CreateSnapshotCallback,
+      optsOrCallback?: CallOptions|CreateSnapshotCallback,
       callback?: CreateSnapshotCallback): void|Promise<CreateSnapshotResponse> {
     if (!(this.parent instanceof Subscription)) {
       throw new Error(
           `This is only available if you accessed this object through Subscription#snapshot`);
     }
 
-    const options = typeof gaxOpts === 'function' ? {} : gaxOpts;
-    callback = typeof gaxOpts === 'function' ? gaxOpts : callback;
+    const options = typeof optsOrCallback === 'object' ? optsOrCallback : {};
+    callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback;
 
     return this.parent.createSnapshot(
-        this.name, gaxOpts! as CallOptions, (err, snapshot, resp) => {
+        this.name, options, (err, snapshot, resp) => {
           if (err) {
             callback!(err, null, resp);
             return;