@modern-js/create-request 2.15.0 → 2.16.0
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/browser.js +27 -43
- package/dist/cjs/handleRes.js +11 -29
- package/dist/cjs/node.js +36 -48
- package/dist/cjs/types.js +4 -15
- package/dist/esm/browser.js +249 -234
- package/dist/esm/handleRes.js +181 -173
- package/dist/esm/node.js +131 -123
- package/dist/esm/types.js +1 -1
- package/dist/esm-node/browser.js +5 -7
- package/dist/esm-node/handleRes.js +5 -7
- package/dist/esm-node/node.js +10 -8
- package/dist/esm-node/types.js +1 -0
- package/package.json +10 -6
package/dist/esm/browser.js
CHANGED
|
@@ -1,158 +1,174 @@
|
|
|
1
|
-
function
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
function _array_like_to_array(arr, len) {
|
|
2
|
+
if (len == null || len > arr.length)
|
|
3
|
+
len = arr.length;
|
|
4
|
+
for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
5
|
+
arr2[i] = arr[i];
|
|
6
|
+
return arr2;
|
|
5
7
|
}
|
|
6
|
-
function
|
|
7
|
-
|
|
8
|
+
function _array_without_holes(arr) {
|
|
9
|
+
if (Array.isArray(arr))
|
|
10
|
+
return _array_like_to_array(arr);
|
|
8
11
|
}
|
|
9
12
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
13
|
+
try {
|
|
14
|
+
var info = gen[key](arg);
|
|
15
|
+
var value = info.value;
|
|
16
|
+
} catch (error) {
|
|
17
|
+
reject(error);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
if (info.done) {
|
|
21
|
+
resolve(value);
|
|
22
|
+
} else {
|
|
23
|
+
Promise.resolve(value).then(_next, _throw);
|
|
24
|
+
}
|
|
22
25
|
}
|
|
23
|
-
function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
26
|
+
function _async_to_generator(fn) {
|
|
27
|
+
return function() {
|
|
28
|
+
var self = this, args = arguments;
|
|
29
|
+
return new Promise(function(resolve, reject) {
|
|
30
|
+
var gen = fn.apply(self, args);
|
|
31
|
+
function _next(value) {
|
|
32
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
33
|
+
}
|
|
34
|
+
function _throw(err) {
|
|
35
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
36
|
+
}
|
|
37
|
+
_next(void 0);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
37
40
|
}
|
|
38
41
|
function _instanceof(left, right) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
|
|
43
|
+
return !!right[Symbol.hasInstance](left);
|
|
44
|
+
} else {
|
|
45
|
+
return left instanceof right;
|
|
46
|
+
}
|
|
44
47
|
}
|
|
45
|
-
function
|
|
46
|
-
|
|
48
|
+
function _iterable_to_array(iter) {
|
|
49
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
50
|
+
return Array.from(iter);
|
|
47
51
|
}
|
|
48
|
-
function
|
|
49
|
-
|
|
52
|
+
function _non_iterable_spread() {
|
|
53
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
50
54
|
}
|
|
51
|
-
function
|
|
52
|
-
|
|
55
|
+
function _to_consumable_array(arr) {
|
|
56
|
+
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
53
57
|
}
|
|
54
|
-
function
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
58
|
+
function _unsupported_iterable_to_array(o, minLen) {
|
|
59
|
+
if (!o)
|
|
60
|
+
return;
|
|
61
|
+
if (typeof o === "string")
|
|
62
|
+
return _array_like_to_array(o, minLen);
|
|
63
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
64
|
+
if (n === "Object" && o.constructor)
|
|
65
|
+
n = o.constructor.name;
|
|
66
|
+
if (n === "Map" || n === "Set")
|
|
67
|
+
return Array.from(n);
|
|
68
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
69
|
+
return _array_like_to_array(o, minLen);
|
|
61
70
|
}
|
|
62
|
-
var __generator =
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
+
var __generator = function(thisArg, body) {
|
|
72
|
+
var f, y, t, g, _ = {
|
|
73
|
+
label: 0,
|
|
74
|
+
sent: function() {
|
|
75
|
+
if (t[0] & 1)
|
|
76
|
+
throw t[1];
|
|
77
|
+
return t[1];
|
|
78
|
+
},
|
|
79
|
+
trys: [],
|
|
80
|
+
ops: []
|
|
81
|
+
};
|
|
82
|
+
return g = {
|
|
83
|
+
next: verb(0),
|
|
84
|
+
"throw": verb(1),
|
|
85
|
+
"return": verb(2)
|
|
86
|
+
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
87
|
+
return this;
|
|
88
|
+
}), g;
|
|
89
|
+
function verb(n) {
|
|
90
|
+
return function(v) {
|
|
91
|
+
return step([
|
|
92
|
+
n,
|
|
93
|
+
v
|
|
94
|
+
]);
|
|
71
95
|
};
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
break;
|
|
100
|
-
case 4:
|
|
101
|
-
_.label++;
|
|
102
|
-
return {
|
|
103
|
-
value: op[1],
|
|
104
|
-
done: false
|
|
105
|
-
};
|
|
106
|
-
case 5:
|
|
107
|
-
_.label++;
|
|
108
|
-
y = op[1];
|
|
109
|
-
op = [
|
|
110
|
-
0
|
|
111
|
-
];
|
|
112
|
-
continue;
|
|
113
|
-
case 7:
|
|
114
|
-
op = _.ops.pop();
|
|
115
|
-
_.trys.pop();
|
|
116
|
-
continue;
|
|
117
|
-
default:
|
|
118
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
119
|
-
_ = 0;
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
123
|
-
_.label = op[1];
|
|
124
|
-
break;
|
|
125
|
-
}
|
|
126
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
127
|
-
_.label = t[1];
|
|
128
|
-
t = op;
|
|
129
|
-
break;
|
|
130
|
-
}
|
|
131
|
-
if (t && _.label < t[2]) {
|
|
132
|
-
_.label = t[2];
|
|
133
|
-
_.ops.push(op);
|
|
134
|
-
break;
|
|
135
|
-
}
|
|
136
|
-
if (t[2]) _.ops.pop();
|
|
137
|
-
_.trys.pop();
|
|
138
|
-
continue;
|
|
139
|
-
}
|
|
140
|
-
op = body.call(thisArg, _);
|
|
141
|
-
} catch (e) {
|
|
96
|
+
}
|
|
97
|
+
function step(op) {
|
|
98
|
+
if (f)
|
|
99
|
+
throw new TypeError("Generator is already executing.");
|
|
100
|
+
while (_)
|
|
101
|
+
try {
|
|
102
|
+
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)
|
|
103
|
+
return t;
|
|
104
|
+
if (y = 0, t)
|
|
105
|
+
op = [
|
|
106
|
+
op[0] & 2,
|
|
107
|
+
t.value
|
|
108
|
+
];
|
|
109
|
+
switch (op[0]) {
|
|
110
|
+
case 0:
|
|
111
|
+
case 1:
|
|
112
|
+
t = op;
|
|
113
|
+
break;
|
|
114
|
+
case 4:
|
|
115
|
+
_.label++;
|
|
116
|
+
return {
|
|
117
|
+
value: op[1],
|
|
118
|
+
done: false
|
|
119
|
+
};
|
|
120
|
+
case 5:
|
|
121
|
+
_.label++;
|
|
122
|
+
y = op[1];
|
|
142
123
|
op = [
|
|
143
|
-
|
|
144
|
-
e
|
|
124
|
+
0
|
|
145
125
|
];
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
126
|
+
continue;
|
|
127
|
+
case 7:
|
|
128
|
+
op = _.ops.pop();
|
|
129
|
+
_.trys.pop();
|
|
130
|
+
continue;
|
|
131
|
+
default:
|
|
132
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
133
|
+
_ = 0;
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
137
|
+
_.label = op[1];
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
140
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
141
|
+
_.label = t[1];
|
|
142
|
+
t = op;
|
|
143
|
+
break;
|
|
144
|
+
}
|
|
145
|
+
if (t && _.label < t[2]) {
|
|
146
|
+
_.label = t[2];
|
|
147
|
+
_.ops.push(op);
|
|
148
|
+
break;
|
|
149
|
+
}
|
|
150
|
+
if (t[2])
|
|
151
|
+
_.ops.pop();
|
|
152
|
+
_.trys.pop();
|
|
153
|
+
continue;
|
|
149
154
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
155
|
+
op = body.call(thisArg, _);
|
|
156
|
+
} catch (e) {
|
|
157
|
+
op = [
|
|
158
|
+
6,
|
|
159
|
+
e
|
|
160
|
+
];
|
|
161
|
+
y = 0;
|
|
162
|
+
} finally {
|
|
163
|
+
f = t = 0;
|
|
164
|
+
}
|
|
165
|
+
if (op[0] & 5)
|
|
166
|
+
throw op[1];
|
|
167
|
+
return {
|
|
168
|
+
value: op[0] ? op[1] : void 0,
|
|
169
|
+
done: true
|
|
170
|
+
};
|
|
171
|
+
}
|
|
156
172
|
};
|
|
157
173
|
import { compile, pathToRegexp } from "path-to-regexp";
|
|
158
174
|
import qs from "query-string";
|
|
@@ -160,101 +176,100 @@ import { handleRes } from "./handleRes";
|
|
|
160
176
|
var realRequest;
|
|
161
177
|
var realAllowedHeaders;
|
|
162
178
|
var originFetch = function() {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
179
|
+
for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
180
|
+
params[_key] = arguments[_key];
|
|
181
|
+
}
|
|
182
|
+
return fetch.apply(void 0, _to_consumable_array(params)).then(handleRes);
|
|
167
183
|
};
|
|
168
|
-
var configure = function(options) {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
184
|
+
export var configure = function(options) {
|
|
185
|
+
var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders;
|
|
186
|
+
realRequest = request || originFetch;
|
|
187
|
+
if (interceptor && !request) {
|
|
188
|
+
realRequest = interceptor(fetch);
|
|
189
|
+
}
|
|
190
|
+
if (Array.isArray(allowedHeaders)) {
|
|
191
|
+
realAllowedHeaders = allowedHeaders;
|
|
192
|
+
}
|
|
177
193
|
};
|
|
178
|
-
var createRequest = function(path, method, port) {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
});
|
|
211
|
-
} else {
|
|
212
|
-
keys.forEach(function(key, index) {
|
|
213
|
-
payload.params[key.name] = args[index];
|
|
214
|
-
});
|
|
215
|
-
}
|
|
216
|
-
finalPath = getFinalPath(payload.params);
|
|
217
|
-
finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
|
|
218
|
-
headers = payload.headers || {};
|
|
219
|
-
body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
|
|
220
|
-
if (payload.data) {
|
|
221
|
-
headers["Content-Type"] = "application/json";
|
|
222
|
-
body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
|
|
223
|
-
} else if (payload.body) {
|
|
224
|
-
headers["Content-Type"] = "text/plain";
|
|
225
|
-
body = payload.body;
|
|
226
|
-
} else if (payload.formData) {
|
|
227
|
-
body = payload.formData;
|
|
228
|
-
} else if (payload.formUrlencoded) {
|
|
229
|
-
headers["Content-Type"] = "application/x-www-form-urlencoded";
|
|
230
|
-
if (typeof payload.formUrlencoded === "object" && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
231
|
-
// @ts-expect-error
|
|
232
|
-
// eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
|
|
233
|
-
!_instanceof(payload.formUrlencoded, URLSearchParams)) {
|
|
234
|
-
body = qs.stringify(payload.formUrlencoded);
|
|
235
|
-
} else {
|
|
236
|
-
body = payload.formUrlencoded;
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
if (method.toLowerCase() === "get") {
|
|
241
|
-
body = void 0;
|
|
242
|
-
}
|
|
243
|
-
headers.accept = "application/json,*/*;q=0.8";
|
|
244
|
-
return [
|
|
245
|
-
2,
|
|
246
|
-
fetcher(finalURL, {
|
|
247
|
-
method: method,
|
|
248
|
-
body: body,
|
|
249
|
-
headers: headers
|
|
250
|
-
})
|
|
251
|
-
];
|
|
194
|
+
export var createRequest = function(path, method, port) {
|
|
195
|
+
var httpMethodDecider = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "functionName", fetch1 = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : originFetch;
|
|
196
|
+
var getFinalPath = compile(path, {
|
|
197
|
+
encode: encodeURIComponent
|
|
198
|
+
});
|
|
199
|
+
var keys = [];
|
|
200
|
+
pathToRegexp(path, keys);
|
|
201
|
+
var sender = function() {
|
|
202
|
+
var _ref = _async_to_generator(function() {
|
|
203
|
+
var _len, args, _key, fetcher, body, finalURL, headers, payload, requestParams, params, finalPath;
|
|
204
|
+
var _arguments = arguments;
|
|
205
|
+
return __generator(this, function(_state) {
|
|
206
|
+
for (_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
207
|
+
args[_key] = _arguments[_key];
|
|
208
|
+
}
|
|
209
|
+
fetcher = realRequest || originFetch;
|
|
210
|
+
if (httpMethodDecider === "inputParams") {
|
|
211
|
+
finalURL = path;
|
|
212
|
+
body = JSON.stringify({
|
|
213
|
+
args
|
|
214
|
+
});
|
|
215
|
+
headers = {
|
|
216
|
+
"Content-Type": "application/json"
|
|
217
|
+
};
|
|
218
|
+
} else {
|
|
219
|
+
payload = typeof args[args.length - 1] === "object" ? args[args.length - 1] : {};
|
|
220
|
+
payload.params = payload.params || {};
|
|
221
|
+
requestParams = args[0];
|
|
222
|
+
if (typeof requestParams === "object" && requestParams.params) {
|
|
223
|
+
params = requestParams.params;
|
|
224
|
+
keys.forEach(function(key) {
|
|
225
|
+
payload.params[key.name] = params[key.name];
|
|
252
226
|
});
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
227
|
+
} else {
|
|
228
|
+
keys.forEach(function(key, index) {
|
|
229
|
+
payload.params[key.name] = args[index];
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
finalPath = getFinalPath(payload.params);
|
|
233
|
+
finalURL = payload.query ? "".concat(finalPath, "?").concat(qs.stringify(payload.query)) : finalPath;
|
|
234
|
+
headers = payload.headers || {};
|
|
235
|
+
body = payload.data && typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
|
|
236
|
+
if (payload.data) {
|
|
237
|
+
headers["Content-Type"] = "application/json";
|
|
238
|
+
body = typeof payload.data === "object" ? JSON.stringify(payload.data) : payload.body;
|
|
239
|
+
} else if (payload.body) {
|
|
240
|
+
headers["Content-Type"] = "text/plain";
|
|
241
|
+
body = payload.body;
|
|
242
|
+
} else if (payload.formData) {
|
|
243
|
+
body = payload.formData;
|
|
244
|
+
} else if (payload.formUrlencoded) {
|
|
245
|
+
headers["Content-Type"] = "application/x-www-form-urlencoded";
|
|
246
|
+
if (typeof payload.formUrlencoded === "object" && // eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
247
|
+
// @ts-expect-error
|
|
248
|
+
// eslint-disable-next-line node/prefer-global/url-search-params,node/no-unsupported-features/node-builtins
|
|
249
|
+
!_instanceof(payload.formUrlencoded, URLSearchParams)) {
|
|
250
|
+
body = qs.stringify(payload.formUrlencoded);
|
|
251
|
+
} else {
|
|
252
|
+
body = payload.formUrlencoded;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
if (method.toLowerCase() === "get") {
|
|
257
|
+
body = void 0;
|
|
258
|
+
}
|
|
259
|
+
headers.accept = "application/json,*/*;q=0.8";
|
|
260
|
+
return [
|
|
261
|
+
2,
|
|
262
|
+
fetcher(finalURL, {
|
|
263
|
+
method,
|
|
264
|
+
body,
|
|
265
|
+
headers
|
|
266
|
+
})
|
|
267
|
+
];
|
|
268
|
+
});
|
|
269
|
+
});
|
|
270
|
+
return function sender2() {
|
|
271
|
+
return _ref.apply(this, arguments);
|
|
272
|
+
};
|
|
273
|
+
}();
|
|
274
|
+
return sender;
|
|
259
275
|
};
|
|
260
|
-
export { configure, createRequest };
|