Skip to content

Commit bb42080

Browse files
azertyalexazertyalex
committed
feat(types): Add request configuration method to {{classname}}Interface
1 parent 6f9a5b8 commit bb42080

50 files changed

Lines changed: 894 additions & 915 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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,13 @@ export interface {{classname}}Interface {
4747
{{#allParams}}
4848
* @param {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> {{^required}}[{{/required}}{{paramName}}{{^required}}]{{/required}} {{description}}
4949
{{/allParams}}
50-
* @param {*} [options] Override http request option.
5150
{{#isDeprecated}}
5251
* @deprecated
5352
{{/isDeprecated}}
5453
* @throws {RequiredError}
5554
* @memberof {{classname}}Interface
5655
*/
57-
{{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts>;
56+
{{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise<runtime.RequestOpts>;
5857

5958
/**
6059
* {{&notes}}
@@ -114,7 +113,7 @@ export class {{classname}} extends runtime.BaseAPI {
114113
* @deprecated
115114
{{/isDeprecated}}
116115
*/
117-
async {{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
116+
async {{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}): Promise<runtime.RequestOpts> {
118117
{{#allParams}}
119118
{{#required}}
120119
if (requestParameters['{{paramName}}'] == null) {
@@ -361,8 +360,8 @@ export class {{classname}} extends runtime.BaseAPI {
361360
{{/isDeprecated}}
362361
*/
363362
async {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
364-
const requestConfig = await this.{{nickname}}RequestConfig({{#allParams.0}}requestParameters, {{/allParams.0}}initOverrides);
365-
const response = await this.request(requestConfig, initOverrides);
363+
const requestOptions = await this.{{nickname}}RequestOpts({{#allParams.0}}requestParameters{{/allParams.0}});
364+
const response = await this.request(requestOptions, initOverrides);
366365
367366
{{#returnType}}
368367
{{#isResponseFile}}

‎samples/client/others/typescript-fetch/infinite-recursion-issue/apis/TestApi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class TestApi extends runtime.BaseAPI {
3030
/**
3131
* Creates request options for test without sending the request
3232
*/
33-
async testRequestOpts(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
33+
async testRequestOpts(): Promise<runtime.RequestOpts> {
3434
const queryParameters: any = {};
3535

3636
const headerParameters: runtime.HTTPHeaders = {};
@@ -49,8 +49,8 @@ export class TestApi extends runtime.BaseAPI {
4949
/**
5050
*/
5151
async testRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<TestBaseDto>>> {
52-
const requestConfig = await this.testRequestConfig(initOverrides);
53-
const response = await this.request(requestConfig, initOverrides);
52+
const requestOptions = await this.testRequestOpts();
53+
const response = await this.request(requestOptions, initOverrides);
5454

5555
return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(TestBaseDtoFromJSON));
5656
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class DefaultApi extends runtime.BaseAPI {
3434
/**
3535
* Creates request options for list without sending the request
3636
*/
37-
async listRequestOpts(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
37+
async listRequestOpts(requestParameters: ListRequest): Promise<runtime.RequestOpts> {
3838
if (requestParameters['personId'] == null) {
3939
throw new runtime.RequiredError(
4040
'personId',
@@ -61,8 +61,8 @@ export class DefaultApi extends runtime.BaseAPI {
6161
/**
6262
*/
6363
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
64-
const requestConfig = await this.listRequestConfig(requestParameters, initOverrides);
65-
const response = await this.request(requestConfig, initOverrides);
64+
const requestOptions = await this.listRequestOpts(requestParameters);
65+
const response = await this.request(requestOptions, initOverrides);
6666

6767
return new runtime.JSONApiResponse(response, (jsonValue) => ClubFromJSON(jsonValue));
6868
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class DefaultApi extends runtime.BaseAPI {
3434
/**
3535
* Creates request options for list without sending the request
3636
*/
37-
async listRequestOpts(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
37+
async listRequestOpts(requestParameters: ListRequest): Promise<runtime.RequestOpts> {
3838
if (requestParameters['personId'] == null) {
3939
throw new runtime.RequiredError(
4040
'personId',
@@ -61,8 +61,8 @@ export class DefaultApi extends runtime.BaseAPI {
6161
/**
6262
*/
6363
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
64-
const requestConfig = await this.listRequestConfig(requestParameters, initOverrides);
65-
const response = await this.request(requestConfig, initOverrides);
64+
const requestOptions = await this.listRequestOpts(requestParameters);
65+
const response = await this.request(requestOptions, initOverrides);
6666

6767
return new runtime.JSONApiResponse(response, (jsonValue) => ClubFromJSON(jsonValue));
6868
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class AnotherFakeApi extends runtime.BaseAPI {
3434
/**
3535
* Creates request options for _123testSpecialTags without sending the request
3636
*/
37-
async _123testSpecialTagsRequestOpts(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
37+
async _123testSpecialTagsRequestOpts(requestParameters: 123testSpecialTagsRequest): Promise<runtime.RequestOpts> {
3838
if (requestParameters['client'] == null) {
3939
throw new runtime.RequiredError(
4040
'client',
@@ -65,8 +65,8 @@ export class AnotherFakeApi extends runtime.BaseAPI {
6565
* To test special tags
6666
*/
6767
async _123testSpecialTagsRaw(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Client>> {
68-
const requestConfig = await this._123testSpecialTagsRequestConfig(requestParameters, initOverrides);
69-
const response = await this.request(requestConfig, initOverrides);
68+
const requestOptions = await this._123testSpecialTagsRequestOpts(requestParameters);
69+
const response = await this.request(requestOptions, initOverrides);
7070

7171
return new runtime.JSONApiResponse(response, (jsonValue) => ClientFromJSON(jsonValue));
7272
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class DefaultApi extends runtime.BaseAPI {
3030
/**
3131
* Creates request options for fooGet without sending the request
3232
*/
33-
async fooGetRequestOpts(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
33+
async fooGetRequestOpts(): Promise<runtime.RequestOpts> {
3434
const queryParameters: any = {};
3535

3636
const headerParameters: runtime.HTTPHeaders = {};
@@ -49,8 +49,8 @@ export class DefaultApi extends runtime.BaseAPI {
4949
/**
5050
*/
5151
async fooGetRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FooGetDefaultResponse>> {
52-
const requestConfig = await this.fooGetRequestConfig(initOverrides);
53-
const response = await this.request(requestConfig, initOverrides);
52+
const requestOptions = await this.fooGetRequestOpts();
53+
const response = await this.request(requestOptions, initOverrides);
5454

5555
return new runtime.JSONApiResponse(response, (jsonValue) => FooGetDefaultResponseFromJSON(jsonValue));
5656
}

0 commit comments

Comments
 (0)