Skip to content

Commit daaea3a

Browse files
richgoldmdrichgoldmd
committed
Move response to hook only
1 parent 8685b67 commit daaea3a

File tree

6 files changed

+26
-33
lines changed

6 files changed

+26
-33
lines changed

‎src/templates/core/ApiResult.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ export interface ApiResult {
66
readonly status: number;
77
readonly statusText: string;
88
readonly body: any;
9-
readonly response?: any;
109
}

‎src/templates/core/OpenAPI.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import { ApiRequestOptions } from './ApiRequestOptions';
99
export interface RequestHookParams {
1010
url: string;
1111
options: ApiRequestOptions;
12-
responseHeader: string|undefined;
1312
}
1413

1514
export interface ResponseHookParams {
1615
url: string;
1716
result: ApiResult;
17+
response?: any;
1818
}
1919

2020
interface Config {

‎src/templates/core/fetch/request.hbs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
5858

5959
// Pre-hook on request if a function is provided.
6060
const requestHookResult = OpenAPI.REQUEST_HOOK ?
61-
(await OpenAPI.REQUEST_HOOK({ url, options, responseHeader: options.responseHeader})) :
62-
{ url, options, responseHeader: options.responseHeader};
61+
(await OpenAPI.REQUEST_HOOK({ url, options})) : { url, options };
6362

6463

6564
const response = await sendRequest(requestHookResult.options, requestHookResult.url);
@@ -72,11 +71,11 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
7271
ok: response.ok,
7372
status: response.status,
7473
statusText: response.statusText,
75-
body: responseHeader || responseBody,
76-
response
74+
body: responseHeader || responseBody
7775
};
7876

79-
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result}) : result;
77+
// Post-request Hook if provided
78+
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result, response}) : result;
8079

8180
catchErrors(options, result);
8281

‎src/templates/core/node/request.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
6262

6363
// Pre-hook on request if a function is provided.
6464
const requestHookResult = OpenAPI.REQUEST_HOOK ?
65-
(await OpenAPI.REQUEST_HOOK({ url, options, responseHeader: options.responseHeader})) :
66-
{ url, options, responseHeader: options.responseHeader};
65+
(await OpenAPI.REQUEST_HOOK({ url, options})) : { url, options };
6766

6867
const response = await sendRequest(requestHookResult.options, requestHookResult.url);
6968
const responseBody = await getResponseBody(response);
@@ -74,10 +73,11 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
7473
ok: response.ok,
7574
status: response.status,
7675
statusText: response.statusText,
77-
body: responseHeader || responseBody,
78-
response
76+
body: responseHeader || responseBody
7977
};
80-
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result}) : result;
78+
79+
// Post-request Hook if provided
80+
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result, response}) : result;
8181

8282
catchErrors(options, result);
8383
return result;

‎src/templates/core/xhr/request.hbs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
6161

6262
// Pre-hook on request if a function is provided.
6363
const requestHookResult = OpenAPI.REQUEST_HOOK ?
64-
(await OpenAPI.REQUEST_HOOK({ url, options, responseHeader: options.responseHeader})) :
65-
{ url, options, responseHeader: options.responseHeader};
64+
(await OpenAPI.REQUEST_HOOK({ url, options})) : { url, options };
6665

6766
const response = await sendRequest(requestHookResult.options, requestHookResult.url);
6867
const responseBody = await getResponseBody(response);
@@ -74,11 +73,11 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
7473
ok: isSuccess(response.status),
7574
status: response.status,
7675
statusText: response.statusText,
77-
body: responseHeader || responseBody,
78-
response
76+
body: responseHeader || responseBody
7977
};
8078

81-
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result}) : result;
79+
// Post-request Hook if provided
80+
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result, response}) : result;
8281

8382
catchErrors(options, result);
8483
return result;

‎test/__snapshots__/index.spec.js.snap

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export interface ApiResult {
5050
readonly status: number;
5151
readonly statusText: string;
5252
readonly body: any;
53-
readonly response?: any;
5453
}"
5554
`;
5655

@@ -66,13 +65,13 @@ import { ApiRequestOptions } from './ApiRequestOptions';
6665

6766
export interface RequestHookParams {
6867
url: string;
69-
request: ApiRequestOptions;
70-
responseHeader: string|undefined;
68+
options: ApiRequestOptions;
7169
}
7270

7371
export interface ResponseHookParams {
7472
url: string;
7573
result: ApiResult;
74+
response?: any;
7675
}
7776

7877
interface Config {
@@ -288,8 +287,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
288287

289288
// Pre-hook on request if a function is provided.
290289
const requestHookResult = OpenAPI.REQUEST_HOOK ?
291-
(await OpenAPI.REQUEST_HOOK({ url, request: options, responseHeader: options.responseHeader})) :
292-
{ url, options, responseHeader: options.responseHeader};
290+
(await OpenAPI.REQUEST_HOOK({ url, options})) : { url, options };
293291

294292

295293
const response = await sendRequest(requestHookResult.options, requestHookResult.url);
@@ -302,11 +300,11 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
302300
ok: response.ok,
303301
status: response.status,
304302
statusText: response.statusText,
305-
body: responseHeader || responseBody,
306-
response
303+
body: responseHeader || responseBody
307304
};
308305

309-
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result}) : result;
306+
// Post-request Hook if provided
307+
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result, response}) : result;
310308

311309
catchErrors(options, result);
312310

@@ -2424,7 +2422,6 @@ export interface ApiResult {
24242422
readonly status: number;
24252423
readonly statusText: string;
24262424
readonly body: any;
2427-
readonly response?: any;
24282425
}"
24292426
`;
24302427

@@ -2440,13 +2437,13 @@ import { ApiRequestOptions } from './ApiRequestOptions';
24402437

24412438
export interface RequestHookParams {
24422439
url: string;
2443-
request: ApiRequestOptions;
2444-
responseHeader: string|undefined;
2440+
options: ApiRequestOptions;
24452441
}
24462442

24472443
export interface ResponseHookParams {
24482444
url: string;
24492445
result: ApiResult;
2446+
response?: any;
24502447
}
24512448

24522449
interface Config {
@@ -2662,8 +2659,7 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
26622659

26632660
// Pre-hook on request if a function is provided.
26642661
const requestHookResult = OpenAPI.REQUEST_HOOK ?
2665-
(await OpenAPI.REQUEST_HOOK({ url, request: options, responseHeader: options.responseHeader})) :
2666-
{ url, options, responseHeader: options.responseHeader};
2662+
(await OpenAPI.REQUEST_HOOK({ url, options})) : { url, options };
26672663

26682664

26692665
const response = await sendRequest(requestHookResult.options, requestHookResult.url);
@@ -2676,11 +2672,11 @@ export async function request(options: ApiRequestOptions): Promise<ApiResult> {
26762672
ok: response.ok,
26772673
status: response.status,
26782674
statusText: response.statusText,
2679-
body: responseHeader || responseBody,
2680-
response
2675+
body: responseHeader || responseBody
26812676
};
26822677

2683-
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result}) : result;
2678+
// Post-request Hook if provided
2679+
result = OpenAPI.RESPONSE_HOOK ? await OpenAPI.RESPONSE_HOOK({url, result, response}) : result;
26842680

26852681
catchErrors(options, result);
26862682

0 commit comments

Comments
 (0)