chore: upgrade to the latest common (#159)

googleapis · Aug 7, 2018 · cccf274 · cccf274
1 parent 489bbec
commit cccf274
Show file tree

Hide file tree

Showing 10 changed files with 1,683 additions and 1,501 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,8 @@
     "pretest": "npm run compile"
   },
   "dependencies": {
-    "@google-cloud/common": "^0.20.3",
+    "@google-cloud/common": "^0.21.0",
+    "@google-cloud/paginator": "^0.1.0",
     "@google-cloud/promisify": "^0.3.0",
     "arrify": "^1.0.0",
     "big.js": "^5.1.2",

diff --git a/src/dataset.ts b/src/dataset.ts
@@ -16,7 +16,8 @@
 
 'use strict';
 
-import * as common from '@google-cloud/common';
+import {ServiceObject} from '@google-cloud/common';
+import {paginator} from '@google-cloud/paginator';
 import {promisifyAll} from '@google-cloud/promisify';
 import * as extend from 'extend';
 import * as is from 'is';
@@ -205,7 +206,7 @@ function Dataset(bigQuery, id, options) {
     setMetadata: true,
   };
 
-  common.ServiceObject.call(this, {
+  ServiceObject.call(this, {
     parent: bigQuery,
     baseUrl: '/datasets',
     id: id,
@@ -237,7 +238,7 @@ function Dataset(bigQuery, id, options) {
   });
 }
 
-util.inherits(Dataset, common.ServiceObject);
+util.inherits(Dataset, ServiceObject);
 
 /**
  * Run a query as a job. No results are immediately returned. Instead, your
@@ -548,7 +549,7 @@ Dataset.prototype.getTables = function(options, callback) {
  *     this.end();
  *   });
  */
-Dataset.prototype.getTablesStream = common.paginator.streamify('getTables');
+Dataset.prototype.getTablesStream = paginator.streamify('getTables');
 
 /**
  * Run a query scoped to your dataset.
@@ -611,7 +612,7 @@ Dataset.prototype.table = function(id, options) {
  *
  * These methods can be auto-paginated.
  */
-common.paginator.extend(Dataset, ['getTables']);
+paginator.extend(Dataset, ['getTables']);
 
 /*! Developer Documentation
  *

diff --git a/src/index.ts b/src/index.ts
@@ -20,6 +20,7 @@ import * as arrify from 'arrify';
 import * as Big from 'big.js';
 import * as common from '@google-cloud/common';
 import {promisifyAll} from '@google-cloud/promisify';
+import {paginator} from '@google-cloud/paginator';
 import * as extend from 'extend';
 var format = require('string-format-obj');
 import * as is from 'is';
@@ -850,7 +851,7 @@ BigQuery.prototype.createQueryJob = function(options, callback) {
  *     this.end();
  *   });
  */
-BigQuery.prototype.createQueryStream = common.paginator.streamify(
+BigQuery.prototype.createQueryStream = paginator.streamify(
   'queryAsStream_'
 );
 
@@ -1109,7 +1110,7 @@ BigQuery.prototype.getDatasets = function(options, callback) {
  *     this.end();
  *   });
  */
-BigQuery.prototype.getDatasetsStream = common.paginator.streamify(
+BigQuery.prototype.getDatasetsStream = paginator.streamify(
   'getDatasets'
 );
 
@@ -1245,7 +1246,7 @@ BigQuery.prototype.getJobs = function(options, callback) {
  *     this.end();
  *   });
  */
-BigQuery.prototype.getJobsStream = common.paginator.streamify('getJobs');
+BigQuery.prototype.getJobsStream = paginator.streamify('getJobs');
 
 /**
  * Create a reference to an existing job.
@@ -1393,7 +1394,7 @@ BigQuery.prototype.queryAsStream_ = function(query, callback) {
  *
  * These methods can be auto-paginated.
  */
-common.paginator.extend(BigQuery, ['getDatasets', 'getJobs']);
+paginator.extend(BigQuery, ['getDatasets', 'getJobs']);
 
 /*! Developer Documentation
  *

diff --git a/src/job.ts b/src/job.ts
@@ -22,6 +22,7 @@
 
 import * as common from '@google-cloud/common';
 import {promisifyAll} from '@google-cloud/promisify';
+import {paginator} from '@google-cloud/paginator';
 import * as extend from 'extend';
 import * as is from 'is';
 import * as util from 'util';
@@ -428,7 +429,7 @@ Job.prototype.getQueryResults = function(options, callback) {
  *   }))
  *   .pipe(fs.createWriteStream('./test/testdata/testfile.json'));
  */
-Job.prototype.getQueryResultsStream = common.paginator.streamify(
+Job.prototype.getQueryResultsStream = paginator.streamify(
   'getQueryResultsAsStream_'
 );
 
@@ -478,7 +479,7 @@ Job.prototype.poll_ = function(callback) {
  *
  * These methods can be auto-paginated.
  */
-common.paginator.extend(Job, ['getQueryResults']);
+paginator.extend(Job, ['getQueryResults']);
 
 /*! Developer Documentation
  *

diff --git a/src/table.ts b/src/table.ts
@@ -19,6 +19,7 @@
 import * as arrify from 'arrify';
 import * as Big from 'big.js';
 import * as common from '@google-cloud/common';
+import {paginator} from '@google-cloud/paginator';
 import {promisifyAll} from '@google-cloud/promisify';
 var duplexify = require('duplexify');
 import * as extend from 'extend';
@@ -1103,7 +1104,7 @@ Table.prototype.createQueryStream = function(query) {
  *     this.end();
  *   });
  */
-Table.prototype.createReadStream = common.paginator.streamify('getRows');
+Table.prototype.createReadStream = paginator.streamify('getRows');
 
 /**
  * Load data into your table from a readable stream of JSON, CSV, or
@@ -1817,7 +1818,7 @@ Table.prototype.setMetadata = function(metadata, callback) {
  *
  * These methods can be auto-paginated.
  */
-common.paginator.extend(Table, ['getRows']);
+paginator.extend(Table, ['getRows']);
 
 /*! Developer Documentation
  *

diff --git a/test/dataset.ts b/test/dataset.ts
@@ -38,18 +38,20 @@ var fakePfy = extend({}, pfy, {
 
 var extended = false;
 var fakePaginator = {
-  extend: function(Class, methods) {
-    if (Class.name !== 'Dataset') {
-      return;
-    }
-    methods = arrify(methods);
-    assert.strictEqual(Class.name, 'Dataset');
-    assert.deepStrictEqual(methods, ['getTables']);
-    extended = true;
-  },
-  streamify: function(methodName) {
-    return methodName;
-  },
+  paginator: {
+    extend: function(Class, methods) {
+      if (Class.name !== 'Dataset') {
+        return;
+      }
+      methods = arrify(methods);
+      assert.strictEqual(Class.name, 'Dataset');
+      assert.deepStrictEqual(methods, ['getTables']);
+      extended = true;
+    },
+    streamify: function(methodName) {
+      return methodName;
+    },
+  }
 };
 
 function FakeServiceObject() {
@@ -74,9 +76,9 @@ describe('BigQuery/Dataset', function() {
   before(function() {
     Dataset = proxyquire('../src/dataset', {
       '@google-cloud/common': {
-        paginator: fakePaginator,
         ServiceObject: FakeServiceObject,
       },
+      '@google-cloud/paginator': fakePaginator,
       '@google-cloud/promisify': fakePfy,
     });
     Table = require('../src/table');

diff --git a/test/index.ts b/test/index.ts
@@ -80,19 +80,21 @@ var mergeSchemaWithRowsOverride;
 
 var extended = false;
 var fakePaginator = {
-  extend: function(Class, methods) {
-    if (Class.name !== 'BigQuery') {
-      return;
-    }
-
-    methods = arrify(methods);
-    assert.strictEqual(Class.name, 'BigQuery');
-    assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
-    extended = true;
-  },
-  streamify: function(methodName) {
-    return methodName;
-  },
+  paginator: {
+    extend: function(Class, methods) {
+      if (Class.name !== 'BigQuery') {
+        return;
+      }
+
+      methods = arrify(methods);
+      assert.strictEqual(Class.name, 'BigQuery');
+      assert.deepStrictEqual(methods, ['getDatasets', 'getJobs']);
+      extended = true;
+    },
+    streamify: function(methodName) {
+      return methodName;
+    },
+  }
 };
 
 function FakeService() {
@@ -119,9 +121,9 @@ describe('BigQuery', function() {
       './table': FakeTable,
       '@google-cloud/common': {
         Service: FakeService,
-        paginator: fakePaginator,
         util: fakeUtil,
       },
+      '@google-cloud/paginator': fakePaginator,
       '@google-cloud/promisify': fakePfy,
     });
     BigQueryCached = extend({}, BigQuery);

diff --git a/test/job.ts b/test/job.ts
@@ -41,18 +41,20 @@ var fakePfy = extend({}, pfy, {
 
 var extended = false;
 var fakePaginator = {
-  extend: function(Class, methods) {
-    if (Class.name !== 'Job') {
-      return;
-    }
-
-    methods = arrify(methods);
-    assert.deepStrictEqual(methods, ['getQueryResults']);
-    extended = true;
-  },
-  streamify: function(methodName) {
-    return methodName;
-  },
+  paginator: {
+    extend: function(Class, methods) {
+      if (Class.name !== 'Job') {
+        return;
+      }
+
+      methods = arrify(methods);
+      assert.deepStrictEqual(methods, ['getQueryResults']);
+      extended = true;
+    },
+    streamify: function(methodName) {
+      return methodName;
+    },
+  }
 };
 
 describe('BigQuery/Job', function() {
@@ -69,9 +71,9 @@ describe('BigQuery/Job', function() {
   before(function() {
     Job = proxyquire('../src/job.js', {
       '@google-cloud/common': {
-        Operation: FakeOperation,
-        paginator: fakePaginator,
+        Operation: FakeOperation
       },
+      '@google-cloud/paginator': fakePaginator,
       '@google-cloud/promisify': fakePfy,
     });
   });

diff --git a/test/table.ts b/test/table.ts
@@ -50,19 +50,21 @@ var fakePfy = extend({}, pfy, {
 
 var extended = false;
 var fakePaginator = {
-  extend: function(Class, methods) {
-    if (Class.name !== 'Table') {
-      return;
-    }
+  paginator: {
+    extend: function(Class, methods) {
+      if (Class.name !== 'Table') {
+        return;
+      }
 
-    methods = arrify(methods);
-    assert.strictEqual(Class.name, 'Table');
-    assert.deepStrictEqual(methods, ['getRows']);
-    extended = true;
-  },
-  streamify: function(methodName) {
-    return methodName;
-  },
+      methods = arrify(methods);
+      assert.strictEqual(Class.name, 'Table');
+      assert.deepStrictEqual(methods, ['getRows']);
+      extended = true;
+    },
+    streamify: function(methodName) {
+      return methodName;
+    },
+  }
 };
 
 var fakeUuid = extend(true, {}, uuid);
@@ -119,9 +121,9 @@ describe('BigQuery/Table', function() {
       uuid: fakeUuid,
       '@google-cloud/common': {
         ServiceObject: FakeServiceObject,
-        paginator: fakePaginator,
         util: fakeUtil,
       },
+      '@google-cloud/paginator': fakePaginator,
       '@google-cloud/promisify': fakePfy,
     });