Skip to content

[TypeScript][Angular1,2] fix class filename in import/export #5396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Apr 17, 2017
Merged

[TypeScript][Angular1,2] fix class filename in import/export #5396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8701dcd
Fixed classFilename in typescript-angular and recreated samples
TiFu Apr 12, 2017
91910b4
Changed classname to classFilename in ts-angular2/models.mustache
TiFu Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}];
export const APIS = [{{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}];
{{/apiInfo}}
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#models}}
{{#model}}
export * from './{{{ classname }}}';
export * from './{{{ classFilename }}}';
{{/model}}
{{/models}}
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#models}}
{{#model}}
export * from './{{{ classname }}}';
export * from './{{{ classFilename }}}';
{{/model}}
{{/models}}
4 changes: 2 additions & 2 deletions samples/client/petstore-security-test/typescript-angular/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from './FakeApi';
import { FakeApi } from './FakeApi';
export const APIS = [ FakeApi, ];
import { FakeApi } from './FakeApi';
export const APIS = [FakeApi, ];
8 changes: 4 additions & 4 deletions samples/client/petstore/typescript-angular/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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, ];
Copy link
Copy Markdown
Contributor

@wing328 wing328 Apr 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TiFu FYI. I'll file a PR later to remove the trailing comma.

Copy link
Copy Markdown
Contributor

@wing328 wing328 May 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPDATE: fixed via #5563

4 changes: 2 additions & 2 deletions samples/client/petstore/typescript-angular2/npm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703211709
## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704132011

### Building

Expand All @@ -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.201703211709 --save
npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704132011 --save
```

_unPublished (not recommended):_
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular2/npm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swagger/angular2-typescript-petstore",
"version": "0.0.1-SNAPSHOT.201703211709",
"version": "0.0.1-SNAPSHOT.201704132011",
"description": "swagger client for @swagger/angular2-typescript-petstore",
"author": "Swagger Codegen Contributors",
"keywords": [
Expand Down