Skip to content

Commit ffa3354

Browse files
scottajscottaj
committed
Change code structure by moving path tranformations to assignment
Couldn't get handlebars to format the inline replaces in a sane way without collapsing everything onto one very ugly line. This way keeps some sane template formatting while still outputting workable code.
1 parent 2c3501c commit ffa3354

46 files changed

Lines changed: 1185 additions & 281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -277,21 +277,24 @@ export class {{classname}} extends runtime.BaseAPI {
277277
{{/isArray}}
278278
{{/formParams}}
279279
{{/hasFormParams}}
280+
281+
let urlPath = `{{{path}}}`;
282+
{{#pathParams}}
283+
{{#isDateTimeType}}
284+
urlPath = urlPath.replace(`{${"{{baseName}}"}}`, encodeURIComponent((requestParameters['{{paramName}}'] as any).toISOString()));
285+
{{/isDateTimeType}}
286+
{{^isDateTimeType}}
287+
{{#isDateType}}
288+
urlPath = urlPath.replace(`{${"{{baseName}}"}}`, encodeURIComponent((requestParameters['{{paramName}}'] as any).toISOString().substring(0,10)));
289+
{{/isDateType}}
290+
{{^isDateType}}
291+
urlPath = urlPath.replace(`{${"{{baseName}}"}}`, encodeURIComponent(String(requestParameters['{{paramName}}'])));
292+
{{/isDateType}}
293+
{{/isDateTimeType}}
294+
{{/pathParams}}
295+
280296
const response = await this.request({
281-
path: `{{{path}}}`
282-
{{#pathParams}}
283-
{{#isDateTimeType}}
284-
.replace(`{${"{{baseName}}"}}`, encodeURIComponent((requestParameters['{{paramName}}'] as any).toISOString()))
285-
{{/isDateTimeType}}
286-
{{^isDateTimeType}}
287-
{{#isDateType}}
288-
.replace(`{${"{{baseName}}"}}`, encodeURIComponent((requestParameters['{{paramName}}'] as any).toISOString().substring(0,10)))
289-
{{/isDateType}}
290-
{{^isDateType}}
291-
.replace(`{${"{{baseName}}"}}`, encodeURIComponent(String(requestParameters['{{paramName}}'])))
292-
{{/isDateType}}
293-
{{/isDateTimeType}}
294-
{{/pathParams}},
297+
path: urlPath,
295298
method: '{{httpMethod}}',
296299
headers: headerParameters,
297300
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ export class DefaultApi extends runtime.BaseAPI {
4545

4646
const headerParameters: runtime.HTTPHeaders = {};
4747

48+
49+
let urlPath = `/person/display/{personId}`;
50+
urlPath = urlPath.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId'])));
51+
4852
const response = await this.request({
49-
path: `/person/display/{personId}`.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId']))),
53+
path: urlPath,
5054
method: 'GET',
5155
headers: headerParameters,
5256
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ export class DefaultApi extends runtime.BaseAPI {
4545

4646
const headerParameters: runtime.HTTPHeaders = {};
4747

48+
49+
let urlPath = `/person/display/{personId}`;
50+
urlPath = urlPath.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId'])));
51+
4852
const response = await this.request({
49-
path: `/person/display/{personId}`.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId']))),
53+
path: urlPath,
5054
method: 'GET',
5155
headers: headerParameters,
5256
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ export class AnotherFakeApi extends runtime.BaseAPI {
4949

5050
headerParameters['Content-Type'] = 'application/json';
5151

52+
53+
let urlPath = `/another-fake/dummy`;
54+
5255
const response = await this.request({
53-
path: `/another-fake/dummy`,
56+
path: urlPath,
5457
method: 'PATCH',
5558
headers: headerParameters,
5659
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ export class DefaultApi extends runtime.BaseAPI {
3434

3535
const headerParameters: runtime.HTTPHeaders = {};
3636

37+
38+
let urlPath = `/foo`;
39+
3740
const response = await this.request({
38-
path: `/foo`,
41+
path: urlPath,
3942
method: 'GET',
4043
headers: headerParameters,
4144
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts‎

Lines changed: 88 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,11 @@ export class FakeApi extends runtime.BaseAPI {
181181

182182
const headerParameters: runtime.HTTPHeaders = {};
183183

184+
185+
let urlPath = `/fake/BigDecimalMap`;
186+
184187
const response = await this.request({
185-
path: `/fake/BigDecimalMap`,
188+
path: urlPath,
186189
method: 'GET',
187190
headers: headerParameters,
188191
query: queryParameters,
@@ -207,8 +210,11 @@ export class FakeApi extends runtime.BaseAPI {
207210

208211
const headerParameters: runtime.HTTPHeaders = {};
209212

213+
214+
let urlPath = `/fake/health`;
215+
210216
const response = await this.request({
211-
path: `/fake/health`,
217+
path: urlPath,
212218
method: 'GET',
213219
headers: headerParameters,
214220
query: queryParameters,
@@ -250,8 +256,11 @@ export class FakeApi extends runtime.BaseAPI {
250256
headerParameters['header_1'] = String(requestParameters['header1']);
251257
}
252258

259+
260+
let urlPath = `/fake/http-signature-test`;
261+
253262
const response = await this.request({
254-
path: `/fake/http-signature-test`,
263+
path: urlPath,
255264
method: 'GET',
256265
headers: headerParameters,
257266
query: queryParameters,
@@ -278,8 +287,11 @@ export class FakeApi extends runtime.BaseAPI {
278287

279288
headerParameters['Content-Type'] = 'application/json';
280289

290+
291+
let urlPath = `/fake/outer/boolean`;
292+
281293
const response = await this.request({
282-
path: `/fake/outer/boolean`,
294+
path: urlPath,
283295
method: 'POST',
284296
headers: headerParameters,
285297
query: queryParameters,
@@ -311,8 +323,11 @@ export class FakeApi extends runtime.BaseAPI {
311323

312324
headerParameters['Content-Type'] = 'application/json';
313325

326+
327+
let urlPath = `/fake/outer/composite`;
328+
314329
const response = await this.request({
315-
path: `/fake/outer/composite`,
330+
path: urlPath,
316331
method: 'POST',
317332
headers: headerParameters,
318333
query: queryParameters,
@@ -340,8 +355,11 @@ export class FakeApi extends runtime.BaseAPI {
340355

341356
headerParameters['Content-Type'] = 'application/json';
342357

358+
359+
let urlPath = `/fake/outer/number`;
360+
343361
const response = await this.request({
344-
path: `/fake/outer/number`,
362+
path: urlPath,
345363
method: 'POST',
346364
headers: headerParameters,
347365
query: queryParameters,
@@ -373,8 +391,11 @@ export class FakeApi extends runtime.BaseAPI {
373391

374392
headerParameters['Content-Type'] = 'application/json';
375393

394+
395+
let urlPath = `/fake/outer/string`;
396+
376397
const response = await this.request({
377-
path: `/fake/outer/string`,
398+
path: urlPath,
378399
method: 'POST',
379400
headers: headerParameters,
380401
query: queryParameters,
@@ -413,8 +434,11 @@ export class FakeApi extends runtime.BaseAPI {
413434

414435
headerParameters['Content-Type'] = 'application/json';
415436

437+
438+
let urlPath = `/fake/property/enum-int`;
439+
416440
const response = await this.request({
417-
path: `/fake/property/enum-int`,
441+
path: urlPath,
418442
method: 'POST',
419443
headers: headerParameters,
420444
query: queryParameters,
@@ -450,8 +474,11 @@ export class FakeApi extends runtime.BaseAPI {
450474

451475
headerParameters['Content-Type'] = 'application/json';
452476

477+
478+
let urlPath = `/fake/additionalProperties-reference`;
479+
453480
const response = await this.request({
454-
path: `/fake/additionalProperties-reference`,
481+
path: urlPath,
455482
method: 'POST',
456483
headers: headerParameters,
457484
query: queryParameters,
@@ -486,8 +513,11 @@ export class FakeApi extends runtime.BaseAPI {
486513

487514
headerParameters['Content-Type'] = 'image/png';
488515

516+
517+
let urlPath = `/fake/body-with-binary`;
518+
489519
const response = await this.request({
490-
path: `/fake/body-with-binary`,
520+
path: urlPath,
491521
method: 'PUT',
492522
headers: headerParameters,
493523
query: queryParameters,
@@ -521,8 +551,11 @@ export class FakeApi extends runtime.BaseAPI {
521551

522552
headerParameters['Content-Type'] = 'application/json';
523553

554+
555+
let urlPath = `/fake/body-with-file-schema`;
556+
524557
const response = await this.request({
525-
path: `/fake/body-with-file-schema`,
558+
path: urlPath,
526559
method: 'PUT',
527560
headers: headerParameters,
528561
query: queryParameters,
@@ -566,8 +599,11 @@ export class FakeApi extends runtime.BaseAPI {
566599

567600
headerParameters['Content-Type'] = 'application/json';
568601

602+
603+
let urlPath = `/fake/body-with-query-params`;
604+
569605
const response = await this.request({
570-
path: `/fake/body-with-query-params`,
606+
path: urlPath,
571607
method: 'PUT',
572608
headers: headerParameters,
573609
query: queryParameters,
@@ -601,8 +637,11 @@ export class FakeApi extends runtime.BaseAPI {
601637

602638
headerParameters['Content-Type'] = 'application/json';
603639

640+
641+
let urlPath = `/fake`;
642+
604643
const response = await this.request({
605-
path: `/fake`,
644+
path: urlPath,
606645
method: 'PATCH',
607646
headers: headerParameters,
608647
query: queryParameters,
@@ -733,8 +772,11 @@ export class FakeApi extends runtime.BaseAPI {
733772
formParams.append('callback', requestParameters['callback'] as any);
734773
}
735774

775+
776+
let urlPath = `/fake`;
777+
736778
const response = await this.request({
737-
path: `/fake`,
779+
path: urlPath,
738780
method: 'POST',
739781
headers: headerParameters,
740782
query: queryParameters,
@@ -811,8 +853,11 @@ export class FakeApi extends runtime.BaseAPI {
811853
formParams.append('enum_form_string', requestParameters['enumFormString'] as any);
812854
}
813855

856+
857+
let urlPath = `/fake`;
858+
814859
const response = await this.request({
815-
path: `/fake`,
860+
path: urlPath,
816861
method: 'GET',
817862
headers: headerParameters,
818863
query: queryParameters,
@@ -892,8 +937,11 @@ export class FakeApi extends runtime.BaseAPI {
892937
headerParameters["Authorization"] = `Bearer ${tokenString}`;
893938
}
894939
}
940+
941+
let urlPath = `/fake`;
942+
895943
const response = await this.request({
896-
path: `/fake`,
944+
path: urlPath,
897945
method: 'DELETE',
898946
headers: headerParameters,
899947
query: queryParameters,
@@ -928,8 +976,11 @@ export class FakeApi extends runtime.BaseAPI {
928976

929977
headerParameters['Content-Type'] = 'application/json';
930978

979+
980+
let urlPath = `/fake/inline-additionalProperties`;
981+
931982
const response = await this.request({
932-
path: `/fake/inline-additionalProperties`,
983+
path: urlPath,
933984
method: 'POST',
934985
headers: headerParameters,
935986
query: queryParameters,
@@ -965,8 +1016,11 @@ export class FakeApi extends runtime.BaseAPI {
9651016

9661017
headerParameters['Content-Type'] = 'application/json';
9671018

1019+
1020+
let urlPath = `/fake/inline-freeform-additionalProperties`;
1021+
9681022
const response = await this.request({
969-
path: `/fake/inline-freeform-additionalProperties`,
1023+
path: urlPath,
9701024
method: 'POST',
9711025
headers: headerParameters,
9721026
query: queryParameters,
@@ -1029,8 +1083,11 @@ export class FakeApi extends runtime.BaseAPI {
10291083
formParams.append('param2', requestParameters['param2'] as any);
10301084
}
10311085

1086+
1087+
let urlPath = `/fake/jsonFormData`;
1088+
10321089
const response = await this.request({
1033-
path: `/fake/jsonFormData`,
1090+
path: urlPath,
10341091
method: 'GET',
10351092
headers: headerParameters,
10361093
query: queryParameters,
@@ -1066,8 +1123,11 @@ export class FakeApi extends runtime.BaseAPI {
10661123

10671124
headerParameters['Content-Type'] = 'application/json';
10681125

1126+
1127+
let urlPath = `/fake/nullable`;
1128+
10691129
const response = await this.request({
1070-
path: `/fake/nullable`,
1130+
path: urlPath,
10711131
method: 'POST',
10721132
headers: headerParameters,
10731133
query: queryParameters,
@@ -1163,8 +1223,11 @@ export class FakeApi extends runtime.BaseAPI {
11631223

11641224
const headerParameters: runtime.HTTPHeaders = {};
11651225

1226+
1227+
let urlPath = `/fake/test-query-parameters`;
1228+
11661229
const response = await this.request({
1167-
path: `/fake/test-query-parameters`,
1230+
path: urlPath,
11681231
method: 'PUT',
11691232
headers: headerParameters,
11701233
query: queryParameters,
@@ -1198,8 +1261,11 @@ export class FakeApi extends runtime.BaseAPI {
11981261

11991262
headerParameters['Content-Type'] = 'application/json';
12001263

1264+
1265+
let urlPath = `/fake/stringMap-reference`;
1266+
12011267
const response = await this.request({
1202-
path: `/fake/stringMap-reference`,
1268+
path: urlPath,
12031269
method: 'POST',
12041270
headers: headerParameters,
12051271
query: queryParameters,

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ export class FakeClassnameTags123Api extends runtime.BaseAPI {
5353
queryParameters["api_key_query"] = await this.configuration.apiKey("api_key_query"); // api_key_query authentication
5454
}
5555

56+
57+
let urlPath = `/fake_classname_test`;
58+
5659
const response = await this.request({
57-
path: `/fake_classname_test`,
60+
path: urlPath,
5861
method: 'PATCH',
5962
headers: headerParameters,
6063
query: queryParameters,

0 commit comments

Comments
 (0)