rxtutils 1.1.4-beta.15 → 1.1.4-beta.17

package/cjs/request/index.cjs

@@ -1,6 +1,5 @@
 'use strict';
 
-var tslib = require('tslib');
 var axios = require('axios');
 var at = require('lodash-es/at');
 var defaultHandlers = require('./defaultHandlers.cjs');
@@ -14,11 +13,10 @@ var error = require('./error.cjs');
  * @returns 请求创建函数
  */
 function createBaseRequest(baseOptions) {
-    var baseURL = Object(baseOptions).baseURL;
-    // 创建新的 Axios 实例并配置基础URL和跨域凭证
-    var instance = axios.create({
+    const { baseURL } = Object(baseOptions);
+    // 创建新的 Axios 实例并配置基础URL
+    const instance = axios.create({
         baseURL: baseURL,
-        withCredentials: true,
     });
     /**
      * 创建请求函数
@@ -29,166 +27,153 @@ function createBaseRequest(baseOptions) {
      * @returns 发送请求的函数
      */
     return function createRequest(requestOptions, createOptions) {
-        var _a = tslib.__assign({}, requestOptions), method = _a.method, url = _a.url;
-        var _b = tslib.__assign(tslib.__assign({}, baseOptions), createOptions), baseURL = _b.baseURL, _c = _b.cacheDataKey, cacheDataKey = _c === void 0 ? "".concat(method, ":").concat(baseURL).concat(url) : _c, cacheDataInStorage = _b.cacheDataInStorage, _d = _b.cacheKeyEquals, cacheKeyEquals = _d === void 0 ? defaultEquals : _d, cacheTime = _b.cacheTime, _e = _b.indexDBName, indexDBName = _e === void 0 ? "__apiCacheDatabase__" : _e;
-        var cache = new index.default(cacheDataInStorage, cacheDataKey, cacheTime, indexDBName, cacheKeyEquals);
-        function request(requestParam, options) {
-            return tslib.__awaiter(this, void 0, void 0, function () {
-                function retry() {
-                    if (retryTimes > 0) {
-                        return request(requestParam, tslib.__assign(tslib.__assign({}, options), { retryTimes: retryTimes - 1 }));
+        const { method, url } = { ...requestOptions };
+        const { baseURL, cacheDataKey = `${method}:${baseURL}${url}`, cacheDataInStorage, cacheKeyEquals = defaultEquals, cacheTime, indexDBName = "__apiCacheDatabase__", } = {
+            ...baseOptions,
+            ...createOptions,
+        };
+        const cache = new index.default(cacheDataInStorage, cacheDataKey, cacheTime, indexDBName, cacheKeyEquals);
+        async function request(requestParam, options) {
+            const mergedOptions = {
+                ...baseOptions,
+                ...createOptions,
+                ...options,
+            };
+            let { requestMiddlewares = [], axiosOptions: finalAxiosOptions = {}, requestParamsOrDataTransfer, responseTransfer } = mergedOptions;
+            let finalRequestOptions = { ...requestOptions, ...requestParam };
+            for (const middleware of requestMiddlewares) {
+                const { axiosOptions: nextAxiosOptions = finalAxiosOptions, requestOptions: nextRequestOptions = finalRequestOptions } = await middleware({ ...mergedOptions, axiosOptions: finalAxiosOptions }, finalRequestOptions);
+                finalAxiosOptions = nextAxiosOptions;
+                finalRequestOptions = nextRequestOptions;
+            }
+            const { method, url, data = {}, params = {}, } = finalRequestOptions;
+            let requestDataOrParams = params;
+            if (method.toLowerCase() === "post") {
+                requestDataOrParams = data;
+            }
+            const { defaultMessageShower = console.error } = {
+                ...baseOptions,
+                ...createOptions,
+                ...options,
+            };
+            const { enableCache = false, cacheData = false, defaultErrorCodeHandler = defaultHandlers._defaultErrorCodeHandler.bind(null, defaultMessageShower), defaultHttpErrorCodeHandler = defaultHandlers._defaultHttpErrorCodeHandler.bind(null, defaultMessageShower), otherErrorHandler = defaultHandlers._defaultOtherErrorCodeHandler.bind(null, defaultMessageShower), errorCodePath = "code", cacheTime = 60, errorCodeMap = {}, successCodes = ["0", "200"], httpErrorCodeMap = {}, 
+            // axiosOptions = {},
+            throwError = true, retryTimes = 0 } = { ...baseOptions, ...createOptions, ...options };
+            if (enableCache) {
+                const cacheItem = cache.getCache(requestDataOrParams);
+                if (cacheItem) {
+                    return Promise.resolve(cacheItem);
+                }
+            }
+            function retry() {
+                if (retryTimes > 0) {
+                    return request(requestParam, { ...options, retryTimes: retryTimes - 1 });
+                }
+                return null;
+            }
+            return instance
+                .request({
+                method,
+                url,
+                data: data ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(data) : data),
+                params: params ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(params) : params),
+                ...finalAxiosOptions,
+            })
+                .then(async (res) => {
+                const errorCode = String(at(res.data, errorCodePath));
+                let finalData = responseTransfer ? responseTransfer(res.data) : res.data;
+                if (successCodes.includes(errorCode)) {
+                    if (cacheData) {
+                        cache.setCache(requestDataOrParams, finalData, { cacheTime });
                     }
-                    return null;
+                    return finalData;
+                }
+                // 不在成功 code 中，意味着请求失败
+                const { [errorCode]: customHandler = defaultErrorCodeHandler } = errorCodeMap;
+                const err = new error("服务端错误", "server", res);
+                if (typeof customHandler === "string") {
+                    defaultMessageShower(customHandler);
+                    const retryTask = retry();
+                    if (retryTask)
+                        return retryTask;
+                }
+                else {
+                    const { replaceResData = res.data, throwError: handlerThrowError = "default", } = Object((await customHandler(errorCode, res.data, res, {
+                        ...requestOptions,
+                        ...requestParam,
+                    })));
+                    const retryTask = retry();
+                    if (retryTask)
+                        return retryTask;
+                    res.data = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return res.data;
+                    }
+                }
+                if (throwError) {
+                    throw err;
                 }
-                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, 
-                // axiosOptions = {},
-                throwError, _x, retryTimes, cacheItem;
-                var _this = this;
-                return tslib.__generator(this, function (_y) {
-                    switch (_y.label) {
-                        case 0:
-                            _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;
-                            finalRequestOptions = tslib.__assign(tslib.__assign({}, requestOptions), requestParam);
-                            _i = 0, requestMiddlewares_1 = requestMiddlewares;
-                            _y.label = 1;
-                        case 1:
-                            if (!(_i < requestMiddlewares_1.length)) return [3 /*break*/, 4];
-                            middleware = requestMiddlewares_1[_i];
-                            return [4 /*yield*/, middleware(finalAxiosOptions, finalRequestOptions)];
-                        case 2:
-                            _d = _y.sent(), _e = _d.axiosOptions, nextAxiosOptions = _e === void 0 ? finalAxiosOptions : _e, _f = _d.requestOptions, nextRequestOptions = _f === void 0 ? finalRequestOptions : _f;
-                            finalAxiosOptions = nextAxiosOptions;
-                            finalRequestOptions = nextRequestOptions;
-                            _y.label = 3;
-                        case 3:
-                            _i++;
-                            return [3 /*break*/, 1];
-                        case 4:
-                            method = finalRequestOptions.method, url = finalRequestOptions.url, _g = finalRequestOptions.data, data = _g === void 0 ? {} : _g, _h = finalRequestOptions.params, params = _h === void 0 ? {} : _h;
-                            requestDataOrParams = params;
-                            if (method.toLowerCase() === "post") {
-                                requestDataOrParams = data;
-                            }
-                            _j = tslib.__assign(tslib.__assign(tslib.__assign({}, baseOptions), createOptions), options).defaultMessageShower, defaultMessageShower = _j === void 0 ? console.error : _j;
-                            _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;
-                            if (enableCache) {
-                                cacheItem = cache.getCache(requestDataOrParams);
-                                if (cacheItem) {
-                                    return [2 /*return*/, Promise.resolve(cacheItem)];
-                                }
-                            }
-                            return [2 /*return*/, instance
-                                    .request(tslib.__assign({ method: method, url: url, data: data, params: params }, finalAxiosOptions))
-                                    .then(function (res) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                    var errorCode, _a, _b, _c, customHandler, err, retryTask, _d, _e, replaceResData, _f, handlerThrowError, _g, retryTask;
-                                    return tslib.__generator(this, function (_h) {
-                                        switch (_h.label) {
-                                            case 0:
-                                                errorCode = String(at(res.data, errorCodePath));
-                                                if (successCodes.includes(errorCode)) {
-                                                    if (cacheData) {
-                                                        cache.setCache(requestDataOrParams, res.data, { cacheTime: cacheTime });
-                                                    }
-                                                    return [2 /*return*/, res.data];
-                                                }
-                                                _a = errorCodeMap, _b = errorCode, _c = _a[_b], customHandler = _c === void 0 ? defaultErrorCodeHandler : _c;
-                                                err = new error("服务端错误", "server", res);
-                                                if (!(typeof customHandler === "string")) return [3 /*break*/, 1];
-                                                defaultMessageShower(customHandler);
-                                                retryTask = retry();
-                                                if (retryTask)
-                                                    return [2 /*return*/, retryTask];
-                                                return [3 /*break*/, 3];
-                                            case 1:
-                                                _g = Object;
-                                                return [4 /*yield*/, customHandler(errorCode, res.data, res, tslib.__assign(tslib.__assign({}, requestOptions), requestParam))];
-                                            case 2:
-                                                _d = _g.apply(void 0, [(_h.sent())]), _e = _d.replaceResData, replaceResData = _e === void 0 ? res.data : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? "default" : _f;
-                                                retryTask = retry();
-                                                if (retryTask)
-                                                    return [2 /*return*/, retryTask];
-                                                res.data = replaceResData;
-                                                switch (handlerThrowError) {
-                                                    case true:
-                                                        throw err;
-                                                    case false:
-                                                        return [2 /*return*/, res.data];
-                                                }
-                                                _h.label = 3;
-                                            case 3:
-                                                if (throwError) {
-                                                    throw err;
-                                                }
-                                                return [2 /*return*/, res.data];
-                                        }
-                                    });
-                                }); }, function (error$1) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                    var resData, _a, _b, _c, customHandler, err, retryTask, _d, _e, replaceResData, _f, handlerThrowError, _g, retryTask, resData, err, _h, _j, replaceResData, _k, handlerThrowError, _l, retryTask;
-                                    return tslib.__generator(this, function (_m) {
-                                        switch (_m.label) {
-                                            case 0:
-                                                if (!error$1.response) return [3 /*break*/, 4];
-                                                resData = error$1;
-                                                _a = httpErrorCodeMap, _b = error$1.response.status, _c = _a[_b], customHandler = _c === void 0 ? defaultHttpErrorCodeHandler : _c;
-                                                err = new error("服务端错误", "http", error$1);
-                                                if (!(typeof customHandler === "string")) return [3 /*break*/, 1];
-                                                defaultMessageShower(customHandler);
-                                                retryTask = retry();
-                                                if (retryTask)
-                                                    return [2 /*return*/, retryTask];
-                                                return [3 /*break*/, 3];
-                                            case 1:
-                                                _g = Object;
-                                                return [4 /*yield*/, customHandler(error$1.response.status, error$1, tslib.__assign(tslib.__assign({}, requestOptions), requestParam))];
-                                            case 2:
-                                                _d = _g.apply(void 0, [(_m.sent())]), _e = _d.replaceResData, replaceResData = _e === void 0 ? error$1 : _e, _f = _d.throwError, handlerThrowError = _f === void 0 ? "default" : _f;
-                                                retryTask = retry();
-                                                if (retryTask)
-                                                    return [2 /*return*/, retryTask];
-                                                resData = replaceResData;
-                                                switch (handlerThrowError) {
-                                                    case true:
-                                                        throw err;
-                                                    case false:
-                                                        return [2 /*return*/, resData];
-                                                }
-                                                _m.label = 3;
-                                            case 3:
-                                                if (throwError) {
-                                                    throw err;
-                                                }
-                                                return [2 /*return*/, resData];
-                                            case 4:
-                                                resData = error$1;
-                                                err = new error("服务端错误", "http", error$1);
-                                                err.type = "http";
-                                                err.data = error$1;
-                                                _l = Object;
-                                                return [4 /*yield*/, otherErrorHandler(error$1)];
-                                            case 5:
-                                                _h = (_l.apply(void 0, [(_m.sent())])), _j = _h.replaceResData, replaceResData = _j === void 0 ? error$1 : _j, _k = _h.throwError, handlerThrowError = _k === void 0 ? "default" : _k;
-                                                retryTask = retry();
-                                                if (retryTask)
-                                                    return [2 /*return*/, retryTask];
-                                                resData = replaceResData;
-                                                switch (handlerThrowError) {
-                                                    case true:
-                                                        throw err;
-                                                    case false:
-                                                        return [2 /*return*/, resData];
-                                                }
-                                                if (throwError) {
-                                                    throw err;
-                                                }
-                                                return [2 /*return*/, resData];
-                                        }
-                                    });
-                                }); })];
+                return res.data;
+            }, async (error$1) => {
+                if (error$1.response) {
+                    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
+                    let resData = error$1;
+                    const { [error$1.response.status]: customHandler = defaultHttpErrorCodeHandler, } = httpErrorCodeMap;
+                    const err = new error("服务端错误", "http", error$1);
+                    if (typeof customHandler === "string") {
+                        defaultMessageShower(customHandler);
+                        const retryTask = retry();
+                        if (retryTask)
+                            return retryTask;
                     }
-                });
+                    else {
+                        const { replaceResData = error$1, throwError: handlerThrowError = "default", } = Object((await customHandler(error$1.response.status, error$1, {
+                            ...requestOptions,
+                            ...requestParam,
+                        })));
+                        const retryTask = retry();
+                        if (retryTask)
+                            return retryTask;
+                        resData = replaceResData;
+                        switch (handlerThrowError) {
+                            case true:
+                                throw err;
+                            case false:
+                                return resData;
+                        }
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
+                else {
+                    let resData = error$1;
+                    const err = new error("服务端错误", "http", error$1);
+                    err.type = "http";
+                    err.data = error$1;
+                    const { replaceResData = error$1, throwError: handlerThrowError = "default", } = (Object((await otherErrorHandler(error$1))));
+                    const retryTask = retry();
+                    if (retryTask)
+                        return retryTask;
+                    resData = replaceResData;
+                    switch (handlerThrowError) {
+                        case true:
+                            throw err;
+                        case false:
+                            return resData;
+                    }
+                    if (throwError) {
+                        throw err;
+                    }
+                    return resData;
+                }
             });
         }
-        request.clearCache = function () {
+        request.clearCache = () => {
             cache.clear();
         };
         return request;

package/cjs/request/index.d.ts

@@ -119,6 +119,20 @@ interface Options<Params = any, Data = any> {
         requestOptions?: RequestOptions<Params>;
     })[];
     retryTimes?: number;
+    /**
+     * 请求参数或数据转换函数
+     * 可以在发送请求前对参数或数据进行处理
+     * @param paramsOrData 请求参数或数据
+     * @returns 处理后的参数或数据
+     */
+    requestParamsOrDataTransfer?: (paramsOrData: Params) => any;
+    /**
+     * 响应数据转换函数
+     * 可以在接收响应数据后对数据进行处理
+     * @param data 响应数据
+     * @returns 处理后的响应数据
+     */
+    responseTransfer?: (data: any) => Data;
 }
 /**
  * 请求参数接口

package/cjs/store/createGetter/index.cjs

@@ -9,11 +9,11 @@ var react = require('react');
  * @param getterNameMaps 将 getter 函数和 getter 名称一一映射
  * @returns getter object
  */
-var createStoreGetter = function (store, getters, getterNameMaps) {
-    var gettersObj = {};
-    Object.keys(getters).forEach(function (key) {
+const createStoreGetter = (store, getters, getterNameMaps) => {
+    const gettersObj = {};
+    Object.keys(getters).forEach((key) => {
         Object.defineProperty(gettersObj, getterNameMaps[key], {
-            get: function () { return getters[key](store.get()); }
+            get: () => getters[key](store.get())
         });
     });
     return gettersObj;
@@ -25,14 +25,14 @@ var createStoreGetter = function (store, getters, getterNameMaps) {
  * @param getterNameMaps 将 getter 函数和 getter 名称一一映射
  * @returns getter memo hook
  */
-var createStoreGetterMemo = function (store, getters, getterNameMaps) {
+const createStoreGetterMemo = (store, getters, getterNameMaps) => {
     // 创建缓存数据 hook
-    return function () {
-        var storeData = store.use()[0];
-        var reducedData = react.useMemo(function () {
-            return Object.keys(getters).reduce(function (acc, key) {
-                var mappedKey = getterNameMaps[key];
-                var getterValue = getters[key](storeData);
+    return () => {
+        const [storeData] = store.use();
+        const reducedData = react.useMemo(() => {
+            return Object.keys(getters).reduce((acc, key) => {
+                const mappedKey = getterNameMaps[key];
+                const getterValue = getters[key](storeData);
                 acc[mappedKey] = getterValue;
                 return acc;
             }, {});

package/cjs/store/createStateStore/index.cjs

@@ -13,19 +13,19 @@ function resolveHookState(nextState, currentState) {
     return nextState;
 }
 /** 判断当前环境是否为浏览器 */
-var isBrowser = typeof window !== 'undefined';
+const isBrowser = typeof window !== 'undefined';
 /**
  * 只执行一次的 useEffect hook
  * @param effect 要执行的副作用函数
  */
-var useEffectOnce = function (effect) {
+const useEffectOnce = (effect) => {
     react.useEffect(effect, []);
 };
 /**
  * 同构的 useLayoutEffect
  * 在服务端渲染时使用 useEffect，在浏览器环境使用 useLayoutEffect
  */
-var useIsomorphicLayoutEffect = isBrowser ? react.useLayoutEffect : react.useEffect;
+const useIsomorphicLayoutEffect = isBrowser ? react.useLayoutEffect : react.useEffect;
 /**
  * 创建状态存储
  * 提供一个简单的状态管理解决方案，支持组件间状态共享
@@ -39,12 +39,12 @@ function createStateStore(initialState) {
      * 状态存储对象
      * 包含当前状态、设置状态的方法、状态更新器和监听器列表
      */
-    var store = {
+    const store = {
         state: initialState instanceof Function ? initialState() : initialState,
-        setState: function (nextState) {
+        setState(nextState) {
             store.state = resolveHookState(nextState, store.state);
-            store.setters.forEach(function (setter) { return setter(store.state); });
-            store.watchers.forEach(function (watcher) { return watcher(store.state); });
+            store.setters.forEach((setter) => setter(store.state));
+            store.watchers.forEach((watcher) => watcher(store.state));
         },
         setters: [],
         watchers: [],
@@ -55,15 +55,15 @@ function createStateStore(initialState) {
      *
      * @returns [当前状态, 状态更新函数]
      */
-    var use = function () {
+    const use = () => {
         // 使用 React 的 useState 创建组件本地状态
-        var _a = react.useState(store.state), globalState = _a[0], stateSetter = _a[1];
+        const [globalState, stateSetter] = react.useState(store.state);
         // 组件卸载时清理状态更新器
-        useEffectOnce(function () { return function () {
-            store.setters = store.setters.filter(function (setter) { return setter !== stateSetter; });
-        }; });
+        useEffectOnce(() => () => {
+            store.setters = store.setters.filter((setter) => setter !== stateSetter);
+        });
         // 在组件挂载和更新时注册状态更新器
-        useIsomorphicLayoutEffect(function () {
+        useIsomorphicLayoutEffect(() => {
             if (!store.setters.includes(stateSetter)) {
                 store.setters.push(stateSetter);
             }
@@ -71,26 +71,26 @@ function createStateStore(initialState) {
         return [globalState, store.setState];
     };
     /** 获取当前状态值 */
-    var get = function () { return store.state; };
+    const get = () => store.state;
     /** 设置状态的函数引用 */
-    var set = store.setState;
+    const set = store.setState;
     /**
      * 监听状态变化
      * @param callback 状态变化时的回调函数
      * @returns 取消监听的函数
      */
-    var watch = function (callback) {
+    const watch = (callback) => {
         store.watchers.push(callback);
-        var close = function () {
-            store.watchers = store.watchers.filter(function (watcher) { return watcher !== callback; });
+        const close = () => {
+            store.watchers = store.watchers.filter((watcher) => watcher !== callback);
         };
         return close;
     };
     return {
-        use: use,
-        get: get,
-        set: set,
-        watch: watch,
+        use,
+        get,
+        set,
+        watch,
     };
 }