@datocms/rest-client-utils 1.1.11 → 1.1.12
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__/buildNormalizedParams.test.js +66 -0
- package/dist/cjs/__tests__/buildNormalizedParams.test.js.map +1 -0
- package/dist/cjs/buildNormalizedParams.js +48 -0
- package/dist/cjs/buildNormalizedParams.js.map +1 -0
- package/dist/cjs/request.js +2 -5
- package/dist/cjs/request.js.map +1 -1
- package/dist/esm/__tests__/buildNormalizedParams.test.d.ts +1 -0
- package/dist/esm/__tests__/buildNormalizedParams.test.js +64 -0
- package/dist/esm/__tests__/buildNormalizedParams.test.js.map +1 -0
- package/dist/esm/buildNormalizedParams.d.ts +1 -0
- package/dist/esm/buildNormalizedParams.js +44 -0
- package/dist/esm/buildNormalizedParams.js.map +1 -0
- package/dist/esm/request.js +2 -2
- package/dist/esm/request.js.map +1 -1
- package/dist/types/__tests__/buildNormalizedParams.test.d.ts +1 -0
- package/dist/types/buildNormalizedParams.d.ts +1 -0
- package/package.json +3 -4
- package/src/__tests__/buildNormalizedParams.test.ts +107 -0
- package/src/buildNormalizedParams.ts +38 -0
- package/src/request.ts +4 -2
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
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
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
var buildNormalizedParams_1 = require("../buildNormalizedParams");
|
|
40
|
+
describe('URLQueryParams', function () {
|
|
41
|
+
it('encodes complex params', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
|
+
return __generator(this, function (_a) {
|
|
43
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: 0 })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"0\",\n ],\n ]\n ");
|
|
44
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: true })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"true\",\n ],\n ]\n ");
|
|
45
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: false })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"false\",\n ],\n ]\n ");
|
|
46
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: '' })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"\",\n ],\n ]\n ");
|
|
47
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: null })).toMatchInlineSnapshot("Array []");
|
|
48
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: undefined })).toMatchInlineSnapshot("Array []");
|
|
49
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({ foo: 'bàr' })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"b\u00E0r\",\n ],\n ]\n ");
|
|
50
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({
|
|
51
|
+
page: {
|
|
52
|
+
offset: 0,
|
|
53
|
+
limit: 10,
|
|
54
|
+
},
|
|
55
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"page[offset]\",\n \"0\",\n ],\n Array [\n \"page[limit]\",\n \"10\",\n ],\n ]\n ");
|
|
56
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({
|
|
57
|
+
filter: { fields: { md5: { eq: 'foo' } } },
|
|
58
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"filter[fields][md5][eq]\",\n \"foo\",\n ],\n ]\n ");
|
|
59
|
+
expect((0, buildNormalizedParams_1.buildNormalizedParams)({
|
|
60
|
+
foo: { bar: ['a', 'b', 10] },
|
|
61
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo[bar][]\",\n \"a\",\n ],\n Array [\n \"foo[bar][]\",\n \"b\",\n ],\n Array [\n \"foo[bar][]\",\n \"10\",\n ],\n ]\n ");
|
|
62
|
+
return [2 /*return*/];
|
|
63
|
+
});
|
|
64
|
+
}); });
|
|
65
|
+
});
|
|
66
|
+
//# sourceMappingURL=buildNormalizedParams.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildNormalizedParams.test.js","sourceRoot":"","sources":["../../../src/__tests__/buildNormalizedParams.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAiE;AAEjE,QAAQ,CAAC,gBAAgB,EAAE;IACzB,EAAE,CAAC,wBAAwB,EAAE;;YAC3B,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,mGAO/D,CAAC,CAAC;YACH,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,sGAOlE,CAAC,CAAC;YACH,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,uGAOnE,CAAC,CAAC;YACH,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,kGAOhE,CAAC,CAAC;YACH,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAChE,UAAU,CACX,CAAC;YACF,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,qBAAqB,CACrE,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,IAAA,6CAAqB,EAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,0GAOnE,CAAC,CAAC;YAEH,MAAM,CACJ,IAAA,6CAAqB,EAAC;gBACpB,IAAI,EAAE;oBACJ,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,EAAE;iBACV;aACF,CAAC,CACH,CAAC,qBAAqB,CAAC,wLAWvB,CAAC,CAAC;YAEH,MAAM,CACJ,IAAA,6CAAqB,EAAC;gBACpB,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;aAC3C,CAAC,CACH,CAAC,qBAAqB,CAAC,yHAOvB,CAAC,CAAC;YAEH,MAAM,CACJ,IAAA,6CAAqB,EAAC;gBACpB,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;aAC7B,CAAC,CACH,CAAC,qBAAqB,CAAC,+PAevB,CAAC,CAAC;;;SACJ,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
3
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
4
|
+
if (ar || !(i in from)) {
|
|
5
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
6
|
+
ar[i] = from[i];
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.buildNormalizedParams = void 0;
|
|
13
|
+
function buildKey(path) {
|
|
14
|
+
return path.reduce(function (result, chunk, index) { return (index === 0 ? chunk : "".concat(result, "[").concat(chunk, "]")); }, '');
|
|
15
|
+
}
|
|
16
|
+
function buildNormalizedParams(input, path) {
|
|
17
|
+
if (path === void 0) { path = []; }
|
|
18
|
+
var result = [];
|
|
19
|
+
for (var _i = 0, _a = Object.entries(input); _i < _a.length; _i++) {
|
|
20
|
+
var _b = _a[_i], key = _b[0], value = _b[1];
|
|
21
|
+
if (typeof value === 'number' || typeof value === 'string') {
|
|
22
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), value.toString()]);
|
|
23
|
+
}
|
|
24
|
+
else if (value === true) {
|
|
25
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), 'true']);
|
|
26
|
+
}
|
|
27
|
+
else if (value === false) {
|
|
28
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), 'false']);
|
|
29
|
+
}
|
|
30
|
+
else if (typeof value === 'object') {
|
|
31
|
+
if (Array.isArray(value)) {
|
|
32
|
+
for (var _c = 0, value_1 = value; _c < value_1.length; _c++) {
|
|
33
|
+
var innerValue = value_1[_c];
|
|
34
|
+
result.push(["".concat(buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), "[]"), innerValue.toString()]);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else if (value) {
|
|
38
|
+
for (var _d = 0, _e = buildNormalizedParams(value, __spreadArray(__spreadArray([], path, true), [key], false)); _d < _e.length; _d++) {
|
|
39
|
+
var param = _e[_d];
|
|
40
|
+
result.push(param);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return result;
|
|
46
|
+
}
|
|
47
|
+
exports.buildNormalizedParams = buildNormalizedParams;
|
|
48
|
+
//# sourceMappingURL=buildNormalizedParams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildNormalizedParams.js","sourceRoot":"","sources":["../../src/buildNormalizedParams.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,SAAS,QAAQ,CAAC,IAAc;IAC9B,OAAO,IAAI,CAAC,MAAM,CAChB,UAAC,MAAM,EAAE,KAAK,EAAE,KAAK,IAAK,OAAA,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAG,MAAM,cAAI,KAAK,MAAG,CAAC,EAA7C,CAA6C,EACvE,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB,CACnC,KAA8B,EAC9B,IAAmB;IAAnB,qBAAA,EAAA,SAAmB;IAEnB,IAAM,MAAM,GAAuB,EAAE,CAAC;IAEtC,KAA2B,UAAqB,EAArB,KAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAArB,cAAqB,EAArB,IAAqB,EAAE;QAAvC,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QACpB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC1D,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SAC3D;aAAM,IAAI,KAAK,KAAK,IAAI,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,MAAM,CAAC,CAAC,CAAC;SACjD;aAAM,IAAI,KAAK,KAAK,KAAK,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,OAAO,CAAC,CAAC,CAAC;SAClD;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,KAAyB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;oBAA3B,IAAM,UAAU,cAAA;oBACnB,MAAM,CAAC,IAAI,CAAC,CAAC,UAAG,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,OAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;iBACvE;aACF;iBAAM,IAAI,KAAK,EAAE;gBAChB,KAAoB,UAGnB,EAHmB,KAAA,qBAAqB,CACvC,KAAgC,kCAC5B,IAAI,UAAE,GAAG,UACd,EAHmB,cAGnB,EAHmB,IAGnB,EAAE;oBAHE,IAAM,KAAK,SAAA;oBAId,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACpB;aACF;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA9BD,sDA8BC"}
|
package/dist/cjs/request.js
CHANGED
|
@@ -46,12 +46,9 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
-
};
|
|
52
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
50
|
exports.request = exports.LogLevel = void 0;
|
|
54
|
-
var
|
|
51
|
+
var buildNormalizedParams_1 = require("./buildNormalizedParams");
|
|
55
52
|
var fetch_1 = require("@whatwg-node/fetch");
|
|
56
53
|
var errors_1 = require("./errors");
|
|
57
54
|
var wait_1 = require("./wait");
|
|
@@ -152,7 +149,7 @@ function request(options) {
|
|
|
152
149
|
baseUrl = options.baseUrl.replace(/\/$/, '');
|
|
153
150
|
body = options.body ? JSON.stringify(options.body, null, 2) : undefined;
|
|
154
151
|
queryString = options.queryParams && Object.keys(options.queryParams).length > 0
|
|
155
|
-
? "?".concat(
|
|
152
|
+
? "?".concat(new URLSearchParams((0, buildNormalizedParams_1.buildNormalizedParams)(options.queryParams)).toString())
|
|
156
153
|
: '';
|
|
157
154
|
url = "".concat(baseUrl).concat(options.url).concat(queryString);
|
|
158
155
|
if (logLevel >= LogLevel.BASIC) {
|
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":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
11
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
12
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
13
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
14
|
+
function step(op) {
|
|
15
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
16
|
+
while (_) try {
|
|
17
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
18
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
19
|
+
switch (op[0]) {
|
|
20
|
+
case 0: case 1: t = op; break;
|
|
21
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
22
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
23
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
24
|
+
default:
|
|
25
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
26
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
27
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
28
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
29
|
+
if (t[2]) _.ops.pop();
|
|
30
|
+
_.trys.pop(); continue;
|
|
31
|
+
}
|
|
32
|
+
op = body.call(thisArg, _);
|
|
33
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
34
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
import { buildNormalizedParams } from '../buildNormalizedParams';
|
|
38
|
+
describe('URLQueryParams', function () {
|
|
39
|
+
it('encodes complex params', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
40
|
+
return __generator(this, function (_a) {
|
|
41
|
+
expect(buildNormalizedParams({ foo: 0 })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"0\",\n ],\n ]\n ");
|
|
42
|
+
expect(buildNormalizedParams({ foo: true })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"true\",\n ],\n ]\n ");
|
|
43
|
+
expect(buildNormalizedParams({ foo: false })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"false\",\n ],\n ]\n ");
|
|
44
|
+
expect(buildNormalizedParams({ foo: '' })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"\",\n ],\n ]\n ");
|
|
45
|
+
expect(buildNormalizedParams({ foo: null })).toMatchInlineSnapshot("Array []");
|
|
46
|
+
expect(buildNormalizedParams({ foo: undefined })).toMatchInlineSnapshot("Array []");
|
|
47
|
+
expect(buildNormalizedParams({ foo: 'bàr' })).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo\",\n \"b\u00E0r\",\n ],\n ]\n ");
|
|
48
|
+
expect(buildNormalizedParams({
|
|
49
|
+
page: {
|
|
50
|
+
offset: 0,
|
|
51
|
+
limit: 10,
|
|
52
|
+
},
|
|
53
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"page[offset]\",\n \"0\",\n ],\n Array [\n \"page[limit]\",\n \"10\",\n ],\n ]\n ");
|
|
54
|
+
expect(buildNormalizedParams({
|
|
55
|
+
filter: { fields: { md5: { eq: 'foo' } } },
|
|
56
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"filter[fields][md5][eq]\",\n \"foo\",\n ],\n ]\n ");
|
|
57
|
+
expect(buildNormalizedParams({
|
|
58
|
+
foo: { bar: ['a', 'b', 10] },
|
|
59
|
+
})).toMatchInlineSnapshot("\n Array [\n Array [\n \"foo[bar][]\",\n \"a\",\n ],\n Array [\n \"foo[bar][]\",\n \"b\",\n ],\n Array [\n \"foo[bar][]\",\n \"10\",\n ],\n ]\n ");
|
|
60
|
+
return [2 /*return*/];
|
|
61
|
+
});
|
|
62
|
+
}); });
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=buildNormalizedParams.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildNormalizedParams.test.js","sourceRoot":"","sources":["../../../src/__tests__/buildNormalizedParams.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,QAAQ,CAAC,gBAAgB,EAAE;IACzB,EAAE,CAAC,wBAAwB,EAAE;;YAC3B,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,mGAO/D,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,sGAOlE,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,uGAOnE,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,kGAOhE,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAChE,UAAU,CACX,CAAC;YACF,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,qBAAqB,CACrE,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,0GAOnE,CAAC,CAAC;YAEH,MAAM,CACJ,qBAAqB,CAAC;gBACpB,IAAI,EAAE;oBACJ,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,EAAE;iBACV;aACF,CAAC,CACH,CAAC,qBAAqB,CAAC,wLAWvB,CAAC,CAAC;YAEH,MAAM,CACJ,qBAAqB,CAAC;gBACpB,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;aAC3C,CAAC,CACH,CAAC,qBAAqB,CAAC,yHAOvB,CAAC,CAAC;YAEH,MAAM,CACJ,qBAAqB,CAAC;gBACpB,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;aAC7B,CAAC,CACH,CAAC,qBAAqB,CAAC,+PAevB,CAAC,CAAC;;;SACJ,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function buildNormalizedParams(input: Record<string, unknown>, path?: string[]): [string, string][];
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
2
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
3
|
+
if (ar || !(i in from)) {
|
|
4
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
5
|
+
ar[i] = from[i];
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
9
|
+
};
|
|
10
|
+
function buildKey(path) {
|
|
11
|
+
return path.reduce(function (result, chunk, index) { return (index === 0 ? chunk : "".concat(result, "[").concat(chunk, "]")); }, '');
|
|
12
|
+
}
|
|
13
|
+
export function buildNormalizedParams(input, path) {
|
|
14
|
+
if (path === void 0) { path = []; }
|
|
15
|
+
var result = [];
|
|
16
|
+
for (var _i = 0, _a = Object.entries(input); _i < _a.length; _i++) {
|
|
17
|
+
var _b = _a[_i], key = _b[0], value = _b[1];
|
|
18
|
+
if (typeof value === 'number' || typeof value === 'string') {
|
|
19
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), value.toString()]);
|
|
20
|
+
}
|
|
21
|
+
else if (value === true) {
|
|
22
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), 'true']);
|
|
23
|
+
}
|
|
24
|
+
else if (value === false) {
|
|
25
|
+
result.push([buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), 'false']);
|
|
26
|
+
}
|
|
27
|
+
else if (typeof value === 'object') {
|
|
28
|
+
if (Array.isArray(value)) {
|
|
29
|
+
for (var _c = 0, value_1 = value; _c < value_1.length; _c++) {
|
|
30
|
+
var innerValue = value_1[_c];
|
|
31
|
+
result.push(["".concat(buildKey(__spreadArray(__spreadArray([], path, true), [key], false)), "[]"), innerValue.toString()]);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else if (value) {
|
|
35
|
+
for (var _d = 0, _e = buildNormalizedParams(value, __spreadArray(__spreadArray([], path, true), [key], false)); _d < _e.length; _d++) {
|
|
36
|
+
var param = _e[_d];
|
|
37
|
+
result.push(param);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return result;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=buildNormalizedParams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildNormalizedParams.js","sourceRoot":"","sources":["../../src/buildNormalizedParams.ts"],"names":[],"mappings":";;;;;;;;;AAAA,SAAS,QAAQ,CAAC,IAAc;IAC9B,OAAO,IAAI,CAAC,MAAM,CAChB,UAAC,MAAM,EAAE,KAAK,EAAE,KAAK,IAAK,OAAA,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAG,MAAM,cAAI,KAAK,MAAG,CAAC,EAA7C,CAA6C,EACvE,EAAE,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAA8B,EAC9B,IAAmB;IAAnB,qBAAA,EAAA,SAAmB;IAEnB,IAAM,MAAM,GAAuB,EAAE,CAAC;IAEtC,KAA2B,UAAqB,EAArB,KAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAArB,cAAqB,EAArB,IAAqB,EAAE;QAAvC,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QACpB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC1D,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SAC3D;aAAM,IAAI,KAAK,KAAK,IAAI,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,MAAM,CAAC,CAAC,CAAC;SACjD;aAAM,IAAI,KAAK,KAAK,KAAK,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,EAAE,OAAO,CAAC,CAAC,CAAC;SAClD;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,KAAyB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;oBAA3B,IAAM,UAAU,cAAA;oBACnB,MAAM,CAAC,IAAI,CAAC,CAAC,UAAG,QAAQ,iCAAK,IAAI,UAAE,GAAG,UAAE,OAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;iBACvE;aACF;iBAAM,IAAI,KAAK,EAAE;gBAChB,KAAoB,UAGnB,EAHmB,KAAA,qBAAqB,CACvC,KAAgC,kCAC5B,IAAI,UAAE,GAAG,UACd,EAHmB,cAGnB,EAHmB,IAGnB,EAAE;oBAHE,IAAM,KAAK,SAAA;oBAId,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACpB;aACF;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/esm/request.js
CHANGED
|
@@ -45,7 +45,7 @@ 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
|
-
import
|
|
48
|
+
import { buildNormalizedParams } from './buildNormalizedParams';
|
|
49
49
|
import { fetch as universalFetch } from '@whatwg-node/fetch';
|
|
50
50
|
import { ApiError, TimeoutError, } from './errors';
|
|
51
51
|
import { wait } from './wait';
|
|
@@ -146,7 +146,7 @@ export function request(options) {
|
|
|
146
146
|
baseUrl = options.baseUrl.replace(/\/$/, '');
|
|
147
147
|
body = options.body ? JSON.stringify(options.body, null, 2) : undefined;
|
|
148
148
|
queryString = options.queryParams && Object.keys(options.queryParams).length > 0
|
|
149
|
-
? "?".concat(
|
|
149
|
+
? "?".concat(new URLSearchParams(buildNormalizedParams(options.queryParams)).toString())
|
|
150
150
|
: '';
|
|
151
151
|
url = "".concat(baseUrl).concat(options.url).concat(queryString);
|
|
152
152
|
if (logLevel >= LogLevel.BASIC) {
|
package/dist/esm/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function buildNormalizedParams(input: Record<string, unknown>, path?: string[]): [string, string][];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datocms/rest-client-utils",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.12",
|
|
4
4
|
"description": "Utilities for DatoCMS REST API clients",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datocms",
|
|
@@ -38,10 +38,9 @@
|
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@whatwg-node/fetch": "^0.5.3",
|
|
40
40
|
"async-scheduler": "^1.4.4",
|
|
41
|
-
"browser-or-node": "^2.0.0"
|
|
42
|
-
"qs": "^6.10.3"
|
|
41
|
+
"browser-or-node": "^2.0.0"
|
|
43
42
|
},
|
|
44
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "20f895c824269b2c1a4a51a3abb329d840d24b2a",
|
|
45
44
|
"devDependencies": {
|
|
46
45
|
"@types/qs": "^6.9.7"
|
|
47
46
|
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { buildNormalizedParams } from '../buildNormalizedParams';
|
|
2
|
+
|
|
3
|
+
describe('URLQueryParams', () => {
|
|
4
|
+
it('encodes complex params', async () => {
|
|
5
|
+
expect(buildNormalizedParams({ foo: 0 })).toMatchInlineSnapshot(`
|
|
6
|
+
Array [
|
|
7
|
+
Array [
|
|
8
|
+
"foo",
|
|
9
|
+
"0",
|
|
10
|
+
],
|
|
11
|
+
]
|
|
12
|
+
`);
|
|
13
|
+
expect(buildNormalizedParams({ foo: true })).toMatchInlineSnapshot(`
|
|
14
|
+
Array [
|
|
15
|
+
Array [
|
|
16
|
+
"foo",
|
|
17
|
+
"true",
|
|
18
|
+
],
|
|
19
|
+
]
|
|
20
|
+
`);
|
|
21
|
+
expect(buildNormalizedParams({ foo: false })).toMatchInlineSnapshot(`
|
|
22
|
+
Array [
|
|
23
|
+
Array [
|
|
24
|
+
"foo",
|
|
25
|
+
"false",
|
|
26
|
+
],
|
|
27
|
+
]
|
|
28
|
+
`);
|
|
29
|
+
expect(buildNormalizedParams({ foo: '' })).toMatchInlineSnapshot(`
|
|
30
|
+
Array [
|
|
31
|
+
Array [
|
|
32
|
+
"foo",
|
|
33
|
+
"",
|
|
34
|
+
],
|
|
35
|
+
]
|
|
36
|
+
`);
|
|
37
|
+
expect(buildNormalizedParams({ foo: null })).toMatchInlineSnapshot(
|
|
38
|
+
`Array []`,
|
|
39
|
+
);
|
|
40
|
+
expect(buildNormalizedParams({ foo: undefined })).toMatchInlineSnapshot(
|
|
41
|
+
`Array []`,
|
|
42
|
+
);
|
|
43
|
+
|
|
44
|
+
expect(buildNormalizedParams({ foo: 'bàr' })).toMatchInlineSnapshot(`
|
|
45
|
+
Array [
|
|
46
|
+
Array [
|
|
47
|
+
"foo",
|
|
48
|
+
"bàr",
|
|
49
|
+
],
|
|
50
|
+
]
|
|
51
|
+
`);
|
|
52
|
+
|
|
53
|
+
expect(
|
|
54
|
+
buildNormalizedParams({
|
|
55
|
+
page: {
|
|
56
|
+
offset: 0,
|
|
57
|
+
limit: 10,
|
|
58
|
+
},
|
|
59
|
+
}),
|
|
60
|
+
).toMatchInlineSnapshot(`
|
|
61
|
+
Array [
|
|
62
|
+
Array [
|
|
63
|
+
"page[offset]",
|
|
64
|
+
"0",
|
|
65
|
+
],
|
|
66
|
+
Array [
|
|
67
|
+
"page[limit]",
|
|
68
|
+
"10",
|
|
69
|
+
],
|
|
70
|
+
]
|
|
71
|
+
`);
|
|
72
|
+
|
|
73
|
+
expect(
|
|
74
|
+
buildNormalizedParams({
|
|
75
|
+
filter: { fields: { md5: { eq: 'foo' } } },
|
|
76
|
+
}),
|
|
77
|
+
).toMatchInlineSnapshot(`
|
|
78
|
+
Array [
|
|
79
|
+
Array [
|
|
80
|
+
"filter[fields][md5][eq]",
|
|
81
|
+
"foo",
|
|
82
|
+
],
|
|
83
|
+
]
|
|
84
|
+
`);
|
|
85
|
+
|
|
86
|
+
expect(
|
|
87
|
+
buildNormalizedParams({
|
|
88
|
+
foo: { bar: ['a', 'b', 10] },
|
|
89
|
+
}),
|
|
90
|
+
).toMatchInlineSnapshot(`
|
|
91
|
+
Array [
|
|
92
|
+
Array [
|
|
93
|
+
"foo[bar][]",
|
|
94
|
+
"a",
|
|
95
|
+
],
|
|
96
|
+
Array [
|
|
97
|
+
"foo[bar][]",
|
|
98
|
+
"b",
|
|
99
|
+
],
|
|
100
|
+
Array [
|
|
101
|
+
"foo[bar][]",
|
|
102
|
+
"10",
|
|
103
|
+
],
|
|
104
|
+
]
|
|
105
|
+
`);
|
|
106
|
+
});
|
|
107
|
+
});
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
function buildKey(path: string[]) {
|
|
2
|
+
return path.reduce(
|
|
3
|
+
(result, chunk, index) => (index === 0 ? chunk : `${result}[${chunk}]`),
|
|
4
|
+
'',
|
|
5
|
+
);
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export function buildNormalizedParams(
|
|
9
|
+
input: Record<string, unknown>,
|
|
10
|
+
path: string[] = [],
|
|
11
|
+
): [string, string][] {
|
|
12
|
+
const result: [string, string][] = [];
|
|
13
|
+
|
|
14
|
+
for (const [key, value] of Object.entries(input)) {
|
|
15
|
+
if (typeof value === 'number' || typeof value === 'string') {
|
|
16
|
+
result.push([buildKey([...path, key]), value.toString()]);
|
|
17
|
+
} else if (value === true) {
|
|
18
|
+
result.push([buildKey([...path, key]), 'true']);
|
|
19
|
+
} else if (value === false) {
|
|
20
|
+
result.push([buildKey([...path, key]), 'false']);
|
|
21
|
+
} else if (typeof value === 'object') {
|
|
22
|
+
if (Array.isArray(value)) {
|
|
23
|
+
for (const innerValue of value) {
|
|
24
|
+
result.push([`${buildKey([...path, key])}[]`, innerValue.toString()]);
|
|
25
|
+
}
|
|
26
|
+
} else if (value) {
|
|
27
|
+
for (const param of buildNormalizedParams(
|
|
28
|
+
value as Record<string, unknown>,
|
|
29
|
+
[...path, key],
|
|
30
|
+
)) {
|
|
31
|
+
result.push(param);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return result;
|
|
38
|
+
}
|
package/src/request.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { buildNormalizedParams } from './buildNormalizedParams';
|
|
2
2
|
import { fetch as universalFetch } from '@whatwg-node/fetch';
|
|
3
3
|
import {
|
|
4
4
|
ApiError,
|
|
@@ -164,7 +164,9 @@ export async function request<T>(options: RequestOptions): Promise<T> {
|
|
|
164
164
|
|
|
165
165
|
const queryString =
|
|
166
166
|
options.queryParams && Object.keys(options.queryParams).length > 0
|
|
167
|
-
? `?${
|
|
167
|
+
? `?${new URLSearchParams(
|
|
168
|
+
buildNormalizedParams(options.queryParams),
|
|
169
|
+
).toString()}`
|
|
168
170
|
: '';
|
|
169
171
|
|
|
170
172
|
const url = `${baseUrl}${options.url}${queryString}`;
|