refactor: remove weird root binding (#1476)

googleapis · Dec 5, 2018 · 8244127 · 8244127
1 parent d59bc21
commit 8244127
Show file tree

Hide file tree

Showing 218 changed files with 9,672 additions and 23,135 deletions.
diff --git a/.kokoro/test.sh b/.kokoro/test.sh
@@ -22,5 +22,6 @@ cd $(dirname $0)/..
 
 npm install
 npm test
+./node_modules/nyc/bin/nyc.js report
 
 bash $KOKORO_GFILE_DIR/codecov.sh
diff --git a/.nycrc b/.nycrc
@@ -3,7 +3,8 @@
   "exclude": [
     "src/*{/*,/**/*}.js",
     "src/*/v*/*.js",
-    "test/**/*.js"
+    "test/**/*.js",
+    "build/test"
   ],
   "watermarks": {
     "branches": [

diff --git a/package.json b/package.json
@@ -32,7 +32,6 @@
     "compile": "tsc -p .",
     "build-tools": "tsc -p tsconfig.tools.json",
     "clean": "gts clean",
-    "codecov": "nyc report && codecov -f .coverage/*.json",
     "fix": "eslint --fix '**/*.js' && gts fix",
     "pregenerate": "npm run build-tools",
     "generate": "node build/src/generator/generate.js",

diff --git a/src/apis/abusiveexperiencereport/v1.ts b/src/apis/abusiveexperiencereport/v1.ts
@@ -16,7 +16,7 @@
 
 import {AxiosPromise} from 'axios';
 import {Compute, JWT, OAuth2Client, UserRefreshClient} from 'google-auth-library';
-import {BodyResponseCallback, createAPIRequest, GlobalOptions, GoogleConfigurable, MethodOptions} from 'googleapis-common';
+import {APIRequestContext, BodyResponseCallback, createAPIRequest, GlobalOptions, GoogleConfigurable, MethodOptions} from 'googleapis-common';
 
 // tslint:disable: no-any
 // tslint:disable: class-name
@@ -29,6 +29,8 @@ export namespace abusiveexperiencereport_v1 {
     version: 'v1';
   }
 
+  let context: APIRequestContext;
+
   interface StandardParameters {
     /**
      * V1 error format.
@@ -97,24 +99,14 @@ export namespace abusiveexperiencereport_v1 {
    * @param {object=} options Options for Abusiveexperiencereport
    */
   export class Abusiveexperiencereport {
-    _options: GlobalOptions;
-    google?: GoogleConfigurable;
-    root = this;
-
     sites: Resource$Sites;
     violatingSites: Resource$Violatingsites;
 
     constructor(options: GlobalOptions, google?: GoogleConfigurable) {
-      this._options = options || {};
-      this.google = google;
-      this.getRoot.bind(this);
+      context = {_options: options || {}, google};
 
-      this.sites = new Resource$Sites(this);
-      this.violatingSites = new Resource$Violatingsites(this);
-    }
-
-    getRoot() {
-      return this.root;
+      this.sites = new Resource$Sites();
+      this.violatingSites = new Resource$Violatingsites();
     }
   }
 
@@ -163,15 +155,7 @@ export namespace abusiveexperiencereport_v1 {
 
 
   export class Resource$Sites {
-    root: Abusiveexperiencereport;
-    constructor(root: Abusiveexperiencereport) {
-      this.root = root;
-      this.getRoot.bind(this);
-    }
-
-    getRoot() {
-      return this.root;
-    }
+    constructor() {}
 
 
     /**
@@ -226,7 +210,7 @@ export namespace abusiveexperiencereport_v1 {
         params,
         requiredParams: ['name'],
         pathParams: ['name'],
-        context: this.getRoot()
+        context
       };
       if (callback) {
         createAPIRequest<Schema$SiteSummaryResponse>(parameters, callback);
@@ -257,15 +241,7 @@ export namespace abusiveexperiencereport_v1 {
 
 
   export class Resource$Violatingsites {
-    root: Abusiveexperiencereport;
-    constructor(root: Abusiveexperiencereport) {
-      this.root = root;
-      this.getRoot.bind(this);
-    }
-
-    getRoot() {
-      return this.root;
-    }
+    constructor() {}
 
 
     /**
@@ -325,7 +301,7 @@ export namespace abusiveexperiencereport_v1 {
         params,
         requiredParams: [],
         pathParams: [],
-        context: this.getRoot()
+        context
       };
       if (callback) {
         createAPIRequest<Schema$ViolatingSitesResponse>(parameters, callback);

diff --git a/src/apis/acceleratedmobilepageurl/v1.ts b/src/apis/acceleratedmobilepageurl/v1.ts
@@ -16,7 +16,7 @@
 
 import {AxiosPromise} from 'axios';
 import {Compute, JWT, OAuth2Client, UserRefreshClient} from 'google-auth-library';
-import {BodyResponseCallback, createAPIRequest, GlobalOptions, GoogleConfigurable, MethodOptions} from 'googleapis-common';
+import {APIRequestContext, BodyResponseCallback, createAPIRequest, GlobalOptions, GoogleConfigurable, MethodOptions} from 'googleapis-common';
 
 // tslint:disable: no-any
 // tslint:disable: class-name
@@ -29,6 +29,8 @@ export namespace acceleratedmobilepageurl_v1 {
     version: 'v1';
   }
 
+  let context: APIRequestContext;
+
   interface StandardParameters {
     /**
      * V1 error format.
@@ -97,22 +99,12 @@ export namespace acceleratedmobilepageurl_v1 {
    * @param {object=} options Options for Acceleratedmobilepageurl
    */
   export class Acceleratedmobilepageurl {
-    _options: GlobalOptions;
-    google?: GoogleConfigurable;
-    root = this;
-
     ampUrls: Resource$Ampurls;
 
     constructor(options: GlobalOptions, google?: GoogleConfigurable) {
-      this._options = options || {};
-      this.google = google;
-      this.getRoot.bind(this);
-
-      this.ampUrls = new Resource$Ampurls(this);
-    }
+      context = {_options: options || {}, google};
 
-    getRoot() {
-      return this.root;
+      this.ampUrls = new Resource$Ampurls();
     }
   }
 
@@ -185,15 +177,7 @@ export namespace acceleratedmobilepageurl_v1 {
 
 
   export class Resource$Ampurls {
-    root: Acceleratedmobilepageurl;
-    constructor(root: Acceleratedmobilepageurl) {
-      this.root = root;
-      this.getRoot.bind(this);
-    }
-
-    getRoot() {
-      return this.root;
-    }
+    constructor() {}
 
 
     /**
@@ -256,7 +240,7 @@ export namespace acceleratedmobilepageurl_v1 {
         params,
         requiredParams: [],
         pathParams: [],
-        context: this.getRoot()
+        context
       };
       if (callback) {
         createAPIRequest<Schema$BatchGetAmpUrlsResponse>(parameters, callback);