Fix googleapis#1594 move context from namespace to class scope

ajaaym · Feb 19, 2019 · 2233076 · 2233076
1 parent 4c56cb2
commit 2233076
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/generator/templates/api-endpoint.njk b/src/generator/templates/api-endpoint.njk
@@ -40,7 +40,6 @@ export interface Options extends GlobalOptions {
   version: '{{api.version|replace('\.', '_')}}';
 }
 
-let context: APIRequestContext;
 
 interface StandardParameters {
   {% for pname, p in api.parameters|dictsort %}
@@ -67,22 +66,22 @@ interface StandardParameters {
  * @param {object=} options Options for {{ Name }}
  */
 export class {{ Name }} {
-
+  context: APIRequestContext;
   {% if api.resources %}
     {% for rname, r in api.resources|dictsort %}
       {{ rname }}: Resource${{ rname|capitalize }};
     {% endfor %}
   {% endif %}
 
   constructor(options: GlobalOptions, google?: GoogleConfigurable) {
-    context = {
+    this.context = {
       _options: options || {},
       google
     };
 
     {% if api.resources %}
       {% for rname, r in api.resources|dictsort %}
-        this.{{ rname }} = new Resource${{ rname|capitalize }}();
+        this.{{ rname }} = new Resource${{ rname|capitalize }}(this.context);
       {% endfor %}
     {% endif %}
   }

diff --git a/src/generator/templates/method-partial.njk b/src/generator/templates/method-partial.njk
@@ -68,7 +68,7 @@
     {% if m.mediaUpload.protocols.simple.path %}mediaUrl: (rootUrl + {{ ('/' + m.mediaUpload.protocols.simple.path)|buildurl|safe }}).replace(/([^:]\/)\/+/g, '$1'),{% endif %}
     requiredParams: [{% if m.parameterOrder.length %}'{{ m.parameterOrder|join("', '")|safe }}'{% endif %}],
     pathParams: [{% if pathParams.length %}'{{ pathParams|join("', '")|safe }}'{% endif %}],
-    context
+    context: this.context
   };
   {% set responseType = "Schema$" + m.response.$ref|default() %}
   if (callback) {

diff --git a/src/generator/templates/resource-partial.njk b/src/generator/templates/resource-partial.njk
@@ -4,17 +4,19 @@
   {% for rname, r in api.resources|dictsort %}
     {% set ClassName = classPath + rname|capitalize|camelify %}
     export class {{ ClassName }} {
+      context: APIRequestContext;
       {% if r.resources %}
         {% for rname, r2 in r.resources|dictsort %}
           {% set innerClassName = ClassName + "$" + rname|capitalize|camelify %}
           {{ rname|camelify }}: {{ innerClassName }};
         {% endfor %}
       {% endif %}
-      constructor() {
+      constructor(context: APIRequestContext) {
+        this.context = context;
         {% if r.resources %}
           {% for rname, r2 in r.resources|dictsort %}
             {% set innerClassName = ClassName + "$" + rname|capitalize|camelify %}
-            this.{{ rname|camelify }} = new {{ innerClassName }}();
+            this.{{ rname|camelify }} = new {{ innerClassName }}(this.context);
           {% endfor %}
         {% endif %}
       }