From 59931ef0f73019de87afbeac4d01de7b7eb38dce Mon Sep 17 00:00:00 2001 From: delenius Date: Fri, 12 Feb 2016 08:50:19 -0800 Subject: [PATCH] Correct exporting of enum classes Fixes #2102. --- .../resources/Javascript/enumClass.mustache | 21 +++----- .../main/resources/Javascript/model.mustache | 7 ++- .../javascript-promise/src/model/Category.js | 5 +- .../javascript-promise/src/model/Order.js | 50 ++++++++----------- .../javascript-promise/src/model/Pet.js | 50 ++++++++----------- .../javascript-promise/src/model/Tag.js | 5 +- .../javascript-promise/src/model/User.js | 5 +- .../petstore/javascript/src/model/Category.js | 5 +- .../petstore/javascript/src/model/Order.js | 50 ++++++++----------- .../petstore/javascript/src/model/Pet.js | 50 ++++++++----------- .../petstore/javascript/src/model/Tag.js | 5 +- .../petstore/javascript/src/model/User.js | 5 +- 12 files changed, 106 insertions(+), 152 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache b/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache index 341c55ca977..5acd5504bb5 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache @@ -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}}; diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache index 5592b328cbe..aaf5fc2015f 100644 --- a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache +++ b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache @@ -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}}; } diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js index 0e63bbd4297..858cb72fbee 100644 --- a/samples/client/petstore/javascript-promise/src/model/Category.js +++ b/samples/client/petstore/javascript-promise/src/model/Category.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var Category = function Category() { /** @@ -86,6 +83,8 @@ return JSON.stringify(this); } + + if (module) { module.Category = Category; } diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js index 4877a538513..f762915a93e 100644 --- a/samples/client/petstore/javascript-promise/src/model/Order.js +++ b/samples/client/petstore/javascript-promise/src/model/Order.js @@ -14,37 +14,8 @@ } }(this, function(module, ApiClient) { '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; } diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js index c892be4aaac..65690006acf 100644 --- a/samples/client/petstore/javascript-promise/src/model/Pet.js +++ b/samples/client/petstore/javascript-promise/src/model/Pet.js @@ -14,37 +14,8 @@ } }(this, function(module, ApiClient, Category, Tag) { '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; } diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js index f2451493103..d5f3265bd70 100644 --- a/samples/client/petstore/javascript-promise/src/model/Tag.js +++ b/samples/client/petstore/javascript-promise/src/model/Tag.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var Tag = function Tag() { /** @@ -86,6 +83,8 @@ return JSON.stringify(this); } + + if (module) { module.Tag = Tag; } diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js index 68dfc609d55..dff858cd57d 100644 --- a/samples/client/petstore/javascript-promise/src/model/User.js +++ b/samples/client/petstore/javascript-promise/src/model/User.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var User = function User() { /** @@ -227,6 +224,8 @@ return JSON.stringify(this); } + + if (module) { module.User = User; } diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js index 0e63bbd4297..858cb72fbee 100644 --- a/samples/client/petstore/javascript/src/model/Category.js +++ b/samples/client/petstore/javascript/src/model/Category.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var Category = function Category() { /** @@ -86,6 +83,8 @@ return JSON.stringify(this); } + + if (module) { module.Category = Category; } diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js index 4877a538513..f762915a93e 100644 --- a/samples/client/petstore/javascript/src/model/Order.js +++ b/samples/client/petstore/javascript/src/model/Order.js @@ -14,37 +14,8 @@ } }(this, function(module, ApiClient) { '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; } diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js index c892be4aaac..65690006acf 100644 --- a/samples/client/petstore/javascript/src/model/Pet.js +++ b/samples/client/petstore/javascript/src/model/Pet.js @@ -14,37 +14,8 @@ } }(this, function(module, ApiClient, Category, Tag) { '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; } diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js index f2451493103..d5f3265bd70 100644 --- a/samples/client/petstore/javascript/src/model/Tag.js +++ b/samples/client/petstore/javascript/src/model/Tag.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var Tag = function Tag() { /** @@ -86,6 +83,8 @@ return JSON.stringify(this); } + + if (module) { module.Tag = Tag; } diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js index 68dfc609d55..dff858cd57d 100644 --- a/samples/client/petstore/javascript/src/model/User.js +++ b/samples/client/petstore/javascript/src/model/User.js @@ -14,11 +14,8 @@ } }(this, function(module, ApiClient) { 'use strict'; - - - var User = function User() { /** @@ -227,6 +224,8 @@ return JSON.stringify(this); } + + if (module) { module.User = User; }