phecda-core 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { i as isArray, a as isBoolean, j as isCnName, l as isDate, k as isEnName, n as isHexColor, h as isIdCard, f as isLandline, g as isMailBox, e as isMobile, b as isNumber, d as isObject, o as isPostalCode, c as isString, m as isWechat, t as toNumber, p as toString } from './pipe-6da589ab.js';
+export { a as isArray, b as isBoolean, k as isCnName, m as isDate, l as isEnName, o as isHexColor, j as isIdCard, g as isLandline, h as isMailBox, f as isMobile, c as isNumber, e as isObject, i as isOption, p as isPostalCode, d as isString, n as isWechat, t as toNumber, q as toString } from './pipe-5d060247.js';
 
 interface NameSpace {
     [name: string]: Phecda;
@@ -7,10 +7,10 @@ interface UsePipeOptions {
     transform?: boolean;
     collectError?: boolean;
 }
-interface PhecdaInjectData {
+interface InjectData {
     [key: string]: any;
 }
-interface PhecdaHandler {
+interface Handler {
     [key: string]: any;
 }
 interface Phecda {
@@ -20,7 +20,7 @@ interface Phecda {
         __EXPOSE_VAR__: Set<PropertyKey>;
         __IGNORE_VAR__: Set<PropertyKey>;
         __STATE_VAR__: Set<PropertyKey>;
-        __STATE_HANDLER__: Map<PropertyKey, PhecdaHandler[]>;
+        __STATE_HANDLER__: Map<PropertyKey, Handler[]>;
         __STATE_NAMESPACE__: Map<PropertyKey, Object>;
     };
 }
@@ -79,7 +79,7 @@ declare function addDecoToClass<M extends new (...args: any) => any>(c: M, key:
 
 declare function Init(target: any, key: PropertyKey): void;
 declare function Bind(value: any): (target: any, k: PropertyKey) => void;
-declare function Rule(rule: RegExp | string | Function | number, info: string | ((k: string) => string), meta?: any): (obj: any, key: PropertyKey) => void;
+declare function Rule(rule: RegExp | string | ((arg: any) => boolean | 'ok') | number, info: string | ((k: string) => string), meta?: any): (obj: any, key: PropertyKey) => void;
 declare function Ignore(target: any, key: PropertyKey): void;
 declare function Clear(target: any, key: PropertyKey): void;
 declare function Err<Fn extends (...args: any) => any>(cb: Fn): (target: any, key: PropertyKey) => void;
@@ -89,9 +89,9 @@ declare function Tag(tag: string): (target: any) => void;
 declare function Assign(cb: (instance?: any) => any): (target: any) => void;
 declare function Global(target: any): void;
 declare function Empty(_target: any): void;
-declare const DataMap: PhecdaInjectData;
-declare function Provide<K extends keyof PhecdaInjectData>(key: K, value: PhecdaInjectData[K]): void;
-declare function Inject<K extends keyof PhecdaInjectData>(key: K): PhecdaInjectData[K];
+declare const DataMap: InjectData;
+declare function Provide<K extends keyof InjectData>(key: K, value: InjectData[K]): void;
+declare function Inject<K extends keyof InjectData>(key: K): InjectData[K];
 
 declare function validate(p: RegExp | string | Function | Object | Number, v: any): Promise<any>;
 declare function getTag<M extends new (...args: any) => any>(Model: M): any;
@@ -109,8 +109,8 @@ declare function getModelState(target: Phecda): PropertyKey[];
 declare function getOwnExposeKey(target: Phecda): string[];
 declare function getExposeKey(target: Phecda): PropertyKey[];
 declare function getOwnIgnoreKey(target: Phecda): string[];
-declare function regisHandler(target: Phecda, key: PropertyKey, handler: PhecdaHandler): void;
-declare function getOwnHandler(target: Phecda, key: PropertyKey): PhecdaHandler[];
+declare function regisHandler(target: Phecda, key: PropertyKey, handler: Handler): void;
+declare function getOwnHandler(target: Phecda, key: PropertyKey): Handler[];
 declare function getHandler(target: Phecda, key: PropertyKey): any[];
 declare function setState(target: Phecda, key: PropertyKey, state: Record<string, any>): void;
 declare function getOwnState(target: Phecda, key: PropertyKey): Object;
@@ -128,4 +128,4 @@ declare function Watcher(eventName: keyof Events, options?: {
 declare function Effect(eventName: string, options?: any): (obj: any, key: string) => void;
 declare function Storage(storeKey?: string): (target: any, key?: PropertyKey) => void;
 
-export { Assign, Bind, ClassValue, Clear, DataMap, Effect, Empty, Err, Events, Expose, Global, Ignore, Init, Inject, NameSpace, Phecda, PhecdaHandler, PhecdaInjectData, Pipe, Provide, Rule, Storage, Tag, UsePipeOptions, Watcher, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getInitEvent, getModelState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnInitEvent, getOwnModelState, getOwnState, getProperty, getState, getTag, init, injectProperty, isPhecda, plainToClass, regisHandler, regisInitEvent, register, registerAsync, setExposeKey, setIgnoreKey, setModelVar, setState, snapShot, to, validate };
+export { Assign, Bind, ClassValue, Clear, DataMap, Effect, Empty, Err, Events, Expose, Global, Handler, Ignore, Init, Inject, InjectData, NameSpace, Phecda, Pipe, Provide, Rule, Storage, Tag, UsePipeOptions, Watcher, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getInitEvent, getModelState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnInitEvent, getOwnModelState, getOwnState, getProperty, getState, getTag, init, injectProperty, isPhecda, plainToClass, regisHandler, regisInitEvent, register, registerAsync, setExposeKey, setIgnoreKey, setModelVar, setState, snapShot, to, validate };

package/dist/index.global.js

@@ -71,6 +71,7 @@ var Phecda = (() => {
     isMobile: () => isMobile,
     isNumber: () => isNumber,
     isObject: () => isObject,
+    isOption: () => isOption,
     isPhecda: () => isPhecda,
     isPostalCode: () => isPostalCode,
     isString: () => isString,
@@ -366,11 +367,18 @@ var Phecda = (() => {
   }
   __name(Assign, "Assign");
   function Global(target) {
-    if (!globalThis.__PHECDA__)
-      globalThis.__PHECDA__ = {};
     const tag = target.prototype.__TAG__;
-    if (tag)
-      globalThis.__PHECDA__[tag] = target;
+    if (tag) {
+      init(target.prototype);
+      setModelVar(target.prototype, "__CLASS");
+      regisHandler(target.prototype, "__CLASS", {
+        init: async () => {
+          if (!globalThis.__PHECDA__)
+            globalThis.__PHECDA__ = {};
+          globalThis.__PHECDA__[tag] = target;
+        }
+      });
+    }
   }
   __name(Global, "Global");
   function Empty(_target) {
@@ -428,7 +436,10 @@ var Phecda = (() => {
         if (options.collectError !== false) {
           for (const handler of handlers) {
             const rule = handler.rule;
-            if (rule && !await validate(rule, data[item])) {
+            const ret = await validate(rule, data[item]);
+            if (ret === "ok")
+              break;
+            if (rule && !ret) {
               err.push(typeof handler.info === "function" ? handler.info(item) : handler.info);
               if (!options.collectError)
                 break;
@@ -583,6 +594,10 @@ var Phecda = (() => {
   __name(Storage, "Storage");
 
   // src/preset/rule.ts
+  function isOption() {
+    return Rule((param) => param === void 0 ? "ok" : true, "");
+  }
+  __name(isOption, "isOption");
   function isArray(info) {
     return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
   }

package/dist/index.js

@@ -70,6 +70,7 @@ __export(src_exports, {
   isMobile: () => isMobile,
   isNumber: () => isNumber,
   isObject: () => isObject,
+  isOption: () => isOption,
   isPhecda: () => isPhecda,
   isPostalCode: () => isPostalCode,
   isString: () => isString,
@@ -366,11 +367,18 @@ function Assign(cb) {
 }
 __name(Assign, "Assign");
 function Global(target) {
-  if (!globalThis.__PHECDA__)
-    globalThis.__PHECDA__ = {};
   const tag = target.prototype.__TAG__;
-  if (tag)
-    globalThis.__PHECDA__[tag] = target;
+  if (tag) {
+    init(target.prototype);
+    setModelVar(target.prototype, "__CLASS");
+    regisHandler(target.prototype, "__CLASS", {
+      init: async () => {
+        if (!globalThis.__PHECDA__)
+          globalThis.__PHECDA__ = {};
+        globalThis.__PHECDA__[tag] = target;
+      }
+    });
+  }
 }
 __name(Global, "Global");
 function Empty(_target) {
@@ -428,7 +436,10 @@ async function plainToClass(Model, input, options = {}) {
       if (options.collectError !== false) {
         for (const handler of handlers) {
           const rule = handler.rule;
-          if (rule && !await validate(rule, data[item])) {
+          const ret = await validate(rule, data[item]);
+          if (ret === "ok")
+            break;
+          if (rule && !ret) {
             err.push(typeof handler.info === "function" ? handler.info(item) : handler.info);
             if (!options.collectError)
               break;
@@ -583,6 +594,10 @@ function Storage(storeKey) {
 __name(Storage, "Storage");
 
 // src/preset/rule.ts
+function isOption() {
+  return Rule((param) => param === void 0 ? "ok" : true, "");
+}
+__name(isOption, "isOption");
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
 }
@@ -709,6 +724,7 @@ __name(toString, "toString");
   isMobile,
   isNumber,
   isObject,
+  isOption,
   isPhecda,
   isPostalCode,
   isString,

package/dist/index.mjs

@@ -276,11 +276,18 @@ function Assign(cb) {
 }
 __name(Assign, "Assign");
 function Global(target) {
-  if (!globalThis.__PHECDA__)
-    globalThis.__PHECDA__ = {};
   const tag = target.prototype.__TAG__;
-  if (tag)
-    globalThis.__PHECDA__[tag] = target;
+  if (tag) {
+    init(target.prototype);
+    setModelVar(target.prototype, "__CLASS");
+    regisHandler(target.prototype, "__CLASS", {
+      init: async () => {
+        if (!globalThis.__PHECDA__)
+          globalThis.__PHECDA__ = {};
+        globalThis.__PHECDA__[tag] = target;
+      }
+    });
+  }
 }
 __name(Global, "Global");
 function Empty(_target) {
@@ -338,7 +345,10 @@ async function plainToClass(Model, input, options = {}) {
       if (options.collectError !== false) {
         for (const handler of handlers) {
           const rule = handler.rule;
-          if (rule && !await validate(rule, data[item])) {
+          const ret = await validate(rule, data[item]);
+          if (ret === "ok")
+            break;
+          if (rule && !ret) {
             err.push(typeof handler.info === "function" ? handler.info(item) : handler.info);
             if (!options.collectError)
               break;
@@ -493,6 +503,10 @@ function Storage(storeKey) {
 __name(Storage, "Storage");
 
 // src/preset/rule.ts
+function isOption() {
+  return Rule((param) => param === void 0 ? "ok" : true, "");
+}
+__name(isOption, "isOption");
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
 }
@@ -618,6 +632,7 @@ export {
   isMobile,
   isNumber,
   isObject,
+  isOption,
   isPhecda,
   isPostalCode,
   isString,

package/dist/{pipe-6da589ab.d.ts → pipe-5d060247.d.ts}

@@ -1,3 +1,4 @@
+declare function isOption(): (obj: any, key: PropertyKey) => void;
 declare function isArray(info?: string): (obj: any, key: PropertyKey) => void;
 declare function isBoolean(info?: string): (obj: any, key: PropertyKey) => void;
 declare function isNumber(info?: string): (obj: any, key: PropertyKey) => void;
@@ -17,4 +18,4 @@ declare function isPostalCode(info?: string): (obj: any, key: PropertyKey) => vo
 declare function toNumber(): (obj: any, key: PropertyKey) => void;
 declare function toString(): (obj: any, key: PropertyKey) => void;
 
-export { isBoolean as a, isNumber as b, isString as c, isObject as d, isMobile as e, isLandline as f, isMailBox as g, isIdCard as h, isArray as i, isCnName as j, isEnName as k, isDate as l, isWechat as m, isHexColor as n, isPostalCode as o, toString as p, toNumber as t };
+export { isArray as a, isBoolean as b, isNumber as c, isString as d, isObject as e, isMobile as f, isLandline as g, isMailBox as h, isOption as i, isIdCard as j, isCnName as k, isEnName as l, isDate as m, isWechat as n, isHexColor as o, isPostalCode as p, toString as q, toNumber as t };

package/dist/preset/index.d.ts

@@ -1 +1 @@
-export { i as isArray, a as isBoolean, j as isCnName, l as isDate, k as isEnName, n as isHexColor, h as isIdCard, f as isLandline, g as isMailBox, e as isMobile, b as isNumber, d as isObject, o as isPostalCode, c as isString, m as isWechat, t as toNumber, p as toString } from '../pipe-6da589ab.js';
+export { a as isArray, b as isBoolean, k as isCnName, m as isDate, l as isEnName, o as isHexColor, j as isIdCard, g as isLandline, h as isMailBox, f as isMobile, c as isNumber, e as isObject, i as isOption, p as isPostalCode, d as isString, n as isWechat, t as toNumber, q as toString } from '../pipe-5d060247.js';

package/dist/preset/index.global.js

@@ -34,6 +34,7 @@ var Phecda = (() => {
     isMobile: () => isMobile,
     isNumber: () => isNumber,
     isObject: () => isObject,
+    isOption: () => isOption,
     isPostalCode: () => isPostalCode,
     isString: () => isString,
     isWechat: () => isWechat,
@@ -106,6 +107,10 @@ var Phecda = (() => {
   __name(Pipe, "Pipe");
 
   // src/preset/rule.ts
+  function isOption() {
+    return Rule((param) => param === void 0 ? "ok" : true, "");
+  }
+  __name(isOption, "isOption");
   function isArray(info) {
     return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
   }

package/dist/preset/index.js

@@ -33,6 +33,7 @@ __export(preset_exports, {
   isMobile: () => isMobile,
   isNumber: () => isNumber,
   isObject: () => isObject,
+  isOption: () => isOption,
   isPostalCode: () => isPostalCode,
   isString: () => isString,
   isWechat: () => isWechat,
@@ -106,6 +107,10 @@ function Pipe(v) {
 __name(Pipe, "Pipe");
 
 // src/preset/rule.ts
+function isOption() {
+  return Rule((param) => param === void 0 ? "ok" : true, "");
+}
+__name(isOption, "isOption");
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
 }
@@ -206,6 +211,7 @@ __name(toString, "toString");
   isMobile,
   isNumber,
   isObject,
+  isOption,
   isPostalCode,
   isString,
   isWechat,

package/dist/preset/index.mjs

@@ -66,6 +66,10 @@ function Pipe(v) {
 __name(Pipe, "Pipe");
 
 // src/preset/rule.ts
+function isOption() {
+  return Rule((param) => param === void 0 ? "ok" : true, "");
+}
+__name(isOption, "isOption");
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
 }
@@ -165,6 +169,7 @@ export {
   isMobile,
   isNumber,
   isObject,
+  isOption,
   isPostalCode,
   isString,
   isWechat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-core",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "description": "provide base function and abstract limit to other phecda module ",
   "main": "dist/index.js",
   "module": "dist/index.mjs",