phecda-core 5.0.0 → 5.1.0

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,10 @@ 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 Const(value: string | number | boolean | null | undefined): (target: any, property: string, index?: any) => void;
 
 declare function getTag<M extends Construct | AbConstruct>(moduleOrInstance: M | InstanceType<M>): PropertyKey;
 /**
@@ -143,6 +144,6 @@ declare abstract class Base {
 }
 
 declare const _createErrorMessage: (type: string, { property, meta }: RuleArgs) => string;
-declare function validate(model: Construct, data: any, collectErrors?: boolean, createErrMsg?: (type: string, { property, meta }: RuleArgs) => string): Promise<any[]>;
+declare function validate(model: Construct, data: any, collectErrors?: boolean, createErrMsg?: (type: string, { property, meta }: RuleArgs) => string, equalFn?: (a: any, b: any) => boolean): Promise<any[]>;
 
-export { type AbConstruct, Assign, Base, CLEAR_KEY, type ClassValue, Clear, type Construct, DataMap, Doc, Effect, Empty, Enum, Err, type Events, Expose, Global, If, Init, Inject, type InjectData, Injectable, Isolate, Max, Min, type NameSpace, Nested, OneOf, Optional, PHECDA_KEY, type Phecda, Pipeline, Provide, Required, Rule, type RuleArgs, SHARE_KEY, Storage, type StorageParam, Tag, Unique, Unmount, Watcher, type WatcherParam, _createErrorMessage, activeInstance, addDecoToClass, functionToClass, get, getInject, getMergedMeta, getMeta, getMetaKey, getMetaParams, getOwnMeta, getOwnMetaKey, getOwnMetaParams, getPhecdaFromTarget, getTag, init, invoke, invokeInit, invokeUnmount, isAsyncFunc, isPhecda, objectToClass, omit, override, partial, pick, set, setInject, setMeta, validate, wait };
+export { type AbConstruct, Assign, Base, CLEAR_KEY, type ClassValue, Clear, Const, type Construct, DataMap, Doc, Effect, Empty, Enum, Err, type Events, Expose, Global, If, Init, Inject, type InjectData, Injectable, Isolate, Max, Min, type NameSpace, Nested, OneOf, Optional, PHECDA_KEY, type Phecda, Pipeline, Provide, Required, Rule, type RuleArgs, SHARE_KEY, Storage, type StorageParam, Tag, Unique, Unmount, Watcher, type WatcherParam, _createErrorMessage, activeInstance, addDecoToClass, functionToClass, get, getInject, getMergedMeta, getMeta, getMetaKey, getMetaParams, getOwnMeta, getOwnMetaKey, getOwnMetaParams, getPhecdaFromTarget, getTag, init, invoke, invokeInit, invokeUnmount, isAsyncFunc, isPhecda, objectToClass, omit, override, partial, pick, set, setInject, setMeta, validate, wait };

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,10 @@ 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 Const(value: string | number | boolean | null | undefined): (target: any, property: string, index?: any) => void;
 
 declare function getTag<M extends Construct | AbConstruct>(moduleOrInstance: M | InstanceType<M>): PropertyKey;
 /**
@@ -143,6 +144,6 @@ declare abstract class Base {
 }
 
 declare const _createErrorMessage: (type: string, { property, meta }: RuleArgs) => string;
-declare function validate(model: Construct, data: any, collectErrors?: boolean, createErrMsg?: (type: string, { property, meta }: RuleArgs) => string): Promise<any[]>;
+declare function validate(model: Construct, data: any, collectErrors?: boolean, createErrMsg?: (type: string, { property, meta }: RuleArgs) => string, equalFn?: (a: any, b: any) => boolean): Promise<any[]>;
 
-export { type AbConstruct, Assign, Base, CLEAR_KEY, type ClassValue, Clear, type Construct, DataMap, Doc, Effect, Empty, Enum, Err, type Events, Expose, Global, If, Init, Inject, type InjectData, Injectable, Isolate, Max, Min, type NameSpace, Nested, OneOf, Optional, PHECDA_KEY, type Phecda, Pipeline, Provide, Required, Rule, type RuleArgs, SHARE_KEY, Storage, type StorageParam, Tag, Unique, Unmount, Watcher, type WatcherParam, _createErrorMessage, activeInstance, addDecoToClass, functionToClass, get, getInject, getMergedMeta, getMeta, getMetaKey, getMetaParams, getOwnMeta, getOwnMetaKey, getOwnMetaParams, getPhecdaFromTarget, getTag, init, invoke, invokeInit, invokeUnmount, isAsyncFunc, isPhecda, objectToClass, omit, override, partial, pick, set, setInject, setMeta, validate, wait };
+export { type AbConstruct, Assign, Base, CLEAR_KEY, type ClassValue, Clear, Const, type Construct, DataMap, Doc, Effect, Empty, Enum, Err, type Events, Expose, Global, If, Init, Inject, type InjectData, Injectable, Isolate, Max, Min, type NameSpace, Nested, OneOf, Optional, PHECDA_KEY, type Phecda, Pipeline, Provide, Required, Rule, type RuleArgs, SHARE_KEY, Storage, type StorageParam, Tag, Unique, Unmount, Watcher, type WatcherParam, _createErrorMessage, activeInstance, addDecoToClass, functionToClass, get, getInject, getMergedMeta, getMeta, getMetaKey, getMetaParams, getOwnMeta, getOwnMetaKey, getOwnMetaParams, getPhecdaFromTarget, getTag, init, invoke, invokeInit, invokeUnmount, isAsyncFunc, isPhecda, objectToClass, omit, override, partial, pick, set, setInject, setMeta, validate, wait };

package/dist/index.js

@@ -26,6 +26,7 @@ __export(index_exports, {
   Base: () => Base,
   CLEAR_KEY: () => CLEAR_KEY,
   Clear: () => Clear,
+  Const: () => Const,
   DataMap: () => DataMap,
   Doc: () => Doc,
   Effect: () => Effect,
@@ -638,29 +639,37 @@ 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
     });
   };
 }
 __name(Enum, "Enum");
+function Const(value) {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
+      const: value
+    });
+  };
+}
+__name(Const, "Const");
 
 // src/base.ts
 function _ts_decorate(decorators, target, key, desc) {
@@ -728,6 +737,8 @@ Base = _ts_decorate([
 // src/validate.ts
 var _createErrorMessage = /* @__PURE__ */ __name((type, { property, meta }) => {
   switch (type) {
+    case "const":
+      return `must be ${meta.const} for "${property}"`;
     case "string":
       return `must be a string for "${property}"`;
     case "number":
@@ -735,7 +746,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":
@@ -761,9 +772,13 @@ function isObject(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
 __name(isObject, "isObject");
-async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage) {
+async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage, equalFn = (a, b) => a === b) {
   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;
@@ -773,6 +788,9 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
       const allRules = [
         async (args2) => {
           const { value: value2 } = args2;
+          if ("const" in meta) {
+            if (!equalFn(value2, meta.const)) return createErrMsg("const", args2);
+          }
           if (required === false && value2 === void 0) return true;
           if (required !== false && value2 === void 0) return createErrMsg("required", args2);
           if (type === String && typeof value2 !== "string") return createErrMsg("string", args2);
@@ -819,19 +837,36 @@ 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;
+            for (const item of oneOf) {
+              switch (item) {
+                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(item)) {
+                    const errs = await validate(item, value2);
+                    if (!errs.length) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else if (typeof item === "function") {
+                    const ret = await item(args2);
+                    if (ret) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else {
+                    if (equalFn(value2, item)) {
+                      isCorrect = true;
+                      break;
+                    }
+                  }
               }
             }
             if (!isCorrect) return createErrMsg("oneOf", args2);
@@ -867,6 +902,7 @@ __name(validate, "validate");
   Base,
   CLEAR_KEY,
   Clear,
+  Const,
   DataMap,
   Doc,
   Effect,

package/dist/index.mjs

@@ -552,29 +552,37 @@ 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
     });
   };
 }
 __name(Enum, "Enum");
+function Const(value) {
+  return (target, property, index) => {
+    setMeta(target, property, index, {
+      const: value
+    });
+  };
+}
+__name(Const, "Const");
 
 // src/base.ts
 function _ts_decorate(decorators, target, key, desc) {
@@ -642,6 +650,8 @@ Base = _ts_decorate([
 // src/validate.ts
 var _createErrorMessage = /* @__PURE__ */ __name((type, { property, meta }) => {
   switch (type) {
+    case "const":
+      return `must be ${meta.const} for "${property}"`;
     case "string":
       return `must be a string for "${property}"`;
     case "number":
@@ -649,7 +659,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":
@@ -675,9 +685,13 @@ function isObject(value) {
   return Object.prototype.toString.call(value) === "[object Object]";
 }
 __name(isObject, "isObject");
-async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage) {
+async function validate(model, data, collectErrors = false, createErrMsg = _createErrorMessage, equalFn = (a, b) => a === b) {
   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;
@@ -687,6 +701,9 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
       const allRules = [
         async (args2) => {
           const { value: value2 } = args2;
+          if ("const" in meta) {
+            if (!equalFn(value2, meta.const)) return createErrMsg("const", args2);
+          }
           if (required === false && value2 === void 0) return true;
           if (required !== false && value2 === void 0) return createErrMsg("required", args2);
           if (type === String && typeof value2 !== "string") return createErrMsg("string", args2);
@@ -733,19 +750,36 @@ 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;
+            for (const item of oneOf) {
+              switch (item) {
+                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(item)) {
+                    const errs = await validate(item, value2);
+                    if (!errs.length) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else if (typeof item === "function") {
+                    const ret = await item(args2);
+                    if (ret) {
+                      isCorrect = true;
+                      break;
+                    }
+                  } else {
+                    if (equalFn(value2, item)) {
+                      isCorrect = true;
+                      break;
+                    }
+                  }
               }
             }
             if (!isCorrect) return createErrMsg("oneOf", args2);
@@ -780,6 +814,7 @@ export {
   Base,
   CLEAR_KEY,
   Clear,
+  Const,
   DataMap,
   Doc,
   Effect,

package/package.json

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