phecda-core 1.0.7 → 1.1.1

package/dist/index.d.ts

@@ -22,6 +22,8 @@ interface Phecda {
 type ClassValue<I> = {
     [P in keyof I]: I[P] extends Function ? undefined : I[P];
 };
+interface PhecdaEvents {
+}
 
 declare function plainToClass<M extends new (...args: any) => any, Data extends Record<PropertyKey, any>>(Model: M, input: Data, options?: UsePipeOptions): Promise<{
     err: string[];
@@ -74,11 +76,11 @@ declare function Rule(rule: RegExp | string | Function | number, info: string, m
 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;
-declare function Get(target: any, key: PropertyKey): void;
+declare function P(target: any, key: PropertyKey): void;
 declare function Pipe(v: ReturnType<typeof to>): (obj: any, key: PropertyKey) => void;
 declare function Tag(tag: string): (target: any) => void;
 declare function Storage(target: any): void;
-declare function Window(target: any): void;
+declare function Global(target: any): void;
 
 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;
@@ -99,6 +101,7 @@ declare function getHandler(target: Phecda, key: PropertyKey): PhecdaHandler[];
 declare function mergeState(target: Phecda, key: PropertyKey, state: any): void;
 declare function getState(target: Phecda, key: PropertyKey): Object | undefined;
 declare function register(instance: Phecda): void;
+declare function registerAsync(instance: Phecda): Promise<void>;
 
 declare function isArray(info?: string): (obj: any, key: PropertyKey) => void;
 declare function isBoolean(info?: string): (obj: any, key: PropertyKey) => void;
@@ -123,6 +126,8 @@ declare const activeInstance: Record<string, any>;
 declare function injectProperty(key: string, value: any): Record<string, any>;
 declare function getProperty(key: string): any;
 
-declare function Watcher(eventName: string): (obj: any, key: string) => void;
+declare function Watcher(eventName: keyof PhecdaEvents, options?: {
+    once: boolean;
+}): (obj: any, key: string) => void;
 
-export { ClassValue, Clear, Err, Get, Ignore, Init, Phecda, PhecdaHandler, PhecdaNameSpace, Pipe, Rule, Storage, Tag, UsePipeOptions, Watcher, Window, activeInstance, addDecoToClass, classToValue, getExposeKey, getHandler, getIgnoreKey, getInitEvent, getModelState, getProperty, getState, getTag, init, injectProperty, isArray, isBoolean, isCnName, isDate, isEnName, isHexColor, isIdCard, isLandline, isMailBox, isMobile, isNumber, isObject, isPhecda, isPostalCode, isString, isWechat, mergeOptions, mergeState, plainToClass, regisHandler, regisInitEvent, register, setExposeKey, setIgnoreKey, setModalVar, snapShot, to, toNumber, toString, validate };
+export { ClassValue, Clear, Err, Global, Ignore, Init, P, Phecda, PhecdaEvents, PhecdaHandler, PhecdaNameSpace, Pipe, Rule, Storage, Tag, UsePipeOptions, Watcher, activeInstance, addDecoToClass, classToValue, getExposeKey, getHandler, getIgnoreKey, getInitEvent, getModelState, getProperty, getState, getTag, init, injectProperty, isArray, isBoolean, isCnName, isDate, isEnName, isHexColor, isIdCard, isLandline, isMailBox, isMobile, isNumber, isObject, isPhecda, isPostalCode, isString, isWechat, mergeOptions, mergeState, plainToClass, regisHandler, regisInitEvent, register, registerAsync, setExposeKey, setIgnoreKey, setModalVar, snapShot, to, toNumber, toString, validate };

package/dist/index.js

@@ -23,15 +23,15 @@ var src_exports = {};
 __export(src_exports, {
   Clear: () => Clear,
   Err: () => Err,
-  Get: () => Get,
+  Global: () => Global,
   Ignore: () => Ignore,
   Init: () => Init,
+  P: () => P,
   Pipe: () => Pipe,
   Rule: () => Rule,
   Storage: () => Storage,
   Tag: () => Tag,
   Watcher: () => Watcher,
-  Window: () => Window,
   activeInstance: () => activeInstance,
   addDecoToClass: () => addDecoToClass,
   classToValue: () => classToValue,
@@ -67,6 +67,7 @@ __export(src_exports, {
   regisHandler: () => regisHandler,
   regisInitEvent: () => regisInitEvent,
   register: () => register,
+  registerAsync: () => registerAsync,
   setExposeKey: () => setExposeKey,
   setIgnoreKey: () => setIgnoreKey,
   setModalVar: () => setModalVar,
@@ -175,7 +176,7 @@ function getExposeKey(target) {
   init(target);
   return [
     ...target._namespace.__EXPOSE_VAR__
-  ];
+  ].filter((item) => !target._namespace.__IGNORE_VAR__.has(item));
 }
 __name(getExposeKey, "getExposeKey");
 function getIgnoreKey(target) {
@@ -214,7 +215,7 @@ function getState(target, key) {
 }
 __name(getState, "getState");
 function register(instance) {
-  const stateVars = getModelState(instance);
+  const stateVars = getExposeKey(instance);
   for (const item of stateVars) {
     const handlers = getHandler(instance, item);
     for (const hanlder of handlers)
@@ -222,6 +223,15 @@ function register(instance) {
   }
 }
 __name(register, "register");
+async function registerAsync(instance) {
+  const stateVars = getExposeKey(instance);
+  for (const item of stateVars) {
+    const handlers = getHandler(instance, item);
+    for (const hanlder of handlers)
+      await hanlder.init?.(instance);
+  }
+}
+__name(registerAsync, "registerAsync");
 
 // src/decorators.ts
 function Init(target, key) {
@@ -255,6 +265,7 @@ function Clear(target, key) {
   target._namespace.__IGNORE_VAR__.delete(key);
   target._namespace.__STATE_VAR__.delete(key);
   target._namespace.__STATE_HANDLER__.delete(key);
+  target._namespace.__STATE_NAMESPACE__.delete(key);
 }
 __name(Clear, "Clear");
 function Err(cb) {
@@ -266,10 +277,10 @@ function Err(cb) {
   };
 }
 __name(Err, "Err");
-function Get(target, key) {
+function P(target, key) {
   setExposeKey(target, key);
 }
-__name(Get, "Get");
+__name(P, "P");
 function Pipe(v) {
   return (obj, key) => {
     setModalVar(obj, key);
@@ -300,7 +311,7 @@ function Storage(target) {
   regisHandler(target.prototype, uniTag, {
     init: (instance) => {
       const { state } = instance;
-      window.addEventListener("beforeunload", () => {
+      globalThis.addEventListener("beforeunload", () => {
         localStorage.setItem(`_phecda_${tag}`, JSON.stringify(state));
       });
       const lastObjStr = localStorage.getItem(`_phecda_${tag}`);
@@ -313,14 +324,14 @@ function Storage(target) {
   });
 }
 __name(Storage, "Storage");
-function Window(target) {
-  if (!window.__PHECDA__)
-    window.__PHECDA__ = {};
+function Global(target) {
+  if (!globalThis.__PHECDA__)
+    globalThis.__PHECDA__ = {};
   const tag = target.prototype._namespace.__TAG__;
   if (tag)
-    window.__PHECDA__[tag] = target;
+    globalThis.__PHECDA__[tag] = target;
 }
-__name(Window, "Window");
+__name(Global, "Global");
 
 // src/helper.ts
 async function plainToClass(Model, input, options = {}) {
@@ -361,12 +372,8 @@ __name(plainToClass, "plainToClass");
 function classToValue(instance) {
   const data = {};
   const exposeVar = getExposeKey(instance);
-  const ignoreVars = getIgnoreKey(instance);
-  for (const item of exposeVar) {
-    if (ignoreVars.includes(item))
-      continue;
+  for (const item of exposeVar)
     data[item] = instance[item];
-  }
   return data;
 }
 __name(classToValue, "classToValue");
@@ -491,7 +498,7 @@ function getProperty(key) {
 __name(getProperty, "getProperty");
 
 // src/custom/decorator.ts
-function Watcher(eventName) {
+function Watcher(eventName, options) {
   return (obj, key) => {
     setModalVar(obj, key);
     regisHandler(obj, key, {
@@ -499,7 +506,8 @@ function Watcher(eventName) {
         getProperty("watcher")?.({
           eventName,
           instance,
-          key
+          key,
+          options
         });
       }
     });
@@ -510,15 +518,15 @@ __name(Watcher, "Watcher");
 0 && (module.exports = {
   Clear,
   Err,
-  Get,
+  Global,
   Ignore,
   Init,
+  P,
   Pipe,
   Rule,
   Storage,
   Tag,
   Watcher,
-  Window,
   activeInstance,
   addDecoToClass,
   classToValue,
@@ -554,6 +562,7 @@ __name(Watcher, "Watcher");
   regisHandler,
   regisInitEvent,
   register,
+  registerAsync,
   setExposeKey,
   setIgnoreKey,
   setModalVar,

package/dist/index.mjs

@@ -98,7 +98,7 @@ function getExposeKey(target) {
   init(target);
   return [
     ...target._namespace.__EXPOSE_VAR__
-  ];
+  ].filter((item) => !target._namespace.__IGNORE_VAR__.has(item));
 }
 __name(getExposeKey, "getExposeKey");
 function getIgnoreKey(target) {
@@ -137,7 +137,7 @@ function getState(target, key) {
 }
 __name(getState, "getState");
 function register(instance) {
-  const stateVars = getModelState(instance);
+  const stateVars = getExposeKey(instance);
   for (const item of stateVars) {
     const handlers = getHandler(instance, item);
     for (const hanlder of handlers)
@@ -145,6 +145,15 @@ function register(instance) {
   }
 }
 __name(register, "register");
+async function registerAsync(instance) {
+  const stateVars = getExposeKey(instance);
+  for (const item of stateVars) {
+    const handlers = getHandler(instance, item);
+    for (const hanlder of handlers)
+      await hanlder.init?.(instance);
+  }
+}
+__name(registerAsync, "registerAsync");
 
 // src/decorators.ts
 function Init(target, key) {
@@ -178,6 +187,7 @@ function Clear(target, key) {
   target._namespace.__IGNORE_VAR__.delete(key);
   target._namespace.__STATE_VAR__.delete(key);
   target._namespace.__STATE_HANDLER__.delete(key);
+  target._namespace.__STATE_NAMESPACE__.delete(key);
 }
 __name(Clear, "Clear");
 function Err(cb) {
@@ -189,10 +199,10 @@ function Err(cb) {
   };
 }
 __name(Err, "Err");
-function Get(target, key) {
+function P(target, key) {
   setExposeKey(target, key);
 }
-__name(Get, "Get");
+__name(P, "P");
 function Pipe(v) {
   return (obj, key) => {
     setModalVar(obj, key);
@@ -223,7 +233,7 @@ function Storage(target) {
   regisHandler(target.prototype, uniTag, {
     init: (instance) => {
       const { state } = instance;
-      window.addEventListener("beforeunload", () => {
+      globalThis.addEventListener("beforeunload", () => {
         localStorage.setItem(`_phecda_${tag}`, JSON.stringify(state));
       });
       const lastObjStr = localStorage.getItem(`_phecda_${tag}`);
@@ -236,14 +246,14 @@ function Storage(target) {
   });
 }
 __name(Storage, "Storage");
-function Window(target) {
-  if (!window.__PHECDA__)
-    window.__PHECDA__ = {};
+function Global(target) {
+  if (!globalThis.__PHECDA__)
+    globalThis.__PHECDA__ = {};
   const tag = target.prototype._namespace.__TAG__;
   if (tag)
-    window.__PHECDA__[tag] = target;
+    globalThis.__PHECDA__[tag] = target;
 }
-__name(Window, "Window");
+__name(Global, "Global");
 
 // src/helper.ts
 async function plainToClass(Model, input, options = {}) {
@@ -284,12 +294,8 @@ __name(plainToClass, "plainToClass");
 function classToValue(instance) {
   const data = {};
   const exposeVar = getExposeKey(instance);
-  const ignoreVars = getIgnoreKey(instance);
-  for (const item of exposeVar) {
-    if (ignoreVars.includes(item))
-      continue;
+  for (const item of exposeVar)
     data[item] = instance[item];
-  }
   return data;
 }
 __name(classToValue, "classToValue");
@@ -414,7 +420,7 @@ function getProperty(key) {
 __name(getProperty, "getProperty");
 
 // src/custom/decorator.ts
-function Watcher(eventName) {
+function Watcher(eventName, options) {
   return (obj, key) => {
     setModalVar(obj, key);
     regisHandler(obj, key, {
@@ -422,7 +428,8 @@ function Watcher(eventName) {
         getProperty("watcher")?.({
           eventName,
           instance,
-          key
+          key,
+          options
         });
       }
     });
@@ -432,15 +439,15 @@ __name(Watcher, "Watcher");
 export {
   Clear,
   Err,
-  Get,
+  Global,
   Ignore,
   Init,
+  P,
   Pipe,
   Rule,
   Storage,
   Tag,
   Watcher,
-  Window,
   activeInstance,
   addDecoToClass,
   classToValue,
@@ -476,6 +483,7 @@ export {
   regisHandler,
   regisInitEvent,
   register,
+  registerAsync,
   setExposeKey,
   setIgnoreKey,
   setModalVar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-core",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",