Skip to content

Commit 0bc979e

Browse files
author
swcm-mnestler
authored
[typescript-nestjs] Compatability with tsc 'strict' flag (#17672)
* [typescript-nestjs] Compatability with tsc 'strict' flag * Update samples / docs
1 parent 9500284 commit 0bc979e

6 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ export class ApiModule {
4747
}
4848

4949
private static createAsyncProviders(options: AsyncConfiguration): Provider[] {
50-
if (options.useExisting || options.useFactory) {
51-
return [this.createAsyncConfigurationProvider(options)];
50+
if (options.useClass) {
51+
return [
52+
this.createAsyncConfigurationProvider(options),
53+
{
54+
provide: options.useClass,
55+
useClass: options.useClass,
56+
},
57+
];
5258
}
53-
return [
54-
this.createAsyncConfigurationProvider(options),
55-
{
56-
provide: options.useClass,
57-
useClass: options.useClass,
58-
},
59-
];
59+
return [this.createAsyncConfigurationProvider(options)];
6060
}
6161

6262
private static createAsyncConfigurationProvider(
@@ -73,7 +73,7 @@ export class ApiModule {
7373
provide: Configuration,
7474
useFactory: async (optionsFactory: ConfigurationFactory) =>
7575
await optionsFactory.createConfiguration(),
76-
inject: [options.useExisting || options.useClass],
76+
inject: (options.useExisting && [options.useExisting]) || (options.useClass && [options.useClass]) || [],
7777
};
7878
}
7979

‎modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,24 +208,24 @@ export class {{classname}} {
208208
if ({{paramName}}) {
209209
{{#isCollectionFormatMulti}}
210210
{{paramName}}.forEach((element) => {
211-
formParams.append('{{baseName}}', <any>element);
211+
formParams!.append('{{baseName}}', <any>element);
212212
})
213213
{{/isCollectionFormatMulti}}
214214
{{^isCollectionFormatMulti}}
215-
formParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']));
215+
formParams!.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']));
216216
{{/isCollectionFormatMulti}}
217217
}
218218
{{/isArray}}
219219
{{^isArray}}
220220
if ({{paramName}} !== undefined) {
221-
formParams.append('{{baseName}}', <any>{{paramName}});
221+
formParams!.append('{{baseName}}', <any>{{paramName}});
222222
}
223223
{{/isArray}}
224224
{{/formParams}}
225225

226226
{{/hasFormParams}}
227227
return this.httpClient.{{httpMethod}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}}
228-
{{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
228+
{{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams!.toString() : formParams!{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
229229
{
230230
{{#hasQueryParams}}
231231
params: queryParameters,

‎samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api.module.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ export class ApiModule {
4141
}
4242

4343
private static createAsyncProviders(options: AsyncConfiguration): Provider[] {
44-
if (options.useExisting || options.useFactory) {
45-
return [this.createAsyncConfigurationProvider(options)];
44+
if (options.useClass) {
45+
return [
46+
this.createAsyncConfigurationProvider(options),
47+
{
48+
provide: options.useClass,
49+
useClass: options.useClass,
50+
},
51+
];
4652
}
47-
return [
48-
this.createAsyncConfigurationProvider(options),
49-
{
50-
provide: options.useClass,
51-
useClass: options.useClass,
52-
},
53-
];
53+
return [this.createAsyncConfigurationProvider(options)];
5454
}
5555

5656
private static createAsyncConfigurationProvider(
@@ -67,7 +67,7 @@ export class ApiModule {
6767
provide: Configuration,
6868
useFactory: async (optionsFactory: ConfigurationFactory) =>
6969
await optionsFactory.createConfiguration(),
70-
inject: [options.useExisting || options.useClass],
70+
inject: (options.useExisting && [options.useExisting]) || (options.useClass && [options.useClass]) || [],
7171
};
7272
}
7373

‎samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,15 @@ export class PetService {
383383
}
384384

385385
if (name !== undefined) {
386-
formParams.append('name', <any>name);
386+
formParams!.append('name', <any>name);
387387
}
388388

389389
if (status !== undefined) {
390-
formParams.append('status', <any>status);
390+
formParams!.append('status', <any>status);
391391
}
392392

393393
return this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`,
394-
convertFormParamsToString ? formParams.toString() : formParams,
394+
convertFormParamsToString ? formParams!.toString() : formParams!,
395395
{
396396
withCredentials: this.configuration.withCredentials,
397397
headers: headers
@@ -456,15 +456,15 @@ export class PetService {
456456
}
457457

458458
if (additionalMetadata !== undefined) {
459-
formParams.append('additionalMetadata', <any>additionalMetadata);
459+
formParams!.append('additionalMetadata', <any>additionalMetadata);
460460
}
461461

462462
if (file !== undefined) {
463-
formParams.append('file', <any>file);
463+
formParams!.append('file', <any>file);
464464
}
465465

466466
return this.httpClient.post<ApiResponse>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,
467-
convertFormParamsToString ? formParams.toString() : formParams,
467+
convertFormParamsToString ? formParams!.toString() : formParams!,
468468
{
469469
withCredentials: this.configuration.withCredentials,
470470
headers: headers

‎samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api.module.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ export class ApiModule {
4242
}
4343

4444
private static createAsyncProviders(options: AsyncConfiguration): Provider[] {
45-
if (options.useExisting || options.useFactory) {
46-
return [this.createAsyncConfigurationProvider(options)];
45+
if (options.useClass) {
46+
return [
47+
this.createAsyncConfigurationProvider(options),
48+
{
49+
provide: options.useClass,
50+
useClass: options.useClass,
51+
},
52+
];
4753
}
48-
return [
49-
this.createAsyncConfigurationProvider(options),
50-
{
51-
provide: options.useClass,
52-
useClass: options.useClass,
53-
},
54-
];
54+
return [this.createAsyncConfigurationProvider(options)];
5555
}
5656

5757
private static createAsyncConfigurationProvider(
@@ -68,7 +68,7 @@ export class ApiModule {
6868
provide: Configuration,
6969
useFactory: async (optionsFactory: ConfigurationFactory) =>
7070
await optionsFactory.createConfiguration(),
71-
inject: [options.useExisting || options.useClass],
71+
inject: (options.useExisting && [options.useExisting]) || (options.useClass && [options.useClass]) || [],
7272
};
7373
}
7474

‎samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,15 +384,15 @@ export class PetService {
384384
}
385385

386386
if (name !== undefined) {
387-
formParams.append('name', <any>name);
387+
formParams!.append('name', <any>name);
388388
}
389389

390390
if (status !== undefined) {
391-
formParams.append('status', <any>status);
391+
formParams!.append('status', <any>status);
392392
}
393393

394394
return this.httpClient.post<any>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`,
395-
convertFormParamsToString ? formParams.toString() : formParams,
395+
convertFormParamsToString ? formParams!.toString() : formParams!,
396396
{
397397
withCredentials: this.configuration.withCredentials,
398398
headers: headers
@@ -457,15 +457,15 @@ export class PetService {
457457
}
458458

459459
if (additionalMetadata !== undefined) {
460-
formParams.append('additionalMetadata', <any>additionalMetadata);
460+
formParams!.append('additionalMetadata', <any>additionalMetadata);
461461
}
462462

463463
if (file !== undefined) {
464-
formParams.append('file', <any>file);
464+
formParams!.append('file', <any>file);
465465
}
466466

467467
return this.httpClient.post<ApiResponse>(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,
468-
convertFormParamsToString ? formParams.toString() : formParams,
468+
convertFormParamsToString ? formParams!.toString() : formParams!,
469469
{
470470
withCredentials: this.configuration.withCredentials,
471471
headers: headers

0 commit comments

Comments
 (0)