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

Modifying the es5 and es6 templates for javascript to handle default values (#6649)

Browse Source 
for required fields better. This change ensures the required field isn't
overridden with undefined when the object is constructed - especially through
a chain of constructFromObject calls..
This commit is contained in:
Troy P
2020-08-20 00:24:11 -07:00
committed by GitHub
parent 866df36c94
commit 71321bd049
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Javascript/es6/partial_model_generic.mustache vendored
View File

@@ -26,7 +26,7 @@ class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}e
* Only for internal use. * Only for internal use.
*/{{/emitJSDoc}} */{{/emitJSDoc}}
static initialize(obj{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}}) { {{#vars}}{{#required}} static initialize(obj{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}}) { {{#vars}}{{#required}}
obj['{{baseName}}'] = {{name}};{{/required}}{{/vars}} {{#defaultValue}}obj['{{baseName}}'] = {{name}} || {{{defaultValue}}};{{/defaultValue}}{{^defaultValue}}obj['{{baseName}}'] = {{name}};{{/defaultValue}}{{/required}}{{/vars}}
} }
{{#emitJSDoc}}/** {{#emitJSDoc}}/**

5
modules/openapi-generator/src/main/resources/Javascript/partial_model_generic.mustache vendored
View File

@@ -33,7 +33,12 @@
{{/useInheritance}} {{/useInheritance}}
{{#vars}} {{#vars}}
{{#required}} {{#required}}
{{#defaultValue}}
_this['{{baseName}}'] = {{name}} || {{{defaultValue}}};
{{/defaultValue}}
{{^defaultValue}}
_this['{{baseName}}'] = {{name}}; _this['{{baseName}}'] = {{name}};
{{/defaultValue}}
{{/required}} {{/required}}
{{/vars}} {{/vars}}
{{#parent}} {{#parent}}

2
samples/client/petstore/javascript-es6/src/model/Category.js
View File

@@ -35,7 +35,7 @@ class Category {
* Only for internal use. * Only for internal use.
*/ */
static initialize(obj, name) { static initialize(obj, name) {
obj['name'] = name; obj['name'] = name || 'default-name';
} }
/** /**

2
samples/client/petstore/javascript-promise-es6/src/model/Category.js
View File

@@ -35,7 +35,7 @@ class Category {
* Only for internal use. * Only for internal use.
*/ */
static initialize(obj, name) { static initialize(obj, name) {
obj['name'] = name; obj['name'] = name || 'default-name';
} }
/** /**