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

Merge pull request #2126 from delenius/enum-exports

Browse Source 
Correct exporting of enum classes
This commit is contained in:
wing328 2016-02-16 10:24:41 +08:00
commit 6ecf018f69
12 changed files with 106 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache
View File

@ -1,17 +1,10 @@
//export module
if ( typeof define === "function" && define.amd ) {
define('{{datatypeWithEnum}}', [], function() {
return {{datatypeWithEnum}};
});
}
var {{datatypeWithEnum}} = {
{{#allowableValues}}{{#enumVars}}
/**
* @const
*/
{{name}}: "{{value}}"{{^-last}},
{{/-last}}{{/enumVars}}{{/allowableValues}}
/**
* @const
*/
{{name}}: "{{value}}"{{^-last}},
{{/-last}}{{/enumVars}}{{/allowableValues}}
};
}
{{classname}}.{{datatypeWithEnum}} = {{datatypeWithEnum}};

7
modules/swagger-codegen/src/main/resources/Javascript/model.mustache
View File

@ -14,11 +14,7 @@
}
}(this, function(module, ApiClient{{#imports}}, {{import}}{{/imports}}) {
'use strict';
{{#models}}{{#model}}
{{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
{{>enumClass}}{{/items}}*/{{/items.isEnum}}{{/vars}}
{{#description}}/**
* {{description}}
**/{{/description}}
@ -74,6 +70,9 @@
return JSON.stringify(this);
}
{{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
{{>enumClass}}{{/items}}*/{{/items.isEnum}}{{/vars}}
if (module) {
module.{{classname}} = {{classname}};
}

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

@ -16,9 +16,6 @@
'use strict';
var Category = function Category() {
/**
@ -86,6 +83,8 @@
return JSON.stringify(this);
}
if (module) {
module.Category = Category;
}

50
samples/client/petstore/javascript-promise/src/model/Order.js
View File

@ -16,35 +16,6 @@
'use strict';
//export module
if ( typeof define === "function" && define.amd ) {
define('StatusEnum', [], function() {
return StatusEnum;
});
}
var StatusEnum = {
/**
* @const
*/
PLACED: "placed",
/**
* @const
*/
APPROVED: "approved",
/**
* @const
*/
DELIVERED: "delivered"
}
var Order = function Order() {
/**
@ -207,6 +178,27 @@ var StatusEnum = {
return JSON.stringify(this);
}
var StatusEnum = {
/**
* @const
*/
PLACED: "placed",
/**
* @const
*/
APPROVED: "approved",
/**
* @const
*/
DELIVERED: "delivered"
};
Order.StatusEnum = StatusEnum;
if (module) {
module.Order = Order;
}

50
samples/client/petstore/javascript-promise/src/model/Pet.js
View File

@ -16,35 +16,6 @@
'use strict';
//export module
if ( typeof define === "function" && define.amd ) {
define('StatusEnum', [], function() {
return StatusEnum;
});
}
var StatusEnum = {
/**
* @const
*/
AVAILABLE: "available",
/**
* @const
*/
PENDING: "pending",
/**
* @const
*/
SOLD: "sold"
}
var Pet = function Pet(photoUrls, name) {
/**
@ -209,6 +180,27 @@ var StatusEnum = {
return JSON.stringify(this);
}
var StatusEnum = {
/**
* @const
*/
AVAILABLE: "available",
/**
* @const
*/
PENDING: "pending",
/**
* @const
*/
SOLD: "sold"
};
Pet.StatusEnum = StatusEnum;
if (module) {
module.Pet = Pet;
}

5
samples/client/petstore/javascript-promise/src/model/Tag.js
View File

@ -16,9 +16,6 @@
'use strict';
var Tag = function Tag() {
/**
@ -86,6 +83,8 @@
return JSON.stringify(this);
}
if (module) {
module.Tag = Tag;
}

5
samples/client/petstore/javascript-promise/src/model/User.js
View File

@ -16,9 +16,6 @@
'use strict';
var User = function User() {
/**
@ -227,6 +224,8 @@
return JSON.stringify(this);
}
if (module) {
module.User = User;
}

5
samples/client/petstore/javascript/src/model/Category.js
View File

@ -16,9 +16,6 @@
'use strict';
var Category = function Category() {
/**
@ -86,6 +83,8 @@
return JSON.stringify(this);
}
if (module) {
module.Category = Category;
}

50
samples/client/petstore/javascript/src/model/Order.js
View File

@ -16,35 +16,6 @@
'use strict';
//export module
if ( typeof define === "function" && define.amd ) {
define('StatusEnum', [], function() {
return StatusEnum;
});
}
var StatusEnum = {
/**
* @const
*/
PLACED: "placed",
/**
* @const
*/
APPROVED: "approved",
/**
* @const
*/
DELIVERED: "delivered"
}
var Order = function Order() {
/**
@ -207,6 +178,27 @@ var StatusEnum = {
return JSON.stringify(this);
}
var StatusEnum = {
/**
* @const
*/
PLACED: "placed",
/**
* @const
*/
APPROVED: "approved",
/**
* @const
*/
DELIVERED: "delivered"
};
Order.StatusEnum = StatusEnum;
if (module) {
module.Order = Order;
}

50
samples/client/petstore/javascript/src/model/Pet.js
View File

@ -16,35 +16,6 @@
'use strict';
//export module
if ( typeof define === "function" && define.amd ) {
define('StatusEnum', [], function() {
return StatusEnum;
});
}
var StatusEnum = {
/**
* @const
*/
AVAILABLE: "available",
/**
* @const
*/
PENDING: "pending",
/**
* @const
*/
SOLD: "sold"
}
var Pet = function Pet(photoUrls, name) {
/**
@ -209,6 +180,27 @@ var StatusEnum = {
return JSON.stringify(this);
}
var StatusEnum = {
/**
* @const
*/
AVAILABLE: "available",
/**
* @const
*/
PENDING: "pending",
/**
* @const
*/
SOLD: "sold"
};
Pet.StatusEnum = StatusEnum;
if (module) {
module.Pet = Pet;
}

5
samples/client/petstore/javascript/src/model/Tag.js
View File

@ -16,9 +16,6 @@
'use strict';
var Tag = function Tag() {
/**
@ -86,6 +83,8 @@
return JSON.stringify(this);
}
if (module) {
module.Tag = Tag;
}

5
samples/client/petstore/javascript/src/model/User.js
View File

@ -16,9 +16,6 @@
'use strict';
var User = function User() {
/**
@ -227,6 +224,8 @@
return JSON.stringify(this);
}
if (module) {
module.User = User;
}