phecda-core 5.0.0 → 5.0.1

package/dist/index.d.mts

@@ -85,8 +85,8 @@ interface RuleArgs {
     property: string;
     value: any;
     /**
-       * paramIndex work for params' @Rule
-       */
+    * paramIndex work for params' @Rule
+    */
     index?: number;
     meta: any;
 }
@@ -95,9 +95,9 @@ declare function Required(target: any, property: PropertyKey, index?: any): void
 declare function Optional(target: any, property: PropertyKey, index?: any): void;
 declare function Min(min: number): (target: any, property?: PropertyKey, index?: any) => void;
 declare function Max(max: number): (target: any, property?: PropertyKey, index?: any) => void;
-declare function Nested(model: Construct): (target: any, property: string) => void;
-declare function OneOf(...models: Construct[]): (target: any, property: string) => void;
-declare function Enum(map: Record<string, any>): (target: any, property: string) => void;
+declare function Nested(model: Construct): (target: any, property: string, index?: any) => void;
+declare function OneOf(...validations: (Construct | ((args: RuleArgs) => boolean | Promise<boolean>))[]): (target: any, property: string, index?: any) => void;
+declare function Enum(map: Record<string, any>): (target: any, property: string, index?: any) => void;
 
 declare function getTag<M extends Construct | AbConstruct>(moduleOrInstance: M | InstanceType<M>): PropertyKey;
 /**

package/dist/index.d.ts

@@ -85,8 +85,8 @@ interface RuleArgs {
     property: string;
     value: any;
     /**
-       * paramIndex work for params' @Rule
-       */
+    * paramIndex work for params' @Rule
+    */
     index?: number;
     meta: any;
 }
@@ -95,9 +95,9 @@ declare function Required(target: any, property: PropertyKey, index?: any): void
 declare function Optional(target: any, property: PropertyKey, index?: any): void;
 declare function Min(min: number): (target: any, property?: PropertyKey, index?: any) => void;
 declare function Max(max: number): (target: any, property?: PropertyKey, index?: any) => void;
-declare function Nested(model: Construct): (target: any, property: string) => void;
-declare function OneOf(...models: Construct[]): (target: any, property: string) => void;
-declare function Enum(map: Record<string, any>): (target: any, property: string) => void;
+declare function Nested(model: Construct): (target: any, property: string, index?: any) => void;
+declare function OneOf(...validations: (Construct | ((args: RuleArgs) => boolean | Promise<boolean>))[]): (target: any, property: string, index?: any) => void;
+declare function Enum(map: Record<string, any>): (target: any, property: string, index?: any) => void;
 
 declare function getTag<M extends Construct | AbConstruct>(moduleOrInstance: M | InstanceType<M>): PropertyKey;
 /**

package/dist/index.js

@@ -638,24 +638,24 @@ function Max(max) {
 }
 __name(Max, "Max");
 function Nested(model) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
       nested: model
     });
   };
 }
 __name(Nested, "Nested");
-function OneOf(...models) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
-      oneOf: models
+function OneOf(...validations) {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
+      oneOf: validations
     });
   };
 }
 __name(OneOf, "OneOf");
 function Enum(map) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
       enum: map
     });
   };
@@ -735,7 +735,7 @@ var _createErrorMessage = /* @__PURE__ */ __name((type, { property, meta }) => {
     case "boolean":
       return `must be a boolean for "${property}"`;
     case "oneOf":
-      return `must be one of models(${meta.oneof.map((m) => getTag(m)).join(", ")}) for "${property}"`;
+      return `must pass one of these validations for "${property}"`;
     case "min":
       return `must be greater than ${meta.min} for "${property}"`;
     case "max":
@@ -764,6 +764,10 @@ __name(isObject, "isObject");
 async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage) {
   async function parse(model2, data2) {
     const errors = [];
+    if (!isObject(data2)) {
+      errors.push("data must be an object");
+      return errors;
+    }
     for (const key of getMetaKey(model2)) {
       const meta = getMergedMeta(model2, key);
       const property = key === SHARE_KEY ? "" : key;
@@ -820,18 +824,30 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
           if (oneOf) {
             let isCorrect = false;
             for (const modelOrRule of oneOf) {
-              if (isPhecda(modelOrRule)) {
-                const errs = await validate(modelOrRule, value2);
-                if (!errs.length) {
-                  isCorrect = true;
+              switch (modelOrRule) {
+                case String:
+                  if (typeof value2 === "string") isCorrect = true;
                   break;
-                }
-              } else if (typeof modelOrRule === "function") {
-                const errs = await modelOrRule(args2);
-                if (!errs.length) {
-                  isCorrect = true;
+                case Number:
+                  if (typeof value2 === "number") isCorrect = true;
                   break;
-                }
+                case Boolean:
+                  if (typeof value2 === "boolean") isCorrect = true;
+                  break;
+                default:
+                  if (isPhecda(modelOrRule)) {
+                    const errs = await validate(modelOrRule, value2);
+                    if (!errs.length) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else if (typeof modelOrRule === "function") {
+                    const ret = await modelOrRule(args2);
+                    if (ret) {
+                      isCorrect = true;
+                      break;
+                    }
+                  }
               }
             }
             if (!isCorrect) return createErrMsg("oneOf", args2);

package/dist/index.mjs

@@ -552,24 +552,24 @@ function Max(max) {
 }
 __name(Max, "Max");
 function Nested(model) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
       nested: model
     });
   };
 }
 __name(Nested, "Nested");
-function OneOf(...models) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
-      oneOf: models
+function OneOf(...validations) {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
+      oneOf: validations
     });
   };
 }
 __name(OneOf, "OneOf");
 function Enum(map) {
-  return (target, property) => {
-    setMeta(target, property, void 0, {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
       enum: map
     });
   };
@@ -649,7 +649,7 @@ var _createErrorMessage = /* @__PURE__ */ __name((type, { property, meta }) => {
     case "boolean":
       return `must be a boolean for "${property}"`;
     case "oneOf":
-      return `must be one of models(${meta.oneof.map((m) => getTag(m)).join(", ")}) for "${property}"`;
+      return `must pass one of these validations for "${property}"`;
     case "min":
       return `must be greater than ${meta.min} for "${property}"`;
     case "max":
@@ -678,6 +678,10 @@ __name(isObject, "isObject");
 async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage) {
   async function parse(model2, data2) {
     const errors = [];
+    if (!isObject(data2)) {
+      errors.push("data must be an object");
+      return errors;
+    }
     for (const key of getMetaKey(model2)) {
       const meta = getMergedMeta(model2, key);
       const property = key === SHARE_KEY ? "" : key;
@@ -734,18 +738,30 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
           if (oneOf) {
             let isCorrect = false;
             for (const modelOrRule of oneOf) {
-              if (isPhecda(modelOrRule)) {
-                const errs = await validate(modelOrRule, value2);
-                if (!errs.length) {
-                  isCorrect = true;
+              switch (modelOrRule) {
+                case String:
+                  if (typeof value2 === "string") isCorrect = true;
                   break;
-                }
-              } else if (typeof modelOrRule === "function") {
-                const errs = await modelOrRule(args2);
-                if (!errs.length) {
-                  isCorrect = true;
+                case Number:
+                  if (typeof value2 === "number") isCorrect = true;
                   break;
-                }
+                case Boolean:
+                  if (typeof value2 === "boolean") isCorrect = true;
+                  break;
+                default:
+                  if (isPhecda(modelOrRule)) {
+                    const errs = await validate(modelOrRule, value2);
+                    if (!errs.length) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else if (typeof modelOrRule === "function") {
+                    const ret = await modelOrRule(args2);
+                    if (ret) {
+                      isCorrect = true;
+                      break;
+                    }
+                  }
               }
             }
             if (!isCorrect) return createErrMsg("oneOf", args2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-core",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "provide base function and abstract limit to other phecda module ",
   "author": "fgsreally",
   "license": "MIT",