Skip to content

Commit

Permalink
Misc typescript Angular code generation improvements (#7898)
Browse files Browse the repository at this point in the history 
use const instead of let when possible
add missing semi-colon
replace " with '
  • Loading branch information
@benbenw @wing328
benbenw authored and wing328 committed Apr 6, 2018
1 parent 40d5d09 commit bdd2c2a
Show file tree
Hide file tree
Showing 35 changed files with 428 additions and 428 deletions.
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class ApiModule {
return {
ngModule: ApiModule,
providers: [ { provide: Configuration, useFactory: configurationFactory } ]
}
};
}

constructor( @Optional() @SkipSelf() parentModule: ApiModule,
Expand Down
16 changes: 8 additions & 8 deletions modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class {{classname}} {
*/
private canConsumeForm(consumes: string[]): boolean {
const form = 'multipart/form-data';
for (let consume of consumes) {
for (const consume of consumes) {
if (form === consume) {
return true;
}
Expand Down Expand Up @@ -199,7 +199,7 @@ export class {{classname}} {
{{/isBasic}}
{{#isOAuth}}
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
{{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -213,30 +213,30 @@ export class {{classname}} {
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
{{/produces}}
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
{{^useHttpClient}}
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
{{/useHttpClient}}
{{#useHttpClient}}
headers = headers.set("Accept", httpHeaderAcceptSelected);
headers = headers.set('Accept', httpHeaderAcceptSelected);
{{/useHttpClient}}
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
{{#consumes}}
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
{{/consumes}}
];
{{#bodyParam}}
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
if (httpContentTypeSelected != undefined) {
{{^useHttpClient}}
headers.set('Content-Type', httpContentTypeSelected);
{{/useHttpClient}}
{{#useHttpClient}}
headers = headers.set("Content-Type", httpContentTypeSelected);
headers = headers.set('Content-Type', httpContentTypeSelected);
{{/useHttpClient}}
}
{{/bodyParam}}
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular/modelEnum.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export const {{classname}} = {
{{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
};
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-angular/modelGenericEnums.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export namespace {{classname}} {
{{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
};
{{/isEnum}}
{{/vars}}
}{{/hasEnums}}
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/default/api.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class ApiModule {
return {
ngModule: ApiModule,
providers: [ { provide: Configuration, useFactory: configurationFactory } ]
}
};
}

constructor( @Optional() @SkipSelf() parentModule: ApiModule,
Expand Down
68 changes: 34 additions & 34 deletions samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class PetService {
*/
private canConsumeForm(consumes: string[]): boolean {
const form = 'multipart/form-data';
for (let consume of consumes) {
for (const consume of consumes) {
if (form === consume) {
return true;
}
Expand Down Expand Up @@ -207,7 +207,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -218,17 +218,17 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
'application/json',
'application/xml'
];
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
if (httpContentTypeSelected != undefined) {
headers.set('Content-Type', httpContentTypeSelected);
}
Expand Down Expand Up @@ -266,7 +266,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -277,13 +277,13 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -319,7 +319,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -330,13 +330,13 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -373,7 +373,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -384,13 +384,13 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -430,13 +430,13 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -467,7 +467,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -478,17 +478,17 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
'application/json',
'application/xml'
];
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
if (httpContentTypeSelected != undefined) {
headers.set('Content-Type', httpContentTypeSelected);
}
Expand Down Expand Up @@ -524,7 +524,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -535,13 +535,13 @@ export class PetService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
'application/x-www-form-urlencoded'
];

Expand Down Expand Up @@ -598,7 +598,7 @@ export class PetService {

// authentication (petstore_auth) required
if (this.configuration.accessToken) {
let accessToken = typeof this.configuration.accessToken === 'function'
const accessToken = typeof this.configuration.accessToken === 'function'
? this.configuration.accessToken()
: this.configuration.accessToken;
headers.set('Authorization', 'Bearer ' + accessToken);
Expand All @@ -608,13 +608,13 @@ export class PetService {
let httpHeaderAccepts: string[] = [
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
'multipart/form-data'
];

Expand Down
28 changes: 14 additions & 14 deletions samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class StoreService {
*/
private canConsumeForm(consumes: string[]): boolean {
const form = 'multipart/form-data';
for (let consume of consumes) {
for (const consume of consumes) {
if (form === consume) {
return true;
}
Expand Down Expand Up @@ -139,13 +139,13 @@ export class StoreService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -179,13 +179,13 @@ export class StoreService {
let httpHeaderAccepts: string[] = [
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -219,13 +219,13 @@ export class StoreService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];

let requestOptions: RequestOptionsArgs = new RequestOptions({
Expand Down Expand Up @@ -259,15 +259,15 @@ export class StoreService {
'application/xml',
'application/json'
];
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
if (httpHeaderAcceptSelected != undefined) {
headers.set("Accept", httpHeaderAcceptSelected);
headers.set('Accept', httpHeaderAcceptSelected);
}

// to determine the Content-Type header
let consumes: string[] = [
const consumes: string[] = [
];
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
if (httpContentTypeSelected != undefined) {
headers.set('Content-Type', httpContentTypeSelected);
}
Expand Down
Loading

0 comments on commit bdd2c2a

Please sign in to comment.