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

package/dist/index.d.ts

@@ -1,9 +1,19 @@
+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 Expose(proto: any, key: PropertyKey): void;
+declare function Empty(module: any): void;
+
 interface NameSpace {
     [name: string]: Phecda;
 }
 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;
 }
@@ -23,37 +33,53 @@ type ClassValue<I> = {
 interface Events {
 }
 
-declare function Init(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 Isolate(target: any): 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;
-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 To(...callbacks: ((arg: any, instance: any, key: string) => any)[]): (proto: any, key: PropertyKey) => void;
+declare function Err(cb: (e: Error | any) => void, isCatch?: boolean): (proto: any, key: PropertyKey) => void;
+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 function Watcher(eventName: keyof Events, options?: {
+    once?: boolean;
+}): (proto: any, key: string) => void;
+declare function Effect(eventName: string, options?: any): (proto: any, key: string) => void;
+declare function Storage({ key: storeKey, toJSON, toString }?: {
+    toJSON?: (str: string) => any;
+    toString?: (arg: any) => string;
+    key?: string;
+}): (proto: any, key?: PropertyKey) => 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 classToValue<M>(instance: M): ClassValue<M>;
-declare function snapShot<T extends new (...args: any) => any>(data: InstanceType<T>): {
+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 classToPlain<M>(instance: M): ClassValue<M>;
+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> | PropertyKey, handler: PropertyDecorator | ClassDecorator): void;
 declare function Pipeline(...decos: ((...args: any) => void)[]): (...args: any) => void;
+declare function isAsyncFunc(fn: Function): boolean;
 
-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 +96,13 @@ 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[]>;
 
+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 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;
-}): (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;
 
-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, Phecda, Pipeline, Provide, SHARE_KEY, Storage, StorageParam, Tag, To, Unique, Unmount, Watcher, WatcherParam, activeInstance, addDecoToClass, classToPlain, getBind, getExposeKey, getHandler, getModuleState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnModuleState, getOwnState, getProperty, getState, getTag, init, injectProperty, invokeHandler, isAsyncFunc, isPhecda, plainToClass, regisHandler, setExposeKey, setIgnoreKey, setState, setVar, snapShot, transformClass };

package/dist/index.js

@@ -33,17 +33,19 @@ __export(src_exports, {
   Ignore: () => Ignore,
   Init: () => Init,
   Inject: () => Inject,
-  Nested: () => Nested,
+  Isolate: () => Isolate,
   Pipeline: () => Pipeline,
   Provide: () => Provide,
   SHARE_KEY: () => SHARE_KEY,
   Storage: () => Storage,
   Tag: () => Tag,
   To: () => To,
+  Unique: () => Unique,
+  Unmount: () => Unmount,
   Watcher: () => Watcher,
   activeInstance: () => activeInstance,
   addDecoToClass: () => addDecoToClass,
-  classToValue: () => classToValue,
+  classToPlain: () => classToPlain,
   getBind: () => getBind,
   getExposeKey: () => getExposeKey,
   getHandler: () => getHandler,
@@ -55,15 +57,14 @@ __export(src_exports, {
   getOwnState: () => getOwnState,
   getProperty: () => getProperty,
   getState: () => getState,
-  getSymbol: () => getSymbol,
   getTag: () => getTag,
   init: () => init,
   injectProperty: () => injectProperty,
+  invokeHandler: () => invokeHandler,
+  isAsyncFunc: () => isAsyncFunc,
   isPhecda: () => isPhecda,
   plainToClass: () => plainToClass,
   regisHandler: () => regisHandler,
-  register: () => register,
-  registerAsync: () => registerAsync,
   setExposeKey: () => setExposeKey,
   setIgnoreKey: () => setIgnoreKey,
   setState: () => setState,
@@ -213,35 +214,72 @@ 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(invokeHandler, "invokeHandler");
+
+// src/decorators/core.ts
+function Init(proto, key) {
+  setVar(proto, key);
+  regisHandler(proto, key, {
+    async init(instance) {
+      return instance[key]();
+    }
+  });
 }
-__name(registerAsync, "registerAsync");
+__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);
+    setState(proto, k, {
+      value
+    });
+  };
+}
+__name(Bind, "Bind");
+function Ignore(proto, key) {
+  setIgnoreKey(proto, key);
+}
+__name(Ignore, "Ignore");
+function Clear(proto, key) {
+  init(proto);
+  proto._namespace.__EXPOSE_VAR__.delete(key);
+  proto._namespace.__IGNORE_VAR__.delete(key);
+  proto._namespace.__STATE_VAR__.delete(key);
+  proto._namespace.__STATE_HANDLER__.delete(key);
+  proto._namespace.__STATE_NAMESPACE__.delete(key);
+}
+__name(Clear, "Clear");
+function Expose(proto, key) {
+  setExposeKey(proto, key);
+}
+__name(Expose, "Expose");
+function Empty(module2) {
+  init(module2.prototype);
+}
+__name(Empty, "Empty");
 
 // src/helper.ts
-function getTag(module2) {
-  return module2.prototype?.__TAG__;
+function getTag(moduleOrInstance) {
+  if (typeof moduleOrInstance === "object")
+    moduleOrInstance = moduleOrInstance.constructor;
+  return moduleOrInstance.prototype?.__TAG__ || moduleOrInstance.name;
 }
 __name(getTag, "getTag");
-function getSymbol(instance) {
-  const module2 = instance.constructor;
-  return getTag(module2) || module2.name;
-}
-__name(getSymbol, "getSymbol");
 function getBind(module2) {
   const instance = new module2();
   const keys = getModuleState(instance);
@@ -283,14 +321,14 @@ async function transformClass(instance, force = false) {
   return err;
 }
 __name(transformClass, "transformClass");
-function classToValue(instance) {
+function classToPlain(instance) {
   const data = {};
   const exposeVars = getExposeKey(instance);
   for (const item of exposeVars)
     data[item] = instance[item];
-  return data;
+  return JSON.parse(JSON.stringify(data));
 }
-__name(classToValue, "classToValue");
+__name(classToPlain, "classToPlain");
 function snapShot(data) {
   const snap = {};
   for (const i in data)
@@ -308,8 +346,8 @@ function snapShot(data) {
   };
 }
 __name(snapShot, "snapShot");
-function addDecoToClass(c, key, handler, type = "class") {
-  handler(type === "class" ? c.prototype : c, key);
+function addDecoToClass(c, key, handler) {
+  handler(key === SHARE_KEY ? c : c.prototype, key);
 }
 __name(addDecoToClass, "addDecoToClass");
 function Pipeline(...decos) {
@@ -319,63 +357,43 @@ function Pipeline(...decos) {
   };
 }
 __name(Pipeline, "Pipeline");
-
-// src/decorators.ts
-function Init(proto, key) {
-  setVar(proto, key);
-  regisHandler(proto, key, {
-    async init(instance) {
-      instance[key]();
-    }
-  });
-}
-__name(Init, "Init");
-function Bind(value) {
-  return (proto, k) => {
-    setVar(proto, k);
-    setState(proto, k, {
-      value
-    });
-  };
+function isAsyncFunc(fn) {
+  return fn[Symbol.toStringTag] === "AsyncFunction";
 }
-__name(Bind, "Bind");
-function Ignore(proto, key) {
-  setIgnoreKey(proto, key);
+__name(isAsyncFunc, "isAsyncFunc");
+
+// src/di.ts
+var DataMap = {};
+function Provide(key, value) {
+  DataMap[key] = value;
 }
-__name(Ignore, "Ignore");
-function Clear(proto, key) {
-  init(proto);
-  proto._namespace.__EXPOSE_VAR__.delete(key);
-  proto._namespace.__IGNORE_VAR__.delete(key);
-  proto._namespace.__STATE_VAR__.delete(key);
-  proto._namespace.__STATE_HANDLER__.delete(key);
-  proto._namespace.__STATE_NAMESPACE__.delete(key);
+__name(Provide, "Provide");
+var EmptyProxy = new Proxy(Empty, {
+  apply() {
+    return EmptyProxy;
+  }
+});
+function Inject(key) {
+  return DataMap[key] || EmptyProxy;
 }
-__name(Clear, "Clear");
-function Err(cb) {
-  return (proto, key) => {
-    setVar(proto, key);
-    regisHandler(proto, key, {
-      error: cb
-    });
-  };
+__name(Inject, "Inject");
+var activeInstance = {};
+function injectProperty(key, value) {
+  activeInstance[key] = value;
+  return activeInstance;
 }
-__name(Err, "Err");
-function Expose(proto, key) {
-  setExposeKey(proto, key);
+__name(injectProperty, "injectProperty");
+function getProperty(key) {
+  return activeInstance[key];
 }
-__name(Expose, "Expose");
-function To(cb) {
-  return (proto, key) => {
-    setVar(proto, key);
-    regisHandler(proto, key, {
-      async pipe(instance) {
-        instance[key] = await cb(instance[key], instance, key);
-      }
-    });
-  };
+__name(getProperty, "getProperty");
+
+// src/decorators/function.ts
+function Isolate(target) {
+  init(target.prototype);
+  target.prototype.__ISOLATE__ = true;
 }
-__name(To, "To");
+__name(Isolate, "Isolate");
 function Tag(tag) {
   return (module2) => {
     init(module2.prototype);
@@ -383,6 +401,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);
@@ -414,57 +439,67 @@ function Global(module2) {
   });
 }
 __name(Global, "Global");
-function Empty(module2) {
-  init(module2.prototype);
-}
-__name(Empty, "Empty");
-var DataMap = {};
-function Provide(key, value) {
-  DataMap[key] = value;
-}
-__name(Provide, "Provide");
-var EmptyProxy = new Proxy(Empty, {
-  apply() {
-    return EmptyProxy;
-  }
-});
-function Inject(key) {
-  return DataMap[key] || EmptyProxy;
-}
-__name(Inject, "Inject");
-function Nested(module2) {
-  return To(async (property) => {
-    const instance = plainToClass(module2, property);
-    const err = await transformClass(instance);
-    if (err.length > 0)
-      throw new Error(err[0]);
-    return instance;
-  });
-}
-__name(Nested, "Nested");
-
-// src/custom/decorator.ts
-var activeInstance = {};
-function injectProperty(key, value) {
-  activeInstance[key] = value;
-  return activeInstance;
+function To(...callbacks) {
+  return (proto, key) => {
+    setVar(proto, key);
+    regisHandler(proto, key, {
+      async pipe(instance) {
+        for (const cb of callbacks)
+          instance[key] = await cb(instance[key], instance, key);
+      }
+    });
+  };
 }
-__name(injectProperty, "injectProperty");
-function getProperty(key) {
-  return activeInstance[key];
+__name(To, "To");
+function Err(cb, isCatch = false) {
+  return (proto, key) => {
+    setVar(proto, key);
+    regisHandler(proto, key, {
+      init: (instance) => {
+        if (typeof instance[key] === "function") {
+          const oldFn = instance[key].bind(instance);
+          if (isAsyncFunc(oldFn)) {
+            instance[key] = async (...args) => {
+              try {
+                await oldFn(...args);
+              } catch (e) {
+                cb(e);
+                if (!isCatch)
+                  throw e;
+              }
+            };
+          } else {
+            instance[key] = (...args) => {
+              try {
+                oldFn(...args);
+              } catch (e) {
+                cb(e);
+                if (!isCatch)
+                  throw e;
+              }
+            };
+          }
+        }
+      }
+    });
+  };
 }
-__name(getProperty, "getProperty");
+__name(Err, "Err");
 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 +531,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,17 +586,19 @@ __name(Storage, "Storage");
   Ignore,
   Init,
   Inject,
-  Nested,
+  Isolate,
   Pipeline,
   Provide,
   SHARE_KEY,
   Storage,
   Tag,
   To,
+  Unique,
+  Unmount,
   Watcher,
   activeInstance,
   addDecoToClass,
-  classToValue,
+  classToPlain,
   getBind,
   getExposeKey,
   getHandler,
@@ -567,15 +610,14 @@ __name(Storage, "Storage");
   getOwnState,
   getProperty,
   getState,
-  getSymbol,
   getTag,
   init,
   injectProperty,
+  invokeHandler,
+  isAsyncFunc,
   isPhecda,
   plainToClass,
   regisHandler,
-  register,
-  registerAsync,
   setExposeKey,
   setIgnoreKey,
   setState,

package/dist/index.mjs

@@ -141,35 +141,72 @@ 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(invokeHandler, "invokeHandler");
+
+// src/decorators/core.ts
+function Init(proto, key) {
+  setVar(proto, key);
+  regisHandler(proto, key, {
+    async init(instance) {
+      return instance[key]();
+    }
+  });
 }
-__name(registerAsync, "registerAsync");
+__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);
+    setState(proto, k, {
+      value
+    });
+  };
+}
+__name(Bind, "Bind");
+function Ignore(proto, key) {
+  setIgnoreKey(proto, key);
+}
+__name(Ignore, "Ignore");
+function Clear(proto, key) {
+  init(proto);
+  proto._namespace.__EXPOSE_VAR__.delete(key);
+  proto._namespace.__IGNORE_VAR__.delete(key);
+  proto._namespace.__STATE_VAR__.delete(key);
+  proto._namespace.__STATE_HANDLER__.delete(key);
+  proto._namespace.__STATE_NAMESPACE__.delete(key);
+}
+__name(Clear, "Clear");
+function Expose(proto, key) {
+  setExposeKey(proto, key);
+}
+__name(Expose, "Expose");
+function Empty(module) {
+  init(module.prototype);
+}
+__name(Empty, "Empty");
 
 // src/helper.ts
-function getTag(module) {
-  return module.prototype?.__TAG__;
+function getTag(moduleOrInstance) {
+  if (typeof moduleOrInstance === "object")
+    moduleOrInstance = moduleOrInstance.constructor;
+  return moduleOrInstance.prototype?.__TAG__ || moduleOrInstance.name;
 }
 __name(getTag, "getTag");
-function getSymbol(instance) {
-  const module = instance.constructor;
-  return getTag(module) || module.name;
-}
-__name(getSymbol, "getSymbol");
 function getBind(module) {
   const instance = new module();
   const keys = getModuleState(instance);
@@ -211,14 +248,14 @@ async function transformClass(instance, force = false) {
   return err;
 }
 __name(transformClass, "transformClass");
-function classToValue(instance) {
+function classToPlain(instance) {
   const data = {};
   const exposeVars = getExposeKey(instance);
   for (const item of exposeVars)
     data[item] = instance[item];
-  return data;
+  return JSON.parse(JSON.stringify(data));
 }
-__name(classToValue, "classToValue");
+__name(classToPlain, "classToPlain");
 function snapShot(data) {
   const snap = {};
   for (const i in data)
@@ -236,8 +273,8 @@ function snapShot(data) {
   };
 }
 __name(snapShot, "snapShot");
-function addDecoToClass(c, key, handler, type = "class") {
-  handler(type === "class" ? c.prototype : c, key);
+function addDecoToClass(c, key, handler) {
+  handler(key === SHARE_KEY ? c : c.prototype, key);
 }
 __name(addDecoToClass, "addDecoToClass");
 function Pipeline(...decos) {
@@ -247,63 +284,43 @@ function Pipeline(...decos) {
   };
 }
 __name(Pipeline, "Pipeline");
-
-// src/decorators.ts
-function Init(proto, key) {
-  setVar(proto, key);
-  regisHandler(proto, key, {
-    async init(instance) {
-      instance[key]();
-    }
-  });
-}
-__name(Init, "Init");
-function Bind(value) {
-  return (proto, k) => {
-    setVar(proto, k);
-    setState(proto, k, {
-      value
-    });
-  };
+function isAsyncFunc(fn) {
+  return fn[Symbol.toStringTag] === "AsyncFunction";
 }
-__name(Bind, "Bind");
-function Ignore(proto, key) {
-  setIgnoreKey(proto, key);
+__name(isAsyncFunc, "isAsyncFunc");
+
+// src/di.ts
+var DataMap = {};
+function Provide(key, value) {
+  DataMap[key] = value;
 }
-__name(Ignore, "Ignore");
-function Clear(proto, key) {
-  init(proto);
-  proto._namespace.__EXPOSE_VAR__.delete(key);
-  proto._namespace.__IGNORE_VAR__.delete(key);
-  proto._namespace.__STATE_VAR__.delete(key);
-  proto._namespace.__STATE_HANDLER__.delete(key);
-  proto._namespace.__STATE_NAMESPACE__.delete(key);
+__name(Provide, "Provide");
+var EmptyProxy = new Proxy(Empty, {
+  apply() {
+    return EmptyProxy;
+  }
+});
+function Inject(key) {
+  return DataMap[key] || EmptyProxy;
 }
-__name(Clear, "Clear");
-function Err(cb) {
-  return (proto, key) => {
-    setVar(proto, key);
-    regisHandler(proto, key, {
-      error: cb
-    });
-  };
+__name(Inject, "Inject");
+var activeInstance = {};
+function injectProperty(key, value) {
+  activeInstance[key] = value;
+  return activeInstance;
 }
-__name(Err, "Err");
-function Expose(proto, key) {
-  setExposeKey(proto, key);
+__name(injectProperty, "injectProperty");
+function getProperty(key) {
+  return activeInstance[key];
 }
-__name(Expose, "Expose");
-function To(cb) {
-  return (proto, key) => {
-    setVar(proto, key);
-    regisHandler(proto, key, {
-      async pipe(instance) {
-        instance[key] = await cb(instance[key], instance, key);
-      }
-    });
-  };
+__name(getProperty, "getProperty");
+
+// src/decorators/function.ts
+function Isolate(target) {
+  init(target.prototype);
+  target.prototype.__ISOLATE__ = true;
 }
-__name(To, "To");
+__name(Isolate, "Isolate");
 function Tag(tag) {
   return (module) => {
     init(module.prototype);
@@ -311,6 +328,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);
@@ -342,57 +366,67 @@ function Global(module) {
   });
 }
 __name(Global, "Global");
-function Empty(module) {
-  init(module.prototype);
-}
-__name(Empty, "Empty");
-var DataMap = {};
-function Provide(key, value) {
-  DataMap[key] = value;
-}
-__name(Provide, "Provide");
-var EmptyProxy = new Proxy(Empty, {
-  apply() {
-    return EmptyProxy;
-  }
-});
-function Inject(key) {
-  return DataMap[key] || EmptyProxy;
-}
-__name(Inject, "Inject");
-function Nested(module) {
-  return To(async (property) => {
-    const instance = plainToClass(module, property);
-    const err = await transformClass(instance);
-    if (err.length > 0)
-      throw new Error(err[0]);
-    return instance;
-  });
-}
-__name(Nested, "Nested");
-
-// src/custom/decorator.ts
-var activeInstance = {};
-function injectProperty(key, value) {
-  activeInstance[key] = value;
-  return activeInstance;
+function To(...callbacks) {
+  return (proto, key) => {
+    setVar(proto, key);
+    regisHandler(proto, key, {
+      async pipe(instance) {
+        for (const cb of callbacks)
+          instance[key] = await cb(instance[key], instance, key);
+      }
+    });
+  };
 }
-__name(injectProperty, "injectProperty");
-function getProperty(key) {
-  return activeInstance[key];
+__name(To, "To");
+function Err(cb, isCatch = false) {
+  return (proto, key) => {
+    setVar(proto, key);
+    regisHandler(proto, key, {
+      init: (instance) => {
+        if (typeof instance[key] === "function") {
+          const oldFn = instance[key].bind(instance);
+          if (isAsyncFunc(oldFn)) {
+            instance[key] = async (...args) => {
+              try {
+                await oldFn(...args);
+              } catch (e) {
+                cb(e);
+                if (!isCatch)
+                  throw e;
+              }
+            };
+          } else {
+            instance[key] = (...args) => {
+              try {
+                oldFn(...args);
+              } catch (e) {
+                cb(e);
+                if (!isCatch)
+                  throw e;
+              }
+            };
+          }
+        }
+      }
+    });
+  };
 }
-__name(getProperty, "getProperty");
+__name(Err, "Err");
 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 +458,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,17 +512,19 @@ export {
   Ignore,
   Init,
   Inject,
-  Nested,
+  Isolate,
   Pipeline,
   Provide,
   SHARE_KEY,
   Storage,
   Tag,
   To,
+  Unique,
+  Unmount,
   Watcher,
   activeInstance,
   addDecoToClass,
-  classToValue,
+  classToPlain,
   getBind,
   getExposeKey,
   getHandler,
@@ -494,15 +536,14 @@ export {
   getOwnState,
   getProperty,
   getState,
-  getSymbol,
   getTag,
   init,
   injectProperty,
+  invokeHandler,
+  isAsyncFunc,
   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.11",
   "description": "provide base function and abstract limit to other phecda module ",
   "main": "dist/index.js",
   "module": "dist/index.mjs",