Skip to content

Commit bdd2c2a

Browse files
benbenwwing328
benbenw
authored and
wing328
committed
Misc typescript Angular code generation improvements (#7898)
use const instead of let when possible add missing semi-colon replace " with '
1 parent 40d5d09 commit bdd2c2a

File tree

35 files changed

+428
-428
lines changed

35 files changed

+428
-428
lines changed

‎modules/swagger-codegen/src/main/resources/typescript-angular/api.module.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class ApiModule {
2222
return {
2323
ngModule: ApiModule,
2424
providers: [ { provide: Configuration, useFactory: configurationFactory } ]
25-
}
25+
};
2626
}
2727

2828
constructor( @Optional() @SkipSelf() parentModule: ApiModule,

‎modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class {{classname}} {
6464
*/
6565
private canConsumeForm(consumes: string[]): boolean {
6666
const form = 'multipart/form-data';
67-
for (let consume of consumes) {
67+
for (const consume of consumes) {
6868
if (form === consume) {
6969
return true;
7070
}
@@ -199,7 +199,7 @@ export class {{classname}} {
199199
{{/isBasic}}
200200
{{#isOAuth}}
201201
if (this.configuration.accessToken) {
202-
let accessToken = typeof this.configuration.accessToken === 'function'
202+
const accessToken = typeof this.configuration.accessToken === 'function'
203203
? this.configuration.accessToken()
204204
: this.configuration.accessToken;
205205
{{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Bearer ' + accessToken);
@@ -213,30 +213,30 @@ export class {{classname}} {
213213
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
214214
{{/produces}}
215215
];
216-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
216+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
217217
if (httpHeaderAcceptSelected != undefined) {
218218
{{^useHttpClient}}
219-
headers.set("Accept", httpHeaderAcceptSelected);
219+
headers.set('Accept', httpHeaderAcceptSelected);
220220
{{/useHttpClient}}
221221
{{#useHttpClient}}
222-
headers = headers.set("Accept", httpHeaderAcceptSelected);
222+
headers = headers.set('Accept', httpHeaderAcceptSelected);
223223
{{/useHttpClient}}
224224
}
225225

226226
// to determine the Content-Type header
227-
let consumes: string[] = [
227+
const consumes: string[] = [
228228
{{#consumes}}
229229
'{{{mediaType}}}'{{#hasMore}},{{/hasMore}}
230230
{{/consumes}}
231231
];
232232
{{#bodyParam}}
233-
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
233+
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
234234
if (httpContentTypeSelected != undefined) {
235235
{{^useHttpClient}}
236236
headers.set('Content-Type', httpContentTypeSelected);
237237
{{/useHttpClient}}
238238
{{#useHttpClient}}
239-
headers = headers.set("Content-Type", httpContentTypeSelected);
239+
headers = headers.set('Content-Type', httpContentTypeSelected);
240240
{{/useHttpClient}}
241241
}
242242
{{/bodyParam}}

‎modules/swagger-codegen/src/main/resources/typescript-angular/modelEnum.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ export const {{classname}} = {
66
{{name}}: {{{value}}} as {{classname}}{{^-last}},{{/-last}}
77
{{/enumVars}}
88
{{/allowableValues}}
9-
}
9+
};

‎modules/swagger-codegen/src/main/resources/typescript-angular/modelGenericEnums.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export namespace {{classname}} {
1010
{{name}}: {{{value}}} as {{enumName}}{{^-last}},{{/-last}}
1111
{{/enumVars}}
1212
{{/allowableValues}}
13-
}
13+
};
1414
{{/isEnum}}
1515
{{/vars}}
1616
}{{/hasEnums}}

‎samples/client/petstore/typescript-angular-v2/default/api.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class ApiModule {
2121
return {
2222
ngModule: ApiModule,
2323
providers: [ { provide: Configuration, useFactory: configurationFactory } ]
24-
}
24+
};
2525
}
2626

2727
constructor( @Optional() @SkipSelf() parentModule: ApiModule,

‎samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class PetService {
5050
*/
5151
private canConsumeForm(consumes: string[]): boolean {
5252
const form = 'multipart/form-data';
53-
for (let consume of consumes) {
53+
for (const consume of consumes) {
5454
if (form === consume) {
5555
return true;
5656
}
@@ -207,7 +207,7 @@ export class PetService {
207207

208208
// authentication (petstore_auth) required
209209
if (this.configuration.accessToken) {
210-
let accessToken = typeof this.configuration.accessToken === 'function'
210+
const accessToken = typeof this.configuration.accessToken === 'function'
211211
? this.configuration.accessToken()
212212
: this.configuration.accessToken;
213213
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -218,17 +218,17 @@ export class PetService {
218218
'application/xml',
219219
'application/json'
220220
];
221-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
221+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
222222
if (httpHeaderAcceptSelected != undefined) {
223-
headers.set("Accept", httpHeaderAcceptSelected);
223+
headers.set('Accept', httpHeaderAcceptSelected);
224224
}
225225

226226
// to determine the Content-Type header
227-
let consumes: string[] = [
227+
const consumes: string[] = [
228228
'application/json',
229229
'application/xml'
230230
];
231-
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
231+
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
232232
if (httpContentTypeSelected != undefined) {
233233
headers.set('Content-Type', httpContentTypeSelected);
234234
}
@@ -266,7 +266,7 @@ export class PetService {
266266

267267
// authentication (petstore_auth) required
268268
if (this.configuration.accessToken) {
269-
let accessToken = typeof this.configuration.accessToken === 'function'
269+
const accessToken = typeof this.configuration.accessToken === 'function'
270270
? this.configuration.accessToken()
271271
: this.configuration.accessToken;
272272
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -277,13 +277,13 @@ export class PetService {
277277
'application/xml',
278278
'application/json'
279279
];
280-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
280+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
281281
if (httpHeaderAcceptSelected != undefined) {
282-
headers.set("Accept", httpHeaderAcceptSelected);
282+
headers.set('Accept', httpHeaderAcceptSelected);
283283
}
284284

285285
// to determine the Content-Type header
286-
let consumes: string[] = [
286+
const consumes: string[] = [
287287
];
288288

289289
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -319,7 +319,7 @@ export class PetService {
319319

320320
// authentication (petstore_auth) required
321321
if (this.configuration.accessToken) {
322-
let accessToken = typeof this.configuration.accessToken === 'function'
322+
const accessToken = typeof this.configuration.accessToken === 'function'
323323
? this.configuration.accessToken()
324324
: this.configuration.accessToken;
325325
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -330,13 +330,13 @@ export class PetService {
330330
'application/xml',
331331
'application/json'
332332
];
333-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
333+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
334334
if (httpHeaderAcceptSelected != undefined) {
335-
headers.set("Accept", httpHeaderAcceptSelected);
335+
headers.set('Accept', httpHeaderAcceptSelected);
336336
}
337337

338338
// to determine the Content-Type header
339-
let consumes: string[] = [
339+
const consumes: string[] = [
340340
];
341341

342342
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -373,7 +373,7 @@ export class PetService {
373373

374374
// authentication (petstore_auth) required
375375
if (this.configuration.accessToken) {
376-
let accessToken = typeof this.configuration.accessToken === 'function'
376+
const accessToken = typeof this.configuration.accessToken === 'function'
377377
? this.configuration.accessToken()
378378
: this.configuration.accessToken;
379379
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -384,13 +384,13 @@ export class PetService {
384384
'application/xml',
385385
'application/json'
386386
];
387-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
387+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
388388
if (httpHeaderAcceptSelected != undefined) {
389-
headers.set("Accept", httpHeaderAcceptSelected);
389+
headers.set('Accept', httpHeaderAcceptSelected);
390390
}
391391

392392
// to determine the Content-Type header
393-
let consumes: string[] = [
393+
const consumes: string[] = [
394394
];
395395

396396
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -430,13 +430,13 @@ export class PetService {
430430
'application/xml',
431431
'application/json'
432432
];
433-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
433+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
434434
if (httpHeaderAcceptSelected != undefined) {
435-
headers.set("Accept", httpHeaderAcceptSelected);
435+
headers.set('Accept', httpHeaderAcceptSelected);
436436
}
437437

438438
// to determine the Content-Type header
439-
let consumes: string[] = [
439+
const consumes: string[] = [
440440
];
441441

442442
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -467,7 +467,7 @@ export class PetService {
467467

468468
// authentication (petstore_auth) required
469469
if (this.configuration.accessToken) {
470-
let accessToken = typeof this.configuration.accessToken === 'function'
470+
const accessToken = typeof this.configuration.accessToken === 'function'
471471
? this.configuration.accessToken()
472472
: this.configuration.accessToken;
473473
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -478,17 +478,17 @@ export class PetService {
478478
'application/xml',
479479
'application/json'
480480
];
481-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
481+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
482482
if (httpHeaderAcceptSelected != undefined) {
483-
headers.set("Accept", httpHeaderAcceptSelected);
483+
headers.set('Accept', httpHeaderAcceptSelected);
484484
}
485485

486486
// to determine the Content-Type header
487-
let consumes: string[] = [
487+
const consumes: string[] = [
488488
'application/json',
489489
'application/xml'
490490
];
491-
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
491+
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
492492
if (httpContentTypeSelected != undefined) {
493493
headers.set('Content-Type', httpContentTypeSelected);
494494
}
@@ -524,7 +524,7 @@ export class PetService {
524524

525525
// authentication (petstore_auth) required
526526
if (this.configuration.accessToken) {
527-
let accessToken = typeof this.configuration.accessToken === 'function'
527+
const accessToken = typeof this.configuration.accessToken === 'function'
528528
? this.configuration.accessToken()
529529
: this.configuration.accessToken;
530530
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -535,13 +535,13 @@ export class PetService {
535535
'application/xml',
536536
'application/json'
537537
];
538-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
538+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
539539
if (httpHeaderAcceptSelected != undefined) {
540-
headers.set("Accept", httpHeaderAcceptSelected);
540+
headers.set('Accept', httpHeaderAcceptSelected);
541541
}
542542

543543
// to determine the Content-Type header
544-
let consumes: string[] = [
544+
const consumes: string[] = [
545545
'application/x-www-form-urlencoded'
546546
];
547547

@@ -598,7 +598,7 @@ export class PetService {
598598

599599
// authentication (petstore_auth) required
600600
if (this.configuration.accessToken) {
601-
let accessToken = typeof this.configuration.accessToken === 'function'
601+
const accessToken = typeof this.configuration.accessToken === 'function'
602602
? this.configuration.accessToken()
603603
: this.configuration.accessToken;
604604
headers.set('Authorization', 'Bearer ' + accessToken);
@@ -608,13 +608,13 @@ export class PetService {
608608
let httpHeaderAccepts: string[] = [
609609
'application/json'
610610
];
611-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
611+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
612612
if (httpHeaderAcceptSelected != undefined) {
613-
headers.set("Accept", httpHeaderAcceptSelected);
613+
headers.set('Accept', httpHeaderAcceptSelected);
614614
}
615615

616616
// to determine the Content-Type header
617-
let consumes: string[] = [
617+
const consumes: string[] = [
618618
'multipart/form-data'
619619
];
620620

‎samples/client/petstore/typescript-angular-v2/default/api/store.service.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class StoreService {
4949
*/
5050
private canConsumeForm(consumes: string[]): boolean {
5151
const form = 'multipart/form-data';
52-
for (let consume of consumes) {
52+
for (const consume of consumes) {
5353
if (form === consume) {
5454
return true;
5555
}
@@ -139,13 +139,13 @@ export class StoreService {
139139
'application/xml',
140140
'application/json'
141141
];
142-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
142+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
143143
if (httpHeaderAcceptSelected != undefined) {
144-
headers.set("Accept", httpHeaderAcceptSelected);
144+
headers.set('Accept', httpHeaderAcceptSelected);
145145
}
146146

147147
// to determine the Content-Type header
148-
let consumes: string[] = [
148+
const consumes: string[] = [
149149
];
150150

151151
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -179,13 +179,13 @@ export class StoreService {
179179
let httpHeaderAccepts: string[] = [
180180
'application/json'
181181
];
182-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
182+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
183183
if (httpHeaderAcceptSelected != undefined) {
184-
headers.set("Accept", httpHeaderAcceptSelected);
184+
headers.set('Accept', httpHeaderAcceptSelected);
185185
}
186186

187187
// to determine the Content-Type header
188-
let consumes: string[] = [
188+
const consumes: string[] = [
189189
];
190190

191191
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -219,13 +219,13 @@ export class StoreService {
219219
'application/xml',
220220
'application/json'
221221
];
222-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
222+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
223223
if (httpHeaderAcceptSelected != undefined) {
224-
headers.set("Accept", httpHeaderAcceptSelected);
224+
headers.set('Accept', httpHeaderAcceptSelected);
225225
}
226226

227227
// to determine the Content-Type header
228-
let consumes: string[] = [
228+
const consumes: string[] = [
229229
];
230230

231231
let requestOptions: RequestOptionsArgs = new RequestOptions({
@@ -259,15 +259,15 @@ export class StoreService {
259259
'application/xml',
260260
'application/json'
261261
];
262-
let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
262+
const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
263263
if (httpHeaderAcceptSelected != undefined) {
264-
headers.set("Accept", httpHeaderAcceptSelected);
264+
headers.set('Accept', httpHeaderAcceptSelected);
265265
}
266266

267267
// to determine the Content-Type header
268-
let consumes: string[] = [
268+
const consumes: string[] = [
269269
];
270-
let httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes);
270+
const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
271271
if (httpContentTypeSelected != undefined) {
272272
headers.set('Content-Type', httpContentTypeSelected);
273273
}

0 commit comments

Comments
 (0)