rxtutils 1.1.5 → 1.1.7

package/README.md

@@ -12,6 +12,12 @@ yarn add rxtutils
 pnpm add rxtutils
 ```
 
+也支持按需导入子模块（如 `rxtutils/cache`, `rxtutils/hooks` 等）。
+
+### ⚠️ 环境要求
+
+本库的构建目标为 **ES2020**。如果在低版本环境中使用，请确保配置了相应的 Polyfill 或构建转译。
+
 ## 🚀 功能特性
 
 - **缓存管理** - 支持内存、localStorage、sessionStorage 和 IndexedDB 多种存储方式
@@ -67,7 +73,7 @@ const customCache = new Cache<{ id: number; name: string }, any>(
   'customCache',
   300,
   'customDB',
-  (prev, next) => prev.id === next.id // 只比较 id 字段
+  (prev, next) => prev.id === next.id, // 只比较 id 字段
 );
 ```
 
@@ -84,13 +90,13 @@ import { createBaseRequest } from 'rxtutils';
 const request = createBaseRequest({
   baseURL: 'https://api.example.com',
   throwError: true,
-  defaultMessageShower: (message) => console.log(message)
+  defaultMessageShower: (message) => console.log(message),
 });
 
 // 创建具体请求
 const getUserInfo = request<{ id: number }, { name: string; email: string }>({
   method: 'GET',
-  url: '/user/:id'
+  url: '/user/:id',
 });
 
 // 发送请求
@@ -107,13 +113,13 @@ const request = createBaseRequest({
     '401': '未授权，请重新登录',
     '500': (code, data, res) => ({
       replaceResData: { error: '服务器内部错误' },
-      throwError: false
-    })
+      throwError: false,
+    }),
   },
   httpErrorCodeMap: {
     404: '资源不存在',
-    500: '服务器错误'
-  }
+    500: '服务器错误',
+  },
 });
 ```
 
@@ -126,7 +132,7 @@ const request = createBaseRequest({
   cacheData: true,
   cacheDataInStorage: 'localStorage',
   cacheDataKey: 'api-cache',
-  cacheTime: 300
+  cacheTime: 300,
 });
 
 // 第一次请求会从服务器获取数据
@@ -158,7 +164,7 @@ const userStore = createStateStore({
 // 在组件中使用
 function UserComponent() {
   const [user, setUser] = userStore.use();
-  
+
   const handleLogin = () => {
     setUser({
       name: 'John Doe',
@@ -166,7 +172,7 @@ function UserComponent() {
       isLoggedIn: true
     });
   };
-  
+
   return (
     <div>
       <p>用户名: {user.name}</p>
@@ -274,12 +280,10 @@ console.log(allErrors); // 返回所有验证错误
 import { BaseValidator } from 'rxtutils';
 
 // 创建自定义验证装饰器
-const VCustom = BaseValidator.decoratorCreator(
-  (val) => {
-    // 自定义验证逻辑
-    return typeof val === 'string' && val.startsWith('custom-');
-  }
-);
+const VCustom = BaseValidator.decoratorCreator((val) => {
+  // 自定义验证逻辑
+  return typeof val === 'string' && val.startsWith('custom-');
+});
 
 // 使用自定义验证装饰器
 class Product extends BaseValidator {
@@ -329,7 +333,7 @@ form.password = '123456';
 
 // 验证单个字段的所有规则
 const usernameErrors = form.validate('username', true);
-console.log(usernameErrors); 
+console.log(usernameErrors);
 // [{ status: false, message: '用户名长度不能少于3位' }]
 
 // 验证所有字段，每个字段遇到第一个错误就停止
@@ -379,7 +383,7 @@ const useUserGetters = createStoreGetterMemo(userStore, getters, getterNameMaps)
 
 function UserProfile() {
   const { fullName, isAdult, displayName } = useUserGetters();
-  
+
   return (
     <div>
       <h1>{fullName}</h1>
@@ -394,26 +398,26 @@ function UserProfile() {
 
 ### Cache 配置
 
-| 参数 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| `storageType` | `'sessionStorage' \| 'localStorage' \| 'indexedDB'` | `undefined` | 存储类型 |
-| `cacheKey` | `string` | `undefined` | 缓存键名 |
-| `cacheTime` | `number` | `60` | 缓存时间（秒） |
-| `indexDBName` | `string` | `'__apiCacheDatabase__'` | IndexedDB 数据库名称 |
-| `cacheKeyEquals` | `function` | `defaultEquals` | 缓存键比较函数 |
+| 参数             | 类型                                                | 默认值                   | 说明                 |
+| ---------------- | --------------------------------------------------- | ------------------------ | -------------------- |
+| `storageType`    | `'sessionStorage' \| 'localStorage' \| 'indexedDB'` | `undefined`              | 存储类型             |
+| `cacheKey`       | `string`                                            | `undefined`              | 缓存键名             |
+| `cacheTime`      | `number`                                            | `60`                     | 缓存时间（秒）       |
+| `indexDBName`    | `string`                                            | `'__apiCacheDatabase__'` | IndexedDB 数据库名称 |
+| `cacheKeyEquals` | `function`                                          | `defaultEquals`          | 缓存键比较函数       |
 
 ### Request 配置
 
-| 参数 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| `baseURL` | `string` | `''` | 请求基础URL |
-| `throwError` | `boolean` | `true` | 是否抛出错误 |
-| `enableCache` | `boolean` | `false` | 是否启用缓存 |
-| `cacheData` | `boolean` | `false` | 是否缓存数据 |
-| `cacheTime` | `number` | `60` | 缓存时间（秒） |
-| `cacheDataInStorage` | `StorageType` | `undefined` | 缓存存储类型 |
-| `errorCodePath` | `string` | `'code'` | 错误码路径 |
-| `successCodes` | `string[]` | `['0', '200']` | 成功状态码 |
+| 参数                 | 类型          | 默认值         | 说明           |
+| -------------------- | ------------- | -------------- | -------------- |
+| `baseURL`            | `string`      | `''`           | 请求基础URL    |
+| `throwError`         | `boolean`     | `true`         | 是否抛出错误   |
+| `enableCache`        | `boolean`     | `false`        | 是否启用缓存   |
+| `cacheData`          | `boolean`     | `false`        | 是否缓存数据   |
+| `cacheTime`          | `number`      | `60`           | 缓存时间（秒） |
+| `cacheDataInStorage` | `StorageType` | `undefined`    | 缓存存储类型   |
+| `errorCodePath`      | `string`      | `'code'`       | 错误码路径     |
+| `successCodes`       | `string[]`    | `['0', '200']` | 成功状态码     |
 
 ## 📝 类型定义
 
@@ -487,12 +491,12 @@ const apiRequest = createBaseRequest({
   enableCache: true,
   cacheData: true,
   cacheDataInStorage: 'localStorage',
-  cacheTime: 300
+  cacheTime: 300,
 });
 
 const getProductList = apiRequest<{ page: number }, { products: Product[] }>({
   method: 'GET',
-  url: '/products'
+  url: '/products',
 });
 ```
 
@@ -503,19 +507,23 @@ const getProductList = apiRequest<{ page: number }, { products: Product[] }>({
 const userStore = createStateStore({
   user: null,
   permissions: [],
-  theme: 'light'
+  theme: 'light',
 });
 
 // 创建用户相关的计算属性
-const userGetters = createStoreGetter(userStore, {
-  isLoggedIn: (state) => !!state.user,
-  canEdit: (state) => state.permissions.includes('edit'),
-  isDarkTheme: (state) => state.theme === 'dark'
-}, {
-  isLoggedIn: 'isLoggedIn',
-  canEdit: 'canEdit',
-  isDarkTheme: 'isDarkTheme'
-});
+const userGetters = createStoreGetter(
+  userStore,
+  {
+    isLoggedIn: (state) => !!state.user,
+    canEdit: (state) => state.permissions.includes('edit'),
+    isDarkTheme: (state) => state.theme === 'dark',
+  },
+  {
+    isLoggedIn: 'isLoggedIn',
+    canEdit: 'canEdit',
+    isDarkTheme: 'isDarkTheme',
+  },
+);
 ```
 
 ### 3. 表单数据缓存
@@ -531,9 +539,69 @@ formCache.setCache('user-form', formData);
 const savedData = formCache.getCache('user-form');
 ```
 
+## 🛠 开发
+
+本项目包含一个 playground 用于调试和预览。
+
+```bash
+# 安装依赖
+pnpm install --frozen-lockfile
+
+# 启动开发服务器
+pnpm dev
+
+# 运行测试
+pnpm test
+
+# 代码检查
+pnpm lint
+
+# 代码格式化
+pnpm format
+
+# 类型检查
+pnpm typecheck
+
+# 构建
+pnpm build
+```
+
 ## 🤝 贡献
 
-欢迎提交 Issue 和 Pull Request 来帮助改进这个项目。
+欢迎提交 Issue 和 Pull Request 来帮助改进这个项目。提交前建议先执行：
+
+```bash
+pnpm format:check
+pnpm lint
+pnpm typecheck
+pnpm test
+pnpm build
+```
+
+## 🔧 Git Alias（可选）
+
+如果你习惯使用 Git alias，建议配置到个人环境（`~/.gitconfig`），而不是放在仓库中。
+
+方式一：逐条命令配置
+
+```bash
+git config --global alias.cm commit
+git config --global alias.cc checkout
+git config --global alias.bc branch
+git config --global alias.df diff
+git config --global alias.lg log
+```
+
+方式二：直接追加配置片段到 `~/.gitconfig`
+
+```ini
+[alias]
+  cm = commit
+  cc = checkout
+  bc = branch
+  df = diff
+  lg = log
+```
 
 ## 📄 许可证
 
@@ -544,4 +612,4 @@ MIT License
 - [TypeScript](https://www.typescriptlang.org/)
 - [React](https://reactjs.org/)
 - [Axios](https://axios-http.com/)
-- [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)
+- [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)

package/cjs/cache/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const moment = require("moment");
+const dateFns = require("date-fns");
 const indexDB = require("./indexDB.cjs");
 const defaultEquals = require("../_utils/defaultEquals.cjs");
 const StorageMap = {
@@ -40,17 +40,13 @@ class Cache {
   async _init() {
     const { storageType: cacheType, cacheKey } = this.cacheOptions;
     if (this.storage instanceof indexDB.IndexedDBStorage) {
-      this.cache = JSON.parse(
-        await this.storage.getItem(cacheKey) || "[]"
-      );
+      this.cache = JSON.parse(await this.storage.getItem(cacheKey) || "[]");
     } else if (this.storage instanceof Storage) {
       this.storage = StorageMap[cacheType];
       if (this.storage) {
         if (typeof cacheKey === "string") {
           try {
-            this.cache = JSON.parse(
-              this.storage.getItem(cacheKey) || "[]"
-            );
+            this.cache = JSON.parse(this.storage.getItem(cacheKey) || "[]");
           } catch (e) {
             this.cache = [];
             console.error(`缓存数据解析失败，key:${cacheKey}`);
@@ -68,7 +64,7 @@ class Cache {
    */
   _filterExpired() {
     const newCache = this.cache.filter((item) => {
-      return moment(item.expireTime).isAfter(moment());
+      return dateFns.isAfter(dateFns.parseISO(item.expireTime), /* @__PURE__ */ new Date());
     });
     this.cache = newCache;
   }
@@ -80,10 +76,7 @@ class Cache {
   _saveToStorage() {
     if (this.storage) {
       if (typeof this.cacheOptions.cacheKey === "string") {
-        this.storage.setItem(
-          this.cacheOptions.cacheKey,
-          JSON.stringify(this.cache)
-        );
+        this.storage.setItem(this.cacheOptions.cacheKey, JSON.stringify(this.cache));
       }
     }
   }
@@ -107,7 +100,7 @@ class Cache {
     this.cache.push({
       params,
       data,
-      expireTime: moment().add(cacheTime, "seconds").toJSON()
+      expireTime: dateFns.addSeconds(/* @__PURE__ */ new Date(), cacheTime ?? 0).toISOString()
     });
     this._saveToStorage();
   }
@@ -122,7 +115,7 @@ class Cache {
     });
     const item = this.cache[itemIndex];
     if (item) {
-      if (moment(item.expireTime).isAfter(moment())) {
+      if (dateFns.isAfter(dateFns.parseISO(item.expireTime), /* @__PURE__ */ new Date())) {
         return item.data;
       } else {
         this.cache.splice(itemIndex, 1);

package/cjs/hooks/useCombineControlValue.cjs

@@ -10,16 +10,19 @@ function useCombineControlValue({
   const { [valueKey]: value } = props;
   const hasValue = Object.prototype.hasOwnProperty.call(props, valueKey);
   const [internalValue, setInternalValue] = react.useState(value ?? defaultValue);
-  const handleChange = react.useCallback((...params) => {
-    let realNextVal;
-    if (typeof resolveFn === "function") {
-      realNextVal = resolveFn(...params);
-    } else {
-      realNextVal = params[0];
-    }
-    setInternalValue(realNextVal);
-    onChange?.(...params);
-  }, [onChange, resolveFn]);
+  const handleChange = react.useCallback(
+    (...params) => {
+      let realNextVal;
+      if (typeof resolveFn === "function") {
+        realNextVal = resolveFn(...params);
+      } else {
+        realNextVal = params[0];
+      }
+      setInternalValue(realNextVal);
+      onChange?.(...params);
+    },
+    [onChange, resolveFn]
+  );
   const finalValue = react.useMemo(() => {
     if (hasValue) return value;
     return internalValue;

package/cjs/request/index.cjs

@@ -37,19 +37,25 @@ function createBaseRequest(baseOptions) {
         ...createOptions,
         ...options
       };
-      let { requestMiddlewares = [], axiosOptions: finalAxiosOptions = {}, requestParamsOrDataTransfer, responseTransfer } = mergedOptions;
+      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);
+        const {
+          axiosOptions: nextAxiosOptions = finalAxiosOptions,
+          requestOptions: nextRequestOptions = finalRequestOptions
+        } = await middleware(
+          { ...mergedOptions, axiosOptions: finalAxiosOptions },
+          finalRequestOptions
+        );
         finalAxiosOptions = nextAxiosOptions;
         finalRequestOptions = nextRequestOptions;
       }
-      const {
-        method: method2,
-        url: url2,
-        data = {},
-        params = {}
-      } = finalRequestOptions;
+      const { method: method2, url: url2, data = {}, params = {} } = finalRequestOptions;
       let requestDataOrParams = params;
       if (method2.toLowerCase() === "post") {
         requestDataOrParams = data;
@@ -62,18 +68,9 @@ function createBaseRequest(baseOptions) {
       const {
         enableCache = false,
         cacheData = false,
-        defaultErrorCodeHandler = defaultHandlers._defaultErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
-        defaultHttpErrorCodeHandler = defaultHandlers._defaultHttpErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
-        otherErrorHandler = defaultHandlers._defaultOtherErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
+        defaultErrorCodeHandler = defaultHandlers._defaultErrorCodeHandler.bind(null, defaultMessageShower),
+        defaultHttpErrorCodeHandler = defaultHandlers._defaultHttpErrorCodeHandler.bind(null, defaultMessageShower),
+        otherErrorHandler = defaultHandlers._defaultOtherErrorCodeHandler.bind(null, defaultMessageShower),
         errorCodePath = "code",
         cacheTime: cacheTime2 = 60,
         errorCodeMap = {},
@@ -98,8 +95,8 @@ function createBaseRequest(baseOptions) {
       return instance.request({
         method: method2,
         url: url2,
-        data: data ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(data) : data),
-        params: params ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(params) : params),
+        data: requestParamsOrDataTransfer ? requestParamsOrDataTransfer(data) : data,
+        params: requestParamsOrDataTransfer ? requestParamsOrDataTransfer(params) : params,
         ...finalAxiosOptions
       }).then(
         async (res) => {
@@ -118,10 +115,7 @@ function createBaseRequest(baseOptions) {
             const retryTask = retry();
             if (retryTask) return retryTask;
           } else {
-            const {
-              replaceResData = res.data,
-              throwError: handlerThrowError = "default"
-            } = Object(
+            const { replaceResData = res.data, throwError: handlerThrowError = "default" } = Object(
               await customHandler(errorCode, res.data, res, {
                 ...requestOptions,
                 ...requestParam
@@ -145,19 +139,14 @@ function createBaseRequest(baseOptions) {
         async (error$1) => {
           if (error$1.response) {
             let resData = error$1;
-            const {
-              [error$1.response.status]: customHandler = defaultHttpErrorCodeHandler
-            } = httpErrorCodeMap;
+            const { [error$1.response.status]: customHandler = defaultHttpErrorCodeHandler } = httpErrorCodeMap;
             const err = new error.default("服务端错误", "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(
+              const { replaceResData = error$1, throwError: handlerThrowError = "default" } = Object(
                 await customHandler(error$1.response.status, error$1, {
                   ...requestOptions,
                   ...requestParam
@@ -182,12 +171,7 @@ function createBaseRequest(baseOptions) {
             const err = new error.default("服务端错误", "http", error$1);
             err.type = "http";
             err.data = error$1;
-            const {
-              replaceResData = error$1,
-              throwError: handlerThrowError = "default"
-            } = Object(
-              await otherErrorHandler(error$1)
-            );
+            const { replaceResData = error$1, throwError: handlerThrowError = "default" } = Object(await otherErrorHandler(error$1));
             const retryTask = retry();
             if (retryTask) return retryTask;
             resData = replaceResData;

package/cjs/validator/decorators.cjs

@@ -9,38 +9,30 @@ function VRequired(noneVals = [void 0]) {
     return true;
   });
 }
-const VString = validator.BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "string") {
-      return false;
-    }
-    return true;
+const VString = validator.BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "string") {
+    return false;
   }
-);
-const VNumber = validator.BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "number") {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VNumber = validator.BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "number") {
+    return false;
   }
-);
-const VArray = validator.BaseValidator.decoratorCreator(
-  (val) => {
-    if (!Array.isArray(val)) {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VArray = validator.BaseValidator.decoratorCreator((val) => {
+  if (!Array.isArray(val)) {
+    return false;
   }
-);
-const VBoolean = validator.BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "boolean") {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VBoolean = validator.BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "boolean") {
+    return false;
   }
-);
+  return true;
+});
 const VMin = (min) => validator.BaseValidator.decoratorCreator((val) => {
   if (typeof val !== "number" || val < min) {
     return false;
@@ -71,15 +63,13 @@ const VMaxLength = (maxLen) => validator.BaseValidator.decoratorCreator((val) =>
   }
   return true;
 });
-const VEmail = validator.BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "string") {
-      return false;
-    }
-    const emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailReg.test(val);
+const VEmail = validator.BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "string") {
+    return false;
   }
-);
+  const emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailReg.test(val);
+});
 const VPattern = (pattern) => validator.BaseValidator.decoratorCreator((val) => {
   if (typeof val !== "string") {
     return false;

package/es/cache/index.d.ts

@@ -5,7 +5,7 @@ import { IndexedDBStorage } from './indexDB';
  * - localStorage: 本地存储，永久保存
  * - indexedDB: IndexedDB 数据库存储
  */
-export type StorageType = "sessionStorage" | "localStorage" | "indexedDB";
+export type StorageType = 'sessionStorage' | 'localStorage' | 'indexedDB';
 /**
  * 缓存项接口定义
  * 定义了单个缓存项的数据结构
@@ -27,7 +27,7 @@ export interface ICache<Param, Data> {
     /**
      * 过期时间
      * - ISO 8601 格式的字符串
-     * - 由 moment().add(cacheTime, 'seconds').toJSON() 生成
+     * - 由 addSeconds(new Date(), cacheTime).toISOString() 生成
      * - 示例：'2025-06-12T10:30:00.000Z'
      */
     expireTime: string;
@@ -122,7 +122,7 @@ export default class Cache<Param, Data> {
      * @param data 要缓存的数据
      * @param cacheOptions 可选的缓存配置，可以覆盖默认的缓存时间
      */
-    setCache(params: Param, data: Data, cacheOptions?: Omit<ICacheOptions<Param>, "storageType" | "cacheKey" | "cacheKeyEquals">): void;
+    setCache(params: Param, data: Data, cacheOptions?: Omit<ICacheOptions<Param>, 'storageType' | 'cacheKey' | 'cacheKeyEquals'>): void;
     /**
      * 获取缓存数据
      * @param params 查询参数

package/es/cache/index.mjs

@@ -1,4 +1,4 @@
-import moment from "moment";
+import { isAfter, parseISO, addSeconds } from "date-fns";
 import { IndexedDBStorage } from "./indexDB.mjs";
 import defaultEquals from "../_utils/defaultEquals.mjs";
 const StorageMap = {
@@ -38,17 +38,13 @@ class Cache {
   async _init() {
     const { storageType: cacheType, cacheKey } = this.cacheOptions;
     if (this.storage instanceof IndexedDBStorage) {
-      this.cache = JSON.parse(
-        await this.storage.getItem(cacheKey) || "[]"
-      );
+      this.cache = JSON.parse(await this.storage.getItem(cacheKey) || "[]");
     } else if (this.storage instanceof Storage) {
       this.storage = StorageMap[cacheType];
       if (this.storage) {
         if (typeof cacheKey === "string") {
           try {
-            this.cache = JSON.parse(
-              this.storage.getItem(cacheKey) || "[]"
-            );
+            this.cache = JSON.parse(this.storage.getItem(cacheKey) || "[]");
           } catch (e) {
             this.cache = [];
             console.error(`缓存数据解析失败，key:${cacheKey}`);
@@ -66,7 +62,7 @@ class Cache {
    */
   _filterExpired() {
     const newCache = this.cache.filter((item) => {
-      return moment(item.expireTime).isAfter(moment());
+      return isAfter(parseISO(item.expireTime), /* @__PURE__ */ new Date());
     });
     this.cache = newCache;
   }
@@ -78,10 +74,7 @@ class Cache {
   _saveToStorage() {
     if (this.storage) {
       if (typeof this.cacheOptions.cacheKey === "string") {
-        this.storage.setItem(
-          this.cacheOptions.cacheKey,
-          JSON.stringify(this.cache)
-        );
+        this.storage.setItem(this.cacheOptions.cacheKey, JSON.stringify(this.cache));
       }
     }
   }
@@ -105,7 +98,7 @@ class Cache {
     this.cache.push({
       params,
       data,
-      expireTime: moment().add(cacheTime, "seconds").toJSON()
+      expireTime: addSeconds(/* @__PURE__ */ new Date(), cacheTime ?? 0).toISOString()
     });
     this._saveToStorage();
   }
@@ -120,7 +113,7 @@ class Cache {
     });
     const item = this.cache[itemIndex];
     if (item) {
-      if (moment(item.expireTime).isAfter(moment())) {
+      if (isAfter(parseISO(item.expireTime), /* @__PURE__ */ new Date())) {
         return item.data;
       } else {
         this.cache.splice(itemIndex, 1);

package/es/hooks/useCombineControlValue.mjs

@@ -8,16 +8,19 @@ function useCombineControlValue({
   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 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;

package/es/request/index.d.ts

@@ -14,7 +14,7 @@ export type ErrorHandlerReturnType<D> = {
      * - false: 不抛出错误
      * - 'default': 使用默认错误处理逻辑
      */
-    throwError?: boolean | "default";
+    throwError?: boolean | 'default';
 };
 /**
  * 请求配置选项接口
@@ -98,7 +98,7 @@ export interface Options<Params = any, Data = any> {
      * 可以配置 HTTP 状态码对应的错误信息或处理函数
      * @default {} 空对象，使用默认处理函数
      */
-    httpErrorCodeMap?: Record<string, string | ((code: number, res: AxiosResponse<Data>, requestParam: RequestOptions<Params>) => (ErrorHandlerReturnType<Data> | void | 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 中时调用
@@ -109,12 +109,12 @@ export interface Options<Params = any, Data = any> {
      * 处理非 HTTP 错误和非业务错误码的错误
      */
     otherErrorHandler?: (error: any) => ErrorHandlerReturnType<Data> | void | Promise<ErrorHandlerReturnType<Data> | void>;
-    axiosOptions?: Omit<AxiosRequestConfig<Params>, "method" | "url" | "params" | "data">;
+    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;
@@ -152,7 +152,7 @@ export interface RequestOptions<Param> {
  * @param baseOptions 基础配置选项
  * @returns 请求创建函数
  */
-export default function createBaseRequest(baseOptions?: Options): <Param, Data extends Record<any, any>>(requestOptions: RequestOptions<Param>, createOptions?: Omit<Options<Param, Data>, "baseURL">) => {
+export default function createBaseRequest<D extends Record<any, any>>(baseOptions?: Options<D>): <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;
 };

package/es/request/index.mjs

@@ -35,19 +35,25 @@ function createBaseRequest(baseOptions) {
         ...createOptions,
         ...options
       };
-      let { requestMiddlewares = [], axiosOptions: finalAxiosOptions = {}, requestParamsOrDataTransfer, responseTransfer } = mergedOptions;
+      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);
+        const {
+          axiosOptions: nextAxiosOptions = finalAxiosOptions,
+          requestOptions: nextRequestOptions = finalRequestOptions
+        } = await middleware(
+          { ...mergedOptions, axiosOptions: finalAxiosOptions },
+          finalRequestOptions
+        );
         finalAxiosOptions = nextAxiosOptions;
         finalRequestOptions = nextRequestOptions;
       }
-      const {
-        method: method2,
-        url: url2,
-        data = {},
-        params = {}
-      } = finalRequestOptions;
+      const { method: method2, url: url2, data = {}, params = {} } = finalRequestOptions;
       let requestDataOrParams = params;
       if (method2.toLowerCase() === "post") {
         requestDataOrParams = data;
@@ -60,18 +66,9 @@ function createBaseRequest(baseOptions) {
       const {
         enableCache = false,
         cacheData = false,
-        defaultErrorCodeHandler = _defaultErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
-        defaultHttpErrorCodeHandler = _defaultHttpErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
-        otherErrorHandler = _defaultOtherErrorCodeHandler.bind(
-          null,
-          defaultMessageShower
-        ),
+        defaultErrorCodeHandler = _defaultErrorCodeHandler.bind(null, defaultMessageShower),
+        defaultHttpErrorCodeHandler = _defaultHttpErrorCodeHandler.bind(null, defaultMessageShower),
+        otherErrorHandler = _defaultOtherErrorCodeHandler.bind(null, defaultMessageShower),
         errorCodePath = "code",
         cacheTime: cacheTime2 = 60,
         errorCodeMap = {},
@@ -96,8 +93,8 @@ function createBaseRequest(baseOptions) {
       return instance.request({
         method: method2,
         url: url2,
-        data: data ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(data) : data),
-        params: params ?? (requestParamsOrDataTransfer ? requestParamsOrDataTransfer(params) : params),
+        data: requestParamsOrDataTransfer ? requestParamsOrDataTransfer(data) : data,
+        params: requestParamsOrDataTransfer ? requestParamsOrDataTransfer(params) : params,
         ...finalAxiosOptions
       }).then(
         async (res) => {
@@ -116,10 +113,7 @@ function createBaseRequest(baseOptions) {
             const retryTask = retry();
             if (retryTask) return retryTask;
           } else {
-            const {
-              replaceResData = res.data,
-              throwError: handlerThrowError = "default"
-            } = Object(
+            const { replaceResData = res.data, throwError: handlerThrowError = "default" } = Object(
               await customHandler(errorCode, res.data, res, {
                 ...requestOptions,
                 ...requestParam
@@ -143,19 +137,14 @@ function createBaseRequest(baseOptions) {
         async (error) => {
           if (error.response) {
             let resData = error;
-            const {
-              [error.response.status]: customHandler = defaultHttpErrorCodeHandler
-            } = httpErrorCodeMap;
+            const { [error.response.status]: customHandler = defaultHttpErrorCodeHandler } = httpErrorCodeMap;
             const err = new RequestError("服务端错误", "http", error);
             if (typeof customHandler === "string") {
               defaultMessageShower(customHandler);
               const retryTask = retry();
               if (retryTask) return retryTask;
             } else {
-              const {
-                replaceResData = error,
-                throwError: handlerThrowError = "default"
-              } = Object(
+              const { replaceResData = error, throwError: handlerThrowError = "default" } = Object(
                 await customHandler(error.response.status, error, {
                   ...requestOptions,
                   ...requestParam
@@ -180,12 +169,7 @@ function createBaseRequest(baseOptions) {
             const err = new RequestError("服务端错误", "http", error);
             err.type = "http";
             err.data = error;
-            const {
-              replaceResData = error,
-              throwError: handlerThrowError = "default"
-            } = Object(
-              await otherErrorHandler(error)
-            );
+            const { replaceResData = error, throwError: handlerThrowError = "default" } = Object(await otherErrorHandler(error));
             const retryTask = retry();
             if (retryTask) return retryTask;
             resData = replaceResData;

package/es/store/index.d.ts

@@ -1,4 +1,4 @@
 export { createStoreGetter, createStoreGetterMemo } from './createGetter';
 export { default as createStateStore } from './createStateStore';
 export type { StoreGetter, GetterNameMap, ReducedData } from './createGetter';
-export type { IHookStateInitialSetter, IHookStateInitAction, IHookStateSetter, IHookStateSetAction, IHookStateResolvable } from './createStateStore';
+export type { IHookStateInitialSetter, IHookStateInitAction, IHookStateSetter, IHookStateSetAction, IHookStateResolvable, } from './createStateStore';

package/es/validator/decorators.mjs

@@ -7,38 +7,30 @@ function VRequired(noneVals = [void 0]) {
     return true;
   });
 }
-const VString = BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "string") {
-      return false;
-    }
-    return true;
+const VString = BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "string") {
+    return false;
   }
-);
-const VNumber = BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "number") {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VNumber = BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "number") {
+    return false;
   }
-);
-const VArray = BaseValidator.decoratorCreator(
-  (val) => {
-    if (!Array.isArray(val)) {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VArray = BaseValidator.decoratorCreator((val) => {
+  if (!Array.isArray(val)) {
+    return false;
   }
-);
-const VBoolean = BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "boolean") {
-      return false;
-    }
-    return true;
+  return true;
+});
+const VBoolean = BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "boolean") {
+    return false;
   }
-);
+  return true;
+});
 const VMin = (min) => BaseValidator.decoratorCreator((val) => {
   if (typeof val !== "number" || val < min) {
     return false;
@@ -69,15 +61,13 @@ const VMaxLength = (maxLen) => BaseValidator.decoratorCreator((val) => {
   }
   return true;
 });
-const VEmail = BaseValidator.decoratorCreator(
-  (val) => {
-    if (typeof val !== "string") {
-      return false;
-    }
-    const emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailReg.test(val);
+const VEmail = BaseValidator.decoratorCreator((val) => {
+  if (typeof val !== "string") {
+    return false;
   }
-);
+  const emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailReg.test(val);
+});
 const VPattern = (pattern) => BaseValidator.decoratorCreator((val) => {
   if (typeof val !== "string") {
     return false;

package/es/validator/index.d.ts

@@ -1,2 +1,2 @@
 export { BaseValidator } from './validator';
-export { VRequired, VString, VNumber, VEmail, VMinLength, VArray, VBoolean, VPattern, VMaxLength, VMax, VMin } from './decorators';
+export { VRequired, VString, VNumber, VEmail, VMinLength, VArray, VBoolean, VPattern, VMaxLength, VMax, VMin, } from './decorators';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxtutils",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "type": "module",
   "main": "cjs/index.cjs",
   "module": "es/index.mjs",
@@ -51,7 +51,14 @@
   "scripts": {
     "dev": "vite serve playground --config playground/vite.config.ts",
     "build": "pnpm clean && vite build",
-    "clean": "rimraf es cjs",
+    "clean": "rimraf es cjs dist",
+    "format": "prettier . --write",
+    "format:check": "prettier . --check",
+    "lint": "eslint . --max-warnings=0",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsc -p tsconfig.test.json --noEmit",
     "publishNpm": "npm publish --registry https://registry.npmjs.org",
     "loginNpm": "npm login --registry https://registry.npmjs.org"
   },
@@ -59,28 +66,42 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.28.6",
     "@babel/plugin-transform-class-static-block": "^7.28.6",
+    "@eslint/js": "^9.39.2",
     "@rollup/plugin-typescript": "^12.3.0",
+    "@testing-library/react": "^16.3.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.19.5",
     "@types/react": "^19.2.8",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.2",
     "babel-plugin-react-compiler": "^1.0.0",
-    "react-dom": "^19.2.3",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-vitest": "^0.5.4",
+    "fake-indexeddb": "^6.2.2",
+    "globals": "^17.3.0",
+    "jsdom": "^28.0.0",
+    "prettier": "^3.8.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "rimraf": "^6.1.2",
     "rollup": "^4.55.1",
     "rollup-plugin-dts": "^6.3.0",
     "typescript": "^5.9.3",
+    "typescript-eslint": "^8.54.0",
     "vite": "^7.3.1",
-    "vite-plugin-dts": "^4.5.4"
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "react": "^19.2.3"
   },
   "dependencies": {
     "axios": "^1.13.2",
+    "date-fns": "^4.1.0",
     "lodash-es": "^4.17.22",
-    "moment": "^2.30.1",
     "tslib": "^2.8.1"
   }
-}
+}