rxtutils 1.1.4-beta.9 → 1.1.6

package/es/hooks/useCombineControlValue.mjs

@@ -1,41 +1,35 @@
-import { useState, useCallback, useMemo } from 'react';
-
-/**
- * @param param props 组件属性
- * @param param valueKey 组件值的key，默认value, undefined 被认为是有值，只有当 key 不存在时，转换为非受控模式
- * @param param defaultValue 默认值，当 value 和 defaultValue 同时存在时，以 value 为默认值
- * @param param onChange 值改变时的回调
- * @returns value: 组件应该采用的值，onChange：值改变时的回调，处理非受控值与向父组件传递值的逻辑
- */
-function useCombineControlValue(_a, resolveFn) {
-    var props = _a.props, _b = _a.valueKey, valueKey = _b === void 0 ? 'value' : _b, defaultValue = _a.defaultValue, onChange = _a.onChange;
-    var _c = props, _d = valueKey, value = _c[_d];
-    var hasValue = Object.prototype.hasOwnProperty.call(props, valueKey);
-    var _e = useState(value !== null && value !== void 0 ? value : defaultValue), internalValue = _e[0], setInternalValue = _e[1];
-    var handleChange = useCallback(function () {
-        var params = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            params[_i] = arguments[_i];
-        }
-        var realNextVal;
-        if (typeof resolveFn === 'function') {
-            realNextVal = resolveFn.apply(void 0, params);
-        }
-        else {
-            realNextVal = params[0];
-        }
-        setInternalValue(realNextVal);
-        onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, params);
-    }, [onChange, resolveFn]);
-    var finalValue = useMemo(function () {
-        if (hasValue)
-            return value;
-        return internalValue;
-    }, [hasValue, internalValue, value]);
-    return {
-        value: finalValue,
-        onChange: handleChange
-    };
+import { useState, useCallback, useMemo } from "react";
+function useCombineControlValue({
+  props,
+  valueKey = "value",
+  defaultValue,
+  onChange
+}, resolveFn) {
+  const { [valueKey]: value } = props;
+  const hasValue = Object.prototype.hasOwnProperty.call(props, valueKey);
+  const [internalValue, setInternalValue] = useState(value ?? defaultValue);
+  const handleChange = useCallback(
+    (...params) => {
+      let realNextVal;
+      if (typeof resolveFn === "function") {
+        realNextVal = resolveFn(...params);
+      } else {
+        realNextVal = params[0];
+      }
+      setInternalValue(realNextVal);
+      onChange?.(...params);
+    },
+    [onChange, resolveFn]
+  );
+  const finalValue = useMemo(() => {
+    if (hasValue) return value;
+    return internalValue;
+  }, [hasValue, internalValue, value]);
+  return {
+    value: finalValue,
+    onChange: handleChange
+  };
 }
-
-export { useCombineControlValue };
+export {
+  useCombineControlValue
+};

package/es/index.d.ts

@@ -1,8 +1,28 @@
-export { default as Cache, ICache, ICacheOptions, StorageMap, StorageType } from './cache/index.js';
-export { ErrorHandlerReturnType, Options, RequestOptions, default as createBaseRequest } from './request/index.js';
-export { createStoreGetter, createStoreGetterMemo } from './store/createGetter/index.js';
-export { IHookStateInitAction, IHookStateInitialSetter, IHookStateResolvable, IHookStateSetAction, IHookStateSetter, default as createStateStore } from './store/createStateStore/index.js';
-export { BaseValidator } from './validator/validator.js';
-export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString } from './validator/decorators.js';
-export { useCombineControlValue } from './hooks/useCombineControlValue.js';
-export { default as RequestError, RequestErrorType } from './request/error.js';
+/**
+ * 导出主要功能模块
+ */
+/** 缓存管理模块 */
+export { default as Cache } from './cache';
+/** HTTP 请求创建模块 */
+export { default as createBaseRequest } from './request';
+/** 状态管理模块 */
+export { createStateStore } from './store';
+export { createStoreGetter, createStoreGetterMemo } from './store';
+export { VRequired, VString, VNumber, VEmail, VMinLength, VArray, VBoolean, VPattern, VMaxLength, VMax, VMin, BaseValidator, } from './validator';
+/**
+ * 缓存模块类型导出
+ * 包含缓存接口、配置选项、存储映射和存储类型
+ */
+export type { ICache, ICacheOptions, StorageMap, StorageType } from './cache';
+/**
+ * 请求模块类型导出
+ * 包含错误处理、请求选项和错误类型
+ */
+export type { ErrorHandlerReturnType, Options, RequestOptions, RequestError, RequestErrorType, } from './request';
+/**
+ * 状态管理模块类型导出
+ * 包含状态初始化、设置和更新的类型定义
+ */
+export type { IHookStateInitialSetter, IHookStateInitAction, IHookStateSetter, IHookStateSetAction, IHookStateResolvable, } from './store';
+export { useCombineControlValue } from './hooks';
+export { downloadBlob } from './downloadBlob';

package/es/index.mjs

@@ -1,7 +1,29 @@
-export { default as Cache } from './cache/index.mjs';
-export { default as createBaseRequest } from './request/index.mjs';
-export { createStoreGetter, createStoreGetterMemo } from './store/createGetter/index.mjs';
-export { default as createStateStore } from './store/createStateStore/index.mjs';
-export { BaseValidator } from './validator/validator.mjs';
-export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString } from './validator/decorators.mjs';
-export { useCombineControlValue } from './hooks/useCombineControlValue.mjs';
+import { default as default2 } from "./cache/index.mjs";
+import { default as default3 } from "./request/index.mjs";
+import { createStoreGetter, createStoreGetterMemo } from "./store/createGetter/index.mjs";
+import { default as default4 } from "./store/createStateStore/index.mjs";
+import { BaseValidator } from "./validator/validator.mjs";
+import { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString } from "./validator/decorators.mjs";
+import { useCombineControlValue } from "./hooks/useCombineControlValue.mjs";
+import { downloadBlob } from "./downloadBlob.mjs";
+export {
+  BaseValidator,
+  default2 as Cache,
+  VArray,
+  VBoolean,
+  VEmail,
+  VMax,
+  VMaxLength,
+  VMin,
+  VMinLength,
+  VNumber,
+  VPattern,
+  VRequired,
+  VString,
+  default3 as createBaseRequest,
+  default4 as createStateStore,
+  createStoreGetter,
+  createStoreGetterMemo,
+  downloadBlob,
+  useCombineControlValue
+};

package/es/request/defaultHandlers.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 默认业务错误码处理函数
+ * 用于处理业务错误码的默认行为
+ *
+ * @param defaultMessageShower 消息展示函数
+ * @param code 业务错误码
+ */
+export declare function _defaultErrorCodeHandler(defaultMessageShower: (message: string) => void, code: string): void;
+/**
+ * 默认 HTTP 错误码处理函数
+ * 用于处理 HTTP 状态码错误的默认行为
+ *
+ * @param defaultMessageShower 消息展示函数
+ * @param code HTTP 状态码
+ */
+export declare function _defaultHttpErrorCodeHandler(defaultMessageShower: (message: string) => void, code: number): void;
+/**
+ * 默认其他错误处理函数
+ * 用于处理未知错误或非标准错误的默认行为
+ *
+ * @param defaultMessageShower 消息展示函数
+ * @param error 错误对象
+ */
+export declare function _defaultOtherErrorCodeHandler(defaultMessageShower: (message: string) => void, error: any): void;

package/es/request/defaultHandlers.mjs

@@ -1,32 +1,14 @@
-/**
- * 默认业务错误码处理函数
- * 用于处理业务错误码的默认行为
- *
- * @param defaultMessageShower 消息展示函数
- * @param code 业务错误码
- */
 function _defaultErrorCodeHandler(defaultMessageShower, code) {
-    defaultMessageShower("\u8BF7\u6C42\u51FA\u9519\uFF0C\u9519\u8BEF\u7801\uFF1A".concat(code, "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+  defaultMessageShower(`请求出错，错误码：${code}，请稍后再试`);
 }
-/**
- * 默认 HTTP 错误码处理函数
- * 用于处理 HTTP 状态码错误的默认行为
- *
- * @param defaultMessageShower 消息展示函数
- * @param code HTTP 状态码
- */
 function _defaultHttpErrorCodeHandler(defaultMessageShower, code) {
-    defaultMessageShower("\u670D\u52A1\u7AEF\u8BF7\u6C42\u51FA\u9519\uFF0CHttp\u9519\u8BEF\u7801\uFF1A".concat(String(code), "\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5"));
+  defaultMessageShower(`服务端请求出错，Http错误码：${String(code)}，请稍后再试`);
 }
-/**
- * 默认其他错误处理函数
- * 用于处理未知错误或非标准错误的默认行为
- *
- * @param defaultMessageShower 消息展示函数
- * @param error 错误对象
- */
 function _defaultOtherErrorCodeHandler(defaultMessageShower, error) {
-    defaultMessageShower("\u672A\u77E5\u8BF7\u6C42\u51FA\u9519\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
+  defaultMessageShower(`未知请求出错，请稍后再试`);
 }
-
-export { _defaultErrorCodeHandler, _defaultHttpErrorCodeHandler, _defaultOtherErrorCodeHandler };
+export {
+  _defaultErrorCodeHandler,
+  _defaultHttpErrorCodeHandler,
+  _defaultOtherErrorCodeHandler
+};

package/es/request/error.d.ts

@@ -3,7 +3,7 @@
  * - server: 服务端业务错误
  * - http: HTTP 网络错误
  */
-type RequestErrorType = 'server' | 'http';
+export type RequestErrorType = 'server' | 'http';
 /**
  * 请求错误类
  * 用于统一处理请求过程中的各种错误
@@ -11,7 +11,7 @@ type RequestErrorType = 'server' | 'http';
  * @template Data 错误数据类型
  * @extends Error
  */
-declare class RequestError<Data = any> extends Error {
+export default class RequestError<Data = any> extends Error {
     /** 错误码 */
     code: string;
     /** 错误类型 */
@@ -24,8 +24,5 @@ declare class RequestError<Data = any> extends Error {
      * @param type 错误类型
      * @param data 错误相关的数据
      */
-    constructor(message: string, type: RequestErrorType, data?: Data);
+    constructor(message: string, type: RequestErrorType, data?: Data, code?: string);
 }
-
-export { RequestError as default };
-export type { RequestErrorType };

package/es/request/error.mjs

@@ -1,28 +1,18 @@
-import { __extends } from 'tslib';
-
-/**
- * 请求错误类
- * 用于统一处理请求过程中的各种错误
- *
- * @template Data 错误数据类型
- * @extends Error
- */
-var RequestError = /** @class */ (function (_super) {
-    __extends(RequestError, _super);
-    /**
-     * 构造函数
-     * @param message 错误消息
-     * @param type 错误类型
-     * @param data 错误相关的数据
-     */
-    function RequestError(message, type, data) {
-        var _this = _super.call(this, message) || this;
-        _this.name = 'RequestError';
-        _this.type = type;
-        _this.data = data;
-        return _this;
-    }
-    return RequestError;
-}(Error));
-
-export { RequestError as default };
+class RequestError extends Error {
+  /**
+   * 构造函数
+   * @param message 错误消息
+   * @param type 错误类型
+   * @param data 错误相关的数据
+   */
+  constructor(message, type, data, code = "") {
+    super(message);
+    this.name = "RequestError";
+    this.type = type;
+    this.data = data;
+    this.code = code;
+  }
+}
+export {
+  RequestError as default
+};

package/es/request/index.d.ts

@@ -1,12 +1,11 @@
-import { AxiosResponse, Method, AxiosRequestConfig } from 'axios';
-import { StorageType } from '../cache/index.js';
-export { default as RequestError, RequestErrorType } from './error.js';
-
+import { AxiosResponse, AxiosRequestConfig, Method } from 'axios';
+import { StorageType } from '../cache';
+import { default as RequestError, RequestErrorType } from './error';
 /**
  * 错误处理器返回类型
  * @template D 响应数据类型
  */
-type ErrorHandlerReturnType<D> = {
+export type ErrorHandlerReturnType<D> = {
     /** 替换响应数据 */
     replaceResData?: D;
     /**
@@ -15,14 +14,14 @@ type ErrorHandlerReturnType<D> = {
      * - false: 不抛出错误
      * - 'default': 使用默认错误处理逻辑
      */
-    throwError?: boolean | "default";
+    throwError?: boolean | 'default';
 };
 /**
  * 请求配置选项接口
  * @template Params 请求参数类型
  * @template Data 响应数据类型
  */
-interface Options<Params = any, Data = any> {
+export interface Options<Params = any, Data = any> {
     /** 请求基础URL，默认为空字符串 */
     baseURL?: string;
     /**
@@ -83,12 +82,12 @@ interface Options<Params = any, Data = any> {
      * 可以配置错误码对应的错误信息或处理函数
      * @default {} 空对象，使用默认处理函数
      */
-    errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void)>;
+    errorCodeMap?: Record<string, string | ((code: string, data: Data, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>)>;
     /**
      * 默认错误码处理函数
      * 当错误码不在 errorCodeMap 中时调用
      */
-    defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => Promise<ErrorHandlerReturnType<Data> | void>;
+    defaultErrorCodeHandler?: (code: string, data: Data, res: AxiosResponse<Data>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
     /**
      * 成功状态的错误码列表
      * @default ['0', '200']
@@ -99,31 +98,46 @@ interface Options<Params = any, Data = any> {
      * 可以配置 HTTP 状态码对应的错误信息或处理函数
      * @default {} 空对象，使用默认处理函数
      */
-    httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => Promise<ErrorHandlerReturnType<Data> | void>)>;
+    httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>)>;
     /**
      * 默认 HTTP 错误码处理函数
      * 当 HTTP 状态码不在 httpErrorCodeMap 中时调用
      */
-    defaultHttpErrorCodeHandler?: (code: number, error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
+    defaultHttpErrorCodeHandler?: (code: number, error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
     /**
      * 其他错误处理函数
      * 处理非 HTTP 错误和非业务错误码的错误
      */
-    otherErrorHandler?: (error: any) => Promise<ErrorHandlerReturnType<Data> | void>;
-    axiosOptions?: Omit<AxiosRequestConfig<Params>, "method" | "url" | "params" | "data">;
+    otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
+    axiosOptions?: Omit<AxiosRequestConfig<Params>, 'method' | 'url' | 'params' | 'data'>;
     requestMiddlewares?: ((options: Options<Params, Data>, requestOptions: RequestOptions<Params>) => Promise<{
-        axiosOptions?: Options<Params, Data>["axiosOptions"];
+        axiosOptions?: Options<Params, Data>['axiosOptions'];
         requestOptions?: RequestOptions<Params>;
     }> | {
-        axiosOptions: Options<Params, Data>["axiosOptions"];
+        axiosOptions: Options<Params, Data>['axiosOptions'];
         requestOptions?: RequestOptions<Params>;
     })[];
+    retryTimes?: number;
+    /**
+     * 请求参数或数据转换函数
+     * 可以在发送请求前对参数或数据进行处理
+     * @param paramsOrData 请求参数或数据
+     * @returns 处理后的参数或数据
+     */
+    requestParamsOrDataTransfer?: (paramsOrData: Params) => any;
+    /**
+     * 响应数据转换函数
+     * 可以在接收响应数据后对数据进行处理
+     * @param data 响应数据
+     * @returns 处理后的响应数据
+     */
+    responseTransfer?: (data: any) => Data;
 }
 /**
  * 请求参数接口
  * @template Param 请求参数类型
  */
-interface RequestOptions<Param> {
+export interface RequestOptions<Param> {
     /** HTTP 请求方法 */
     method: Method;
     /** 请求URL */
@@ -138,10 +152,8 @@ interface RequestOptions<Param> {
  * @param baseOptions 基础配置选项
  * @returns 请求创建函数
  */
-declare function createBaseRequest(baseOptions?: Options): <Param, Data extends Record<any, any>>(requestOptions: RequestOptions<Param>, createOptions?: Omit<Options<Param, Data>, "baseURL">) => {
+export default function createBaseRequest(baseOptions?: Options): <Param, Data extends Record<any, any>>(requestOptions: RequestOptions<Param>, createOptions?: Omit<Options<Param, Data>, "baseURL">) => {
     (requestParam?: Omit<RequestOptions<Param>, "url" | "method">, options?: Omit<Options<Param, Data>, "baseURL" | "cacheDataKey" | "cacheDataInStorage" | "cacheKeyEquals">): Promise<Data>;
     clearCache(): void;
 };
-
-export { createBaseRequest as default };
-export type { ErrorHandlerReturnType, Options, RequestOptions };
+export { type RequestError, type RequestErrorType };