@ethlete/query 0.1.0-next.6 → 0.1.0-next.7
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.
|
@@ -5,7 +5,10 @@ export const request = async (options) => {
|
|
|
5
5
|
if (!response.ok) {
|
|
6
6
|
throw response;
|
|
7
7
|
}
|
|
8
|
-
const
|
|
8
|
+
const isJsonResponse = response.headers.get('Content-Type')?.includes('application/json');
|
|
9
|
+
const isTextResponse = response.headers.get('Content-Type')?.includes('text/plain');
|
|
10
|
+
console.log({ isJsonResponse, isTextResponse, h: response.headers.get('Content-Type') });
|
|
11
|
+
const data = (isJsonResponse ? await response.json() : isTextResponse ? await response.text() : null);
|
|
9
12
|
const expiresInSeconds = options.cacheAdapter
|
|
10
13
|
? options.cacheAdapter(response.headers)
|
|
11
14
|
: extractExpiresInSeconds(response.headers);
|
|
@@ -16,4 +19,4 @@ export const request = async (options) => {
|
|
|
16
19
|
throw await buildRequestError(error, options.route, options.init);
|
|
17
20
|
}
|
|
18
21
|
};
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvcXVlcnkvc3JjL2xpYi9yZXF1ZXN0L3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLGlCQUFpQixFQUFFLHlCQUF5QixFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFdkcsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLEtBQUssRUFBc0IsT0FJakQsRUFBRSxFQUFFO0lBQ0gsSUFBSTtRQUNGLE1BQU0sUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTFELElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFO1lBQ2hCLE1BQU0sUUFBUSxDQUFDO1NBQ2hCO1FBRUQsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsUUFBUSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDMUYsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBRXBGLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxjQUFjLEVBQUUsY0FBYyxFQUFFLENBQUMsRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFekYsTUFBTSxJQUFJLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQWEsQ0FBQztRQUVsSCxNQUFNLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxZQUFZO1lBQzNDLENBQUMsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7WUFDeEMsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUU5QyxNQUFNLGtCQUFrQixHQUFHLHlCQUF5QixDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFFdkUsT0FBTyxFQUFFLElBQUksRUFBRSxrQkFBa0IsRUFBRSxDQUFDO0tBQ3JDO0lBQUMsT0FBTyxLQUFLLEVBQUU7UUFDZCxNQUFNLE1BQU0saUJBQWlCLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0tBQ25FO0FBQ0gsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2FjaGVBZGFwdGVyRm4gfSBmcm9tICcuL3JlcXVlc3QudHlwZXMnO1xuaW1wb3J0IHsgYnVpbGRSZXF1ZXN0RXJyb3IsIGJ1aWxkVGltZXN0YW1wRnJvbVNlY29uZHMsIGV4dHJhY3RFeHBpcmVzSW5TZWNvbmRzIH0gZnJvbSAnLi9yZXF1ZXN0LnV0aWwnO1xuXG5leHBvcnQgY29uc3QgcmVxdWVzdCA9IGFzeW5jIDxSZXNwb25zZSA9IHVua25vd24+KG9wdGlvbnM6IHtcbiAgcm91dGU6IHN0cmluZztcbiAgaW5pdD86IFJlcXVlc3RJbml0O1xuICBjYWNoZUFkYXB0ZXI/OiBDYWNoZUFkYXB0ZXJGbjtcbn0pID0+IHtcbiAgdHJ5IHtcbiAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IGZldGNoKG9wdGlvbnMucm91dGUsIG9wdGlvbnMuaW5pdCk7XG5cbiAgICBpZiAoIXJlc3BvbnNlLm9rKSB7XG4gICAgICB0aHJvdyByZXNwb25zZTtcbiAgICB9XG5cbiAgICBjb25zdCBpc0pzb25SZXNwb25zZSA9IHJlc3BvbnNlLmhlYWRlcnMuZ2V0KCdDb250ZW50LVR5cGUnKT8uaW5jbHVkZXMoJ2FwcGxpY2F0aW9uL2pzb24nKTtcbiAgICBjb25zdCBpc1RleHRSZXNwb25zZSA9IHJlc3BvbnNlLmhlYWRlcnMuZ2V0KCdDb250ZW50LVR5cGUnKT8uaW5jbHVkZXMoJ3RleHQvcGxhaW4nKTtcblxuICAgIGNvbnNvbGUubG9nKHsgaXNKc29uUmVzcG9uc2UsIGlzVGV4dFJlc3BvbnNlLCBoOiByZXNwb25zZS5oZWFkZXJzLmdldCgnQ29udGVudC1UeXBlJykgfSk7XG5cbiAgICBjb25zdCBkYXRhID0gKGlzSnNvblJlc3BvbnNlID8gYXdhaXQgcmVzcG9uc2UuanNvbigpIDogaXNUZXh0UmVzcG9uc2UgPyBhd2FpdCByZXNwb25zZS50ZXh0KCkgOiBudWxsKSBhcyBSZXNwb25zZTtcblxuICAgIGNvbnN0IGV4cGlyZXNJblNlY29uZHMgPSBvcHRpb25zLmNhY2hlQWRhcHRlclxuICAgICAgPyBvcHRpb25zLmNhY2hlQWRhcHRlcihyZXNwb25zZS5oZWFkZXJzKVxuICAgICAgOiBleHRyYWN0RXhwaXJlc0luU2Vjb25kcyhyZXNwb25zZS5oZWFkZXJzKTtcblxuICAgIGNvbnN0IGV4cGlyZXNJblRpbWVzdGFtcCA9IGJ1aWxkVGltZXN0YW1wRnJvbVNlY29uZHMoZXhwaXJlc0luU2Vjb25kcyk7XG5cbiAgICByZXR1cm4geyBkYXRhLCBleHBpcmVzSW5UaW1lc3RhbXAgfTtcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICB0aHJvdyBhd2FpdCBidWlsZFJlcXVlc3RFcnJvcihlcnJvciwgb3B0aW9ucy5yb3V0ZSwgb3B0aW9ucy5pbml0KTtcbiAgfVxufTtcbiJdfQ==
|
|
@@ -267,12 +267,16 @@ const guessContentType = (body) => {
|
|
|
267
267
|
};
|
|
268
268
|
|
|
269
269
|
const request = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
270
|
+
var _a, _b;
|
|
270
271
|
try {
|
|
271
272
|
const response = yield fetch(options.route, options.init);
|
|
272
273
|
if (!response.ok) {
|
|
273
274
|
throw response;
|
|
274
275
|
}
|
|
275
|
-
const
|
|
276
|
+
const isJsonResponse = (_a = response.headers.get('Content-Type')) === null || _a === void 0 ? void 0 : _a.includes('application/json');
|
|
277
|
+
const isTextResponse = (_b = response.headers.get('Content-Type')) === null || _b === void 0 ? void 0 : _b.includes('text/plain');
|
|
278
|
+
console.log({ isJsonResponse, isTextResponse, h: response.headers.get('Content-Type') });
|
|
279
|
+
const data = (isJsonResponse ? yield response.json() : isTextResponse ? yield response.text() : null);
|
|
276
280
|
const expiresInSeconds = options.cacheAdapter
|
|
277
281
|
? options.cacheAdapter(response.headers)
|
|
278
282
|
: extractExpiresInSeconds(response.headers);
|