From f1710a184013ee44166e212064dbf5ed7b546cd4 Mon Sep 17 00:00:00 2001 From: tkb16 Date: Thu, 14 Jan 2016 12:51:02 +0100 Subject: [PATCH 1/3] skip trailing comma for enums --- .../src/main/resources/TypeScript-Angular/model.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache index f4cfe923baa..c533c6739af 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache @@ -28,7 +28,7 @@ namespace {{package}} { {{#isEnum}} export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} - {{.}} = '{{.}}',{{/values}}{{/allowableValues}} + {{.}} = '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}} } {{/isEnum}} {{/vars}} From 198310d5f21591828d47c734cb6a4a8012a1b9f3 Mon Sep 17 00:00:00 2001 From: Marc Brugger Date: Thu, 14 Jan 2016 14:06:00 +0100 Subject: [PATCH 2/3] skip trailing comma for enums --- .../src/main/resources/TypeScript-node/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache index 62f6760a6ec..a80aa388d2b 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache @@ -31,7 +31,7 @@ export namespace {{classname}} { {{#vars}} {{#isEnum}} export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}} - {{.}} = '{{.}}',{{/values}}{{/allowableValues}} + {{.}} = '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}} } {{/isEnum}} {{/vars}} From 341c840bf9b5f098098c5f99e8a29b2c916d7836 Mon Sep 17 00:00:00 2001 From: bakito Date: Thu, 14 Jan 2016 14:51:06 +0100 Subject: [PATCH 3/3] regenerate petshop code --- .../client/petstore/typescript-angular/API/Client/Order.ts | 2 +- samples/client/petstore/typescript-angular/API/Client/Pet.ts | 2 +- samples/client/petstore/typescript-node/api.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts index 1dd84e6d0ad..c01c6482810 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Order.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts @@ -26,7 +26,7 @@ namespace API.Client { export enum StatusEnum { placed = 'placed', approved = 'approved', - delivered = 'delivered', + delivered = 'delivered' } } } diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts index 60431f69c83..d0702f8d0ec 100644 --- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts +++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts @@ -26,7 +26,7 @@ namespace API.Client { export enum StatusEnum { available = 'available', pending = 'pending', - sold = 'sold', + sold = 'sold' } } } diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts index 3ae51281c65..8982c807b45 100644 --- a/samples/client/petstore/typescript-node/api.ts +++ b/samples/client/petstore/typescript-node/api.ts @@ -43,7 +43,7 @@ export namespace Pet { export enum StatusEnum { available = 'available', pending = 'pending', - sold = 'sold', + sold = 'sold' } } export class Tag { @@ -67,7 +67,7 @@ export namespace Order { export enum StatusEnum { placed = 'placed', approved = 'approved', - delivered = 'delivered', + delivered = 'delivered' } }