rxtutils 1.1.2-beta.22 → 1.1.2-beta.23

package/README.md

@@ -294,10 +294,10 @@ BaseValidator 类提供了两个主要的验证方法：
 
 ```typescript
 // 验证单个字段
-validate(itemKey: string, itemAll: boolean = false): { status: boolean; message?: string }[] | null;
+validate(itemKey: string, itemAll: boolean = false): string[] | null;
 
 // 验证多个或所有字段
-validateAll(itemAll: boolean = false, everyItem: boolean = false, order?: string[]): { status: boolean; message?: string }[] | null;
+validateAll(itemAll: boolean = false, everyItem: boolean = false, order?: string[]): string[] | null;
 ```
 
 参数说明：

package/cjs/validator/decorators.d.ts

@@ -19,8 +19,7 @@ import { BaseValidator } from './validator.js';
  *   username?: string;
  * }
  */
-declare function VRequired(noneVals?: any[]): (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare function VRequired(noneVals?: any[]): (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 字符串类型验证装饰器
  * 验证值是否为字符串类型
@@ -33,8 +32,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   username?: string;
  * }
  */
-declare const VString: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VString: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 数字类型验证装饰器
  * 验证值是否为数字类型
@@ -47,8 +45,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VNumber: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VNumber: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 数组类型验证装饰器
  * 验证值是否为数组类型
@@ -61,8 +58,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   tags?: string[];
  * }
  */
-declare const VArray: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VArray: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 布尔类型验证装饰器
  * 验证值是否为布尔类型
@@ -75,8 +71,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   active?: boolean;
  * }
  */
-declare const VBoolean: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VBoolean: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最小值验证装饰器
  * 验证数字是否大于或等于指定的最小值
@@ -90,8 +85,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VMin: (min: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMin: (min: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最大值验证装饰器
  * 验证数字是否小于或等于指定的最大值
@@ -105,8 +99,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VMax: (max: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMax: (max: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最小长度验证装饰器
  * 验证字符串或数组的长度是否大于或等于指定的最小长度
@@ -120,8 +113,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   password?: string;
  * }
  */
-declare const VMinLength: (minLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMinLength: (minLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最大长度验证装饰器
  * 验证字符串或数组的长度是否小于或等于指定的最大长度
@@ -135,8 +127,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   username?: string;
  * }
  */
-declare const VMaxLength: (maxLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMaxLength: (maxLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 邮箱格式验证装饰器
  * 验证字符串是否符合邮箱格式
@@ -149,8 +140,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   email?: string;
  * }
  */
-declare const VEmail: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VEmail: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 正则表达式验证装饰器
  * 验证字符串是否匹配指定的正则表达式模式
@@ -164,7 +154,6 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   phone?: string;
  * }
  */
-declare const VPattern: (pattern: RegExp) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VPattern: (pattern: RegExp) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 
 export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString };

package/cjs/validator/validator.cjs

@@ -19,43 +19,38 @@ var BaseValidator = /** @class */ (function () {
     }
     /**
      * 验证单个字段
-     * @param itemKey 要验证的字段名
      * @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
+     * @param itemKey 要验证的字段名
      * @returns 验证错误数组，如果没有错误则返回null
      */
     BaseValidator.prototype.validate = function (itemKey, itemAll) {
         if (itemAll === void 0) { itemAll = false; }
         var validatorMap = this[this.__keySymbol];
-        var errors = {};
+        var errors = [];
         // 校验每个 key
         var validators = validatorMap[itemKey];
         if (!validators) {
-            return errors;
+            return null;
         }
         for (var _i = 0, validators_1 = validators; _i < validators_1.length; _i++) {
             var validator = validators_1[_i];
             var res = validator(this[itemKey]);
             if (!res.status) {
-                if (Array.isArray(errors[res.name])) {
-                    errors[res.name].push(res.message);
-                }
-                else {
-                    errors[res.name] = [res.message];
-                }
-                if (!itemAll)
-                    break;
+                errors[res.name].push(res.message);
             }
+            if (!itemAll)
+                break;
         }
-        if (Object.keys(errors).length) {
+        if (errors.length) {
             return errors;
         }
         return null;
     };
     /**
      * 验证多个或所有字段
+     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
      * @param everyItem 是否验证所有字段，为true时会验证所有字段，为false时遇到第一个失败的字段就停止
-     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @returns 验证错误数组，如果没有错误则返回null
      */
     BaseValidator.prototype.validateAll = function (order, itemAll, everyItem) {

package/cjs/validator/validator.d.ts

@@ -32,16 +32,16 @@ declare class BaseValidator {
     constructor();
     /**
      * 验证单个字段
-     * @param itemKey 要验证的字段名
      * @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
+     * @param itemKey 要验证的字段名
      * @returns 验证错误数组，如果没有错误则返回null
      */
-    validate(itemKey: string, itemAll?: boolean): Record<string, string[]> | null;
+    validate(itemKey: string, itemAll?: boolean): string[] | null;
     /**
      * 验证多个或所有字段
+     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
      * @param everyItem 是否验证所有字段，为true时会验证所有字段，为false时遇到第一个失败的字段就停止
-     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @returns 验证错误数组，如果没有错误则返回null
      */
     validateAll(order?: string[], itemAll?: boolean, everyItem?: boolean): Record<string, string[]> | null;

package/es/validator/decorators.d.ts

@@ -19,8 +19,7 @@ import { BaseValidator } from './validator.js';
  *   username?: string;
  * }
  */
-declare function VRequired(noneVals?: any[]): (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare function VRequired(noneVals?: any[]): (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 字符串类型验证装饰器
  * 验证值是否为字符串类型
@@ -33,8 +32,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   username?: string;
  * }
  */
-declare const VString: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VString: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 数字类型验证装饰器
  * 验证值是否为数字类型
@@ -47,8 +45,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VNumber: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VNumber: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 数组类型验证装饰器
  * 验证值是否为数组类型
@@ -61,8 +58,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   tags?: string[];
  * }
  */
-declare const VArray: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VArray: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 布尔类型验证装饰器
  * 验证值是否为布尔类型
@@ -75,8 +71,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   active?: boolean;
  * }
  */
-declare const VBoolean: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VBoolean: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最小值验证装饰器
  * 验证数字是否大于或等于指定的最小值
@@ -90,8 +85,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VMin: (min: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMin: (min: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最大值验证装饰器
  * 验证数字是否小于或等于指定的最大值
@@ -105,8 +99,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   age?: number;
  * }
  */
-declare const VMax: (max: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMax: (max: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最小长度验证装饰器
  * 验证字符串或数组的长度是否大于或等于指定的最小长度
@@ -120,8 +113,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   password?: string;
  * }
  */
-declare const VMinLength: (minLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMinLength: (minLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 最大长度验证装饰器
  * 验证字符串或数组的长度是否小于或等于指定的最大长度
@@ -135,8 +127,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   username?: string;
  * }
  */
-declare const VMaxLength: (maxLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VMaxLength: (maxLen: number) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 邮箱格式验证装饰器
  * 验证字符串是否符合邮箱格式
@@ -149,8 +140,7 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   email?: string;
  * }
  */
-declare const VEmail: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VEmail: (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 /**
  * 正则表达式验证装饰器
  * 验证字符串是否匹配指定的正则表达式模式
@@ -164,7 +154,6 @@ context: ClassFieldDecoratorContext<BaseValidator>) => void;
  *   phone?: string;
  * }
  */
-declare const VPattern: (pattern: RegExp) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, // 简单邮箱正则
-context: ClassFieldDecoratorContext<BaseValidator>) => void;
+declare const VPattern: (pattern: RegExp) => (message?: ((val: any, value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => string) | string) => (value: undefined, context: ClassFieldDecoratorContext<BaseValidator>) => void;
 
 export { VArray, VBoolean, VEmail, VMax, VMaxLength, VMin, VMinLength, VNumber, VPattern, VRequired, VString };

package/es/validator/validator.d.ts

@@ -32,16 +32,16 @@ declare class BaseValidator {
     constructor();
     /**
      * 验证单个字段
-     * @param itemKey 要验证的字段名
      * @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
+     * @param itemKey 要验证的字段名
      * @returns 验证错误数组，如果没有错误则返回null
      */
-    validate(itemKey: string, itemAll?: boolean): Record<string, string[]> | null;
+    validate(itemKey: string, itemAll?: boolean): string[] | null;
     /**
      * 验证多个或所有字段
+     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
      * @param everyItem 是否验证所有字段，为true时会验证所有字段，为false时遇到第一个失败的字段就停止
-     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @returns 验证错误数组，如果没有错误则返回null
      */
     validateAll(order?: string[], itemAll?: boolean, everyItem?: boolean): Record<string, string[]> | null;

package/es/validator/validator.mjs

@@ -17,43 +17,38 @@ var BaseValidator = /** @class */ (function () {
     }
     /**
      * 验证单个字段
-     * @param itemKey 要验证的字段名
      * @param itemAll 是否验证所有规则，为true时会验证该字段的所有规则，为false时遇到第一个失败的规则就停止
+     * @param itemKey 要验证的字段名
      * @returns 验证错误数组，如果没有错误则返回null
      */
     BaseValidator.prototype.validate = function (itemKey, itemAll) {
         if (itemAll === void 0) { itemAll = false; }
         var validatorMap = this[this.__keySymbol];
-        var errors = {};
+        var errors = [];
         // 校验每个 key
         var validators = validatorMap[itemKey];
         if (!validators) {
-            return errors;
+            return null;
         }
         for (var _i = 0, validators_1 = validators; _i < validators_1.length; _i++) {
             var validator = validators_1[_i];
             var res = validator(this[itemKey]);
             if (!res.status) {
-                if (Array.isArray(errors[res.name])) {
-                    errors[res.name].push(res.message);
-                }
-                else {
-                    errors[res.name] = [res.message];
-                }
-                if (!itemAll)
-                    break;
+                errors[res.name].push(res.message);
             }
+            if (!itemAll)
+                break;
         }
-        if (Object.keys(errors).length) {
+        if (errors.length) {
             return errors;
         }
         return null;
     };
     /**
      * 验证多个或所有字段
+     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @param itemAll 是否验证每个字段的所有规则，为true时会验证字段的所有规则，为false时遇到第一个失败的规则就停止
      * @param everyItem 是否验证所有字段，为true时会验证所有字段，为false时遇到第一个失败的字段就停止
-     * @param order 验证字段的顺序，可以指定验证的字段名数组及其顺序
      * @returns 验证错误数组，如果没有错误则返回null
      */
     BaseValidator.prototype.validateAll = function (order, itemAll, everyItem) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxtutils",
-  "version": "1.1.2-beta.22",
+  "version": "1.1.2-beta.23",
   "type": "module",
   "main": "cjs/index.cjs",
   "module": "es/index.mjs",