loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[javascript] Fix usages of exports in generated ES6 code (#5835)

Browse Source
This commit is contained in:
Kevin Murphy 2017-06-18 09:28:12 -07:00 committed by wing328
parent aa37b9747f
commit 6fef7acf9f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/swagger-codegen/src/main/resources/Javascript-es6/ApiClient.mustache
View File

@ -347,7 +347,7 @@ export default class ApiClient {
data = response.text; data = response.text;
} }
return exports.convertToType(data, returnType); return ApiClient.convertToType(data, returnType);
} }
{{#emitJSDoc}}{{^usePromises}}/** {{#emitJSDoc}}{{^usePromises}}/**
@ -521,7 +521,7 @@ export default class ApiClient {
case 'String': case 'String':
return String(data); return String(data);
case 'Date': case 'Date':
return this.parseDate(String(data)); return ApiClient.parseDate(String(data));
case 'Blob': case 'Blob':
return data; return data;
default: default:
@ -536,7 +536,7 @@ export default class ApiClient {
var itemType = type[0]; var itemType = type[0];
return data.map((item) => { return data.map((item) => {
return exports.convertToType(item, itemType); return ApiClient.convertToType(item, itemType);
}); });
} else if (typeof type === 'object') { } else if (typeof type === 'object') {
// for plain object type like: {'String': 'Integer'} // for plain object type like: {'String': 'Integer'}
@ -552,8 +552,8 @@ export default class ApiClient {
var result = {}; var result = {};
for (var k in data) { for (var k in data) {
if (data.hasOwnProperty(k)) { if (data.hasOwnProperty(k)) {
var key = exports.convertToType(k, keyType); var key = ApiClient.convertToType(k, keyType);
var value = exports.convertToType(data[k], valueType); var value = ApiClient.convertToType(data[k], valueType);
result[key] = value; result[key] = value;
} }
} }
@ -575,12 +575,12 @@ export default class ApiClient {
if (Array.isArray(data)) { if (Array.isArray(data)) {
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
if (data.hasOwnProperty(i)) if (data.hasOwnProperty(i))
obj[i] = exports.convertToType(data[i], itemType); obj[i] = ApiClient.convertToType(data[i], itemType);
} }
} else { } else {
for (var k in data) { for (var k in data) {
if (data.hasOwnProperty(k)) if (data.hasOwnProperty(k))
obj[k] = exports.convertToType(data[k], itemType); obj[k] = ApiClient.convertToType(data[k], itemType);
} }
} }
}; };

4
modules/swagger-codegen/src/main/resources/Javascript-es6/partial_model_generic.mustache
View File

@ -20,7 +20,7 @@ export default class {{classname}} {
constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) { constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) {
{{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-isArray}}
this = new Array(); this = new Array();
Object.setPrototypeOf(this, exports);{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}} Object.setPrototypeOf(this, {{classname}});{{/vendorExtensions.x-isArray}}{{/parentModel}}{{/parent}}
{{#useInheritance}} {{#useInheritance}}
{{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}} {{#parentModel}}{{classname}}.call(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/parentModel}}
@ -41,7 +41,7 @@ export default class {{classname}} {
*/{{/emitJSDoc}} */{{/emitJSDoc}}
static constructFromObject(data, obj) { static constructFromObject(data, obj) {
if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} { 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}}{{^parentModel}}ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');{{/parentModel}}
{{/parent}} {{/parent}}