From 50a9d3323a00b58dc7746033fd60cb8e98dc4e4d Mon Sep 17 00:00:00 2001 From: snebjorn Date: Fri, 26 Aug 2022 12:47:58 +0200 Subject: [PATCH] fix: [typescript-angular] `.join` does not exist on type `Set` (#13278) fixes #11782 --- .../main/resources/typescript-angular/api.service.mustache | 6 +++--- .../typescript/petstore-expected/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- .../builds/with-npm/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- .../builds/with-npm/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache index 3f5870face9..d26a53825dc 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache @@ -202,7 +202,7 @@ export class {{classname}} { {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']), '{{baseName}}'); + [...{{paramName}}].join(COLLECTION_FORMATS['{{collectionFormat}}']), '{{baseName}}'); {{/isCollectionFormatMulti}} {{/isQueryParamObjectFormatJson}} } @@ -220,7 +220,7 @@ export class {{classname}} { {{#headerParams}} {{#isArray}} if ({{paramName}}) { - localVarHeaders = localVarHeaders.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); + localVarHeaders = localVarHeaders.set('{{baseName}}', [...{{paramName}}].join(COLLECTION_FORMATS['{{collectionFormat}}'])); } {{/isArray}} {{^isArray}} @@ -339,7 +339,7 @@ export class {{classname}} { localVarFormParams = localVarFormParams.append('{{baseName}}', element) as any || localVarFormParams; }) } else { - localVarFormParams = localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])) as any || localVarFormParams; + localVarFormParams = localVarFormParams.append('{{baseName}}', [...{{paramName}}].join(COLLECTION_FORMATS['{{collectionFormat}}'])) as any || localVarFormParams; } {{/isCollectionFormatMulti}} } diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts index a6d4153dc9f..8acb855e371 100644 --- a/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts +++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts @@ -267,7 +267,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -341,7 +341,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts index f3638c7b80e..af5e66c44f0 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api/pet.service.ts @@ -267,7 +267,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -342,7 +342,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts index 7c16b4bd412..6cc2d34c403 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts @@ -267,7 +267,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -342,7 +342,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts index 7c16b4bd412..6cc2d34c403 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts @@ -267,7 +267,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -342,7 +342,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts index f3638c7b80e..af5e66c44f0 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api/pet.service.ts @@ -267,7 +267,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -342,7 +342,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts index 04c3f1befbe..f4a214bac67 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts @@ -271,7 +271,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -346,7 +346,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts index 04c3f1befbe..f4a214bac67 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts @@ -271,7 +271,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -346,7 +346,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders; diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts index 04c3f1befbe..f4a214bac67 100644 --- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api/pet.service.ts @@ -271,7 +271,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (status) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - status.join(COLLECTION_FORMATS['csv']), 'status'); + [...status].join(COLLECTION_FORMATS['csv']), 'status'); } let localVarHeaders = this.defaultHeaders; @@ -346,7 +346,7 @@ export class PetService { let localVarQueryParameters = new HttpParams({encoder: this.encoder}); if (tags) { localVarQueryParameters = this.addToHttpParams(localVarQueryParameters, - tags.join(COLLECTION_FORMATS['csv']), 'tags'); + [...tags].join(COLLECTION_FORMATS['csv']), 'tags'); } let localVarHeaders = this.defaultHeaders;