Skip to content

Commit c4d5ba1

Browse files
masaeeduwing328
masaeedu
authored and
wing328
committed
Prefix local vars to prevent conflict with params (#6717)
* Prefix local vars to prevent conflict with params Fixes #6698 * Update test snapshots
1 parent ff9c723 commit c4d5ba1

File tree

3 files changed

+608
-608
lines changed
  • modules/swagger-codegen/src/main/resources/typescript-fetch
  • samples/client/petstore/typescript-fetch/builds

3 files changed

+608
-608
lines changed

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -98,49 +98,49 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
9898
}
9999
{{/required}}
100100
{{/allParams}}
101-
const path = `{{{path}}}`{{#pathParams}}
101+
const localVarPath = `{{{path}}}`{{#pathParams}}
102102
.replace(`{${"{{baseName}}"}}`, encodeURIComponent(String({{paramName}}))){{/pathParams}};
103-
const urlObj = url.parse(path, true);
104-
const requestOptions = Object.assign({ method: '{{httpMethod}}' }, options);
105-
const headerParameter = {} as any;
106-
const queryParameter = {} as any;
103+
const localVarUrlObj = url.parse(localVarPath, true);
104+
const localVarRequestOptions = Object.assign({ method: '{{httpMethod}}' }, options);
105+
const localVarHeaderParameter = {} as any;
106+
const localVarQueryParameter = {} as any;
107107
{{#hasFormParams}}
108-
const formParams = new url.URLSearchParams();
108+
const localVarFormParams = new url.URLSearchParams();
109109
{{/hasFormParams}}
110110
111111
{{#authMethods}}
112112
// authentication {{name}} required
113113
{{#isApiKey}}
114114
{{#isKeyInHeader}}
115115
if (configuration && configuration.apiKey) {
116-
const apiKeyValue = typeof configuration.apiKey === 'function'
116+
const localVarApiKeyValue = typeof configuration.apiKey === 'function'
117117
? configuration.apiKey("{{keyParamName}}")
118118
: configuration.apiKey;
119-
headerParameter["{{keyParamName}}"] = apiKeyValue;
119+
localVarHeaderParameter["{{keyParamName}}"] = localVarApiKeyValue;
120120
}
121121
{{/isKeyInHeader}}
122122
{{#isKeyInQuery}}
123123
if (configuration && configuration.apiKey) {
124-
const apiKeyValue = typeof configuration.apiKey === 'function'
124+
const localVarApiKeyValue = typeof configuration.apiKey === 'function'
125125
? configuration.apiKey("{{keyParamName}}")
126126
: configuration.apiKey;
127-
queryParameter["{{keyParamName}}"] = apiKeyValue;
127+
localVarQueryParameter["{{keyParamName}}"] = localVarApiKeyValue;
128128
}
129129
{{/isKeyInQuery}}
130130
{{/isApiKey}}
131131
{{#isBasic}}
132132
// http basic authentication required
133133
if (configuration && (configuration.username || configuration.password)) {
134-
headerParameter["Authorization"] = "Basic " + btoa(configuration.username + ":" + configuration.password);
134+
localVarHeaderParameter["Authorization"] = "Basic " + btoa(configuration.username + ":" + configuration.password);
135135
}
136136
{{/isBasic}}
137137
{{#isOAuth}}
138138
// oauth required
139139
if (configuration && configuration.accessToken) {
140-
const accessTokenValue = typeof configuration.accessToken === 'function'
140+
const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
141141
? configuration.accessToken("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}])
142142
: configuration.accessToken;
143-
headerParameter["Authorization"] = "Bearer " + accessTokenValue;
143+
localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
144144
}
145145
{{/isOAuth}}
146146
@@ -149,24 +149,24 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
149149
{{#isListContainer}}
150150
if ({{paramName}}) {
151151
{{#isCollectionFormatMulti}}
152-
queryParameter['{{baseName}}'] = {{paramName}};
152+
localVarQueryParameter['{{baseName}}'] = {{paramName}};
153153
{{/isCollectionFormatMulti}}
154154
{{^isCollectionFormatMulti}}
155-
queryParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]);
155+
localVarQueryParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]);
156156
{{/isCollectionFormatMulti}}
157157
}
158158
{{/isListContainer}}
159159
{{^isListContainer}}
160160
if ({{paramName}} !== undefined) {
161161
{{#isDateTime}}
162-
queryParameter['{{baseName}}'] = ({{paramName}} as any).toISOString();
162+
localVarQueryParameter['{{baseName}}'] = ({{paramName}} as any).toISOString();
163163
{{/isDateTime}}
164164
{{^isDateTime}}
165165
{{#isDate}}
166-
queryParameter['{{baseName}}'] = ({{paramName}} as any).toISOString();
166+
localVarQueryParameter['{{baseName}}'] = ({{paramName}} as any).toISOString();
167167
{{/isDate}}
168168
{{^isDate}}
169-
queryParameter['{{baseName}}'] = {{paramName}};
169+
localVarQueryParameter['{{baseName}}'] = {{paramName}};
170170
{{/isDate}}
171171
{{/isDateTime}}
172172
}
@@ -176,12 +176,12 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
176176
{{#headerParams}}
177177
{{#isListContainer}}
178178
if ({{paramName}}) {
179-
headerParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
179+
localVarHeaderParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
180180
}
181181
{{/isListContainer}}
182182
{{^isListContainer}}
183183
if ({{paramName}} !== undefined && {{paramName}} !== null) {
184-
headerParameter['{{baseName}}'] = String({{paramName}});
184+
localVarHeaderParameter['{{baseName}}'] = String({{paramName}});
185185
}
186186
{{/isListContainer}}
187187
@@ -191,43 +191,43 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur
191191
if ({{paramName}}) {
192192
{{#isCollectionFormatMulti}}
193193
{{paramName}}.forEach((element) => {
194-
formParams.append('{{baseName}}', element as any);
194+
localVarFormParams.append('{{baseName}}', element as any);
195195
})
196196
{{/isCollectionFormatMulti}}
197197
{{^isCollectionFormatMulti}}
198-
formParams.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
198+
localVarFormParams.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
199199
{{/isCollectionFormatMulti}}
200200
}
201201
{{/isListContainer}}
202202
{{^isListContainer}}
203203
if ({{paramName}} !== undefined) {
204-
formParams.set('{{baseName}}', {{paramName}} as any);
204+
localVarFormParams.set('{{baseName}}', {{paramName}} as any);
205205
}
206206
{{/isListContainer}}
207207
208208
{{/formParams}}
209209
{{#hasFormParams}}
210-
headerParameter['Content-Type'] = 'application/x-www-form-urlencoded';
210+
localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
211211
212212
{{/hasFormParams}}
213213
{{#bodyParam}}
214-
headerParameter['Content-Type'] = 'application/json';
214+
localVarHeaderParameter['Content-Type'] = 'application/json';
215215
216216
{{/bodyParam}}
217-
urlObj.query = Object.assign({}, urlObj.query, queryParameter, options.query);
217+
localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
218218
// fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
219-
delete urlObj.search;
220-
requestOptions.headers = Object.assign({}, headerParameter, options.headers);
219+
delete localVarUrlObj.search;
220+
localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
221221
{{#hasFormParams}}
222-
requestOptions.body = formParams.toString();
222+
localVarRequestOptions.body = localVarFormParams.toString();
223223
{{/hasFormParams}}
224224
{{#bodyParam}}
225-
requestOptions.body = JSON.stringify({{paramName}} || {});
225+
localVarRequestOptions.body = JSON.stringify({{paramName}} || {});
226226
{{/bodyParam}}
227227
228228
return {
229-
url: url.format(urlObj),
230-
options: requestOptions,
229+
url: url.format(localVarUrlObj),
230+
options: localVarRequestOptions,
231231
};
232232
},
233233
{{/operation}}
@@ -254,9 +254,9 @@ export const {{classname}}Fp = function(configuration?: Configuration) {
254254
* @throws {RequiredError}
255255
*/
256256
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}any{{/returnType}}> {
257-
const fetchArgs = {{classname}}FetchParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
257+
const localVarFetchArgs = {{classname}}FetchParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
258258
return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => {
259-
return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => {
259+
return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
260260
if (response.status >= 200 && response.status < 300) {
261261
return response{{#returnType}}.json(){{/returnType}};
262262
} else {

0 commit comments

Comments
 (0)