phecda-core 5.0.1 → 5.1.1

package/dist/index.d.mts

@@ -98,6 +98,7 @@ declare function Max(max: number): (target: any, property?: PropertyKey, index?:
 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

@@ -98,6 +98,7 @@ declare function Max(max: number): (target: any, property?: PropertyKey, index?:
 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,
@@ -661,6 +662,14 @@ function 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":
@@ -761,7 +772,7 @@ 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)) {
@@ -777,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);
@@ -823,8 +837,8 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
           }
           if (oneOf) {
             let isCorrect = false;
-            for (const modelOrRule of oneOf) {
-              switch (modelOrRule) {
+            for (const item of oneOf) {
+              switch (item) {
                 case String:
                   if (typeof value2 === "string") isCorrect = true;
                   break;
@@ -835,18 +849,23 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
                   if (typeof value2 === "boolean") isCorrect = true;
                   break;
                 default:
-                  if (isPhecda(modelOrRule)) {
-                    const errs = await validate(modelOrRule, value2);
+                  if (isPhecda(item)) {
+                    const errs = await validate(item, value2);
                     if (!errs.length) {
                       isCorrect = true;
                       break;
                     }
-                  } else if (typeof modelOrRule === "function") {
-                    const ret = await modelOrRule(args2);
+                  } else if (typeof item === "function") {
+                    const ret = await item(args2);
                     if (ret) {
                       isCorrect = true;
                       break;
                     }
+                  } else {
+                    if (equalFn(value2, item)) {
+                      isCorrect = true;
+                      break;
+                    }
                   }
               }
             }
@@ -883,6 +902,7 @@ __name(validate, "validate");
   Base,
   CLEAR_KEY,
   Clear,
+  Const,
   DataMap,
   Doc,
   Effect,

package/dist/index.mjs

@@ -575,6 +575,14 @@ function 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":
@@ -675,7 +685,7 @@ 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)) {
@@ -691,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);
@@ -737,8 +750,8 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
           }
           if (oneOf) {
             let isCorrect = false;
-            for (const modelOrRule of oneOf) {
-              switch (modelOrRule) {
+            for (const item of oneOf) {
+              switch (item) {
                 case String:
                   if (typeof value2 === "string") isCorrect = true;
                   break;
@@ -749,18 +762,23 @@ async function validate(model, data, collectErrors = false, createErrMsg = _crea
                   if (typeof value2 === "boolean") isCorrect = true;
                   break;
                 default:
-                  if (isPhecda(modelOrRule)) {
-                    const errs = await validate(modelOrRule, value2);
+                  if (isPhecda(item)) {
+                    const errs = await validate(item, value2);
                     if (!errs.length) {
                       isCorrect = true;
                       break;
                     }
-                  } else if (typeof modelOrRule === "function") {
-                    const ret = await modelOrRule(args2);
+                  } else if (typeof item === "function") {
+                    const ret = await item(args2);
                     if (ret) {
                       isCorrect = true;
                       break;
                     }
+                  } else {
+                    if (equalFn(value2, item)) {
+                      isCorrect = true;
+                      break;
+                    }
                   }
               }
             }
@@ -796,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.1",
+  "version": "5.1.1",
   "description": "provide base function and abstract limit to other phecda module ",
   "author": "fgsreally",
   "license": "MIT",
@@ -9,14 +9,27 @@
     "phecda",
     "core"
   ],
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs"
+    }
+  },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      ".": [
+        "dist/index.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
   "devDependencies": {
-    "tsup": "^8.1.0"
+    "tsup": "^8.5.0"
   },
   "dependencies": {
     "reflect-metadata": "^0.1.14"