From 6fef7acf9f83058d4b42dcb0966b58d82c30f055 Mon Sep 17 00:00:00 2001
From: Kevin Murphy <kemurphy.cmu@gmail.com>
Date: Sun, 18 Jun 2017 09:28:12 -0700
Subject: [PATCH] [javascript] Fix usages of `exports` in generated ES6 code
 (#5835)

---
 .../resources/Javascript-es6/ApiClient.mustache    | 14 +++++++-------
 .../Javascript-es6/partial_model_generic.mustache  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
index 57dfc0d937f..17e9000179d 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
@@ -347,7 +347,7 @@ export default class ApiClient {
             data = response.text;
         }
 
-        return exports.convertToType(data, returnType);
+        return ApiClient.convertToType(data, returnType);
     }
 
     {{#emitJSDoc}}{{^usePromises}}/**
@@ -521,7 +521,7 @@ export default class ApiClient {
             case 'String':
                 return String(data);
             case 'Date':
-                return this.parseDate(String(data));
+                return ApiClient.parseDate(String(data));
             case 'Blob':
                 return data;
             default:
@@ -536,7 +536,7 @@ export default class ApiClient {
                     var itemType = type[0];
 
                     return data.map((item) => {
-                        return exports.convertToType(item, itemType);
+                        return ApiClient.convertToType(item, itemType);
                     });
                 } else if (typeof type === 'object') {
                     // for plain object type like: {'String': 'Integer'}
@@ -552,8 +552,8 @@ export default class ApiClient {
                     var result = {};
                     for (var k in data) {
                         if (data.hasOwnProperty(k)) {
-                            var key = exports.convertToType(k, keyType);
-                            var value = exports.convertToType(data[k], valueType);
+                            var key = ApiClient.convertToType(k, keyType);
+                            var value = ApiClient.convertToType(data[k], valueType);
                             result[key] = value;
                         }
                     }
@@ -575,12 +575,12 @@ export default class ApiClient {
         if (Array.isArray(data)) {
             for (var i = 0; i < data.length; i++) {
                 if (data.hasOwnProperty(i))
-                    obj[i] = exports.convertToType(data[i], itemType);
+                    obj[i] = ApiClient.convertToType(data[i], itemType);
             }
         } else {
             for (var k in data) {
                 if (data.hasOwnProperty(k))
-                    obj[k] = exports.convertToType(data[k], itemType);
+                    obj[k] = ApiClient.convertToType(data[k], itemType);
             }
         }
     };
diff --git a/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache b/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache
index 7fbfebecf13..5ba893a4542 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache
@@ -20,7 +20,7 @@ export default class {{classname}} {
     constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
         {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
         this = new Array();
-        Object.setPrototypeOf(this, exports);{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
+        Object.setPrototypeOf(this, {{classname}});{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
 
         {{#useInheritance}}
         {{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
@@ -41,7 +41,7 @@ export default class {{classname}} {
     */{{/emitJSDoc}}
     static constructFromObject(data, obj) {
         if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
-            obj = obj || new exports();
+            obj = obj || new {{classname}}();
 
             {{#parent}}{{^parentModel}}ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');{{/parentModel}}
             {{/parent}}