chore: use split common modules (#200)

Author: JustinBeckwith

handwritten/pubsub/.gitignore

@@ -7,3 +7,4 @@ out/
 system-test/secrets.js
 system-test/*key.json
 *.lock
+.vscode

handwritten/pubsub/package-lock.json

@@ -65,6 +65,9 @@
   },
   "dependencies": {
     "@google-cloud/common": "^0.20.0",
+    "@google-cloud/paginator": "^0.1.0",
+    "@google-cloud/projectify": "^0.3.0",
+    "@google-cloud/promisify": "^0.3.0",
     "arrify": "^1.0.0",
     "async-each": "^1.0.1",
     "delay": "^3.0.0",

handwritten/pubsub/package.json

@@ -17,6 +17,7 @@
 'use strict';
 
 var common = require('@google-cloud/common');
+const {replaceProjectIdToken} = require('@google-cloud/projectify');
 var duplexify = require('duplexify');
 var each = require('async-each');
 var events = require('events');
@@ -233,7 +234,7 @@ ConnectionPool.prototype.createConnection = function() {
       .on('error', onConnectionError)
       .on('data', onConnectionData)
       .write({
-        subscription: common.util.replaceProjectIdToken(
+        subscription: replaceProjectIdToken(
           self.subscription.name,
           self.pubsub.projectId
         ),

handwritten/pubsub/src/connection-pool.js

@@ -21,7 +21,7 @@
 'use strict';
 
 var arrify = require('arrify');
-var common = require('@google-cloud/common');
+const {promisifyAll} = require('@google-cloud/promisify');
 var is = require('is');
 
 /**
@@ -332,6 +332,6 @@ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) {
  * All async methods (except for streams) will return a Promise in the event
  * that a callback is omitted.
  */
-common.util.promisifyAll(IAM);
+promisifyAll(IAM);
 
 module.exports = IAM;

handwritten/pubsub/src/iam.js

@@ -16,11 +16,13 @@
 
 'use strict';
 
-var common = require('@google-cloud/common');
+const {replaceProjectIdToken} = require('@google-cloud/projectify');
+const {paginator} = require('@google-cloud/paginator');
+const {promisifyAll} = require('@google-cloud/promisify');
 var extend = require('extend');
 var {GoogleAuth} = require('google-auth-library');
 var gax = require('google-gax');
-var grpc = new gax.GrpcClient().grpc;
+var {grpc} = new gax.GrpcClient();
 var is = require('is');
 
 var PKG = require('../package.json');
@@ -97,7 +99,7 @@ function PubSub(options) {
     return new PubSub(options);
   }
 
-  options = common.util.normalizeArguments(this, options);
+  options = options || {};
 
   // Determine what scopes are needed.
   // It is the union of the scopes on both clients.
@@ -483,9 +485,7 @@ PubSub.prototype.getSnapshots = function(options, callback) {
  *     this.end();
  *   });
  */
-PubSub.prototype.getSnapshotsStream = common.paginator.streamify(
-  'getSnapshots'
-);
+PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots');
 
 /**
  * Query object for listing subscriptions.
@@ -629,7 +629,7 @@ PubSub.prototype.getSubscriptions = function(options, callback) {
  *     this.end();
  *   });
  */
-PubSub.prototype.getSubscriptionsStream = common.paginator.streamify(
+PubSub.prototype.getSubscriptionsStream = paginator.streamify(
   'getSubscriptions'
 );
 
@@ -768,7 +768,7 @@ PubSub.prototype.getTopics = function(options, callback) {
  *     this.end();
  *   });
  */
-PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics');
+PubSub.prototype.getTopicsStream = paginator.streamify('getTopics');
 
 /**
  * Get the PubSub client object.
@@ -832,7 +832,7 @@ PubSub.prototype.request = function(config, callback) {
     }
 
     var reqOpts = extend(true, {}, config.reqOpts);
-    reqOpts = common.util.replaceProjectIdToken(reqOpts, self.projectId);
+    reqOpts = replaceProjectIdToken(reqOpts, self.projectId);
 
     client[config.method](reqOpts, config.gaxOpts, callback);
   });
@@ -933,18 +933,14 @@ PubSub.prototype.topic = function(name, options) {
  *
  * These methods can be agto-paginated.
  */
-common.paginator.extend(PubSub, [
-  'getSnapshots',
-  'getSubscriptions',
-  'getTopics',
-]);
+paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']);
 
 /*! Developer Documentation
  *
  * All async methods (except for streams) will return a Promise in the event
  * that a callback is omitted.
  */
-common.util.promisifyAll(PubSub, {
+promisifyAll(PubSub, {
   exclude: ['request', 'snapshot', 'subscription', 'topic'],
 });
 

handwritten/pubsub/src/index.js

@@ -17,7 +17,7 @@
 'use strict';
 
 var arrify = require('arrify');
-var common = require('@google-cloud/common');
+const {promisifyAll} = require('@google-cloud/promisify');
 var each = require('async-each');
 var extend = require('extend');
 var is = require('is');
@@ -263,7 +263,7 @@ Publisher.prototype.queue_ = function(data, attrs, callback) {
  * All async methods (except for streams) will return a Promise in the event
  * that a callback is omitted.
  */
-common.util.promisifyAll(Publisher, {
+promisifyAll(Publisher, {
   singular: true,
 });
 

handwritten/pubsub/src/publisher.js

@@ -17,6 +17,7 @@
 'use strict';
 
 var common = require('@google-cloud/common');
+const {promisifyAll} = require('@google-cloud/promisify');
 var is = require('is');
 
 /**
@@ -211,6 +212,6 @@ Snapshot.prototype.delete = function(callback) {
  * All async methods (except for streams) will return a Promise in the event
  * that a callback is omitted.
  */
-common.util.promisifyAll(Snapshot);
+promisifyAll(Snapshot);
 
 module.exports = Snapshot;

handwritten/pubsub/src/snapshot.js

@@ -19,6 +19,7 @@
 var arrify = require('arrify');
 var chunk = require('lodash.chunk');
 var common = require('@google-cloud/common');
+const {promisify} = require('@google-cloud/promisify');
 var delay = require('delay');
 var events = require('events');
 var extend = require('extend');
@@ -138,7 +139,7 @@ Subscriber.prototype.acknowledge_ = function(ackIds, connId) {
       return self.writeTo_(connId, {ackIds: ackIdChunk});
     }
 
-    return common.util.promisify(self.request).call(self, {
+    return promisify(self.request).call(self, {
       client: 'SubscriberClient',
       method: 'acknowledge',
       reqOpts: {
@@ -396,7 +397,7 @@ Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) {
       });
     }
 
-    return common.util.promisify(self.request).call(self, {
+    return promisify(self.request).call(self, {
       client: 'SubscriberClient',
       method: 'modifyAckDeadline',
       reqOpts: {