refactor: remove dependency on extend (#163)

packages/google-cloud-dns/.eslintignore

@@ -1,4 +1,3 @@
-node_modules/*
-samples/node_modules/*
-src/**/doc/*
+**/node_modules
 build/
+docs/

packages/google-cloud-dns/package.json

@@ -39,7 +39,7 @@
     "system-test": "mocha build/system-test --timeout 600000",
     "clean": "gts clean",
     "compile": "tsc -p .",
-    "fix": "eslint --fix 'samples/**/*.js' && gts fix",
+    "fix": "eslint --fix '**/*.js' && gts fix",
     "prepare": "npm run compile",
     "pretest": "npm run compile"
   },
@@ -49,15 +49,13 @@
     "@google-cloud/promisify": "^0.3.0",
     "arrify": "^1.0.1",
     "dns-zonefile": "0.2.2",
-    "extend": "^3.0.0",
     "lodash.groupby": "^4.6.0",
     "string-format-obj": "^1.1.1",
     "teeny-request": "^3.6.0"
   },
   "devDependencies": {
     "@google-cloud/nodejs-repo-tools": "^2.3.0",
     "@types/arrify": "^1.0.4",
-    "@types/extend": "^3.0.0",
     "@types/lodash.groupby": "^4.6.4",
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.9.4",

packages/google-cloud-dns/src/index.ts

@@ -18,7 +18,6 @@ import {GoogleAuthOptions, Service} from '@google-cloud/common';
 import {paginator} from '@google-cloud/paginator';
 import {promisifyAll} from '@google-cloud/promisify';
 import * as arrify from 'arrify';
-import * as extend from 'extend';
 import * as r from 'request';
 import {Stream} from 'stream';
 import {teenyRequest} from 'teeny-request';
@@ -323,7 +322,7 @@ class DNS extends Service {
           });
           let nextQuery: GetZonesRequest|null = null;
           if (resp.nextPageToken) {
-            nextQuery = extend({}, query, {
+            nextQuery = Object.assign({}, query, {
               pageToken: resp.nextPageToken,
             });
           }

packages/google-cloud-dns/src/record.ts

@@ -16,8 +16,6 @@
 
 import {promisifyAll} from '@google-cloud/promisify';
 import * as arrify from 'arrify';
-import * as extend from 'extend';
-
 import {Change, CreateChangeCallback} from './change';
 import {Zone} from './zone';
 
@@ -103,7 +101,7 @@ export class Record implements RecordObject {
      * @property {number} metadata.ttl
      */
     this.metadata = metadata;
-    extend(this, this.toJSON());
+    Object.assign(this, this.toJSON());
     if (this.rrdatas) {
       /**
        * @name Record#data
@@ -162,7 +160,7 @@ export class Record implements RecordObject {
    * @returns {object}
    */
   toJSON() {
-    const recordObject: RecordObject = extend({}, this.metadata, {
+    const recordObject: RecordObject = Object.assign({}, this.metadata, {
       type: this.type.toUpperCase(),
     });
     if (recordObject.data) {

packages/google-cloud-dns/src/zone.ts

@@ -18,7 +18,6 @@ import {DeleteCallback, ServiceObject} from '@google-cloud/common';
 import {paginator} from '@google-cloud/paginator';
 import {promisifyAll} from '@google-cloud/promisify';
 import * as arrify from 'arrify';
-import * as extend from 'extend';
 import * as fs from 'fs';
 
 import groupBy = require('lodash.groupby');
@@ -433,7 +432,7 @@ class Zone extends ServiceObject {
         // tslint:disable-next-line:forin
         for (const recordName in recordsByName) {
           const records = recordsByName[recordName];
-          const templateRecord = extend({}, records[0]);
+          const templateRecord = Object.assign({}, records[0]);
           if (records.length > 1) {
             // Combine the `rrdatas` values from all records of the same type.
             templateRecord.rrdatas =
@@ -445,7 +444,7 @@ class Zone extends ServiceObject {
       }
       return recordsOut;
     };
-    const body = extend(
+    const body = Object.assign(
         {
           additions: groupByType(arrify(config.add).map(x => x.toJSON())),
           deletions: groupByType(arrify(config.delete).map(x => x.toJSON())),
@@ -774,7 +773,7 @@ class Zone extends ServiceObject {
           });
           let nextQuery = null;
           if (resp.nextPageToken) {
-            nextQuery = extend({}, query, {
+            nextQuery = Object.assign({}, query, {
               pageToken: resp.nextPageToken,
             });
           }
@@ -899,7 +898,7 @@ class Zone extends ServiceObject {
         filterByTypes_,
       };
     }
-    const requestQuery = extend({}, query) as GetRecordsRequest;
+    const requestQuery = Object.assign({}, query) as GetRecordsRequest;
     delete requestQuery.filterByTypes_;
     this.request(
         {
@@ -921,7 +920,7 @@ class Zone extends ServiceObject {
           }
           let nextQuery: {}|null = null;
           if (resp.nextPageToken) {
-            nextQuery = extend({}, query, {
+            nextQuery = Object.assign({}, query, {
               pageToken: resp.nextPageToken,
             });
           }

packages/google-cloud-dns/system-test/.eslintrc.yml

@@ -2,5 +2,4 @@
 env:
   mocha: true
 rules:
-  node/no-unpublished-require: off
   no-console: off

packages/google-cloud-dns/test/.eslintrc.yml

@@ -1,5 +1,3 @@
 ---
 env:
   mocha: true
-rules:
-  node/no-unpublished-require: off

packages/google-cloud-dns/test/change.ts

@@ -17,14 +17,13 @@
 import {ServiceObject, ServiceObjectConfig} from '@google-cloud/common';
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
-import * as extend from 'extend';
 import * as proxyquire from 'proxyquire';
 import {Response} from 'request';
 
 import {Change} from '../src/change';
 
 let promisified = false;
-const fakePromisify = extend({}, promisify, {
+const fakePromisify = Object.assign({}, promisify, {
   promisifyAll(esClass: Function) {
     if (esClass.name === 'Change') {
       promisified = true;

packages/google-cloud-dns/test/index.ts

@@ -18,7 +18,6 @@ import {Service, ServiceConfig, ServiceOptions, util} from '@google-cloud/common
 import * as promisify from '@google-cloud/promisify';
 import * as arrify from 'arrify';
 import * as assert from 'assert';
-import * as extend from 'extend';
 import * as proxyquire from 'proxyquire';
 import {CoreOptions, OptionsWithUri, Response} from 'request';
 
@@ -50,13 +49,13 @@ class FakeService extends Service {
   }
 }
 
-const fakeUtil = extend({}, util, {
+const fakeUtil = Object.assign({}, util, {
   makeAuthenticatedRequestFactory() {},
 });
-const originalFakeUtil = extend(true, {}, fakeUtil);
+const originalFakeUtil = Object.assign({}, fakeUtil);
 
 let promisified = false;
-const fakePromisify = extend({}, promisify, {
+const fakePromisify = Object.assign({}, promisify, {
   // tslint:disable-next-line:variable-name
   promisifyAll(esClass: Function, options: promisify.PromisifyAllOptions) {
     if (esClass.name !== 'DNS') {
@@ -96,7 +95,7 @@ describe('DNS', () => {
   });
 
   beforeEach(() => {
-    extend(fakeUtil, originalFakeUtil);
+    Object.assign(fakeUtil, originalFakeUtil);
     dns = new DNS({
       projectId: PROJECT_ID,
     });
@@ -152,7 +151,7 @@ describe('DNS', () => {
     });
 
     it('should use a provided description', done => {
-      const cfg = extend({}, config, {description: 'description'});
+      const cfg = Object.assign({}, config, {description: 'description'});
 
       dns.request = (reqOpts: CoreOptions) => {
         assert.strictEqual(reqOpts.json.description, cfg.description);
@@ -175,7 +174,7 @@ describe('DNS', () => {
       dns.request = (reqOpts: OptionsWithUri) => {
         assert.strictEqual(reqOpts.method, 'POST');
         assert.strictEqual(reqOpts.uri, '/managedZones');
-        const expectedBody = extend({}, config, {
+        const expectedBody = Object.assign({}, config, {
           name: zoneName,
           description: '',
         });
@@ -327,12 +326,12 @@ describe('DNS', () => {
       });
 
       it('should set a nextQuery if necessary', done => {
-        const apiResponseWithNextPageToken = extend({}, apiResponse, {
+        const apiResponseWithNextPageToken = Object.assign({}, apiResponse, {
           nextPageToken: 'next-page-token',
         });
 
         const query = {a: 'b', c: 'd'};
-        const originalQuery = extend({}, query);
+        const originalQuery = Object.assign({}, query);
 
         dns.request = (reqOpts: {}, callback: Function) => {
           callback(null, apiResponseWithNextPageToken);
@@ -344,10 +343,9 @@ describe('DNS', () => {
           // Check the original query wasn't modified.
           assert.deepStrictEqual(query, originalQuery);
 
-          assert.deepStrictEqual(
-              nextQuery, extend({}, query, {
-                pageToken: apiResponseWithNextPageToken.nextPageToken,
-              }));
+          assert.deepStrictEqual(nextQuery, Object.assign({}, query, {
+            pageToken: apiResponseWithNextPageToken.nextPageToken,
+          }));
 
           done();
         });

packages/google-cloud-dns/test/record.ts

@@ -16,13 +16,12 @@
 
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
-import * as extend from 'extend';
 import * as proxyquire from 'proxyquire';
 
 import {Record} from '../src';
 
 let promisified = false;
-const fakePromisify = extend({}, promisify, {
+const fakePromisify = Object.assign({}, promisify, {
   promisifyAll(esClass: Function, options: promisify.PromisifyAllOptions) {
     if (esClass.name !== 'Record') {
       return;
@@ -304,7 +303,7 @@ describe('Record', () => {
 
   describe('toJSON', () => {
     it('should format the data for the API', () => {
-      const expectedRecord = extend({}, METADATA, {
+      const expectedRecord = Object.assign({}, METADATA, {
         type: 'A',
         rrdatas: METADATA.data,
       });
@@ -316,7 +315,7 @@ describe('Record', () => {
 
   describe('toString', () => {
     it('should format the data for a zonefile', () => {
-      const jsonRecord = extend({}, METADATA, {
+      const jsonRecord = Object.assign({}, METADATA, {
         type: TYPE,
         rrdatas: ['example.com.', 'example2.com.'],
       });

packages/google-cloud-dns/test/zone.ts

@@ -18,7 +18,6 @@ import {ServiceObject, ServiceObjectConfig} from '@google-cloud/common';
 import * as promisify from '@google-cloud/promisify';
 import * as arrify from 'arrify';
 import * as assert from 'assert';
-import * as extend from 'extend';
 import * as proxyquire from 'proxyquire';
 import {CoreOptions, OptionsWithUri, Response} from 'request';
 import * as uuid from 'uuid';
@@ -27,7 +26,7 @@ import {Change, CreateChangeRequest} from '../src/change';
 import {Record, RecordObject} from '../src/record';
 
 let promisified = false;
-const fakePromisify = extend({}, promisify, {
+const fakePromisify = Object.assign({}, promisify, {
   promisifyAll(esClass: Function, options: promisify.PromisifyAllOptions) {
     if (esClass.name !== 'Zone') {
       return;
@@ -153,7 +152,7 @@ describe('Zone', () => {
     });
 
     it('should inherit from ServiceObject', done => {
-      const dnsInstance = extend({}, DNS, {
+      const dnsInstance = Object.assign({}, DNS, {
         createZone: {
           bind(context: {}) {
             assert.strictEqual(context, dnsInstance);
@@ -205,7 +204,7 @@ describe('Zone', () => {
 
   describe('createChange', () => {
     function generateRecord(recordJson?: {}) {
-      recordJson = extend(
+      recordJson = Object.assign(
           {
             name: uuid.v1(),
             type: uuid.v1(),
@@ -645,7 +644,7 @@ describe('Zone', () => {
 
       it('should build a nextQuery if necessary', done => {
         const nextPageToken = 'next-page-token';
-        const apiResponseWithNextPageToken = extend({}, apiResponse, {
+        const apiResponseWithNextPageToken = Object.assign({}, apiResponse, {
           nextPageToken,
         });
         const expectedNextQuery = {
@@ -728,7 +727,7 @@ describe('Zone', () => {
 
       it('should execute callback with nextQuery if necessary', done => {
         const nextPageToken = 'next-page-token';
-        const apiResponseWithNextPageToken = extend({}, apiResponse, {
+        const apiResponseWithNextPageToken = Object.assign({}, apiResponse, {
           nextPageToken,
         });
         const expectedNextQuery = {pageToken: nextPageToken};