Skip to content

Commit 98ff2d2

Browse files
committed
Merge pull request #1261 from wing328/typescript-node-fix-param-name
[TypeScript] fix parameter name for typescript-node using baseName
2 parents cbc2fb2 + 2b06a81 commit 98ff2d2

File tree

2 files changed

+27
-10
lines changed
  • modules/swagger-codegen/src/main/resources/TypeScript-node
  • samples/client/petstore/typescript-node

2 files changed

+27
-10
lines changed

modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,37 +160,34 @@ export class {{classname}} {
160160
var path = this.url + this.basePath + '{{path}}';
161161
162162
{{#pathParams}}
163-
path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}}));
163+
path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}}));
164164

165165
{{/pathParams}}
166166
var queryParameters: any = {};
167167
var headerParams: any = {};
168168
var formParams: any = {};
169169

170-
{{#allParams}}
171-
{{#required}}
170+
{{#allParams}}{{#required}}
172171
// verify required parameter '{{paramName}}' is set
173172
if (!{{paramName}}) {
174173
throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}');
175174
}
176-
177-
{{/required}}
178-
{{/allParams}}
175+
{{/required}}{{/allParams}}
179176
{{#queryParams}}
180177
if ({{paramName}} !== undefined) {
181-
queryParameters['{{paramName}}'] = {{paramName}};
178+
queryParameters['{{baseName}}'] = {{paramName}};
182179
}
183180

184181
{{/queryParams}}
185182
{{#headerParams}}
186-
headerParams['{{paramName}}'] = {{paramName}};
183+
headerParams['{{baseName}}'] = {{paramName}};
187184

188185
{{/headerParams}}
189186
var useFormData = false;
190187

191188
{{#formParams}}
192189
if ({{paramName}} !== undefined) {
193-
formParams['{{paramName}}'] = {{paramName}};
190+
formParams['{{baseName}}'] = {{paramName}};
194191
}
195192
{{#isFile}}
196193
useFormData = true;

samples/client/petstore/typescript-node/api.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ export class UserApi {
149149
var headerParams: any = {};
150150
var formParams: any = {};
151151

152+
152153
var useFormData = false;
153154

154155
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -194,6 +195,7 @@ export class UserApi {
194195
var headerParams: any = {};
195196
var formParams: any = {};
196197

198+
197199
var useFormData = false;
198200

199201
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -239,6 +241,7 @@ export class UserApi {
239241
var headerParams: any = {};
240242
var formParams: any = {};
241243

244+
242245
var useFormData = false;
243246

244247
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -284,6 +287,7 @@ export class UserApi {
284287
var headerParams: any = {};
285288
var formParams: any = {};
286289

290+
287291
if (username !== undefined) {
288292
queryParameters['username'] = username;
289293
}
@@ -336,6 +340,7 @@ export class UserApi {
336340
var headerParams: any = {};
337341
var formParams: any = {};
338342

343+
339344
var useFormData = false;
340345

341346
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -382,6 +387,7 @@ export class UserApi {
382387
var headerParams: any = {};
383388
var formParams: any = {};
384389

390+
385391
// verify required parameter 'username' is set
386392
if (!username) {
387393
throw new Error('Missing required parameter username when calling getUserByName');
@@ -433,6 +439,7 @@ export class UserApi {
433439
var headerParams: any = {};
434440
var formParams: any = {};
435441

442+
436443
// verify required parameter 'username' is set
437444
if (!username) {
438445
throw new Error('Missing required parameter username when calling updateUser');
@@ -485,6 +492,7 @@ export class UserApi {
485492
var headerParams: any = {};
486493
var formParams: any = {};
487494

495+
488496
// verify required parameter 'username' is set
489497
if (!username) {
490498
throw new Error('Missing required parameter username when calling deleteUser');
@@ -559,6 +567,7 @@ export class PetApi {
559567
var headerParams: any = {};
560568
var formParams: any = {};
561569

570+
562571
var useFormData = false;
563572

564573
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -606,6 +615,7 @@ export class PetApi {
606615
var headerParams: any = {};
607616
var formParams: any = {};
608617

618+
609619
var useFormData = false;
610620

611621
var deferred = promise.defer<{ response: http.ClientResponse; }>();
@@ -653,6 +663,7 @@ export class PetApi {
653663
var headerParams: any = {};
654664
var formParams: any = {};
655665

666+
656667
if (status !== undefined) {
657668
queryParameters['status'] = status;
658669
}
@@ -703,6 +714,7 @@ export class PetApi {
703714
var headerParams: any = {};
704715
var formParams: any = {};
705716

717+
706718
if (tags !== undefined) {
707719
queryParameters['tags'] = tags;
708720
}
@@ -755,6 +767,7 @@ export class PetApi {
755767
var headerParams: any = {};
756768
var formParams: any = {};
757769

770+
758771
// verify required parameter 'petId' is set
759772
if (!petId) {
760773
throw new Error('Missing required parameter petId when calling getPetById');
@@ -810,6 +823,7 @@ export class PetApi {
810823
var headerParams: any = {};
811824
var formParams: any = {};
812825

826+
813827
// verify required parameter 'petId' is set
814828
if (!petId) {
815829
throw new Error('Missing required parameter petId when calling updatePetWithForm');
@@ -871,12 +885,13 @@ export class PetApi {
871885
var headerParams: any = {};
872886
var formParams: any = {};
873887

888+
874889
// verify required parameter 'petId' is set
875890
if (!petId) {
876891
throw new Error('Missing required parameter petId when calling deletePet');
877892
}
878893

879-
headerParams['apiKey'] = apiKey;
894+
headerParams['api_key'] = apiKey;
880895

881896
var useFormData = false;
882897

@@ -926,6 +941,7 @@ export class PetApi {
926941
var headerParams: any = {};
927942
var formParams: any = {};
928943

944+
929945
// verify required parameter 'petId' is set
930946
if (!petId) {
931947
throw new Error('Missing required parameter petId when calling uploadFile');
@@ -1011,6 +1027,7 @@ export class StoreApi {
10111027
var headerParams: any = {};
10121028
var formParams: any = {};
10131029

1030+
10141031
var useFormData = false;
10151032

10161033
var deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; }; }>();
@@ -1057,6 +1074,7 @@ export class StoreApi {
10571074
var headerParams: any = {};
10581075
var formParams: any = {};
10591076

1077+
10601078
var useFormData = false;
10611079

10621080
var deferred = promise.defer<{ response: http.ClientResponse; body: Order; }>();
@@ -1104,6 +1122,7 @@ export class StoreApi {
11041122
var headerParams: any = {};
11051123
var formParams: any = {};
11061124

1125+
11071126
// verify required parameter 'orderId' is set
11081127
if (!orderId) {
11091128
throw new Error('Missing required parameter orderId when calling getOrderById');
@@ -1155,6 +1174,7 @@ export class StoreApi {
11551174
var headerParams: any = {};
11561175
var formParams: any = {};
11571176

1177+
11581178
// verify required parameter 'orderId' is set
11591179
if (!orderId) {
11601180
throw new Error('Missing required parameter orderId when calling deleteOrder');

0 commit comments

Comments
 (0)