@datocms/rest-client-utils 0.1.8 → 1.1.2
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/ApiError.js +1 -17
- package/dist/cjs/ApiError.js.map +1 -1
- package/dist/cjs/deserialize.js +1 -17
- package/dist/cjs/deserialize.js.map +1 -1
- package/dist/cjs/rawPageIterator.js +33 -73
- package/dist/cjs/rawPageIterator.js.map +1 -1
- package/dist/cjs/request.js +23 -64
- package/dist/cjs/request.js.map +1 -1
- package/dist/cjs/serialize.js +3 -19
- package/dist/cjs/serialize.js.map +1 -1
- package/dist/cjs/wait.js.map +1 -1
- package/dist/esm/ApiError.js +1 -17
- package/dist/esm/ApiError.js.map +1 -1
- package/dist/esm/deserialize.js +1 -17
- package/dist/esm/deserialize.js.map +1 -1
- package/dist/esm/rawPageIterator.js +33 -73
- package/dist/esm/rawPageIterator.js.map +1 -1
- package/dist/esm/request.js +20 -61
- package/dist/esm/request.js.map +1 -1
- package/dist/esm/serialize.js +3 -19
- package/dist/esm/serialize.js.map +1 -1
- package/dist/esm/wait.d.ts +1 -1
- package/dist/esm/wait.js.map +1 -1
- package/dist/types/wait.d.ts +1 -1
- package/package.json +5 -2
- package/src/ApiError.ts +2 -2
- package/src/deserialize.ts +0 -2
- package/src/request.ts +2 -7
- package/src/serialize.ts +2 -2
- package/src/wait.ts +1 -1
package/dist/cjs/ApiError.js
CHANGED
|
@@ -14,22 +14,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
18
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
19
|
-
if (!m) return o;
|
|
20
|
-
var i = m.call(o), r, ar = [], e;
|
|
21
|
-
try {
|
|
22
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
23
|
-
}
|
|
24
|
-
catch (error) { e = { error: error }; }
|
|
25
|
-
finally {
|
|
26
|
-
try {
|
|
27
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
28
|
-
}
|
|
29
|
-
finally { if (e) throw e.error; }
|
|
30
|
-
}
|
|
31
|
-
return ar;
|
|
32
|
-
};
|
|
33
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
18
|
exports.ApiError = void 0;
|
|
35
19
|
function isErrorBody(body) {
|
|
@@ -133,7 +117,7 @@ var ApiError = /** @class */ (function (_super) {
|
|
|
133
117
|
(typeof filterDetails === 'function'
|
|
134
118
|
? filterDetails(error.attributes.details)
|
|
135
119
|
: Object.entries(filterDetails).every(function (_a) {
|
|
136
|
-
var
|
|
120
|
+
var key = _a[0], value = _a[1];
|
|
137
121
|
return error.attributes.details[key] === value;
|
|
138
122
|
})));
|
|
139
123
|
});
|
package/dist/cjs/ApiError.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAYA,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE;QAClE,OAAO,KAAK,CAAC;KACd;IAED,IAAM,YAAY,GAAG,IAAyB,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IAED,IAAM,gBAAgB,GAAG,YAAmC,CAAC;IAE7D,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,IAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzC,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,KAAK,IAAI;QAChB,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC;QAClB,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC;QACpB,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC;QACzB,OAAuB,CAAC,IAAI,KAAK,WAAW,EAC7C;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,IAAM,mBAAmB,GAAuC;IAC9D,iCAAiC,EAAE,oJAAoJ;IACvL,wBAAwB,EAAE,uCAAuC;IACjE,gBAAgB,EAAE,+CAA+C;IACjE,kBAAkB,EAAE,0FAA0F;IAC9G,mBAAmB,EAAE,4BAA4B;IACjD,aAAa,EAAE,6BAA6B;IAC5C,cAAc,EAAE,iHAAiH;IACjI,WAAW,EAAE,wFAAwF;IACrG,2BAA2B,EAAE,4EAA4E;IACzG,qBAAqB,EAAE,sCAAsC;IAC7D,kBAAkB,EAAE,2EAA2E;IAC/F,kBAAkB,EAAE,qKAAqK;IACzL,uBAAuB,EAAE,8DAA8D;IACvF,kBAAkB,EAAE,yFAAyF;IAC7G,qBAAqB,EAAE,6CAA6C;IACpE,gBAAgB,EAAE,oEAAoE;IACtF,kBAAkB,EAAE,qEAAqE;IACzF,0BAA0B,EAAE,qEAAqE;IACjG,oCAAoC,EAAE,oFAAoF;CAC3H,CAAC;AAEF,IAAM,+BAA+B,GAAuC;IAC1E,cAAc,EAAE,sEAAsE;IACtF,oBAAoB,EAAE,oEAAoE;IAC1F,UAAU,EAAE,wEAAwE;IACpF,KAAK,EAAE,yEAAyE;IAChF,OAAO,EAAE,+DAA+D;IACxE,oBAAoB,EAAE,+DAA+D;IACrF,GAAG,EAAE,yDAAyD;IAC9D,OAAO,EAAE,+DAA+D;IACxE,KAAK,EAAE,uEAAuE;IAC9E,gBAAgB,EAAE,qDAAqD;IACvE,KAAK,EAAE,8FAA8F;IACrG,aAAa,EAAE,4EAA4E;CAC5F,CAAC;AAsBF;IAA8B,4BAAK;IAKjC,kBAAY,UAA8B;;QAA1C,YACE,kBAAM,YAAY,CAAC,SAwBpB;QAvBC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;QAElD,IAAI,mBAAmB,IAAI,KAAK,EAAE;YAChC,KAAK,CAAC,iBAAiB,CAAC,KAAI,EAAE,QAAQ,CAAC,CAAC;SACzC;aAAM;YACL,KAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC;SAChC;QAED,KAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,KAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACpC,KAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAE5C,IAAI,OAAO,GAAG,UAAG,UAAU,CAAC,OAAO,CAAC,MAAM,cAAI,UAAU,CAAC,OAAO,CAAC,GAAG,eAAK,KAAI,CAAC,QAAQ,CAAC,MAAM,cAAI,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAE,CAAC;QAE5H,IAAI,KAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,OAAO,IAAI,cAAO,IAAI,CAAC,SAAS,CAAC,KAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC;SAC1D;QAED,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,KAAI,CAAC,YAAY,EAAE;YACrB,KAAI,CAAC,KAAK,IAAI,wBAAiB,KAAI,CAAC,YAAY,CAAE,CAAC;SACpD;;IACH,CAAC;IAED,sBAAI,4BAAM;aAAV;YACE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpC,OAAO,EAAE,CAAC;aACX;YAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QACjC,CAAC;;;OAAA;IAED,4BAAS,GAAT,UACE,WAA8B,EAC9B,aAAiD;QAEjD,IAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,UAAC,KAAK;YACJ,OAAA,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBACrC,CAAC,CAAC,aAAa;oBACb,CAAC,OAAO,aAAa,KAAK,UAAU;wBAClC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;wBACzC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CACjC,UAAC,EAAY;gCAAX,GAAG,QAAA,EAAE,KAAK,QAAA;4BAAM,OAAA,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK;wBAAvC,CAAuC,CAC1D,CAAC,CAAC;QANT,CAMS,CACZ,CAAC;IACJ,CAAC;IAED,sBAAI,kCAAY;aAAhB;YAAA,iBAoBC;YAnBC,IAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAEjE,IAAI,gBAAgB,EAAE;gBACZ,IAAA,KAAK,GAAK,gBAAgB,CAAC,UAAU,CAAC,OAG7C,MAHY,CAGX;gBACF,OAAO,UAAG,+BAA+B,CAAC,KAAK,CAAC,0OAAuO,CAAC;aACzR;YAED,IAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;iBAC5C,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,KAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAApB,CAAoB,CAAC;iBACtC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,mBAAmB,CAAC,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;YAE5C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,IAAI,CAAC;aACb;YAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;;;OAAA;IACH,eAAC;AAAD,CAAC,AA9ED,CAA8B,KAAK,GA8ElC;AA9EY,4BAAQ"}
|
package/dist/cjs/deserialize.js
CHANGED
|
@@ -10,22 +10,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
-
if (!m) return o;
|
|
16
|
-
var i = m.call(o), r, ar = [], e;
|
|
17
|
-
try {
|
|
18
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
-
}
|
|
20
|
-
catch (error) { e = { error: error }; }
|
|
21
|
-
finally {
|
|
22
|
-
try {
|
|
23
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
-
}
|
|
25
|
-
finally { if (e) throw e.error; }
|
|
26
|
-
}
|
|
27
|
-
return ar;
|
|
28
|
-
};
|
|
29
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
14
|
exports.deserializeResponseBody = exports.deserializeJsonEntity = void 0;
|
|
31
15
|
function hasData(thing) {
|
|
@@ -35,7 +19,7 @@ function deserializeJsonEntity(_a) {
|
|
|
35
19
|
var id = _a.id, type = _a.type, attributes = _a.attributes, relationships = _a.relationships, meta = _a.meta;
|
|
36
20
|
return __assign(__assign(__assign(__assign(__assign({}, (id ? { id: id } : {})), (type ? { type: type } : {})), (attributes || {})), (relationships
|
|
37
21
|
? Object.fromEntries(Object.entries(relationships).map(function (_a) {
|
|
38
|
-
var
|
|
22
|
+
var rel = _a[0], value = _a[1];
|
|
39
23
|
return [
|
|
40
24
|
rel,
|
|
41
25
|
value === null || value === void 0 ? void 0 : value.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAYA,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,SAAgB,qBAAqB,CAAI,EAMzB;QALd,EAAE,QAAA,EACF,IAAI,UAAA,EACJ,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,IAAI,UAAA;IAEJ,OAAO,iDACF,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAClB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACtB,CAAC,UAAU,IAAI,EAAE,CAAC,GAClB,CAAC,aAAa;QACf,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA;gBAClD,GAAG;gBACH,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI;aACZ;QAHmD,CAGnD,CAAC,CACH;QACH,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrB,CAAC;AACT,CAAC;AArBD,sDAqBC;AAED,SAAgB,uBAAuB,CAAI,IAAa;IACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAiB,CAAC;KAC7D;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC;AAC1D,CAAC;AAVD,0DAUC"}
|
|
@@ -38,26 +38,14 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
|
|
|
38
38
|
function reject(value) { resume("throw", value); }
|
|
39
39
|
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
40
40
|
};
|
|
41
|
-
var __values = (this && this.__values) || function(o) {
|
|
42
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
43
|
-
if (m) return m.call(o);
|
|
44
|
-
if (o && typeof o.length === "number") return {
|
|
45
|
-
next: function () {
|
|
46
|
-
if (o && i >= o.length) o = void 0;
|
|
47
|
-
return { value: o && o[i++], done: !o };
|
|
48
|
-
}
|
|
49
|
-
};
|
|
50
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
51
|
-
};
|
|
52
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
42
|
exports.rawPageIterator = void 0;
|
|
54
43
|
var async_scheduler_1 = require("async-scheduler");
|
|
55
44
|
function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
56
45
|
return __asyncGenerator(this, arguments, function rawPageIterator_1() {
|
|
57
|
-
var perPage, concurrency, firstResponse,
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
switch (_g.label) {
|
|
46
|
+
var perPage, concurrency, firstResponse, _i, _a, item, totalCount, limiter, promises, _loop_1, offset, response, _b, _c, item;
|
|
47
|
+
return __generator(this, function (_d) {
|
|
48
|
+
switch (_d.label) {
|
|
61
49
|
case 0:
|
|
62
50
|
perPage = (iteratorOptions === null || iteratorOptions === void 0 ? void 0 : iteratorOptions.perPage) || pagination.defaultLimit;
|
|
63
51
|
if (perPage > pagination.maxLimit) {
|
|
@@ -69,35 +57,21 @@ function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
|
69
57
|
}
|
|
70
58
|
return [4 /*yield*/, __await(callPerformer({ limit: perPage, offset: 0 }))];
|
|
71
59
|
case 1:
|
|
72
|
-
firstResponse =
|
|
73
|
-
|
|
60
|
+
firstResponse = _d.sent();
|
|
61
|
+
_i = 0, _a = firstResponse.data;
|
|
62
|
+
_d.label = 2;
|
|
74
63
|
case 2:
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
_g.label = 3;
|
|
78
|
-
case 3:
|
|
79
|
-
if (!!_b.done) return [3 /*break*/, 7];
|
|
80
|
-
item = _b.value;
|
|
64
|
+
if (!(_i < _a.length)) return [3 /*break*/, 6];
|
|
65
|
+
item = _a[_i];
|
|
81
66
|
return [4 /*yield*/, __await(item)];
|
|
82
|
-
case
|
|
67
|
+
case 3: return [4 /*yield*/, _d.sent()];
|
|
68
|
+
case 4:
|
|
69
|
+
_d.sent();
|
|
70
|
+
_d.label = 5;
|
|
83
71
|
case 5:
|
|
84
|
-
|
|
85
|
-
|
|
72
|
+
_i++;
|
|
73
|
+
return [3 /*break*/, 2];
|
|
86
74
|
case 6:
|
|
87
|
-
_b = _a.next();
|
|
88
|
-
return [3 /*break*/, 3];
|
|
89
|
-
case 7: return [3 /*break*/, 10];
|
|
90
|
-
case 8:
|
|
91
|
-
e_1_1 = _g.sent();
|
|
92
|
-
e_1 = { error: e_1_1 };
|
|
93
|
-
return [3 /*break*/, 10];
|
|
94
|
-
case 9:
|
|
95
|
-
try {
|
|
96
|
-
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
97
|
-
}
|
|
98
|
-
finally { if (e_1) throw e_1.error; }
|
|
99
|
-
return [7 /*endfinally*/];
|
|
100
|
-
case 10:
|
|
101
75
|
totalCount = firstResponse.meta.total_count;
|
|
102
76
|
limiter = new async_scheduler_1.Scheduler(concurrency);
|
|
103
77
|
promises = [];
|
|
@@ -109,41 +83,27 @@ function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
|
109
83
|
for (offset = perPage; offset < totalCount; offset += perPage) {
|
|
110
84
|
_loop_1(offset);
|
|
111
85
|
}
|
|
112
|
-
|
|
113
|
-
case
|
|
114
|
-
if (!(promises.length > 0)) return [3 /*break*/,
|
|
86
|
+
_d.label = 7;
|
|
87
|
+
case 7:
|
|
88
|
+
if (!(promises.length > 0)) return [3 /*break*/, 14];
|
|
115
89
|
return [4 /*yield*/, __await(promises.shift())];
|
|
116
|
-
case
|
|
117
|
-
response =
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
case 14:
|
|
124
|
-
if (!!_d.done) return [3 /*break*/, 18];
|
|
125
|
-
item = _d.value;
|
|
90
|
+
case 8:
|
|
91
|
+
response = _d.sent();
|
|
92
|
+
_b = 0, _c = response.data;
|
|
93
|
+
_d.label = 9;
|
|
94
|
+
case 9:
|
|
95
|
+
if (!(_b < _c.length)) return [3 /*break*/, 13];
|
|
96
|
+
item = _c[_b];
|
|
126
97
|
return [4 /*yield*/, __await(item)];
|
|
127
|
-
case
|
|
128
|
-
case
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
case
|
|
132
|
-
|
|
133
|
-
return [3 /*break*/,
|
|
134
|
-
case
|
|
135
|
-
case
|
|
136
|
-
e_2_1 = _g.sent();
|
|
137
|
-
e_2 = { error: e_2_1 };
|
|
138
|
-
return [3 /*break*/, 21];
|
|
139
|
-
case 20:
|
|
140
|
-
try {
|
|
141
|
-
if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
|
|
142
|
-
}
|
|
143
|
-
finally { if (e_2) throw e_2.error; }
|
|
144
|
-
return [7 /*endfinally*/];
|
|
145
|
-
case 21: return [3 /*break*/, 11];
|
|
146
|
-
case 22: return [2 /*return*/];
|
|
98
|
+
case 10: return [4 /*yield*/, _d.sent()];
|
|
99
|
+
case 11:
|
|
100
|
+
_d.sent();
|
|
101
|
+
_d.label = 12;
|
|
102
|
+
case 12:
|
|
103
|
+
_b++;
|
|
104
|
+
return [3 /*break*/, 9];
|
|
105
|
+
case 13: return [3 /*break*/, 7];
|
|
106
|
+
case 14: return [2 /*return*/];
|
|
147
107
|
}
|
|
148
108
|
});
|
|
149
109
|
});
|
|
@@ -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,mDAA4C;AAiB5C,SAAuB,eAAe,CACpC,UAA6B,EAC7B,aAG6B,EAC7B,eAAiC;;;;;;oBAE3B,OAAO,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,KAAI,UAAU,CAAC,YAAY,CAAC;oBAEpE,IAAI,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE;wBACjC,MAAM,IAAI,KAAK,CACb,wDAAiD,UAAU,CAAC,QAAQ,CAAE,CACvE,CAAC;qBACH;oBAEK,WAAW,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,KAAI,CAAC,CAAC;oBAEtD,IAAI,WAAW,GAAG,EAAE,EAAE;wBACpB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;qBACzE;oBAEqB,6BAAM,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAA;;oBAAlE,aAAa,GAAG,SAAkD;0BAEnC,EAAlB,KAAA,aAAa,CAAC,IAAI;;;yBAAlB,CAAA,cAAkB,CAAA;oBAA1B,IAAI;iDACP,IAAI;wBAAV,gCAAU;;oBAAV,SAAU,CAAC;;;oBADM,IAAkB,CAAA;;;oBAI/B,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;oBAE5C,OAAO,GAAG,IAAI,2BAAS,CAAC,WAAW,CAAC,CAAC;oBACrC,QAAQ,GAA8B,EAAE,CAAC;wCAEtC,MAAM;wBACb,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,OAAO,CAAuB;4BACpC,OAAA,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,QAAA,EAAE,CAAC;wBAAzC,CAAyC,CAC1C,CACF,CAAC;;oBALJ,KAAS,MAAM,GAAG,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,MAAM,IAAI,OAAO;gCAAxD,MAAM;qBAMd;;;yBAEM,CAAA,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;oBAEP,6BAAM,QAAQ,CAAC,KAAK,EAAG,GAAA;;oBAAlC,QAAQ,GAAG,SAAuB;0BACR,EAAb,KAAA,QAAQ,CAAC,IAAI;;;yBAAb,CAAA,cAAa,CAAA;oBAArB,IAAI;iDACP,IAAI;yBAAV,gCAAU;;oBAAV,SAAU,CAAC;;;oBADM,IAAa,CAAA;;;;;;;CAInC;AAhDD,0CAgDC"}
|
package/dist/cjs/request.js
CHANGED
|
@@ -46,33 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
var __values = (this && this.__values) || function(o) {
|
|
50
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
51
|
-
if (m) return m.call(o);
|
|
52
|
-
if (o && typeof o.length === "number") return {
|
|
53
|
-
next: function () {
|
|
54
|
-
if (o && i >= o.length) o = void 0;
|
|
55
|
-
return { value: o && o[i++], done: !o };
|
|
56
|
-
}
|
|
57
|
-
};
|
|
58
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
59
|
-
};
|
|
60
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
61
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
62
|
-
if (!m) return o;
|
|
63
|
-
var i = m.call(o), r, ar = [], e;
|
|
64
|
-
try {
|
|
65
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
66
|
-
}
|
|
67
|
-
catch (error) { e = { error: error }; }
|
|
68
|
-
finally {
|
|
69
|
-
try {
|
|
70
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
71
|
-
}
|
|
72
|
-
finally { if (e) throw e.error; }
|
|
73
|
-
}
|
|
74
|
-
return ar;
|
|
75
|
-
};
|
|
76
49
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
77
50
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
78
51
|
};
|
|
@@ -81,6 +54,7 @@ exports.request = exports.LogLevel = void 0;
|
|
|
81
54
|
var qs_1 = __importDefault(require("qs"));
|
|
82
55
|
var cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
83
56
|
var ApiError_1 = require("./ApiError");
|
|
57
|
+
var wait_1 = require("./wait");
|
|
84
58
|
var LogLevel;
|
|
85
59
|
(function (LogLevel) {
|
|
86
60
|
/** No logging */
|
|
@@ -133,21 +107,15 @@ function buildApiErrorInitObjectFromJobResult(method, url, requestHeaders, reque
|
|
|
133
107
|
preCallStack: preCallStack,
|
|
134
108
|
};
|
|
135
109
|
}
|
|
136
|
-
function wait(time) {
|
|
137
|
-
return new Promise(function (resolve) {
|
|
138
|
-
setTimeout(resolve, time);
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
110
|
function isErrorWithCode(error) {
|
|
142
111
|
return typeof error === 'object' && !!error && 'code' in error;
|
|
143
112
|
}
|
|
144
113
|
var requestCount = 1;
|
|
145
114
|
function request(options) {
|
|
146
115
|
return __awaiter(this, void 0, void 0, function () {
|
|
147
|
-
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _a, _b,
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
switch (_f.label) {
|
|
116
|
+
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
117
|
+
return __generator(this, function (_d) {
|
|
118
|
+
switch (_d.label) {
|
|
151
119
|
case 0:
|
|
152
120
|
requestId = requestCount;
|
|
153
121
|
requestCount += 1;
|
|
@@ -167,34 +135,25 @@ function request(options) {
|
|
|
167
135
|
if (logLevel >= LogLevel.BASIC) {
|
|
168
136
|
log("[".concat(requestId, "] ").concat(options.method, " ").concat(url));
|
|
169
137
|
if (logLevel >= LogLevel.BODY_AND_HEADERS) {
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
log("[".concat(requestId, "] ").concat(key, ": ").concat(value));
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
177
|
-
finally {
|
|
178
|
-
try {
|
|
179
|
-
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
180
|
-
}
|
|
181
|
-
finally { if (e_1) throw e_1.error; }
|
|
138
|
+
for (_i = 0, _a = Object.entries(headers || {}); _i < _a.length; _i++) {
|
|
139
|
+
_b = _a[_i], key = _b[0], value = _b[1];
|
|
140
|
+
log("[".concat(requestId, "] ").concat(key, ": ").concat(value));
|
|
182
141
|
}
|
|
183
142
|
}
|
|
184
143
|
if (logLevel >= LogLevel.BODY && body) {
|
|
185
144
|
log("[".concat(requestId, "] ").concat(body));
|
|
186
145
|
}
|
|
187
146
|
}
|
|
188
|
-
|
|
147
|
+
_d.label = 1;
|
|
189
148
|
case 1:
|
|
190
|
-
|
|
149
|
+
_d.trys.push([1, 12, , 15]);
|
|
191
150
|
return [4 /*yield*/, (0, cross_fetch_1.default)(url, {
|
|
192
151
|
method: options.method,
|
|
193
152
|
headers: headers,
|
|
194
153
|
body: body,
|
|
195
154
|
})];
|
|
196
155
|
case 2:
|
|
197
|
-
response_1 =
|
|
156
|
+
response_1 = _d.sent();
|
|
198
157
|
responseContentType = response_1.headers.get('Content-Type');
|
|
199
158
|
invalidContentType = responseContentType && !responseContentType.includes('application/json');
|
|
200
159
|
if (!(response_1.status === 429 || invalidContentType)) return [3 /*break*/, 4];
|
|
@@ -213,9 +172,9 @@ function request(options) {
|
|
|
213
172
|
log("[".concat(requestId, "] Invalid response content type \"").concat(responseContentType, "\" (status ").concat(response_1.status, "). Wait ").concat(waitTimeInSecs, " seconds then retry..."));
|
|
214
173
|
}
|
|
215
174
|
}
|
|
216
|
-
return [4 /*yield*/, wait(waitTimeInSecs * 1000)];
|
|
175
|
+
return [4 /*yield*/, (0, wait_1.wait)(waitTimeInSecs * 1000)];
|
|
217
176
|
case 3:
|
|
218
|
-
|
|
177
|
+
_d.sent();
|
|
219
178
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
220
179
|
case 4:
|
|
221
180
|
if (logLevel >= LogLevel.BASIC) {
|
|
@@ -236,26 +195,26 @@ function request(options) {
|
|
|
236
195
|
}
|
|
237
196
|
}
|
|
238
197
|
if (!(response_1.status === 204)) return [3 /*break*/, 5];
|
|
239
|
-
|
|
198
|
+
_c = undefined;
|
|
240
199
|
return [3 /*break*/, 7];
|
|
241
200
|
case 5: return [4 /*yield*/, response_1.json()];
|
|
242
201
|
case 6:
|
|
243
|
-
|
|
244
|
-
|
|
202
|
+
_c = _d.sent();
|
|
203
|
+
_d.label = 7;
|
|
245
204
|
case 7:
|
|
246
|
-
responseBody =
|
|
205
|
+
responseBody = _c;
|
|
247
206
|
if (logLevel >= LogLevel.BODY && responseBody) {
|
|
248
207
|
log("[".concat(requestId, "] ").concat(JSON.stringify(responseBody, null, 2)));
|
|
249
208
|
}
|
|
250
209
|
if (!(response_1.status === 202)) return [3 /*break*/, 9];
|
|
251
210
|
return [4 /*yield*/, options.fetchJobResult(responseBody.data.id)];
|
|
252
211
|
case 8:
|
|
253
|
-
jobResult =
|
|
212
|
+
jobResult = _d.sent();
|
|
254
213
|
if (jobResult.status < 200 || jobResult.status >= 300) {
|
|
255
214
|
throw new ApiError_1.ApiError(buildApiErrorInitObjectFromJobResult(options.method, url, headers, options.body, jobResult.status, jobResult.payload, preCallStack));
|
|
256
215
|
}
|
|
257
216
|
responseBody = jobResult.payload;
|
|
258
|
-
|
|
217
|
+
_d.label = 9;
|
|
259
218
|
case 9:
|
|
260
219
|
if (response_1.status >= 200 && response_1.status < 300) {
|
|
261
220
|
return [2 /*return*/, responseBody];
|
|
@@ -265,20 +224,20 @@ function request(options) {
|
|
|
265
224
|
if (logLevel >= LogLevel.BASIC) {
|
|
266
225
|
log("[".concat(requestId, "] Data validation in progress, wait ").concat(retryCount, " seconds then retry..."));
|
|
267
226
|
}
|
|
268
|
-
return [4 /*yield*/, wait(retryCount * 1000)];
|
|
227
|
+
return [4 /*yield*/, (0, wait_1.wait)(retryCount * 1000)];
|
|
269
228
|
case 10:
|
|
270
|
-
|
|
229
|
+
_d.sent();
|
|
271
230
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
272
231
|
case 11: throw error;
|
|
273
232
|
case 12:
|
|
274
|
-
error_1 =
|
|
233
|
+
error_1 = _d.sent();
|
|
275
234
|
if (!(isErrorWithCode(error_1) && error_1.code.includes('ETIMEDOUT'))) return [3 /*break*/, 14];
|
|
276
235
|
if (logLevel >= LogLevel.BASIC) {
|
|
277
236
|
log("[".concat(requestId, "] Error ").concat(error_1.code, ", wait ").concat(retryCount, " seconds then retry..."));
|
|
278
237
|
}
|
|
279
|
-
return [4 /*yield*/, wait(retryCount * 1000)];
|
|
238
|
+
return [4 /*yield*/, (0, wait_1.wait)(retryCount * 1000)];
|
|
280
239
|
case 13:
|
|
281
|
-
|
|
240
|
+
_d.sent();
|
|
282
241
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
283
242
|
case 14: throw error_1;
|
|
284
243
|
case 15: return [2 /*return*/];
|
package/dist/cjs/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoB;AACpB,4DAAgC;AAChC,uCAA0D;AAE1D,+BAA8B;AAE9B,IAAY,QASX;AATD,WAAY,QAAQ;IAClB,iBAAiB;IACjB,uCAAQ,CAAA;IACR,8DAA8D;IAC9D,yCAAS,CAAA;IACT,0EAA0E;IAC1E,uCAAQ,CAAA;IACR,4FAA4F;IAC5F,+DAAoB,CAAA;AACtB,CAAC,EATW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QASnB;AAmBD,SAAS,eAAe,CAAC,OAAgB;IACvC,IAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,OAAO,CAAC,OAAO,CAAC,UAAC,KAAK,EAAE,GAAG;QACzB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAAc,EACd,GAAW,EACX,cAAsC,EACtC,WAAoB,EACpB,QAAkB,EAClB,YAAqB,EACrB,YAAqB;IAErB,OAAO;QACL,OAAO,EAAE;YACP,GAAG,KAAA;YACH,MAAM,QAAA;YACN,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,WAAW;SAClB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC1C,IAAI,EAAE,YAAY;SACnB;QACD,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAC3C,MAAc,EACd,GAAW,EACX,cAAsC,EACtC,WAAoB,EACpB,cAAsB,EACtB,YAAqB,EACrB,YAAqB;IAErB,OAAO;QACL,OAAO,EAAE;YACP,GAAG,KAAA;YACH,MAAM,QAAA;YACN,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,WAAW;SAClB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,cAAc;YACtB,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,YAAY;SACnB;QACD,YAAY,cAAA;KACb,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,IAAI,YAAY,GAAG,CAAC,CAAC;AAErB,SAAsB,OAAO,CAAI,OAAuB;;;;;;oBAChD,SAAS,GAAG,YAAY,CAAC;oBAC/B,YAAY,IAAI,CAAC,CAAC;oBAEZ,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;oBACpC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,4BAA4B,CAAC;oBAC9D,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;oBACrC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC;oBAC7C,SAAS,GAAG,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC9D,GAAG,GAAG,OAAO,CAAC,KAAK,IAAI,CAAC,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC;oBAEpC,OAAO,cACX,cAAc,EAAE,kBAAkB,EAClC,MAAM,EAAE,kBAAkB,EAC1B,aAAa,EAAE,iBAAU,OAAO,CAAC,QAAQ,CAAE,EAC3C,YAAY,EAAE,SAAS,IACpB,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAChC,CAAC;oBAEI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAC7C,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAExE,WAAW,GACf,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;wBAChE,CAAC,CAAC,WAAI,YAAE,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAE;wBACtE,CAAC,CAAC,EAAE,CAAC;oBAEH,GAAG,GAAG,UAAG,OAAO,SAAG,OAAO,CAAC,GAAG,SAAG,WAAW,CAAE,CAAC;oBAErD,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAC9B,GAAG,CAAC,WAAI,SAAS,eAAK,OAAO,CAAC,MAAM,cAAI,GAAG,CAAE,CAAC,CAAC;wBAC/C,IAAI,QAAQ,IAAI,QAAQ,CAAC,gBAAgB,EAAE;4BACzC,WAAwD,EAA7B,KAAA,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAA7B,cAA6B,EAA7B,IAA6B,EAAE;gCAA/C,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;gCACpB,GAAG,CAAC,WAAI,SAAS,eAAK,GAAG,eAAK,KAAK,CAAE,CAAC,CAAC;6BACxC;yBACF;wBACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;4BACrC,GAAG,CAAC,WAAI,SAAS,eAAK,IAAI,CAAE,CAAC,CAAC;yBAC/B;qBACF;;;;oBAGkB,qBAAM,IAAA,qBAAK,EAAC,GAAG,EAAE;4BAChC,MAAM,EAAE,OAAO,CAAC,MAAM;4BACtB,OAAO,SAAA;4BACP,IAAI,MAAA;yBACL,CAAC,EAAA;;oBAJI,aAAW,SAIf;oBAEI,mBAAmB,GAAG,UAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;oBAC3D,kBAAkB,GACtB,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;yBAEvE,CAAA,UAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAA,EAA7C,wBAA6C;oBAC/C,IAAI,CAAC,SAAS,IAAI,CAAC,kBAAkB,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE;wBAClE,MAAM,IAAI,mBAAQ,CAChB,uBAAuB,CACrB,OAAO,CAAC,MAAM,EACd,GAAG,EACH,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,UAAQ,EACR,SAAS,EACT,YAAY,CACb,CACF,CAAC;qBACH;oBAEK,cAAc,GAAG,UAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;wBAC9D,CAAC,CAAC,oEAAoE;4BACpE,QAAQ,CAAC,UAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAE,EAAE,EAAE,CAAC;wBAC1D,CAAC,CAAC,UAAU,CAAC;oBAEf,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAC9B,IAAI,UAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;4BAC3B,GAAG,CACD,WAAI,SAAS,yCAA+B,cAAc,2BAAwB,CACnF,CAAC;yBACH;6BAAM;4BACL,GAAG,CACD,WAAI,SAAS,+CAAoC,mBAAmB,wBAAa,UAAQ,CAAC,MAAM,qBAAW,cAAc,2BAAwB,CAClJ,CAAC;yBACH;qBACF;oBAED,qBAAM,IAAA,WAAI,EAAC,cAAc,GAAG,IAAI,CAAC,EAAA;;oBAAjC,SAAiC,CAAC;oBAElC,sBAAO,OAAO,uBAAM,OAAO,KAAE,UAAU,EAAE,UAAU,GAAG,CAAC,IAAG,EAAC;;oBAG7D,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAC9B,GAAG,CAAC,WAAI,SAAS,uBAAa,UAAQ,CAAC,MAAM,eAAK,UAAQ,CAAC,UAAU,MAAG,CAAC,CAAC;wBAC1E,IAAI,QAAQ,IAAI,QAAQ,CAAC,gBAAgB,EAAE;4BACzC;gCACE,eAAe;gCACf,eAAe;gCACf,cAAc;gCACd,uBAAuB;gCACvB,cAAc;6BACf,CAAC,OAAO,CAAC,UAAC,GAAG;gCACZ,IAAM,KAAK,GAAG,UAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gCACxC,IAAI,KAAK,EAAE;oCACT,GAAG,CAAC,WAAI,SAAS,eAAK,GAAG,eAAK,KAAK,CAAE,CAAC,CAAC;iCACxC;4BACH,CAAC,CAAC,CAAC;yBACJ;qBACF;yBAGC,CAAA,UAAQ,CAAC,MAAM,KAAK,GAAG,CAAA,EAAvB,wBAAuB;oBAAG,KAAA,SAAS,CAAA;;wBAAG,qBAAM,UAAQ,CAAC,IAAI,EAAE,EAAA;;oBAArB,KAAA,SAAqB,CAAA;;;oBADzD,YAAY,KAC6C;oBAE7D,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,YAAY,EAAE;wBAC7C,GAAG,CAAC,WAAI,SAAS,eAAK,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;qBAChE;yBAEG,CAAA,UAAQ,CAAC,MAAM,KAAK,GAAG,CAAA,EAAvB,wBAAuB;oBACP,qBAAM,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;oBAA9D,SAAS,GAAG,SAAkD;oBAEpE,IAAI,SAAS,CAAC,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,MAAM,IAAI,GAAG,EAAE;wBACrD,MAAM,IAAI,mBAAQ,CAChB,oCAAoC,CAClC,OAAO,CAAC,MAAM,EACd,GAAG,EACH,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,OAAO,EACjB,YAAY,CACb,CACF,CAAC;qBACH;oBAED,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC;;;oBAGnC,IAAI,UAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,UAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;wBACnD,sBAAO,YAAY,EAAC;qBACrB;oBAEK,KAAK,GAAG,IAAI,mBAAQ,CACxB,uBAAuB,CACrB,OAAO,CAAC,MAAM,EACd,GAAG,EACH,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,UAAQ,EACR,YAAY,EACZ,YAAY,CACb,CACF,CAAC;yBAEE,CAAA,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,mCAAmC,CAAC,CAAA,EAAjE,yBAAiE;oBACnE,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAC9B,GAAG,CACD,WAAI,SAAS,iDAAuC,UAAU,2BAAwB,CACvF,CAAC;qBACH;oBAED,qBAAM,IAAA,WAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;oBAA7B,SAA6B,CAAC;oBAE9B,sBAAO,OAAO,uBAAM,OAAO,KAAE,UAAU,EAAE,UAAU,GAAG,CAAC,IAAG,EAAC;yBAG7D,MAAM,KAAK,CAAC;;;yBAER,CAAA,eAAe,CAAC,OAAK,CAAC,IAAI,OAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA,EAA1D,yBAA0D;oBAC5D,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAC9B,GAAG,CACD,WAAI,SAAS,qBAAW,OAAK,CAAC,IAAI,oBAAU,UAAU,2BAAwB,CAC/E,CAAC;qBACH;oBAED,qBAAM,IAAA,WAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;oBAA7B,SAA6B,CAAC;oBAE9B,sBAAO,OAAO,uBAAM,OAAO,KAAE,UAAU,EAAE,UAAU,GAAG,CAAC,IAAG,EAAC;yBAG7D,MAAM,OAAK,CAAC;;;;;CAEf;AAlLD,0BAkLC"}
|
package/dist/cjs/serialize.js
CHANGED
|
@@ -21,22 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
21
21
|
}
|
|
22
22
|
return t;
|
|
23
23
|
};
|
|
24
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
25
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
26
|
-
if (!m) return o;
|
|
27
|
-
var i = m.call(o), r, ar = [], e;
|
|
28
|
-
try {
|
|
29
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
30
|
-
}
|
|
31
|
-
catch (error) { e = { error: error }; }
|
|
32
|
-
finally {
|
|
33
|
-
try {
|
|
34
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
35
|
-
}
|
|
36
|
-
finally { if (e) throw e.error; }
|
|
37
|
-
}
|
|
38
|
-
return ar;
|
|
39
|
-
};
|
|
40
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
25
|
exports.serializeRequestBody = void 0;
|
|
42
26
|
function isRel(object) {
|
|
@@ -55,7 +39,7 @@ function serializeRequestBody(body, options) {
|
|
|
55
39
|
var relationships = {};
|
|
56
40
|
if (options.attributes === '*') {
|
|
57
41
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
58
|
-
var
|
|
42
|
+
var key = _a[0], value = _a[1];
|
|
59
43
|
if (options.relationships.includes(key)) {
|
|
60
44
|
if (isRel(value)) {
|
|
61
45
|
var id_1 = value.id, type_1 = value.type;
|
|
@@ -82,7 +66,7 @@ function serializeRequestBody(body, options) {
|
|
|
82
66
|
}
|
|
83
67
|
else if (options.relationships === '*') {
|
|
84
68
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
85
|
-
var
|
|
69
|
+
var key = _a[0], value = _a[1];
|
|
86
70
|
if (options.attributes.includes(key)) {
|
|
87
71
|
attributes[key] = value;
|
|
88
72
|
}
|
|
@@ -109,7 +93,7 @@ function serializeRequestBody(body, options) {
|
|
|
109
93
|
}
|
|
110
94
|
else {
|
|
111
95
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
112
|
-
var
|
|
96
|
+
var key = _a[0], value = _a[1];
|
|
113
97
|
if (options.attributes.includes(key)) {
|
|
114
98
|
attributes[key] = value;
|
|
115
99
|
}
|
|
@@ -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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"}
|
package/dist/cjs/wait.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI,CAAC,IAAY;IAC/B,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,oBAIC"}
|
package/dist/esm/ApiError.js
CHANGED
|
@@ -13,22 +13,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
17
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
18
|
-
if (!m) return o;
|
|
19
|
-
var i = m.call(o), r, ar = [], e;
|
|
20
|
-
try {
|
|
21
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
22
|
-
}
|
|
23
|
-
catch (error) { e = { error: error }; }
|
|
24
|
-
finally {
|
|
25
|
-
try {
|
|
26
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
27
|
-
}
|
|
28
|
-
finally { if (e) throw e.error; }
|
|
29
|
-
}
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
16
|
function isErrorBody(body) {
|
|
33
17
|
if (typeof body !== 'object' || body === null || !('data' in body)) {
|
|
34
18
|
return false;
|
|
@@ -130,7 +114,7 @@ var ApiError = /** @class */ (function (_super) {
|
|
|
130
114
|
(typeof filterDetails === 'function'
|
|
131
115
|
? filterDetails(error.attributes.details)
|
|
132
116
|
: Object.entries(filterDetails).every(function (_a) {
|
|
133
|
-
var
|
|
117
|
+
var key = _a[0], value = _a[1];
|
|
134
118
|
return error.attributes.details[key] === value;
|
|
135
119
|
})));
|
|
136
120
|
});
|
package/dist/esm/ApiError.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/deserialize.js
CHANGED
|
@@ -9,22 +9,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
13
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
14
|
-
if (!m) return o;
|
|
15
|
-
var i = m.call(o), r, ar = [], e;
|
|
16
|
-
try {
|
|
17
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
18
|
-
}
|
|
19
|
-
catch (error) { e = { error: error }; }
|
|
20
|
-
finally {
|
|
21
|
-
try {
|
|
22
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
23
|
-
}
|
|
24
|
-
finally { if (e) throw e.error; }
|
|
25
|
-
}
|
|
26
|
-
return ar;
|
|
27
|
-
};
|
|
28
12
|
function hasData(thing) {
|
|
29
13
|
return typeof thing === 'object' && !!thing && 'data' in thing;
|
|
30
14
|
}
|
|
@@ -32,7 +16,7 @@ export function deserializeJsonEntity(_a) {
|
|
|
32
16
|
var id = _a.id, type = _a.type, attributes = _a.attributes, relationships = _a.relationships, meta = _a.meta;
|
|
33
17
|
return __assign(__assign(__assign(__assign(__assign({}, (id ? { id: id } : {})), (type ? { type: type } : {})), (attributes || {})), (relationships
|
|
34
18
|
? Object.fromEntries(Object.entries(relationships).map(function (_a) {
|
|
35
|
-
var
|
|
19
|
+
var rel = _a[0], value = _a[1];
|
|
36
20
|
return [
|
|
37
21
|
rel,
|
|
38
22
|
value === null || value === void 0 ? void 0 : value.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;AAYA,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAI,EAMzB;QALd,EAAE,QAAA,EACF,IAAI,UAAA,EACJ,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,IAAI,UAAA;IAEJ,OAAO,iDACF,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAClB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACtB,CAAC,UAAU,IAAI,EAAE,CAAC,GAClB,CAAC,aAAa;QACf,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA;gBAClD,GAAG;gBACH,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI;aACZ;QAHmD,CAGnD,CAAC,CACH;QACH,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrB,CAAC;AACT,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAI,IAAa;IACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAiB,CAAC;KAC7D;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC;AAC1D,CAAC"}
|
|
@@ -37,24 +37,12 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
|
|
|
37
37
|
function reject(value) { resume("throw", value); }
|
|
38
38
|
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
39
39
|
};
|
|
40
|
-
var __values = (this && this.__values) || function(o) {
|
|
41
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
42
|
-
if (m) return m.call(o);
|
|
43
|
-
if (o && typeof o.length === "number") return {
|
|
44
|
-
next: function () {
|
|
45
|
-
if (o && i >= o.length) o = void 0;
|
|
46
|
-
return { value: o && o[i++], done: !o };
|
|
47
|
-
}
|
|
48
|
-
};
|
|
49
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
50
|
-
};
|
|
51
40
|
import { Scheduler } from 'async-scheduler';
|
|
52
41
|
export function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
53
42
|
return __asyncGenerator(this, arguments, function rawPageIterator_1() {
|
|
54
|
-
var perPage, concurrency, firstResponse,
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
switch (_g.label) {
|
|
43
|
+
var perPage, concurrency, firstResponse, _i, _a, item, totalCount, limiter, promises, _loop_1, offset, response, _b, _c, item;
|
|
44
|
+
return __generator(this, function (_d) {
|
|
45
|
+
switch (_d.label) {
|
|
58
46
|
case 0:
|
|
59
47
|
perPage = (iteratorOptions === null || iteratorOptions === void 0 ? void 0 : iteratorOptions.perPage) || pagination.defaultLimit;
|
|
60
48
|
if (perPage > pagination.maxLimit) {
|
|
@@ -66,35 +54,21 @@ export function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
|
66
54
|
}
|
|
67
55
|
return [4 /*yield*/, __await(callPerformer({ limit: perPage, offset: 0 }))];
|
|
68
56
|
case 1:
|
|
69
|
-
firstResponse =
|
|
70
|
-
|
|
57
|
+
firstResponse = _d.sent();
|
|
58
|
+
_i = 0, _a = firstResponse.data;
|
|
59
|
+
_d.label = 2;
|
|
71
60
|
case 2:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
_g.label = 3;
|
|
75
|
-
case 3:
|
|
76
|
-
if (!!_b.done) return [3 /*break*/, 7];
|
|
77
|
-
item = _b.value;
|
|
61
|
+
if (!(_i < _a.length)) return [3 /*break*/, 6];
|
|
62
|
+
item = _a[_i];
|
|
78
63
|
return [4 /*yield*/, __await(item)];
|
|
79
|
-
case
|
|
64
|
+
case 3: return [4 /*yield*/, _d.sent()];
|
|
65
|
+
case 4:
|
|
66
|
+
_d.sent();
|
|
67
|
+
_d.label = 5;
|
|
80
68
|
case 5:
|
|
81
|
-
|
|
82
|
-
|
|
69
|
+
_i++;
|
|
70
|
+
return [3 /*break*/, 2];
|
|
83
71
|
case 6:
|
|
84
|
-
_b = _a.next();
|
|
85
|
-
return [3 /*break*/, 3];
|
|
86
|
-
case 7: return [3 /*break*/, 10];
|
|
87
|
-
case 8:
|
|
88
|
-
e_1_1 = _g.sent();
|
|
89
|
-
e_1 = { error: e_1_1 };
|
|
90
|
-
return [3 /*break*/, 10];
|
|
91
|
-
case 9:
|
|
92
|
-
try {
|
|
93
|
-
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
94
|
-
}
|
|
95
|
-
finally { if (e_1) throw e_1.error; }
|
|
96
|
-
return [7 /*endfinally*/];
|
|
97
|
-
case 10:
|
|
98
72
|
totalCount = firstResponse.meta.total_count;
|
|
99
73
|
limiter = new Scheduler(concurrency);
|
|
100
74
|
promises = [];
|
|
@@ -106,41 +80,27 @@ export function rawPageIterator(pagination, callPerformer, iteratorOptions) {
|
|
|
106
80
|
for (offset = perPage; offset < totalCount; offset += perPage) {
|
|
107
81
|
_loop_1(offset);
|
|
108
82
|
}
|
|
109
|
-
|
|
110
|
-
case
|
|
111
|
-
if (!(promises.length > 0)) return [3 /*break*/,
|
|
83
|
+
_d.label = 7;
|
|
84
|
+
case 7:
|
|
85
|
+
if (!(promises.length > 0)) return [3 /*break*/, 14];
|
|
112
86
|
return [4 /*yield*/, __await(promises.shift())];
|
|
113
|
-
case
|
|
114
|
-
response =
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
case 14:
|
|
121
|
-
if (!!_d.done) return [3 /*break*/, 18];
|
|
122
|
-
item = _d.value;
|
|
87
|
+
case 8:
|
|
88
|
+
response = _d.sent();
|
|
89
|
+
_b = 0, _c = response.data;
|
|
90
|
+
_d.label = 9;
|
|
91
|
+
case 9:
|
|
92
|
+
if (!(_b < _c.length)) return [3 /*break*/, 13];
|
|
93
|
+
item = _c[_b];
|
|
123
94
|
return [4 /*yield*/, __await(item)];
|
|
124
|
-
case
|
|
125
|
-
case
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
case
|
|
129
|
-
|
|
130
|
-
return [3 /*break*/,
|
|
131
|
-
case
|
|
132
|
-
case
|
|
133
|
-
e_2_1 = _g.sent();
|
|
134
|
-
e_2 = { error: e_2_1 };
|
|
135
|
-
return [3 /*break*/, 21];
|
|
136
|
-
case 20:
|
|
137
|
-
try {
|
|
138
|
-
if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
|
|
139
|
-
}
|
|
140
|
-
finally { if (e_2) throw e_2.error; }
|
|
141
|
-
return [7 /*endfinally*/];
|
|
142
|
-
case 21: return [3 /*break*/, 11];
|
|
143
|
-
case 22: return [2 /*return*/];
|
|
95
|
+
case 10: return [4 /*yield*/, _d.sent()];
|
|
96
|
+
case 11:
|
|
97
|
+
_d.sent();
|
|
98
|
+
_d.label = 12;
|
|
99
|
+
case 12:
|
|
100
|
+
_b++;
|
|
101
|
+
return [3 /*break*/, 9];
|
|
102
|
+
case 13: return [3 /*break*/, 7];
|
|
103
|
+
case 14: return [2 /*return*/];
|
|
144
104
|
}
|
|
145
105
|
});
|
|
146
106
|
});
|
|
@@ -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;AAiB5C,MAAM,UAAiB,eAAe,CACpC,UAA6B,EAC7B,aAG6B,EAC7B,eAAiC;;;;;;oBAE3B,OAAO,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,KAAI,UAAU,CAAC,YAAY,CAAC;oBAEpE,IAAI,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE;wBACjC,MAAM,IAAI,KAAK,CACb,wDAAiD,UAAU,CAAC,QAAQ,CAAE,CACvE,CAAC;qBACH;oBAEK,WAAW,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,KAAI,CAAC,CAAC;oBAEtD,IAAI,WAAW,GAAG,EAAE,EAAE;wBACpB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;qBACzE;oBAEqB,6BAAM,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAA;;oBAAlE,aAAa,GAAG,SAAkD;0BAEnC,EAAlB,KAAA,aAAa,CAAC,IAAI;;;yBAAlB,CAAA,cAAkB,CAAA;oBAA1B,IAAI;iDACP,IAAI;wBAAV,gCAAU;;oBAAV,SAAU,CAAC;;;oBADM,IAAkB,CAAA;;;oBAI/B,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;oBAE5C,OAAO,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;oBACrC,QAAQ,GAA8B,EAAE,CAAC;wCAEtC,MAAM;wBACb,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,OAAO,CAAuB;4BACpC,OAAA,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,QAAA,EAAE,CAAC;wBAAzC,CAAyC,CAC1C,CACF,CAAC;;oBALJ,KAAS,MAAM,GAAG,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,MAAM,IAAI,OAAO;gCAAxD,MAAM;qBAMd;;;yBAEM,CAAA,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;oBAEP,6BAAM,QAAQ,CAAC,KAAK,EAAG,GAAA;;oBAAlC,QAAQ,GAAG,SAAuB;0BACR,EAAb,KAAA,QAAQ,CAAC,IAAI;;;yBAAb,CAAA,cAAa,CAAA;oBAArB,IAAI;iDACP,IAAI;yBAAV,gCAAU;;oBAAV,SAAU,CAAC;;;oBADM,IAAa,CAAA;;;;;;;CAInC"}
|
package/dist/esm/request.js
CHANGED
|
@@ -45,36 +45,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
45
45
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
|
-
var __values = (this && this.__values) || function(o) {
|
|
49
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
50
|
-
if (m) return m.call(o);
|
|
51
|
-
if (o && typeof o.length === "number") return {
|
|
52
|
-
next: function () {
|
|
53
|
-
if (o && i >= o.length) o = void 0;
|
|
54
|
-
return { value: o && o[i++], done: !o };
|
|
55
|
-
}
|
|
56
|
-
};
|
|
57
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
58
|
-
};
|
|
59
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
60
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
61
|
-
if (!m) return o;
|
|
62
|
-
var i = m.call(o), r, ar = [], e;
|
|
63
|
-
try {
|
|
64
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
65
|
-
}
|
|
66
|
-
catch (error) { e = { error: error }; }
|
|
67
|
-
finally {
|
|
68
|
-
try {
|
|
69
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
70
|
-
}
|
|
71
|
-
finally { if (e) throw e.error; }
|
|
72
|
-
}
|
|
73
|
-
return ar;
|
|
74
|
-
};
|
|
75
48
|
import qs from 'qs';
|
|
76
49
|
import fetch from 'cross-fetch';
|
|
77
50
|
import { ApiError } from './ApiError';
|
|
51
|
+
import { wait } from './wait';
|
|
78
52
|
export var LogLevel;
|
|
79
53
|
(function (LogLevel) {
|
|
80
54
|
/** No logging */
|
|
@@ -127,21 +101,15 @@ function buildApiErrorInitObjectFromJobResult(method, url, requestHeaders, reque
|
|
|
127
101
|
preCallStack: preCallStack,
|
|
128
102
|
};
|
|
129
103
|
}
|
|
130
|
-
function wait(time) {
|
|
131
|
-
return new Promise(function (resolve) {
|
|
132
|
-
setTimeout(resolve, time);
|
|
133
|
-
});
|
|
134
|
-
}
|
|
135
104
|
function isErrorWithCode(error) {
|
|
136
105
|
return typeof error === 'object' && !!error && 'code' in error;
|
|
137
106
|
}
|
|
138
107
|
var requestCount = 1;
|
|
139
108
|
export function request(options) {
|
|
140
109
|
return __awaiter(this, void 0, void 0, function () {
|
|
141
|
-
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _a, _b,
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
switch (_f.label) {
|
|
110
|
+
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
111
|
+
return __generator(this, function (_d) {
|
|
112
|
+
switch (_d.label) {
|
|
145
113
|
case 0:
|
|
146
114
|
requestId = requestCount;
|
|
147
115
|
requestCount += 1;
|
|
@@ -161,34 +129,25 @@ export function request(options) {
|
|
|
161
129
|
if (logLevel >= LogLevel.BASIC) {
|
|
162
130
|
log("[".concat(requestId, "] ").concat(options.method, " ").concat(url));
|
|
163
131
|
if (logLevel >= LogLevel.BODY_AND_HEADERS) {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
log("[".concat(requestId, "] ").concat(key, ": ").concat(value));
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
171
|
-
finally {
|
|
172
|
-
try {
|
|
173
|
-
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
174
|
-
}
|
|
175
|
-
finally { if (e_1) throw e_1.error; }
|
|
132
|
+
for (_i = 0, _a = Object.entries(headers || {}); _i < _a.length; _i++) {
|
|
133
|
+
_b = _a[_i], key = _b[0], value = _b[1];
|
|
134
|
+
log("[".concat(requestId, "] ").concat(key, ": ").concat(value));
|
|
176
135
|
}
|
|
177
136
|
}
|
|
178
137
|
if (logLevel >= LogLevel.BODY && body) {
|
|
179
138
|
log("[".concat(requestId, "] ").concat(body));
|
|
180
139
|
}
|
|
181
140
|
}
|
|
182
|
-
|
|
141
|
+
_d.label = 1;
|
|
183
142
|
case 1:
|
|
184
|
-
|
|
143
|
+
_d.trys.push([1, 12, , 15]);
|
|
185
144
|
return [4 /*yield*/, fetch(url, {
|
|
186
145
|
method: options.method,
|
|
187
146
|
headers: headers,
|
|
188
147
|
body: body,
|
|
189
148
|
})];
|
|
190
149
|
case 2:
|
|
191
|
-
response_1 =
|
|
150
|
+
response_1 = _d.sent();
|
|
192
151
|
responseContentType = response_1.headers.get('Content-Type');
|
|
193
152
|
invalidContentType = responseContentType && !responseContentType.includes('application/json');
|
|
194
153
|
if (!(response_1.status === 429 || invalidContentType)) return [3 /*break*/, 4];
|
|
@@ -209,7 +168,7 @@ export function request(options) {
|
|
|
209
168
|
}
|
|
210
169
|
return [4 /*yield*/, wait(waitTimeInSecs * 1000)];
|
|
211
170
|
case 3:
|
|
212
|
-
|
|
171
|
+
_d.sent();
|
|
213
172
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
214
173
|
case 4:
|
|
215
174
|
if (logLevel >= LogLevel.BASIC) {
|
|
@@ -230,26 +189,26 @@ export function request(options) {
|
|
|
230
189
|
}
|
|
231
190
|
}
|
|
232
191
|
if (!(response_1.status === 204)) return [3 /*break*/, 5];
|
|
233
|
-
|
|
192
|
+
_c = undefined;
|
|
234
193
|
return [3 /*break*/, 7];
|
|
235
194
|
case 5: return [4 /*yield*/, response_1.json()];
|
|
236
195
|
case 6:
|
|
237
|
-
|
|
238
|
-
|
|
196
|
+
_c = _d.sent();
|
|
197
|
+
_d.label = 7;
|
|
239
198
|
case 7:
|
|
240
|
-
responseBody =
|
|
199
|
+
responseBody = _c;
|
|
241
200
|
if (logLevel >= LogLevel.BODY && responseBody) {
|
|
242
201
|
log("[".concat(requestId, "] ").concat(JSON.stringify(responseBody, null, 2)));
|
|
243
202
|
}
|
|
244
203
|
if (!(response_1.status === 202)) return [3 /*break*/, 9];
|
|
245
204
|
return [4 /*yield*/, options.fetchJobResult(responseBody.data.id)];
|
|
246
205
|
case 8:
|
|
247
|
-
jobResult =
|
|
206
|
+
jobResult = _d.sent();
|
|
248
207
|
if (jobResult.status < 200 || jobResult.status >= 300) {
|
|
249
208
|
throw new ApiError(buildApiErrorInitObjectFromJobResult(options.method, url, headers, options.body, jobResult.status, jobResult.payload, preCallStack));
|
|
250
209
|
}
|
|
251
210
|
responseBody = jobResult.payload;
|
|
252
|
-
|
|
211
|
+
_d.label = 9;
|
|
253
212
|
case 9:
|
|
254
213
|
if (response_1.status >= 200 && response_1.status < 300) {
|
|
255
214
|
return [2 /*return*/, responseBody];
|
|
@@ -261,18 +220,18 @@ export function request(options) {
|
|
|
261
220
|
}
|
|
262
221
|
return [4 /*yield*/, wait(retryCount * 1000)];
|
|
263
222
|
case 10:
|
|
264
|
-
|
|
223
|
+
_d.sent();
|
|
265
224
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
266
225
|
case 11: throw error;
|
|
267
226
|
case 12:
|
|
268
|
-
error_1 =
|
|
227
|
+
error_1 = _d.sent();
|
|
269
228
|
if (!(isErrorWithCode(error_1) && error_1.code.includes('ETIMEDOUT'))) return [3 /*break*/, 14];
|
|
270
229
|
if (logLevel >= LogLevel.BASIC) {
|
|
271
230
|
log("[".concat(requestId, "] Error ").concat(error_1.code, ", wait ").concat(retryCount, " seconds then retry..."));
|
|
272
231
|
}
|
|
273
232
|
return [4 /*yield*/, wait(retryCount * 1000)];
|
|
274
233
|
case 13:
|
|
275
|
-
|
|
234
|
+
_d.sent();
|
|
276
235
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
277
236
|
case 14: throw error_1;
|
|
278
237
|
case 15: return [2 /*return*/];
|
package/dist/esm/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/serialize.js
CHANGED
|
@@ -20,22 +20,6 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
20
20
|
}
|
|
21
21
|
return t;
|
|
22
22
|
};
|
|
23
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
24
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
25
|
-
if (!m) return o;
|
|
26
|
-
var i = m.call(o), r, ar = [], e;
|
|
27
|
-
try {
|
|
28
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
29
|
-
}
|
|
30
|
-
catch (error) { e = { error: error }; }
|
|
31
|
-
finally {
|
|
32
|
-
try {
|
|
33
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
34
|
-
}
|
|
35
|
-
finally { if (e) throw e.error; }
|
|
36
|
-
}
|
|
37
|
-
return ar;
|
|
38
|
-
};
|
|
39
23
|
function isRel(object) {
|
|
40
24
|
return (typeof object === 'object' && !!object && 'id' in object && 'type' in object);
|
|
41
25
|
}
|
|
@@ -52,7 +36,7 @@ export function serializeRequestBody(body, options) {
|
|
|
52
36
|
var relationships = {};
|
|
53
37
|
if (options.attributes === '*') {
|
|
54
38
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
55
|
-
var
|
|
39
|
+
var key = _a[0], value = _a[1];
|
|
56
40
|
if (options.relationships.includes(key)) {
|
|
57
41
|
if (isRel(value)) {
|
|
58
42
|
var id_1 = value.id, type_1 = value.type;
|
|
@@ -79,7 +63,7 @@ export function serializeRequestBody(body, options) {
|
|
|
79
63
|
}
|
|
80
64
|
else if (options.relationships === '*') {
|
|
81
65
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
82
|
-
var
|
|
66
|
+
var key = _a[0], value = _a[1];
|
|
83
67
|
if (options.attributes.includes(key)) {
|
|
84
68
|
attributes[key] = value;
|
|
85
69
|
}
|
|
@@ -106,7 +90,7 @@ export function serializeRequestBody(body, options) {
|
|
|
106
90
|
}
|
|
107
91
|
else {
|
|
108
92
|
Object.entries(otherProperties).forEach(function (_a) {
|
|
109
|
-
var
|
|
93
|
+
var key = _a[0], value = _a[1];
|
|
110
94
|
if (options.attributes.includes(key)) {
|
|
111
95
|
attributes[key] = value;
|
|
112
96
|
}
|
|
@@ -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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"}
|
package/dist/esm/wait.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function wait(time:
|
|
1
|
+
export declare function wait(time: number): Promise<unknown>;
|
package/dist/esm/wait.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/types/wait.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function wait(time:
|
|
1
|
+
export declare function wait(time: number): Promise<unknown>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datocms/rest-client-utils",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "Utilities for DatoCMS REST API clients",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datocms",
|
|
@@ -40,5 +40,8 @@
|
|
|
40
40
|
"cross-fetch": "^3.1.5",
|
|
41
41
|
"qs": "^6.10.3"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "60159cb125e4a493dbbeefb4ac3764d25c2abae8",
|
|
44
|
+
"devDependencies": {
|
|
45
|
+
"@types/qs": "^6.9.7"
|
|
46
|
+
}
|
|
44
47
|
}
|
package/src/ApiError.ts
CHANGED
|
@@ -43,7 +43,7 @@ function isErrorBody(body: unknown): body is ErrorBody {
|
|
|
43
43
|
return true;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
const humanMessageForCode = {
|
|
46
|
+
const humanMessageForCode: Record<string, string | undefined> = {
|
|
47
47
|
BATCH_DATA_VALIDATION_IN_PROGRESS: `The schema of this model changed, we're re-running validations over every record in background. Please retry with this operation in a few seconds!`,
|
|
48
48
|
INSUFFICIENT_PERMISSIONS: `Your role does not permit this action`,
|
|
49
49
|
MAINTENANCE_MODE: `The project is currently in maintenance mode!`,
|
|
@@ -65,7 +65,7 @@ const humanMessageForCode = {
|
|
|
65
65
|
UPLOAD_NOT_PASSING_FIELD_VALIDATIONS: `Couldn't update this asset since some records are failing to pass the validations!`,
|
|
66
66
|
};
|
|
67
67
|
|
|
68
|
-
const humanMessageForPlanUpgradeLimit = {
|
|
68
|
+
const humanMessageForPlanUpgradeLimit: Record<string, string | undefined> = {
|
|
69
69
|
build_triggers: `You've reached the maximum number of build triggers your plan allows`,
|
|
70
70
|
sandbox_environments: `You've reached the maximum number of environments your plan allows`,
|
|
71
71
|
item_types: `You've reached the maximum number of models your plan allows to create`,
|
package/src/deserialize.ts
CHANGED
package/src/request.ts
CHANGED
|
@@ -2,6 +2,7 @@ import qs from 'qs';
|
|
|
2
2
|
import fetch from 'cross-fetch';
|
|
3
3
|
import { ApiError, ApiErrorInitObject } from './ApiError';
|
|
4
4
|
import { JobResult } from './internalTypes';
|
|
5
|
+
import { wait } from './wait';
|
|
5
6
|
|
|
6
7
|
export enum LogLevel {
|
|
7
8
|
/** No logging */
|
|
@@ -32,7 +33,7 @@ type RequestOptions = {
|
|
|
32
33
|
};
|
|
33
34
|
|
|
34
35
|
function headersToObject(headers: Headers): Record<string, string> {
|
|
35
|
-
const result = {};
|
|
36
|
+
const result: Record<string, string> = {};
|
|
36
37
|
|
|
37
38
|
headers.forEach((value, key) => {
|
|
38
39
|
result[key] = value;
|
|
@@ -93,12 +94,6 @@ function buildApiErrorInitObjectFromJobResult(
|
|
|
93
94
|
};
|
|
94
95
|
}
|
|
95
96
|
|
|
96
|
-
function wait(time) {
|
|
97
|
-
return new Promise((resolve) => {
|
|
98
|
-
setTimeout(resolve, time);
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
|
|
102
97
|
function isErrorWithCode(error: unknown): error is { code: string } {
|
|
103
98
|
return typeof error === 'object' && !!error && 'code' in error;
|
|
104
99
|
}
|
package/src/serialize.ts
CHANGED
|
@@ -41,8 +41,8 @@ export function serializeRequestBody<T>(body: unknown, options: Options): T {
|
|
|
41
41
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
42
42
|
const { id, type, meta, ...otherProperties } = body as any;
|
|
43
43
|
|
|
44
|
-
const attributes = {};
|
|
45
|
-
const relationships = {};
|
|
44
|
+
const attributes: Record<string, unknown> = {};
|
|
45
|
+
const relationships: Record<string, unknown> = {};
|
|
46
46
|
|
|
47
47
|
if (options.attributes === '*') {
|
|
48
48
|
Object.entries(otherProperties).forEach(([key, value]) => {
|
package/src/wait.ts
CHANGED