Skip to content

Commit 80c2df0

Browse files
committed
refactor: remove requestParameters destructuration
1 parent 06f0b68 commit 80c2df0

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

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

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,13 @@ export class {{classname}} {
102102
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}): Observable<AxiosResponse<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>>;
103103
public {{nickname}}({{#allParams}}{{^isConstEnumParam}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/isConstEnumParam}}{{/allParams}}): Observable<any> {
104104
{{/useSingleRequestParameter}}
105-
{{#allParams.0}}
106-
{{#useSingleRequestParameter}}
107-
const {
108-
{{#allParams}}
109-
{{paramName}},
110-
{{/allParams}}
111-
} = requestParameters;
112-
113-
{{/useSingleRequestParameter}}
114-
{{/allParams.0}}
115105
{{#allParams}}
116106
{{#required}}
117107
{{#isConstEnumParam}}
118108
let {{paramName}} = {{{dataType}}};
119109
{{/isConstEnumParam}}
120110
{{^isConstEnumParam}}
121-
if ({{paramName}} === null || {{paramName}} === undefined) {
111+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} === null || {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} === undefined) {
122112
throw new Error('Required parameter {{paramName}} was null or undefined when calling {{nickname}}.');
123113
}
124114

@@ -129,24 +119,24 @@ export class {{classname}} {
129119
let queryParameters = new URLSearchParams();
130120
{{#queryParams}}
131121
{{#isArray}}
132-
if ({{paramName}}) {
122+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}) {
133123
{{#isCollectionFormatMulti}}
134-
{{paramName}}.forEach((element) => {
124+
{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}.forEach((element) => {
135125
queryParameters.append('{{baseName}}', <any>element);
136126
})
137127
{{/isCollectionFormatMulti}}
138128
{{^isCollectionFormatMulti}}
139-
queryParameters['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']);
129+
queryParameters['{{baseName}}'] = {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}.join(COLLECTION_FORMATS['{{collectionFormat}}']);
140130
{{/isCollectionFormatMulti}}
141131
}
142132
{{/isArray}}
143133
{{^isArray}}
144-
if ({{paramName}} !== undefined && {{paramName}} !== null) {
134+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} !== undefined && {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} !== null) {
145135
{{#isDateTime}}
146-
queryParameters.append('{{baseName}}', (<any>{{paramName}}).toISOString());
136+
queryParameters.append('{{baseName}}', (<any>{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}).toISOString());
147137
{{/isDateTime}}
148138
{{^isDateTime}}
149-
queryParameters.append('{{baseName}}', <any>{{paramName}});
139+
queryParameters.append('{{baseName}}', <any>{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}});
150140
{{/isDateTime}}
151141
}
152142
{{/isArray}}
@@ -156,13 +146,13 @@ export class {{classname}} {
156146
let headers = {...this.defaultHeaders};
157147
{{#headerParams}}
158148
{{#isArray}}
159-
if ({{paramName}}) {
160-
headers['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']);
149+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}) {
150+
headers['{{baseName}}'] = {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}.join(COLLECTION_FORMATS['{{collectionFormat}}']);
161151
}
162152
{{/isArray}}
163153
{{^isArray}}
164-
if ({{paramName}} !== undefined && {{paramName}} !== null) {
165-
headers['{{baseName}}'] = String({{paramName}});
154+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} !== undefined && {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} !== null) {
155+
headers['{{baseName}}'] = String({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}});
166156
}
167157
{{/isArray}}
168158
{{/headerParams}}
@@ -256,20 +246,20 @@ export class {{classname}} {
256246
{{#formParams}}
257247

258248
{{#isArray}}
259-
if ({{paramName}}) {
249+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}) {
260250
{{#isCollectionFormatMulti}}
261-
{{paramName}}.forEach((element) => {
251+
{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}.forEach((element) => {
262252
formParams!.append('{{baseName}}', <any>element);
263253
})
264254
{{/isCollectionFormatMulti}}
265255
{{^isCollectionFormatMulti}}
266-
formParams!.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']));
256+
formParams!.append('{{baseName}}', {{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}.join(COLLECTION_FORMATS['{{collectionFormat}}']));
267257
{{/isCollectionFormatMulti}}
268258
}
269259
{{/isArray}}
270260
{{^isArray}}
271-
if ({{paramName}} !== undefined) {
272-
formParams!.append('{{baseName}}', <any>{{paramName}});
261+
if ({{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}} !== undefined) {
262+
formParams!.append('{{baseName}}', <any>{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}});
273263
}
274264
{{/isArray}}
275265
{{/formParams}}
@@ -282,7 +272,7 @@ export class {{classname}} {
282272
}
283273

284274
return this.httpClient.{{httpMethod}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}}
285-
{{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams!.toString() : formParams!{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
275+
{{#bodyParam}}{{#useSingleRequestParameter}}requestParameters['{{/useSingleRequestParameter}}{{paramName}}{{#useSingleRequestParameter}}']{{/useSingleRequestParameter}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams!.toString() : formParams!{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
286276
{
287277
{{#hasQueryParams}}
288278
params: queryParameters,

0 commit comments

Comments
 (0)