@datocms/rest-client-utils 5.8.0 → 6.1.1
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.
- package/dist/cjs/__tests__/request.test.js +85 -0
- package/dist/cjs/__tests__/request.test.js.map +1 -0
- package/dist/cjs/errors.js +14 -0
- package/dist/cjs/errors.js.map +1 -1
- package/dist/cjs/request.js +35 -7
- package/dist/cjs/request.js.map +1 -1
- package/dist/esm/__tests__/buildNormalizedParams.test.js +2 -11
- package/dist/esm/__tests__/buildNormalizedParams.test.js.map +1 -1
- package/dist/esm/__tests__/request.test.d.ts +1 -0
- package/dist/esm/__tests__/request.test.js +78 -0
- package/dist/esm/__tests__/request.test.js.map +1 -0
- package/dist/esm/deserialize.js +23 -8
- package/dist/esm/deserialize.js.map +1 -1
- package/dist/esm/errors.js +14 -0
- package/dist/esm/errors.js.map +1 -1
- package/dist/esm/pollJobResult.js +15 -26
- package/dist/esm/pollJobResult.js.map +1 -1
- package/dist/esm/rawPageIterator.js +26 -40
- package/dist/esm/rawPageIterator.js.map +1 -1
- package/dist/esm/request.js +140 -117
- package/dist/esm/request.js.map +1 -1
- package/dist/esm/serialize.js +11 -16
- package/dist/esm/serialize.js.map +1 -1
- package/dist/types/__tests__/request.test.d.ts +1 -0
- package/package.json +2 -2
- package/src/__tests__/request.test.ts +105 -0
- package/src/errors.ts +17 -0
- package/src/request.ts +44 -8
|
@@ -1,46 +1,32 @@
|
|
|
1
|
-
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
2
|
-
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
3
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
-
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
5
|
-
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
6
|
-
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
7
|
-
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
8
|
-
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
9
|
-
function fulfill(value) { resume("next", value); }
|
|
10
|
-
function reject(value) { resume("throw", value); }
|
|
11
|
-
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
12
|
-
};
|
|
13
1
|
import { Scheduler } from 'async-scheduler';
|
|
14
2
|
import { deserializeRawItem } from './deserialize.js';
|
|
15
|
-
export function rawPageIterator(pagination, callPerformer, iteratorOptions, deserializeRawRequestBodyWithItems) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
: item);
|
|
41
|
-
}
|
|
3
|
+
export async function* rawPageIterator(pagination, callPerformer, iteratorOptions, deserializeRawRequestBodyWithItems) {
|
|
4
|
+
const perPage = (iteratorOptions === null || iteratorOptions === void 0 ? void 0 : iteratorOptions.perPage) || pagination.defaultLimit;
|
|
5
|
+
if (perPage > pagination.maxLimit) {
|
|
6
|
+
throw new Error(`perPage option cannot exceed maximum value of ${pagination.maxLimit}`);
|
|
7
|
+
}
|
|
8
|
+
const concurrency = (iteratorOptions === null || iteratorOptions === void 0 ? void 0 : iteratorOptions.concurrency) || 1;
|
|
9
|
+
if (concurrency > 10) {
|
|
10
|
+
throw new Error('concurrency option cannot exceed maximum value of 10');
|
|
11
|
+
}
|
|
12
|
+
const firstResponse = await callPerformer({ limit: perPage, offset: 0 });
|
|
13
|
+
for (const item of firstResponse.data) {
|
|
14
|
+
yield item;
|
|
15
|
+
}
|
|
16
|
+
const totalCount = firstResponse.meta.total_count;
|
|
17
|
+
const limiter = new Scheduler(concurrency);
|
|
18
|
+
const promises = [];
|
|
19
|
+
for (let offset = perPage; offset < totalCount; offset += perPage) {
|
|
20
|
+
promises.push(limiter.enqueue(() => callPerformer({ limit: perPage, offset })));
|
|
21
|
+
}
|
|
22
|
+
while (promises.length > 0) {
|
|
23
|
+
const response = await promises.shift();
|
|
24
|
+
for (const item of response.data) {
|
|
25
|
+
yield deserializeRawRequestBodyWithItems
|
|
26
|
+
? deserializeRawItem(item)
|
|
27
|
+
: item;
|
|
42
28
|
}
|
|
43
|
-
}
|
|
29
|
+
}
|
|
44
30
|
}
|
|
45
31
|
export function warnOnPageQueryParam(queryParams) {
|
|
46
32
|
if (queryParams && 'page' in queryParams) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rawPageIterator.js","sourceRoot":"","sources":["../../src/rawPageIterator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rawPageIterator.js","sourceRoot":"","sources":["../../src/rawPageIterator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAiBtD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,eAAe,CACpC,UAA6B,EAC7B,aAG6B,EAC7B,eAAiC,EACjC,kCAA4C;IAE5C,MAAM,OAAO,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,KAAI,UAAU,CAAC,YAAY,CAAC;IAEpE,IAAI,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,iDAAiD,UAAU,CAAC,QAAQ,EAAE,CACvE,CAAC;KACH;IAED,MAAM,WAAW,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,KAAI,CAAC,CAAC;IAEtD,IAAI,WAAW,GAAG,EAAE,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;KACzE;IAED,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAEzE,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE;QACrC,MAAM,IAAI,CAAC;KACZ;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;IAElD,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAE/C,KAAK,IAAI,MAAM,GAAG,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,MAAM,IAAI,OAAO,EAAE;QACjE,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,OAAO,CAAuB,GAAG,EAAE,CACzC,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAC1C,CACF,CAAC;KACH;IAED,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAG,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;YAChC,MAAM,kCAAkC;gBACtC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC;SACV;KACF;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAgD;IAEhD,IAAI,WAAW,IAAI,MAAM,IAAI,WAAW,EAAE;QACxC,OAAO,CAAC,IAAI,CACV,kGAAkG,CACnG,CAAC;KACH;AACH,CAAC"}
|
package/dist/esm/request.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
/// <reference lib="dom" />
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
import { buildNormalizedParams } from './buildNormalizedParams.js';
|
|
12
3
|
import { ApiError, TimeoutError, } from './errors.js';
|
|
13
4
|
import { CanceledPromiseError, makeCancelablePromise, } from './makeCancelablePromise.js';
|
|
@@ -32,6 +23,28 @@ function headersToObject(headers) {
|
|
|
32
23
|
});
|
|
33
24
|
return result;
|
|
34
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Headers whose value must never end up inside an error object.
|
|
28
|
+
*
|
|
29
|
+
* Right now this client only ever sets one of them, but the list is the point:
|
|
30
|
+
* a header added here is redacted everywhere an error can reach.
|
|
31
|
+
*/
|
|
32
|
+
const SENSITIVE_HEADERS = ['authorization'];
|
|
33
|
+
/**
|
|
34
|
+
* Returns a copy of the request headers with every sensitive value blanked out.
|
|
35
|
+
*
|
|
36
|
+
* Errors travel: they get logged, serialized, sent to error trackers, and — as
|
|
37
|
+
* we learned the hard way — occasionally echoed back to an HTTP client. The
|
|
38
|
+
* real headers are only ever handed to `fetch()`; what we keep on the error is
|
|
39
|
+
* this redacted copy.
|
|
40
|
+
*/
|
|
41
|
+
function redactHeaders(headers) {
|
|
42
|
+
return Object.fromEntries(Object.entries(headers).map(([key, value]) => SENSITIVE_HEADERS.includes(key.toLowerCase())
|
|
43
|
+
? // The last 4 characters are enough to tell two tokens apart while
|
|
44
|
+
// debugging, and useless to whoever gets hold of the log.
|
|
45
|
+
[key, `[REDACTED, ending in ${value.slice(-4)}]`]
|
|
46
|
+
: [key, value]));
|
|
47
|
+
}
|
|
35
48
|
function buildApiErrorInitObject(method, url, requestHeaders, requestBody, response, responseBody, preCallStack) {
|
|
36
49
|
return {
|
|
37
50
|
request: {
|
|
@@ -93,128 +106,138 @@ export function getFetchFn(customFetchFn) {
|
|
|
93
106
|
}
|
|
94
107
|
return fetchFn;
|
|
95
108
|
}
|
|
96
|
-
export function request(options) {
|
|
109
|
+
export async function request(options) {
|
|
97
110
|
var _a;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
111
|
+
const requestId = requestCount;
|
|
112
|
+
requestCount += 1;
|
|
113
|
+
const fetchFn = getFetchFn(options.fetchFn);
|
|
114
|
+
const preCallStack = options.preCallStack;
|
|
115
|
+
const userAgent = options.userAgent || '@datocms/rest-client-utils';
|
|
116
|
+
const retryCount = options.retryCount || 1;
|
|
117
|
+
const logLevel = options.logLevel || LogLevel.NONE;
|
|
118
|
+
const autoRetry = 'autoRetry' in options ? options.autoRetry : true;
|
|
119
|
+
const log = options.logFn || (() => true);
|
|
120
|
+
const headers = {
|
|
121
|
+
'content-type': 'application/json',
|
|
122
|
+
accept: 'application/json',
|
|
123
|
+
authorization: `Bearer ${options.apiToken}`,
|
|
124
|
+
'user-agent': userAgent,
|
|
125
|
+
...(options.extraHeaders ? lowercaseKeys(options.extraHeaders) : {}),
|
|
126
|
+
};
|
|
127
|
+
if (isBrowser) {
|
|
128
|
+
// user agent cannot be set on browser
|
|
129
|
+
delete headers['user-agent'];
|
|
130
|
+
}
|
|
131
|
+
const redactedHeaders = redactHeaders(headers);
|
|
132
|
+
const baseUrl = options.baseUrl.replace(/\/$/, '');
|
|
133
|
+
const body = options.body ? JSON.stringify(options.body, null, 2) : undefined;
|
|
134
|
+
const queryString = options.queryParams && Object.keys(options.queryParams).length > 0
|
|
135
|
+
? `?${new URLSearchParams(buildNormalizedParams(options.queryParams)).toString()}`
|
|
136
|
+
: '';
|
|
137
|
+
const url = `${baseUrl}${options.url}${queryString}`;
|
|
138
|
+
if (logLevel >= LogLevel.BASIC) {
|
|
139
|
+
log(`[${requestId}] ${options.method} ${url}`);
|
|
140
|
+
if (logLevel >= LogLevel.BODY_AND_HEADERS) {
|
|
141
|
+
for (const [key, value] of Object.entries(redactedHeaders)) {
|
|
142
|
+
log(`[${requestId}] ${key}: ${value}`);
|
|
128
143
|
}
|
|
129
144
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
log(`[${requestId}] Rate limit exceeded, wait ${waitTimeInSecs} seconds then retry...`);
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
log(`[${requestId}] Invalid response content type "${responseContentType}" (status ${response.status}). Wait ${waitTimeInSecs} seconds then retry...`);
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
yield wait(waitTimeInSecs * 1000);
|
|
159
|
-
return request(Object.assign(Object.assign({}, options), { retryCount: retryCount + 1 }));
|
|
145
|
+
if (logLevel >= LogLevel.BODY && body) {
|
|
146
|
+
log(`[${requestId}] ${body}`);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
// Declared out here so that the `finally` below can always clear it: a timer
|
|
150
|
+
// left pending keeps Node's event loop alive for as long as it runs.
|
|
151
|
+
let timeoutId;
|
|
152
|
+
try {
|
|
153
|
+
const requestPromise = makeCancelablePromise(fetchFn(url, {
|
|
154
|
+
method: options.method,
|
|
155
|
+
headers,
|
|
156
|
+
body,
|
|
157
|
+
}));
|
|
158
|
+
timeoutId = setTimeout(() => {
|
|
159
|
+
requestPromise.cancel();
|
|
160
|
+
}, options.requestTimeout || 30000);
|
|
161
|
+
const response = await requestPromise;
|
|
162
|
+
const responseContentType = response.headers.get('Content-Type');
|
|
163
|
+
const invalidContentType = responseContentType && !responseContentType.includes('application/json');
|
|
164
|
+
if (response.status === 429 || invalidContentType) {
|
|
165
|
+
if (!autoRetry || (invalidContentType && options.method !== 'GET')) {
|
|
166
|
+
throw new ApiError(buildApiErrorInitObject(options.method, url, redactedHeaders, options.body, response, undefined, preCallStack));
|
|
160
167
|
}
|
|
168
|
+
const waitTimeInSecs = response.headers.has('X-RateLimit-Reset')
|
|
169
|
+
? Number.parseInt(response.headers.get('X-RateLimit-Reset'), 10)
|
|
170
|
+
: retryCount;
|
|
161
171
|
if (logLevel >= LogLevel.BASIC) {
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
'x-queue-time',
|
|
168
|
-
'x-ratelimit-remaining',
|
|
169
|
-
'x-request-id',
|
|
170
|
-
'cf-ray',
|
|
171
|
-
]) {
|
|
172
|
-
const value = response.headers.get(key);
|
|
173
|
-
if (value) {
|
|
174
|
-
log(`[${requestId}] ${key}: ${value}`);
|
|
175
|
-
}
|
|
176
|
-
}
|
|
172
|
+
if (response.status === 429) {
|
|
173
|
+
log(`[${requestId}] Rate limit exceeded, wait ${waitTimeInSecs} seconds then retry...`);
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
log(`[${requestId}] Invalid response content type "${responseContentType}" (status ${response.status}). Wait ${waitTimeInSecs} seconds then retry...`);
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
179
|
+
await wait(waitTimeInSecs * 1000);
|
|
180
|
+
return request({ ...options, retryCount: retryCount + 1 });
|
|
181
|
+
}
|
|
182
|
+
if (logLevel >= LogLevel.BASIC) {
|
|
183
|
+
log(`[${requestId}] Status: ${response.status} (${response.statusText})`);
|
|
184
|
+
if (logLevel >= LogLevel.BODY_AND_HEADERS) {
|
|
185
|
+
for (const key of [
|
|
186
|
+
'x-api-version',
|
|
187
|
+
'x-environment',
|
|
188
|
+
'x-queue-time',
|
|
189
|
+
'x-ratelimit-remaining',
|
|
190
|
+
'x-request-id',
|
|
191
|
+
'cf-ray',
|
|
192
|
+
]) {
|
|
193
|
+
const value = response.headers.get(key);
|
|
194
|
+
if (value) {
|
|
195
|
+
log(`[${requestId}] ${key}: ${value}`);
|
|
196
|
+
}
|
|
187
197
|
}
|
|
188
|
-
responseBody = jobResult.payload;
|
|
189
198
|
}
|
|
190
|
-
|
|
191
|
-
|
|
199
|
+
}
|
|
200
|
+
let responseBody = response.status === 204 ? undefined : await response.json();
|
|
201
|
+
if (logLevel >= LogLevel.BODY && responseBody) {
|
|
202
|
+
log(`[${requestId}] ${JSON.stringify(responseBody, null, 2)}`);
|
|
203
|
+
}
|
|
204
|
+
if (response.status === 202) {
|
|
205
|
+
const jobResult = await options.fetchJobResult(responseBody.data.id);
|
|
206
|
+
if (jobResult.status < 200 || jobResult.status >= 300) {
|
|
207
|
+
throw new ApiError(buildApiErrorInitObjectFromJobResult(options.method, url, redactedHeaders, options.body, jobResult.status, jobResult.payload, preCallStack));
|
|
192
208
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
209
|
+
responseBody = jobResult.payload;
|
|
210
|
+
}
|
|
211
|
+
if (response.status >= 200 && response.status < 300) {
|
|
212
|
+
return responseBody;
|
|
213
|
+
}
|
|
214
|
+
const error = new ApiError(buildApiErrorInitObject(options.method, url, redactedHeaders, options.body, response, responseBody, preCallStack));
|
|
215
|
+
const transientErrorCode = (_a = error.errors.find((e) => e.attributes.transient)) === null || _a === void 0 ? void 0 : _a.attributes.code;
|
|
216
|
+
if (autoRetry && transientErrorCode) {
|
|
217
|
+
if (logLevel >= LogLevel.BASIC) {
|
|
218
|
+
log(`[${requestId}] ${transientErrorCode}, wait ${retryCount} seconds then retry...`);
|
|
201
219
|
}
|
|
202
|
-
|
|
220
|
+
await wait(retryCount * 1000);
|
|
221
|
+
return request({ ...options, retryCount: retryCount + 1 });
|
|
203
222
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
return request(Object.assign(Object.assign({}, options), { retryCount: retryCount + 1 }));
|
|
223
|
+
throw error;
|
|
224
|
+
}
|
|
225
|
+
catch (error) {
|
|
226
|
+
if (error instanceof CanceledPromiseError ||
|
|
227
|
+
(isErrorWithCode(error) && error.code.includes('ETIMEDOUT'))) {
|
|
228
|
+
if (autoRetry && retryCount < MAX_RETRY_COUNT_ON_TIMEOUT_ERROR) {
|
|
229
|
+
if (logLevel >= LogLevel.BASIC) {
|
|
230
|
+
log(`[${requestId}] Timeout error, wait ${retryCount} seconds then retry...`);
|
|
213
231
|
}
|
|
214
|
-
|
|
232
|
+
await wait(retryCount * 1000);
|
|
233
|
+
return request({ ...options, retryCount: retryCount + 1 });
|
|
215
234
|
}
|
|
216
|
-
throw
|
|
235
|
+
throw new TimeoutError(buildTimeoutErrorInitObject(options.method, url, redactedHeaders, options.body, preCallStack));
|
|
217
236
|
}
|
|
218
|
-
|
|
237
|
+
throw error;
|
|
238
|
+
}
|
|
239
|
+
finally {
|
|
240
|
+
clearTimeout(timeoutId);
|
|
241
|
+
}
|
|
219
242
|
}
|
|
220
243
|
//# sourceMappingURL=request.js.map
|
package/dist/esm/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAAA,2BAA2B
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/serialize.js
CHANGED
|
@@ -1,14 +1,3 @@
|
|
|
1
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
-
var t = {};
|
|
3
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
-
t[p] = s[p];
|
|
5
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
-
t[p[i]] = s[p[i]];
|
|
9
|
-
}
|
|
10
|
-
return t;
|
|
11
|
-
};
|
|
12
1
|
function isRel(object) {
|
|
13
2
|
return (typeof object === 'object' && !!object && 'id' in object && 'type' in object);
|
|
14
3
|
}
|
|
@@ -24,7 +13,7 @@ export function serializeRequestBody(body, options) {
|
|
|
24
13
|
data: body.map((entity) => { var _a; return (_a = serializeRequestBody(entity, options)) === null || _a === void 0 ? void 0 : _a.data; }),
|
|
25
14
|
};
|
|
26
15
|
}
|
|
27
|
-
const
|
|
16
|
+
const { id, type: typeInBody, meta, ...otherProperties } = body;
|
|
28
17
|
const attributes = {};
|
|
29
18
|
const relationships = {};
|
|
30
19
|
if (options.attributes === '*') {
|
|
@@ -102,7 +91,13 @@ export function serializeRequestBody(body, options) {
|
|
|
102
91
|
}
|
|
103
92
|
}
|
|
104
93
|
return {
|
|
105
|
-
data:
|
|
94
|
+
data: {
|
|
95
|
+
...(id || options.id ? { id: id || options.id } : {}),
|
|
96
|
+
type: options.type,
|
|
97
|
+
...(Object.keys(attributes).length > 0 ? { attributes } : {}),
|
|
98
|
+
...(Object.keys(relationships).length > 0 ? { relationships } : {}),
|
|
99
|
+
...(meta ? { meta } : {}),
|
|
100
|
+
},
|
|
106
101
|
};
|
|
107
102
|
}
|
|
108
103
|
function processValueForSerialization(value) {
|
|
@@ -124,7 +119,7 @@ export function serializeRawItem(item) {
|
|
|
124
119
|
if (!item || typeof item !== 'object') {
|
|
125
120
|
return item;
|
|
126
121
|
}
|
|
127
|
-
const { __itemTypeId
|
|
122
|
+
const { __itemTypeId, ...rest } = item;
|
|
128
123
|
const processedItem = {};
|
|
129
124
|
for (const [key, value] of Object.entries(rest)) {
|
|
130
125
|
processedItem[key] = processValueForSerialization(value);
|
|
@@ -136,8 +131,8 @@ export function serializeRawRequestBodyWithItems(body) {
|
|
|
136
131
|
return body;
|
|
137
132
|
}
|
|
138
133
|
if (Array.isArray(body.data)) {
|
|
139
|
-
return
|
|
134
|
+
return { ...body, data: body.data.map(serializeRawItem) };
|
|
140
135
|
}
|
|
141
|
-
return
|
|
136
|
+
return { ...body, data: serializeRawItem(body.data) };
|
|
142
137
|
}
|
|
143
138
|
//# sourceMappingURL=serialize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/serialize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../src/serialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datocms/rest-client-utils",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.1.1",
|
|
4
4
|
"description": "Utilities for DatoCMS REST API clients",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datocms",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"async-scheduler": "^1.4.4"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "ac4164968026ba62a2841d31d2b60c31eadb2cc8",
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@types/qs": "^6.9.7"
|
|
54
54
|
}
|