@mi-avalon/libs 1.0.3 → 1.0.4

package/dist/constants/pattern.js

@@ -1,90 +1,135 @@
-export class PatternType {
-    /**
-     * 整数
-     */
-    static integerRegex = /^-?\d+$/;
-    /**
-     * 正整数
-     */
-    static positiveIntegerRegex = /^[1-9]\d*$/;
-    /**
-     * 负整数
-     */
-    static negativeIntegerRegex = /^-[1-9]\d*$/;
-    /**
-     * 浮点数
-     */
-    static floatRegex = /^-?\d+(\.\d+)?$/;
-    /**
-     * 字母
-     */
-    static letter = /^[a-zA-Z]+$/;
-    /**
-     * 汉字
-     */
-    static chinese = /^[\u4e00-\u9fa5]+$/;
-    /**
-     * 数字
-     */
-    static number = /^[0-9]*$/;
-    /**
-     * 用户名 字母开头，允许字母数字下划线，长度4-16
-     */
-    static username = /^[a-zA-Z]\w{3,15}$/;
-    /**
-     * 强用户名 必须包含大小写字母和数字，6-20位
-     */
-    static strongUsername = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,20}$/;
-    /**
-     * 密码 至少8位，包含字母和数字
-     */
-    static password = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/;
-    /**
-     * 强密码 至少8位，包含大小写字母、数字和特殊字符
-     */
-    static strongPassword = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/;
-    /**
-     * 中国大陆的手机号
-     */
-    static phone = /^1[3-9]\d{9}$/;
-    /**
-     * 带区号的手机号
-     */
-    static phoneWithAreaCode = /^\+?\d{2,3}-?\d{8,11}$/;
-    /**
-     * 邮箱
-     */
-    static email = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-    /**
-     * 身份证
-     */
-    static idCard = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
-    /**
-     * 银行卡
-     */
-    static bankCard = /^[1-9]\d{3,30}$/;
-    /**
-     * 邮政编码
-     */
-    static zipCode = /^[1-9]\d{5}$/;
-    /**
-     * IP
-     */
-    static ip = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-    /**
-     * URL
-     */
-    static url = /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,6})([/\w .-]*)*\/?$/;
-    /**
-     * 车牌
-     */
-    static carNumber = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/;
-    /**
-     * 时间 hh:mm:ss
-     */
-    static time = /^([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$/;
-    /**
-     * 日期 YYYY-MM-DD
-     */
-    static date = /^(\d{4})-(\d{2})-(\d{2})$/;
+/**
+ * 正则表达式模式常量 - 增强版本，提供验证函数和类型安全
+ */
+export class PatternValidator {
+    // 基础数字模式
+    static patterns = {
+        /** 整数 */
+        integer: /^-?\d+$/,
+        /** 正整数 */
+        positiveInteger: /^[1-9]\d*$/,
+        /** 负整数 */
+        negativeInteger: /^-[1-9]\d*$/,
+        /** 浮点数 */
+        float: /^-?\d+(\.\d+)?$/,
+        /** 字母 */
+        letter: /^[a-zA-Z]+$/,
+        /** 汉字 */
+        chinese: /^[\u4e00-\u9fa5]+$/,
+        /** 数字 */
+        number: /^[0-9]*$/,
+        // 用户相关模式
+        /** 用户名：字母开头，允许字母数字下划线，长度4-16 */
+        username: /^[a-zA-Z]\w{3,15}$/,
+        /** 强用户名：必须包含大小写字母和数字，6-20位 */
+        strongUsername: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,20}$/,
+        /** 密码：至少8位，包含字母和数字 */
+        password: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/,
+        /** 强密码：至少8位，包含大小写字母、数字和特殊字符 */
+        strongPassword: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/,
+        // 联系方式模式
+        /** 中国大陆手机号 */
+        phone: /^1[3-9]\d{9}$/,
+        /** 带区号的手机号 */
+        phoneWithAreaCode: /^\+?\d{2,3}-?\d{8,11}$/,
+        /** 邮箱 */
+        email: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
+        /** 身份证 */
+        idCard: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/,
+        /** 银行卡 */
+        bankCard: /^[1-9]\d{3,30}$/,
+        /** 邮政编码 */
+        zipCode: /^[1-9]\d{5}$/,
+        // 技术模式
+        /** IP地址 */
+        ip: /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/,
+        /** URL */
+        url: /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,6})([\/\w .-]*)*\/?$/,
+        /** 车牌号 */
+        carNumber: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/,
+        // 时间日期模式
+        /** 时间格式 hh:mm:ss */
+        time: /^([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$/,
+        /** 日期格式 YYYY-MM-DD */
+        date: /^(\d{4})-(\d{2})-(\d{2})$/,
+    };
+    /**
+     * 验证字符串是否匹配指定模式
+     * @param type 模式类型
+     * @param value 要验证的值
+     * @returns 是否匹配
+     */
+    static validate(type, value) {
+        const pattern = this.patterns[type];
+        if (!pattern) {
+            throw new Error(`Unknown pattern type: ${type}`);
+        }
+        return pattern.test(value);
+    }
+    /**
+     * 获取指定模式的正则表达式
+     * @param type 模式类型
+     * @returns 正则表达式
+     */
+    static getPattern(type) {
+        const pattern = this.patterns[type];
+        if (!pattern) {
+            throw new Error(`Unknown pattern type: ${type}`);
+        }
+        return pattern;
+    }
+    /**
+     * 验证邮箱（特殊处理，支持更复杂的验证）
+     * @param email 邮箱地址
+     * @returns 是否有效
+     */
+    static validateEmail(email) {
+        const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+        return emailRegex.test(email) && email.length <= 254;
+    }
+    /**
+     * 验证手机号（支持更多运营商）
+     * @param phone 手机号
+     * @returns 是否有效
+     */
+    static validatePhone(phone) {
+        const phoneRegex = /^1[3-9]\d{9}$/;
+        return phoneRegex.test(phone);
+    }
+    /**
+     * 验证身份证（包含校验位验证）
+     * @param idCard 身份证号
+     * @returns 是否有效
+     */
+    static validateIdCard(idCard) {
+        const pattern = this.patterns.idCard;
+        if (!pattern.test(idCard))
+            return false;
+        // 校验位验证
+        const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+        const codes = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
+        let sum = 0;
+        for (let i = 0; i < 17; i++) {
+            sum += parseInt(idCard[i]) * weights[i];
+        }
+        const checkCode = codes[sum % 11];
+        return idCard[17].toUpperCase() === checkCode;
+    }
+    /**
+     * 创建自定义验证函数
+     * @param pattern 正则表达式
+     * @param errorMessage 错误消息
+     * @returns 验证函数
+     */
+    static createValidator(pattern, errorMessage) {
+        return (value) => {
+            const valid = pattern.test(value);
+            return {
+                valid,
+                message: valid ? undefined : (errorMessage || 'Invalid format')
+            };
+        };
+    }
 }
+// 保持向后兼容的别名
+export const PatternType = PatternValidator;

package/dist/hooks/useFuncRequest.d.ts

@@ -5,6 +5,7 @@ export type UseFuncRequestOptions<T extends (...args: any[]) => Promise<any>> =
     onSuccess?: (data: UnwrapPromise<ReturnType<T>>) => void | Promise<void>;
     onError?: (error: Error) => void | Promise<void>;
     onFinally?: () => void | Promise<void>;
+    autoRunDeps?: any[];
 };
 export declare function useFuncRequest<T extends (...args: any[]) => Promise<any>>(asyncFunc: T, options?: UseFuncRequestOptions<T>): {
     run: (...args: Parameters<T>) => Promise<any>;

package/dist/hooks/useFuncRequest.js

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState, useMemo, useCallback } from 'react';
 export function useFuncRequest(
 // 异步函数
 asyncFunc, 
@@ -9,12 +9,12 @@ options) {
     const [data, setData] = useState(null);
     const abortControllerRef = useRef(undefined);
     const requestIdRef = useRef(0);
-    const cancel = () => {
+    const cancel = useCallback(() => {
         abortControllerRef.current?.abort();
         setLoading(false);
         setError(null);
-    };
-    const run = async (...args) => {
+    }, []);
+    const run = useCallback(async (...args) => {
         const currentRequestId = ++requestIdRef.current;
         cancel();
         const abortController = new AbortController();
@@ -56,12 +56,14 @@ options) {
                 await options?.onFinally?.();
             }
         }
-    };
+    }, [asyncFunc, options, cancel]);
+    // 使用 useMemo 优化依赖项，避免 JSON.stringify 的性能问题
+    const autoRunDeps = useMemo(() => [...(options?.autoRunDeps || []), options?.autoRunArgs], [options?.autoRunDeps, options?.autoRunArgs]);
     useEffect(() => {
         if (options?.autoRunArgs) {
             run(...options.autoRunArgs).catch(() => { });
         }
         return cancel;
-    }, [JSON.stringify(options?.autoRunArgs)]);
-    return { run, cancel, loading, error, data };
+    }, autoRunDeps);
+    return useMemo(() => ({ run, cancel, loading, error, data }), [run, cancel, loading, error, data]);
 }

package/dist/hooks/useInterval.d.ts

@@ -1,8 +1,8 @@
 type Callback = () => void;
-interface UseTimeoutReturn {
+interface UseIntervalReturn {
     start: Callback;
     isRunning: boolean;
     clear: Callback;
 }
-declare function useInterval(callback: Callback, delay: number | null, immediate?: boolean): UseTimeoutReturn;
+declare function useInterval(callback: Callback, delay: number | null, immediate?: boolean): UseIntervalReturn;
 export { useInterval };

package/dist/hooks/useInterval.js

@@ -1,7 +1,8 @@
-import { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 function useInterval(callback, delay, immediate = false) {
     const timerRef = useRef(undefined);
     const savedCallback = useRef(callback);
+    const [isRunning, setIsRunning] = useState(false);
     useEffect(() => {
         savedCallback.current = callback;
     }, [callback]);
@@ -9,6 +10,7 @@ function useInterval(callback, delay, immediate = false) {
         if (timerRef.current) {
             clearInterval(timerRef.current);
             timerRef.current = undefined;
+            setIsRunning(false);
         }
     }, []);
     const start = useCallback(() => {
@@ -18,6 +20,7 @@ function useInterval(callback, delay, immediate = false) {
             if (immediate) {
                 savedCallback.current();
             }
+            setIsRunning(true);
             timerRef.current = setInterval(() => savedCallback.current(), delay);
         }
     }, [delay, clear, immediate]);
@@ -25,6 +28,6 @@ function useInterval(callback, delay, immediate = false) {
     useEffect(() => {
         return clear;
     }, [clear]);
-    return { start, clear, isRunning: !!timerRef.current };
+    return { start, clear, isRunning };
 }
 export { useInterval };

package/dist/hooks/useQuery.d.ts

@@ -1,3 +1 @@
-export declare function useQuery(): {
-    [k: string]: string;
-};
+export declare function useQuery(): Record<string, string>;

package/dist/hooks/useQuery.js

@@ -1,6 +1,53 @@
+import { useMemo, useEffect, useState } from 'react';
 export function useQuery() {
-    const search = window.location.href.split('?')[1] || '';
-    const params = new URLSearchParams(search);
-    const query = Object.fromEntries(params.entries());
-    return query;
+    const [query, setQuery] = useState(() => {
+        // SSR兼容性检查
+        if (typeof window === 'undefined') {
+            return {};
+        }
+        const search = window.location.search;
+        if (!search)
+            return {};
+        const params = new URLSearchParams(search);
+        return Object.fromEntries(params.entries());
+    });
+    // 使用 useMemo 优化性能，避免每次渲染都重新计算
+    const memoizedQuery = useMemo(() => query, [query]);
+    // 监听路由变化（popstate, pushstate, replacestate）
+    useEffect(() => {
+        if (typeof window === 'undefined')
+            return;
+        const updateQuery = () => {
+            const search = window.location.search;
+            if (!search) {
+                setQuery({});
+                return;
+            }
+            const params = new URLSearchParams(search);
+            const newQuery = Object.fromEntries(params.entries());
+            setQuery(newQuery);
+        };
+        // 监听浏览器前进/后退
+        window.addEventListener('popstate', updateQuery);
+        // 拦截 pushState 和 replaceState
+        const originalPushState = history.pushState;
+        const originalReplaceState = history.replaceState;
+        history.pushState = function (...args) {
+            originalPushState.apply(history, args);
+            setTimeout(updateQuery, 0);
+        };
+        history.replaceState = function (...args) {
+            originalReplaceState.apply(history, args);
+            setTimeout(updateQuery, 0);
+        };
+        // 监听 hashchange（对于 hash 路由）
+        window.addEventListener('hashchange', updateQuery);
+        return () => {
+            window.removeEventListener('popstate', updateQuery);
+            window.removeEventListener('hashchange', updateQuery);
+            history.pushState = originalPushState;
+            history.replaceState = originalReplaceState;
+        };
+    }, []);
+    return memoizedQuery;
 }

package/dist/hooks/useTimeout.js

@@ -1,14 +1,16 @@
-import { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 function useTimeout(callback, delay, immediate = false) {
     const timerRef = useRef(undefined);
     const savedCallback = useRef(callback);
+    const [isRunning, setIsRunning] = useState(false);
     useEffect(() => {
         savedCallback.current = callback;
     }, [callback]);
     const clear = useCallback(() => {
         if (timerRef.current) {
-            clearInterval(timerRef.current);
+            clearTimeout(timerRef.current);
             timerRef.current = undefined;
+            setIsRunning(false);
         }
     }, []);
     const start = useCallback(() => {
@@ -18,13 +20,18 @@ function useTimeout(callback, delay, immediate = false) {
             if (immediate) {
                 savedCallback.current();
             }
-            timerRef.current = setTimeout(() => savedCallback.current(), delay);
+            setIsRunning(true);
+            timerRef.current = setTimeout(() => {
+                savedCallback.current();
+                setIsRunning(false);
+                timerRef.current = undefined;
+            }, delay);
         }
     }, [delay, clear, immediate]);
     // 只负责清理
     useEffect(() => {
         return clear;
     }, [clear]);
-    return { start, clear, isRunning: !!timerRef.current };
+    return { start, clear, isRunning };
 }
 export { useTimeout };