rxtutils 1.1.4-beta.11 → 1.1.4-beta.13
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/cjs/request/index.cjs +12 -13
- package/cjs/request/index.d.ts +5 -5
- package/es/request/index.d.ts +5 -5
- package/es/request/index.mjs +12 -13
- package/package.json +1 -1
- package/cjs/_utils/deepAssign.cjs +0 -25
- package/es/_utils/deepAssign.mjs +0 -23
package/cjs/request/index.cjs
CHANGED
|
@@ -7,7 +7,6 @@ var defaultHandlers = require('./defaultHandlers.cjs');
|
|
|
7
7
|
var defaultEquals = require('../_utils/defaultEquals.cjs');
|
|
8
8
|
var index = require('../cache/index.cjs');
|
|
9
9
|
var error = require('./error.cjs');
|
|
10
|
-
var deepAssign = require('../_utils/deepAssign.cjs');
|
|
11
10
|
|
|
12
11
|
/**
|
|
13
12
|
* 创建基础请求实例
|
|
@@ -41,37 +40,37 @@ function createBaseRequest(baseOptions) {
|
|
|
41
40
|
}
|
|
42
41
|
return null;
|
|
43
42
|
}
|
|
44
|
-
var _a, _b, requestMiddlewares, _c, finalAxiosOptions, finalRequestOptions, _i, requestMiddlewares_1, middleware, _d, nextAxiosOptions, nextRequestOptions, method, url,
|
|
43
|
+
var _a, _b, requestMiddlewares, _c, finalAxiosOptions, finalRequestOptions, _i, requestMiddlewares_1, middleware, _d, _e, nextAxiosOptions, _f, nextRequestOptions, method, url, _g, data, _h, params, requestDataOrParams, _j, defaultMessageShower, _k, _l, enableCache, _m, cacheData, _o, defaultErrorCodeHandler, _p, defaultHttpErrorCodeHandler, _q, otherErrorHandler, _r, errorCodePath, _s, cacheTime, _t, errorCodeMap, _u, successCodes, _v, httpErrorCodeMap, _w,
|
|
45
44
|
// axiosOptions = {},
|
|
46
|
-
throwError,
|
|
45
|
+
throwError, _x, retryTimes, cacheItem;
|
|
47
46
|
var _this = this;
|
|
48
|
-
return tslib.__generator(this, function (
|
|
49
|
-
switch (
|
|
47
|
+
return tslib.__generator(this, function (_y) {
|
|
48
|
+
switch (_y.label) {
|
|
50
49
|
case 0:
|
|
51
50
|
_a = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options), _b = _a.requestMiddlewares, requestMiddlewares = _b === void 0 ? [] : _b, _c = _a.axiosOptions, finalAxiosOptions = _c === void 0 ? {} : _c;
|
|
52
51
|
finalRequestOptions = tslib.__assign(tslib.__assign({}, requestOptions), requestParam);
|
|
53
52
|
_i = 0, requestMiddlewares_1 = requestMiddlewares;
|
|
54
|
-
|
|
53
|
+
_y.label = 1;
|
|
55
54
|
case 1:
|
|
56
55
|
if (!(_i < requestMiddlewares_1.length)) return [3 /*break*/, 4];
|
|
57
56
|
middleware = requestMiddlewares_1[_i];
|
|
58
57
|
return [4 /*yield*/, middleware(finalAxiosOptions, finalRequestOptions)];
|
|
59
58
|
case 2:
|
|
60
|
-
_d =
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
_d = _y.sent(), _e = _d.axiosOptions, nextAxiosOptions = _e === void 0 ? finalAxiosOptions : _e, _f = _d.requestOptions, nextRequestOptions = _f === void 0 ? finalRequestOptions : _f;
|
|
60
|
+
finalAxiosOptions = nextAxiosOptions;
|
|
61
|
+
finalRequestOptions = nextRequestOptions;
|
|
62
|
+
_y.label = 3;
|
|
64
63
|
case 3:
|
|
65
64
|
_i++;
|
|
66
65
|
return [3 /*break*/, 1];
|
|
67
66
|
case 4:
|
|
68
|
-
method = finalRequestOptions.method, url = finalRequestOptions.url,
|
|
67
|
+
method = finalRequestOptions.method, url = finalRequestOptions.url, _g = finalRequestOptions.data, data = _g === void 0 ? {} : _g, _h = finalRequestOptions.params, params = _h === void 0 ? {} : _h;
|
|
69
68
|
requestDataOrParams = params;
|
|
70
69
|
if (method.toLowerCase() === "post") {
|
|
71
70
|
requestDataOrParams = data;
|
|
72
71
|
}
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
_j = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _j === void 0 ? console.error : _j;
|
|
73
|
+
_k = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options), _l = _k.enableCache, enableCache = _l === void 0 ? false : _l, _m = _k.cacheData, cacheData = _m === void 0 ? false : _m, _o = _k.defaultErrorCodeHandler, defaultErrorCodeHandler = _o === void 0 ? defaultHandlers._defaultErrorCodeHandler.bind(null, defaultMessageShower) : _o, _p = _k.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _p === void 0 ? defaultHandlers._defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _p, _q = _k.otherErrorHandler, otherErrorHandler = _q === void 0 ? defaultHandlers._defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _q, _r = _k.errorCodePath, errorCodePath = _r === void 0 ? "code" : _r, _s = _k.cacheTime, cacheTime = _s === void 0 ? 60 : _s, _t = _k.errorCodeMap, errorCodeMap = _t === void 0 ? {} : _t, _u = _k.successCodes, successCodes = _u === void 0 ? ["0", "200"] : _u, _v = _k.httpErrorCodeMap, httpErrorCodeMap = _v === void 0 ? {} : _v, _w = _k.throwError, throwError = _w === void 0 ? true : _w, _x = _k.retryTimes, retryTimes = _x === void 0 ? 0 : _x;
|
|
75
74
|
if (enableCache) {
|
|
76
75
|
cacheItem = cache.getCache(requestDataOrParams);
|
|
77
76
|
if (cacheItem) {
|
package/cjs/request/index.d.ts
CHANGED
|
@@ -83,12 +83,12 @@ interface Options<Params = any, Data = any> {
|
|
|
83
83
|
* 可以配置错误码对应的错误信息或处理函数
|
|
84
84
|
* @default {} 空对象，使用默认处理函数
|
|
85
85
|
*/
|
|
86
|
-
errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
|
|
86
|
+
errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>)>;
|
|
87
87
|
/**
|
|
88
88
|
* 默认错误码处理函数
|
|
89
89
|
* 当错误码不在 errorCodeMap 中时调用
|
|
90
90
|
*/
|
|
91
|
-
defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
91
|
+
defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
92
92
|
/**
|
|
93
93
|
* 成功状态的错误码列表
|
|
94
94
|
* @default ['0', '200']
|
|
@@ -99,17 +99,17 @@ interface Options<Params = any, Data = any> {
|
|
|
99
99
|
* 可以配置 HTTP 状态码对应的错误信息或处理函数
|
|
100
100
|
* @default {} 空对象，使用默认处理函数
|
|
101
101
|
*/
|
|
102
|
-
httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => Promise<ErrorHandlerReturnType<Data> | void>)>;
|
|
102
|
+
httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => (ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>))>;
|
|
103
103
|
/**
|
|
104
104
|
* 默认 HTTP 错误码处理函数
|
|
105
105
|
* 当 HTTP 状态码不在 httpErrorCodeMap 中时调用
|
|
106
106
|
*/
|
|
107
|
-
defaultHttpErrorCodeHandler?: (code: number, error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
107
|
+
defaultHttpErrorCodeHandler?: (code: number, error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
108
108
|
/**
|
|
109
109
|
* 其他错误处理函数
|
|
110
110
|
* 处理非 HTTP 错误和非业务错误码的错误
|
|
111
111
|
*/
|
|
112
|
-
otherErrorHandler?: (error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
112
|
+
otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
113
113
|
axiosOptions?: Omit<AxiosRequestConfig<Params>, "method" | "url" | "params" | "data">;
|
|
114
114
|
requestMiddlewares?: ((options: Options<Params, Data>, requestOptions: RequestOptions<Params>) => Promise<{
|
|
115
115
|
axiosOptions?: Options<Params, Data>["axiosOptions"];
|
package/es/request/index.d.ts
CHANGED
|
@@ -83,12 +83,12 @@ interface Options<Params = any, Data = any> {
|
|
|
83
83
|
* 可以配置错误码对应的错误信息或处理函数
|
|
84
84
|
* @default {} 空对象，使用默认处理函数
|
|
85
85
|
*/
|
|
86
|
-
errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
|
|
86
|
+
errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>)>;
|
|
87
87
|
/**
|
|
88
88
|
* 默认错误码处理函数
|
|
89
89
|
* 当错误码不在 errorCodeMap 中时调用
|
|
90
90
|
*/
|
|
91
|
-
defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
91
|
+
defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
92
92
|
/**
|
|
93
93
|
* 成功状态的错误码列表
|
|
94
94
|
* @default ['0', '200']
|
|
@@ -99,17 +99,17 @@ interface Options<Params = any, Data = any> {
|
|
|
99
99
|
* 可以配置 HTTP 状态码对应的错误信息或处理函数
|
|
100
100
|
* @default {} 空对象，使用默认处理函数
|
|
101
101
|
*/
|
|
102
|
-
httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => Promise<ErrorHandlerReturnType<Data> | void>)>;
|
|
102
|
+
httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => (ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>))>;
|
|
103
103
|
/**
|
|
104
104
|
* 默认 HTTP 错误码处理函数
|
|
105
105
|
* 当 HTTP 状态码不在 httpErrorCodeMap 中时调用
|
|
106
106
|
*/
|
|
107
|
-
defaultHttpErrorCodeHandler?: (code: number, error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
107
|
+
defaultHttpErrorCodeHandler?: (code: number, error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
108
108
|
/**
|
|
109
109
|
* 其他错误处理函数
|
|
110
110
|
* 处理非 HTTP 错误和非业务错误码的错误
|
|
111
111
|
*/
|
|
112
|
-
otherErrorHandler?: (error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
|
|
112
|
+
otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
|
|
113
113
|
axiosOptions?: Omit<AxiosRequestConfig<Params>, "method" | "url" | "params" | "data">;
|
|
114
114
|
requestMiddlewares?: ((options: Options<Params, Data>, requestOptions: RequestOptions<Params>) => Promise<{
|
|
115
115
|
axiosOptions?: Options<Params, Data>["axiosOptions"];
|
package/es/request/index.mjs
CHANGED
|
@@ -5,7 +5,6 @@ import { _defaultErrorCodeHandler, _defaultHttpErrorCodeHandler, _defaultOtherEr
|
|
|
5
5
|
import defaultEquals from '../_utils/defaultEquals.mjs';
|
|
6
6
|
import Cache from '../cache/index.mjs';
|
|
7
7
|
import RequestError from './error.mjs';
|
|
8
|
-
import { deepAssign } from '../_utils/deepAssign.mjs';
|
|
9
8
|
|
|
10
9
|
/**
|
|
11
10
|
* 创建基础请求实例
|
|
@@ -39,37 +38,37 @@ function createBaseRequest(baseOptions) {
|
|
|
39
38
|
}
|
|
40
39
|
return null;
|
|
41
40
|
}
|
|
42
|
-
var _a, _b, requestMiddlewares, _c, finalAxiosOptions, finalRequestOptions, _i, requestMiddlewares_1, middleware, _d, nextAxiosOptions, nextRequestOptions, method, url,
|
|
41
|
+
var _a, _b, requestMiddlewares, _c, finalAxiosOptions, finalRequestOptions, _i, requestMiddlewares_1, middleware, _d, _e, nextAxiosOptions, _f, nextRequestOptions, method, url, _g, data, _h, params, requestDataOrParams, _j, defaultMessageShower, _k, _l, enableCache, _m, cacheData, _o, defaultErrorCodeHandler, _p, defaultHttpErrorCodeHandler, _q, otherErrorHandler, _r, errorCodePath, _s, cacheTime, _t, errorCodeMap, _u, successCodes, _v, httpErrorCodeMap, _w,
|
|
43
42
|
// axiosOptions = {},
|
|
44
|
-
throwError,
|
|
43
|
+
throwError, _x, retryTimes, cacheItem;
|
|
45
44
|
var _this = this;
|
|
46
|
-
return __generator(this, function (
|
|
47
|
-
switch (
|
|
45
|
+
return __generator(this, function (_y) {
|
|
46
|
+
switch (_y.label) {
|
|
48
47
|
case 0:
|
|
49
48
|
_a = __assign(__assign(__assign({}, baseOptions), createOptions), options), _b = _a.requestMiddlewares, requestMiddlewares = _b === void 0 ? [] : _b, _c = _a.axiosOptions, finalAxiosOptions = _c === void 0 ? {} : _c;
|
|
50
49
|
finalRequestOptions = __assign(__assign({}, requestOptions), requestParam);
|
|
51
50
|
_i = 0, requestMiddlewares_1 = requestMiddlewares;
|
|
52
|
-
|
|
51
|
+
_y.label = 1;
|
|
53
52
|
case 1:
|
|
54
53
|
if (!(_i < requestMiddlewares_1.length)) return [3 /*break*/, 4];
|
|
55
54
|
middleware = requestMiddlewares_1[_i];
|
|
56
55
|
return [4 /*yield*/, middleware(finalAxiosOptions, finalRequestOptions)];
|
|
57
56
|
case 2:
|
|
58
|
-
_d =
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
_d = _y.sent(), _e = _d.axiosOptions, nextAxiosOptions = _e === void 0 ? finalAxiosOptions : _e, _f = _d.requestOptions, nextRequestOptions = _f === void 0 ? finalRequestOptions : _f;
|
|
58
|
+
finalAxiosOptions = nextAxiosOptions;
|
|
59
|
+
finalRequestOptions = nextRequestOptions;
|
|
60
|
+
_y.label = 3;
|
|
62
61
|
case 3:
|
|
63
62
|
_i++;
|
|
64
63
|
return [3 /*break*/, 1];
|
|
65
64
|
case 4:
|
|
66
|
-
method = finalRequestOptions.method, url = finalRequestOptions.url,
|
|
65
|
+
method = finalRequestOptions.method, url = finalRequestOptions.url, _g = finalRequestOptions.data, data = _g === void 0 ? {} : _g, _h = finalRequestOptions.params, params = _h === void 0 ? {} : _h;
|
|
67
66
|
requestDataOrParams = params;
|
|
68
67
|
if (method.toLowerCase() === "post") {
|
|
69
68
|
requestDataOrParams = data;
|
|
70
69
|
}
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
_j = __assign(__assign(__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _j === void 0 ? console.error : _j;
|
|
71
|
+
_k = __assign(__assign(__assign({}, baseOptions), createOptions), options), _l = _k.enableCache, enableCache = _l === void 0 ? false : _l, _m = _k.cacheData, cacheData = _m === void 0 ? false : _m, _o = _k.defaultErrorCodeHandler, defaultErrorCodeHandler = _o === void 0 ? _defaultErrorCodeHandler.bind(null, defaultMessageShower) : _o, _p = _k.defaultHttpErrorCodeHandler, defaultHttpErrorCodeHandler = _p === void 0 ? _defaultHttpErrorCodeHandler.bind(null, defaultMessageShower) : _p, _q = _k.otherErrorHandler, otherErrorHandler = _q === void 0 ? _defaultOtherErrorCodeHandler.bind(null, defaultMessageShower) : _q, _r = _k.errorCodePath, errorCodePath = _r === void 0 ? "code" : _r, _s = _k.cacheTime, cacheTime = _s === void 0 ? 60 : _s, _t = _k.errorCodeMap, errorCodeMap = _t === void 0 ? {} : _t, _u = _k.successCodes, successCodes = _u === void 0 ? ["0", "200"] : _u, _v = _k.httpErrorCodeMap, httpErrorCodeMap = _v === void 0 ? {} : _v, _w = _k.throwError, throwError = _w === void 0 ? true : _w, _x = _k.retryTimes, retryTimes = _x === void 0 ? 0 : _x;
|
|
73
72
|
if (enableCache) {
|
|
74
73
|
cacheItem = cache.getCache(requestDataOrParams);
|
|
75
74
|
if (cacheItem) {
|
package/package.json
CHANGED
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
function deepAssign(target) {
|
|
4
|
-
var sources = [];
|
|
5
|
-
for (var _i = 1; _i < arguments.length; _i++) {
|
|
6
|
-
sources[_i - 1] = arguments[_i];
|
|
7
|
-
}
|
|
8
|
-
for (var _a = 0, sources_1 = sources; _a < sources_1.length; _a++) {
|
|
9
|
-
var source = sources_1[_a];
|
|
10
|
-
for (var key in source) {
|
|
11
|
-
var val = source[key];
|
|
12
|
-
if (val &&
|
|
13
|
-
typeof val === 'object' &&
|
|
14
|
-
!Array.isArray(val)) {
|
|
15
|
-
target[key] = deepAssign(target[key] || {}, val);
|
|
16
|
-
}
|
|
17
|
-
else {
|
|
18
|
-
target[key] = val;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
return target;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
exports.deepAssign = deepAssign;
|
package/es/_utils/deepAssign.mjs
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
function deepAssign(target) {
|
|
2
|
-
var sources = [];
|
|
3
|
-
for (var _i = 1; _i < arguments.length; _i++) {
|
|
4
|
-
sources[_i - 1] = arguments[_i];
|
|
5
|
-
}
|
|
6
|
-
for (var _a = 0, sources_1 = sources; _a < sources_1.length; _a++) {
|
|
7
|
-
var source = sources_1[_a];
|
|
8
|
-
for (var key in source) {
|
|
9
|
-
var val = source[key];
|
|
10
|
-
if (val &&
|
|
11
|
-
typeof val === 'object' &&
|
|
12
|
-
!Array.isArray(val)) {
|
|
13
|
-
target[key] = deepAssign(target[key] || {}, val);
|
|
14
|
-
}
|
|
15
|
-
else {
|
|
16
|
-
target[key] = val;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
return target;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export { deepAssign };
|