From 1c329483e47f1aad0fdb4e55cb457fb4467c02d0 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Tue, 21 Mar 2017 23:48:35 +0800
Subject: [PATCH] [TypeScript] fix class filename in TS Angular2 template
 (#5131)

* fix class filename in ts angular2 template

* remove trailing comma in ts angular2 template
---
 .../src/main/resources/typescript-angular2/apis.mustache  | 8 ++++----
 .../petstore/typescript-angular2/default/api/api.ts       | 8 ++++----
 samples/client/petstore/typescript-angular2/npm/README.md | 4 ++--
 .../client/petstore/typescript-angular2/npm/api/api.ts    | 8 ++++----
 .../client/petstore/typescript-angular2/npm/package.json  | 2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
index 85522cf6c58..9d3e92349d0 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/apis.mustache
@@ -1,9 +1,9 @@
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
-export * from './{{ classname }}';
-import { {{ classname }} }  from './{{ classname }}';
+export * from './{{ classFilename }}';
+import { {{ classname }} } from './{{ classFilename }}';
 {{/operations}}
 {{/apis}}
-export const APIS = [ {{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}];
-{{/apiInfo}}
\ No newline at end of file
+export const APIS = [{{#apis}}{{#operations}}{{ classname }}{{/operations}}{{^-last}}, {{/-last}}{{/apis}}];
+{{/apiInfo}}
diff --git a/samples/client/petstore/typescript-angular2/default/api/api.ts b/samples/client/petstore/typescript-angular2/default/api/api.ts
index 0d1e9f047fd..4ddd9e29663 100644
--- a/samples/client/petstore/typescript-angular2/default/api/api.ts
+++ b/samples/client/petstore/typescript-angular2/default/api/api.ts
@@ -1,7 +1,7 @@
 export * from './PetApi';
-import { PetApi }  from './PetApi';
+import { PetApi } from './PetApi';
 export * from './StoreApi';
-import { StoreApi }  from './StoreApi';
+import { StoreApi } from './StoreApi';
 export * from './UserApi';
-import { UserApi }  from './UserApi';
-export const APIS = [ PetApi, StoreApi, UserApi, ];
+import { UserApi } from './UserApi';
+export const APIS = [PetApi, StoreApi, UserApi];
diff --git a/samples/client/petstore/typescript-angular2/npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md
index 67e7d791cab..9bfa85dc2ec 100644
--- a/samples/client/petstore/typescript-angular2/npm/README.md
+++ b/samples/client/petstore/typescript-angular2/npm/README.md
@@ -1,4 +1,4 @@
-## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703092202
+## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703211709
 
 ### Building
 
@@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's.
 _published:_
 
 ```
-npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703092202 --save
+npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703211709 --save
 ```
 
 _unPublished (not recommended):_
diff --git a/samples/client/petstore/typescript-angular2/npm/api/api.ts b/samples/client/petstore/typescript-angular2/npm/api/api.ts
index 0d1e9f047fd..4ddd9e29663 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/api.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/api.ts
@@ -1,7 +1,7 @@
 export * from './PetApi';
-import { PetApi }  from './PetApi';
+import { PetApi } from './PetApi';
 export * from './StoreApi';
-import { StoreApi }  from './StoreApi';
+import { StoreApi } from './StoreApi';
 export * from './UserApi';
-import { UserApi }  from './UserApi';
-export const APIS = [ PetApi, StoreApi, UserApi, ];
+import { UserApi } from './UserApi';
+export const APIS = [PetApi, StoreApi, UserApi];
diff --git a/samples/client/petstore/typescript-angular2/npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json
index 583105f7727..ae0d67dbafa 100644
--- a/samples/client/petstore/typescript-angular2/npm/package.json
+++ b/samples/client/petstore/typescript-angular2/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swagger/angular2-typescript-petstore",
-  "version": "0.0.1-SNAPSHOT.201703092202",
+  "version": "0.0.1-SNAPSHOT.201703211709",
   "description": "swagger client for @swagger/angular2-typescript-petstore",
   "author": "Swagger Codegen Contributors",
   "keywords": [