@rest-vir/define-service 0.11.2 → 0.11.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,6 +2,7 @@ import { check } from '@augment-vir/assert';
|
|
|
2
2
|
import { addPrefix, filterMap, getObjectTypedEntries, HttpMethod, } from '@augment-vir/common';
|
|
3
3
|
import { assertValidShape } from 'object-shape-tester';
|
|
4
4
|
import { buildUrl } from 'url-vir';
|
|
5
|
+
import { parseJsonWithUndefined } from '../augments/json.js';
|
|
5
6
|
function defaultFetch(...[url, requestInit,]) {
|
|
6
7
|
return fetch(url, requestInit);
|
|
7
8
|
}
|
|
@@ -64,7 +65,9 @@ export async function fetchEndpoint(endpoint, ...params) {
|
|
|
64
65
|
/* node:coverage ignore next: all tests mock fetch so we're never going to have a fallback here. */
|
|
65
66
|
const response = await (fetch || defaultFetch)(url, requestInit, endpoint);
|
|
66
67
|
if (response.ok) {
|
|
67
|
-
const responseData = endpoint.responseDataShape
|
|
68
|
+
const responseData = endpoint.responseDataShape
|
|
69
|
+
? parseJsonWithUndefined(await response.text())
|
|
70
|
+
: undefined;
|
|
68
71
|
if (endpoint.responseDataShape) {
|
|
69
72
|
assertValidShape(responseData, endpoint.responseDataShape, { allowExtraKeys: true });
|
|
70
73
|
}
|
|
@@ -33,12 +33,12 @@ function finalizeServiceDefinition(serviceInit) {
|
|
|
33
33
|
assertValidShape({ searchParamsShape: undefined, ...endpointInit }, endpointInitShape);
|
|
34
34
|
const endpoint = {
|
|
35
35
|
...endpointInit,
|
|
36
|
-
requestDataShape: endpointInit.requestDataShape
|
|
37
|
-
?
|
|
38
|
-
:
|
|
39
|
-
responseDataShape: endpointInit.responseDataShape
|
|
40
|
-
?
|
|
41
|
-
:
|
|
36
|
+
requestDataShape: endpointInit.requestDataShape == undefined
|
|
37
|
+
? undefined
|
|
38
|
+
: defineShape(endpointInit.requestDataShape, true),
|
|
39
|
+
responseDataShape: endpointInit.responseDataShape == undefined
|
|
40
|
+
? undefined
|
|
41
|
+
: defineShape(endpointInit.responseDataShape, true),
|
|
42
42
|
path: endpointPath,
|
|
43
43
|
service: minimalService,
|
|
44
44
|
customProps: endpointInit.customProps,
|