phecda-core 3.0.0-alpha.1 → 3.0.0-alpha.10

package/dist/index.d.ts

@@ -4,6 +4,8 @@ interface NameSpace {
 interface InjectData {
     [key: string]: any;
 }
+type Construct<T = any> = new (...args: any[]) => T;
+type AbConstruct<T = any> = abstract new (...args: any[]) => T;
 interface Handler {
     [key: string]: any;
 }
@@ -24,13 +26,15 @@ interface Events {
 }
 
 declare function Init(proto: any, key: PropertyKey): void;
+declare function Unmount(proto: any, key: PropertyKey): void;
 declare function Bind(value: any): (proto: any, k: PropertyKey) => void;
 declare function Ignore(proto: any, key: PropertyKey): void;
 declare function Clear(proto: any, key: PropertyKey): void;
 declare function Err<Fn extends (...args: any) => any>(cb: Fn): (proto: any, key: PropertyKey) => void;
 declare function Expose(proto: any, key: PropertyKey): void;
-declare function To(cb: (arg: any, instance: any, key: string) => any): (proto: any, key: PropertyKey) => void;
-declare function Tag(tag: string): (module: any) => void;
+declare function To(...callbacks: ((arg: any, instance: any, key: string) => any)[]): (proto: any, key: PropertyKey) => void;
+declare function Tag(tag: PropertyKey): (module: any) => void;
+declare function Unique(desc?: string): (module: any) => void;
 declare function Assign(cb: (instance?: any) => any): (module: any) => void;
 declare function Global(module: any): void;
 declare function Empty(module: any): void;
@@ -38,22 +42,22 @@ 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 Nested<M extends new (...args: any) => any>(module: M): (proto: any, key: PropertyKey) => void;
+declare function Isolate(): (target: any) => void;
 
-declare function getTag<M extends new (...args: any) => any>(module: M): any;
-declare function getSymbol<M extends new (...args: any) => any>(instance: InstanceType<M>): any;
-declare function getBind<M extends new (...args: any) => any>(module: M): any;
-declare function plainToClass<M extends new (...args: any) => any, Data extends Record<PropertyKey, any>>(module: M, input: Data): InstanceType<M>;
-declare function transformClass<M extends new (...args: any) => any>(instance: InstanceType<M>, force?: boolean): Promise<string[]>;
+declare function getTag<M extends Construct | AbConstruct>(moduleOrInstance: M | InstanceType<M>): PropertyKey;
+declare function getBind<M extends Construct | AbConstruct>(module: M): any;
+declare function plainToClass<M extends Construct, Data extends Record<PropertyKey, any>>(module: M, input: Data): InstanceType<M>;
+declare function transformClass<M extends Construct>(instance: InstanceType<M>, force?: boolean): Promise<string[]>;
 declare function classToValue<M>(instance: M): ClassValue<M>;
-declare function snapShot<T extends new (...args: any) => any>(data: InstanceType<T>): {
+declare function snapShot<T extends Construct>(data: InstanceType<T>): {
     data: InstanceType<T>;
     clear(): void;
     apply(): void;
 };
-declare function addDecoToClass<M extends new (...args: any) => any>(c: M, key: keyof InstanceType<M> | string, handler: ((target: any, key: PropertyKey) => void), type?: 'property' | 'class'): void;
+declare function addDecoToClass<M extends Construct | AbConstruct>(c: M, key: keyof InstanceType<M> | string, handler: ((target: any, key: PropertyKey) => void), type?: 'property' | 'class'): void;
 declare function Pipeline(...decos: ((...args: any) => void)[]): (...args: any) => void;
 
-declare function isPhecda(module: any): boolean;
+declare function isPhecda(module: any): module is Construct;
 declare const SHARE_KEY: unique symbol;
 declare function init(proto: Phecda): void;
 declare function setVar(proto: Phecda, key: PropertyKey): void;
@@ -70,16 +74,34 @@ declare function getHandler(instance: Phecda, key: PropertyKey): any[];
 declare function setState(proto: Phecda, key: PropertyKey, state: Record<string, any>): void;
 declare function getOwnState(instance: Phecda, key: PropertyKey): Object;
 declare function getState(instance: Phecda, key: PropertyKey): any;
-declare function register(instance: Phecda): void;
-declare function registerAsync(instance: Phecda): Promise<void>;
+declare function invokeHandler(event: string, instance: Phecda): Promise<any[]>;
 
+interface StorageParam {
+    key?: string;
+    instance: any;
+    tag: string;
+    toJSON: (str: string) => any;
+    toString: (arg: any) => string;
+}
+interface WatcherParam {
+    key: string;
+    instance: any;
+    eventName: string;
+    options?: {
+        once?: boolean;
+    };
+}
 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: keyof Events, options?: {
-    once: boolean;
+    once?: boolean;
 }): (proto: any, key: string) => void;
 declare function Effect(eventName: string, options?: any): (proto: any, key: string) => void;
-declare function Storage(storeKey?: string): (proto: any, key?: PropertyKey) => void;
+declare function Storage({ key: storeKey, toJSON, toString }?: {
+    toJSON?: (str: string) => any;
+    toString?: (arg: any) => string;
+    key?: string;
+}): (proto: any, key?: PropertyKey) => void;
 
-export { Assign, Bind, ClassValue, Clear, DataMap, Effect, Empty, Err, Events, Expose, Global, Handler, Ignore, Init, Inject, InjectData, NameSpace, Nested, Phecda, Pipeline, Provide, SHARE_KEY, Storage, Tag, To, Watcher, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getModuleState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnModuleState, getOwnState, getProperty, getState, getSymbol, getTag, init, injectProperty, isPhecda, plainToClass, regisHandler, register, registerAsync, setExposeKey, setIgnoreKey, setState, setVar, snapShot, transformClass };
+export { AbConstruct, Assign, Bind, ClassValue, Clear, Construct, DataMap, Effect, Empty, Err, Events, Expose, Global, Handler, Ignore, Init, Inject, InjectData, Isolate, NameSpace, Nested, Phecda, Pipeline, Provide, SHARE_KEY, Storage, StorageParam, Tag, To, Unique, Unmount, Watcher, WatcherParam, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getModuleState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnModuleState, getOwnState, getProperty, getState, getTag, init, injectProperty, invokeHandler, isPhecda, plainToClass, regisHandler, setExposeKey, setIgnoreKey, setState, setVar, snapShot, transformClass };

package/dist/index.js

@@ -33,6 +33,7 @@ __export(src_exports, {
   Ignore: () => Ignore,
   Init: () => Init,
   Inject: () => Inject,
+  Isolate: () => Isolate,
   Nested: () => Nested,
   Pipeline: () => Pipeline,
   Provide: () => Provide,
@@ -40,6 +41,8 @@ __export(src_exports, {
   Storage: () => Storage,
   Tag: () => Tag,
   To: () => To,
+  Unique: () => Unique,
+  Unmount: () => Unmount,
   Watcher: () => Watcher,
   activeInstance: () => activeInstance,
   addDecoToClass: () => addDecoToClass,
@@ -55,15 +58,13 @@ __export(src_exports, {
   getOwnState: () => getOwnState,
   getProperty: () => getProperty,
   getState: () => getState,
-  getSymbol: () => getSymbol,
-  getTag: () => getTag,
+  getTag: () => getTag2,
   init: () => init,
   injectProperty: () => injectProperty,
+  invokeHandler: () => invokeHandler,
   isPhecda: () => isPhecda,
   plainToClass: () => plainToClass,
   regisHandler: () => regisHandler,
-  register: () => register,
-  registerAsync: () => registerAsync,
   setExposeKey: () => setExposeKey,
   setIgnoreKey: () => setIgnoreKey,
   setState: () => setState,
@@ -213,35 +214,22 @@ function getState(instance, key) {
   return ret;
 }
 __name(getState, "getState");
-function register(instance) {
+function invokeHandler(event, instance) {
   const stateVars = getExposeKey(instance);
-  for (const item of stateVars) {
-    const handlers = getHandler(instance, item);
-    for (const hanlder of handlers)
-      hanlder.init?.(instance);
-  }
+  const initHandlers = stateVars.map((item) => {
+    return getHandler(instance, item).filter((h) => !!h[event]).map((h) => h[event](instance));
+  }).flat();
+  return Promise.all(initHandlers);
 }
-__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");
+__name(invokeHandler, "invokeHandler");
 
 // src/helper.ts
-function getTag(module2) {
-  return module2.prototype?.__TAG__;
-}
-__name(getTag, "getTag");
-function getSymbol(instance) {
-  const module2 = instance.constructor;
-  return getTag(module2) || module2.name;
+function getTag2(moduleOrInstance) {
+  if (typeof moduleOrInstance === "object")
+    moduleOrInstance = moduleOrInstance.constructor;
+  return moduleOrInstance.prototype?.__TAG__ || moduleOrInstance.name;
 }
-__name(getSymbol, "getSymbol");
+__name(getTag2, "getTag");
 function getBind(module2) {
   const instance = new module2();
   const keys = getModuleState(instance);
@@ -325,11 +313,20 @@ function Init(proto, key) {
   setVar(proto, key);
   regisHandler(proto, key, {
     async init(instance) {
-      instance[key]();
+      return instance[key]();
     }
   });
 }
 __name(Init, "Init");
+function Unmount(proto, key) {
+  setVar(proto, key);
+  regisHandler(proto, key, {
+    async unmount(instance) {
+      return instance[key]();
+    }
+  });
+}
+__name(Unmount, "Unmount");
 function Bind(value) {
   return (proto, k) => {
     setVar(proto, k);
@@ -365,12 +362,13 @@ function Expose(proto, key) {
   setExposeKey(proto, key);
 }
 __name(Expose, "Expose");
-function To(cb) {
+function To(...callbacks) {
   return (proto, key) => {
     setVar(proto, key);
     regisHandler(proto, key, {
       async pipe(instance) {
-        instance[key] = await cb(instance[key], instance, key);
+        for (const cb of callbacks)
+          instance[key] = await cb(instance[key], instance, key);
       }
     });
   };
@@ -383,6 +381,13 @@ function Tag(tag) {
   };
 }
 __name(Tag, "Tag");
+function Unique(desc) {
+  return (module2) => {
+    init(module2.prototype);
+    module2.prototype.__TAG__ = Symbol(desc || module2.name);
+  };
+}
+__name(Unique, "Unique");
 function Assign(cb) {
   return (module2) => {
     init(module2.prototype);
@@ -442,6 +447,13 @@ function Nested(module2) {
   });
 }
 __name(Nested, "Nested");
+function Isolate() {
+  return (target) => {
+    init(target.prototype);
+    target.prototype.__ISOLATE__ = true;
+  };
+}
+__name(Isolate, "Isolate");
 
 // src/custom/decorator.ts
 var activeInstance = {};
@@ -455,16 +467,20 @@ function getProperty(key) {
 }
 __name(getProperty, "getProperty");
 function Watcher(eventName, options) {
+  let cb;
   return (proto, key) => {
     setVar(proto, key);
     regisHandler(proto, key, {
       init(instance) {
-        getProperty("watcher")?.({
+        return cb = getProperty("watcher")?.({
           eventName,
           instance,
           key,
           options
         });
+      },
+      unmount() {
+        return cb?.();
       }
     });
   };
@@ -496,34 +512,40 @@ function Effect(eventName, options) {
   };
 }
 __name(Effect, "Effect");
-function Storage(storeKey) {
+function Storage({ key: storeKey, toJSON, toString } = {}) {
+  if (!toJSON)
+    toJSON = /* @__PURE__ */ __name((v) => JSON.parse(v), "toJSON");
+  if (!toString)
+    toString = /* @__PURE__ */ __name((v) => JSON.stringify(v), "toString");
   return (proto, key) => {
     let tag;
     if (key) {
       init(proto);
-      tag = storeKey || proto.__TAG__;
-      const uniTag = Symbol(tag);
-      setVar(proto, uniTag);
-      regisHandler(proto, uniTag, {
+      tag = storeKey || `${getTag(proto)}_${key}`;
+      setVar(proto, key);
+      regisHandler(proto, key, {
         init: (instance) => {
-          getProperty("storage")?.({
+          return getProperty("storage")?.({
             instance,
             key,
-            tag
+            tag,
+            toJSON,
+            toString
           });
         }
       });
     } else {
       init(proto.prototype);
-      tag = storeKey || `${proto.prototype.__TAG__}_${key}`;
-      const uniTag = Symbol(tag);
-      setVar(proto.prototype, uniTag);
-      regisHandler(proto.prototype, uniTag, {
+      tag = storeKey || getTag(proto);
+      setVar(proto.prototype, SHARE_KEY);
+      regisHandler(proto.prototype, SHARE_KEY, {
         init: (instance) => {
-          getProperty("storage")?.({
+          return getProperty("storage")?.({
             instance,
-            key: "",
-            tag
+            key,
+            tag,
+            toJSON,
+            toString
           });
         }
       });
@@ -545,6 +567,7 @@ __name(Storage, "Storage");
   Ignore,
   Init,
   Inject,
+  Isolate,
   Nested,
   Pipeline,
   Provide,
@@ -552,6 +575,8 @@ __name(Storage, "Storage");
   Storage,
   Tag,
   To,
+  Unique,
+  Unmount,
   Watcher,
   activeInstance,
   addDecoToClass,
@@ -567,15 +592,13 @@ __name(Storage, "Storage");
   getOwnState,
   getProperty,
   getState,
-  getSymbol,
   getTag,
   init,
   injectProperty,
+  invokeHandler,
   isPhecda,
   plainToClass,
   regisHandler,
-  register,
-  registerAsync,
   setExposeKey,
   setIgnoreKey,
   setState,

package/dist/index.mjs

@@ -141,35 +141,22 @@ function getState(instance, key) {
   return ret;
 }
 __name(getState, "getState");
-function register(instance) {
+function invokeHandler(event, instance) {
   const stateVars = getExposeKey(instance);
-  for (const item of stateVars) {
-    const handlers = getHandler(instance, item);
-    for (const hanlder of handlers)
-      hanlder.init?.(instance);
-  }
+  const initHandlers = stateVars.map((item) => {
+    return getHandler(instance, item).filter((h) => !!h[event]).map((h) => h[event](instance));
+  }).flat();
+  return Promise.all(initHandlers);
 }
-__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");
+__name(invokeHandler, "invokeHandler");
 
 // src/helper.ts
-function getTag(module) {
-  return module.prototype?.__TAG__;
-}
-__name(getTag, "getTag");
-function getSymbol(instance) {
-  const module = instance.constructor;
-  return getTag(module) || module.name;
+function getTag2(moduleOrInstance) {
+  if (typeof moduleOrInstance === "object")
+    moduleOrInstance = moduleOrInstance.constructor;
+  return moduleOrInstance.prototype?.__TAG__ || moduleOrInstance.name;
 }
-__name(getSymbol, "getSymbol");
+__name(getTag2, "getTag");
 function getBind(module) {
   const instance = new module();
   const keys = getModuleState(instance);
@@ -253,11 +240,20 @@ function Init(proto, key) {
   setVar(proto, key);
   regisHandler(proto, key, {
     async init(instance) {
-      instance[key]();
+      return instance[key]();
     }
   });
 }
 __name(Init, "Init");
+function Unmount(proto, key) {
+  setVar(proto, key);
+  regisHandler(proto, key, {
+    async unmount(instance) {
+      return instance[key]();
+    }
+  });
+}
+__name(Unmount, "Unmount");
 function Bind(value) {
   return (proto, k) => {
     setVar(proto, k);
@@ -293,12 +289,13 @@ function Expose(proto, key) {
   setExposeKey(proto, key);
 }
 __name(Expose, "Expose");
-function To(cb) {
+function To(...callbacks) {
   return (proto, key) => {
     setVar(proto, key);
     regisHandler(proto, key, {
       async pipe(instance) {
-        instance[key] = await cb(instance[key], instance, key);
+        for (const cb of callbacks)
+          instance[key] = await cb(instance[key], instance, key);
       }
     });
   };
@@ -311,6 +308,13 @@ function Tag(tag) {
   };
 }
 __name(Tag, "Tag");
+function Unique(desc) {
+  return (module) => {
+    init(module.prototype);
+    module.prototype.__TAG__ = Symbol(desc || module.name);
+  };
+}
+__name(Unique, "Unique");
 function Assign(cb) {
   return (module) => {
     init(module.prototype);
@@ -370,6 +374,13 @@ function Nested(module) {
   });
 }
 __name(Nested, "Nested");
+function Isolate() {
+  return (target) => {
+    init(target.prototype);
+    target.prototype.__ISOLATE__ = true;
+  };
+}
+__name(Isolate, "Isolate");
 
 // src/custom/decorator.ts
 var activeInstance = {};
@@ -383,16 +394,20 @@ function getProperty(key) {
 }
 __name(getProperty, "getProperty");
 function Watcher(eventName, options) {
+  let cb;
   return (proto, key) => {
     setVar(proto, key);
     regisHandler(proto, key, {
       init(instance) {
-        getProperty("watcher")?.({
+        return cb = getProperty("watcher")?.({
           eventName,
           instance,
           key,
           options
         });
+      },
+      unmount() {
+        return cb?.();
       }
     });
   };
@@ -424,34 +439,40 @@ function Effect(eventName, options) {
   };
 }
 __name(Effect, "Effect");
-function Storage(storeKey) {
+function Storage({ key: storeKey, toJSON, toString } = {}) {
+  if (!toJSON)
+    toJSON = /* @__PURE__ */ __name((v) => JSON.parse(v), "toJSON");
+  if (!toString)
+    toString = /* @__PURE__ */ __name((v) => JSON.stringify(v), "toString");
   return (proto, key) => {
     let tag;
     if (key) {
       init(proto);
-      tag = storeKey || proto.__TAG__;
-      const uniTag = Symbol(tag);
-      setVar(proto, uniTag);
-      regisHandler(proto, uniTag, {
+      tag = storeKey || `${getTag(proto)}_${key}`;
+      setVar(proto, key);
+      regisHandler(proto, key, {
         init: (instance) => {
-          getProperty("storage")?.({
+          return getProperty("storage")?.({
             instance,
             key,
-            tag
+            tag,
+            toJSON,
+            toString
           });
         }
       });
     } else {
       init(proto.prototype);
-      tag = storeKey || `${proto.prototype.__TAG__}_${key}`;
-      const uniTag = Symbol(tag);
-      setVar(proto.prototype, uniTag);
-      regisHandler(proto.prototype, uniTag, {
+      tag = storeKey || getTag(proto);
+      setVar(proto.prototype, SHARE_KEY);
+      regisHandler(proto.prototype, SHARE_KEY, {
         init: (instance) => {
-          getProperty("storage")?.({
+          return getProperty("storage")?.({
             instance,
-            key: "",
-            tag
+            key,
+            tag,
+            toJSON,
+            toString
           });
         }
       });
@@ -472,6 +493,7 @@ export {
   Ignore,
   Init,
   Inject,
+  Isolate,
   Nested,
   Pipeline,
   Provide,
@@ -479,6 +501,8 @@ export {
   Storage,
   Tag,
   To,
+  Unique,
+  Unmount,
   Watcher,
   activeInstance,
   addDecoToClass,
@@ -494,15 +518,13 @@ export {
   getOwnState,
   getProperty,
   getState,
-  getSymbol,
-  getTag,
+  getTag2 as getTag,
   init,
   injectProperty,
+  invokeHandler,
   isPhecda,
   plainToClass,
   regisHandler,
-  register,
-  registerAsync,
   setExposeKey,
   setIgnoreKey,
   setState,

package/package.json

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