@anjianshi/utils 2.3.2 → 2.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -27,10 +27,10 @@
     "typeorm": "^0.3.20",
     "typescript": "^5.5.4",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-node": "4.0.8",
     "@anjianshi/presets-eslint-typescript": "5.0.5",
-    "@anjianshi/presets-eslint-react": "4.0.7",
+    "@anjianshi/presets-eslint-node": "4.0.8",
     "@anjianshi/presets-prettier": "3.0.1",
+    "@anjianshi/presets-eslint-react": "4.0.7",
     "@anjianshi/presets-typescript": "3.2.2"
   },
   "peerDependencies": {

package/validators/array.d.ts

@@ -9,6 +9,8 @@ export interface ArrayOptions extends CommonOptions {
     max?: number;
     /** 是否对数组元素进行去重 @defaults false */
     unique?: boolean;
+    /** 如果传入的不是数组，是否要将其视为数组内元素，包裹成数组 */
+    toArray?: boolean;
 }
 type ArrayValues<Options extends ArrayOptions> = Validated<Options extends {
     item: Validator<infer T, CommonOptions>;

package/validators/array.js

@@ -2,8 +2,11 @@ import { success, failed } from '../lang/index.js';
 import { getValidatorGenerator, } from './base.js';
 export function getArrayValidator(options) {
     return getValidatorGenerator(function validate(field, value, options) {
-        if (!Array.isArray(value))
+        if (!Array.isArray(value)) {
+            if (options.toArray)
+                value = [value];
             return failed(`${field} should be an array`);
+        }
         let formatted = [];
         if (typeof options.min === 'number' && value.length < options.min)
             return failed(`array ${field}'s length should >= ${options.min}`);

package/validators/number.d.ts

@@ -9,9 +9,11 @@ export interface NumberOptions extends CommonOptions<number> {
     /**
      * 指定可选值
      * 若指定，前几个选项将不再生效 */
-    choices?: number[];
+    choices?: number[] | Record<number, string>;
 }
 export type NumberValueWithChoices<Options extends NumberOptions> = Options extends {
     choices: (infer T)[];
-} ? T : number;
+} ? T : Options extends {
+    choices: Record<number, string>;
+} ? Options['choices'][keyof Options['choices']] : number;
 export declare function getNumberValidator<const Options extends NumberOptions>(options?: Options): import("./base.js").Validator<NumberValueWithChoices<Options>, Options>;

package/validators/number.js

@@ -7,8 +7,11 @@ export function getNumberValidator(options = {}) {
         if (typeof value !== 'number' || !isFinite(value))
             return failed(`${field} must be a valid number`);
         if ('choices' in options && options.choices) {
-            if (!options.choices.includes(value))
-                return failed(`${field} can only be one of ${options.choices.join(', ')}.`);
+            const choices = Array.isArray(options.choices)
+                ? options.choices
+                : Object.values(options.choices).map(v => parseInt(v, 10));
+            if (!choices.includes(value))
+                return failed(`${field} can only be one of ${choices.join(', ')}.`);
         }
         else {
             if (!truthy(options.float) && value % 1 !== 0)