phecda-react 0.1.0-alpha.9 → 0.1.0-beta.15

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 import { Construct, Events } from 'phecda-web';
 export * from 'phecda-web';
 
-declare function useO<T extends Construct>(module: T): any;
-declare function useR<T extends Construct>(module: T): [InstanceType<T>, InstanceType<T>];
+declare function useO<T extends Construct>(model: T): any;
+declare function useR<T extends Construct>(model: T): [InstanceType<T>, InstanceType<T>];
 declare function createPhecda(): {
-    load(state: any): any;
+    load(state?: any): any;
     unmount(): Promise<void>;
 };
 declare function useEvent<Key extends keyof Events>(eventName: Key, cb: (event: Events[Key]) => void): ((arg: Events[Key]) => void)[];
-declare function initialize<M extends Construct>(module: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
+declare function initialize<M extends Construct>(model: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
 
 export { createPhecda, initialize, useEvent, useO, useR };

package/dist/index.js

@@ -34,56 +34,36 @@ module.exports = __toCommonJS(src_exports);
 var import_valtio = require("valtio");
 var import_react = require("react");
 var import_phecda_web = require("phecda-web");
-function useO(module2) {
-  const { state, _o: oMap } = (0, import_phecda_web.getActiveInstance)();
-  if (module2.prototype.__ISOLATE__) {
-    const instance2 = new module2();
+function useO(model) {
+  const { state, origin } = (0, import_phecda_web.getActiveInstance)();
+  if ((0, import_phecda_web.get)(model.prototype, "isolate")) {
+    const instance2 = new model();
     return instance2;
   }
-  const tag = (0, import_phecda_web.getTag)(module2);
+  const tag = (0, import_phecda_web.getTag)(model);
   if (tag in state) {
-    if (oMap.get(state[tag]) !== module2)
-      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${module2.name}"`);
+    if (origin.get(state[tag]) !== model)
+      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${model.name}"`);
     return state[tag];
   }
-  const instance = new module2();
+  const instance = new model();
   state[tag] = instance;
   return instance;
 }
 __name(useO, "useO");
-function useR(module2) {
-  const { _r: rmap, _f: fmap } = (0, import_phecda_web.getActiveInstance)();
-  const instance = useO(module2);
-  if (rmap.has(instance)) {
-    const proxyInstance2 = rmap.get(instance);
+function useR(model) {
+  const { cache: cacheMap } = (0, import_phecda_web.getActiveInstance)();
+  const instance = useO(model);
+  if (cacheMap.has(instance)) {
+    const proxyInstance2 = cacheMap.get(instance);
     return [
       (0, import_valtio.useSnapshot)(proxyInstance2),
       proxyInstance2
     ];
   }
-  const proxyInstance = (0, import_valtio.proxy)(new Proxy(instance, {
-    get(target, key) {
-      if (key === "_promise")
-        return target[key];
-      if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[key]);
-        const errorHandler = (0, import_phecda_web.getHandler)(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = (0, import_phecda_web.wrapError)(target, key, errorHandler);
-        fmap.set(target[key], wrapper);
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  }));
-  instance._promise = (0, import_phecda_web.registerSerial)(proxyInstance);
-  rmap.set(instance, proxyInstance);
+  const proxyInstance = (0, import_valtio.proxy)(instance);
+  instance._promise = (0, import_phecda_web.invokeHandler)("init", proxyInstance);
+  cacheMap.set(instance, proxyInstance);
   return [
     (0, import_valtio.useSnapshot)(proxyInstance),
     proxyInstance
@@ -95,12 +75,13 @@ function createPhecda() {
   return {
     load(state) {
       const instance = (0, import_phecda_web.getActiveInstance)();
-      instance.state = state;
+      if (state)
+        instance.state = state;
       return this;
     },
     async unmount() {
       const { state } = (0, import_phecda_web.getActiveInstance)();
-      await Object.values(state).map((ins) => (0, import_phecda_web.unmountParallel)(ins));
+      await Object.values(state).map((ins) => (0, import_phecda_web.invokeHandler)("unmount", ins));
       (0, import_phecda_web.resetActiveInstance)();
     }
   };
@@ -108,18 +89,18 @@ function createPhecda() {
 __name(createPhecda, "createPhecda");
 function useEvent(eventName, cb) {
   (0, import_react.useEffect)(() => {
-    return () => emitter.off(eventName, cb);
+    return () => import_phecda_web.emitter.off(eventName, cb);
   });
-  emitter.on(eventName, cb);
+  import_phecda_web.emitter.on(eventName, cb);
   return [
-    (arg) => emitter.emit(eventName, arg),
-    () => emitter.off(eventName, cb)
+    (arg) => import_phecda_web.emitter.emit(eventName, arg),
+    () => import_phecda_web.emitter.off(eventName, cb)
   ];
 }
 __name(useEvent, "useEvent");
-function initialize(module2, deleteOtherProperty = true) {
-  const instance = useO(module2);
-  const newInstance = new module2();
+function initialize(model, deleteOtherProperty = true) {
+  const instance = useO(model);
+  const newInstance = new model();
   Object.assign(instance, newInstance);
   if (deleteOtherProperty) {
     for (const key in instance) {

package/dist/index.mjs

@@ -4,57 +4,37 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 // src/core.ts
 import { proxy, useSnapshot } from "valtio";
 import { useEffect } from "react";
-import { getActiveInstance, getHandler, getTag, registerSerial, resetActiveInstance, unmountParallel, wrapError } from "phecda-web";
-function useO(module) {
-  const { state, _o: oMap } = getActiveInstance();
-  if (module.prototype.__ISOLATE__) {
-    const instance2 = new module();
+import { emitter, get, getActiveInstance, getTag, invokeHandler, resetActiveInstance } from "phecda-web";
+function useO(model) {
+  const { state, origin } = getActiveInstance();
+  if (get(model.prototype, "isolate")) {
+    const instance2 = new model();
     return instance2;
   }
-  const tag = getTag(module);
+  const tag = getTag(model);
   if (tag in state) {
-    if (oMap.get(state[tag]) !== module)
-      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${module.name}"`);
+    if (origin.get(state[tag]) !== model)
+      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${model.name}"`);
     return state[tag];
   }
-  const instance = new module();
+  const instance = new model();
   state[tag] = instance;
   return instance;
 }
 __name(useO, "useO");
-function useR(module) {
-  const { _r: rmap, _f: fmap } = getActiveInstance();
-  const instance = useO(module);
-  if (rmap.has(instance)) {
-    const proxyInstance2 = rmap.get(instance);
+function useR(model) {
+  const { cache: cacheMap } = getActiveInstance();
+  const instance = useO(model);
+  if (cacheMap.has(instance)) {
+    const proxyInstance2 = cacheMap.get(instance);
     return [
       useSnapshot(proxyInstance2),
       proxyInstance2
     ];
   }
-  const proxyInstance = proxy(new Proxy(instance, {
-    get(target, key) {
-      if (key === "_promise")
-        return target[key];
-      if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[key]);
-        const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = wrapError(target, key, errorHandler);
-        fmap.set(target[key], wrapper);
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  }));
-  instance._promise = registerSerial(proxyInstance);
-  rmap.set(instance, proxyInstance);
+  const proxyInstance = proxy(instance);
+  instance._promise = invokeHandler("init", proxyInstance);
+  cacheMap.set(instance, proxyInstance);
   return [
     useSnapshot(proxyInstance),
     proxyInstance
@@ -66,12 +46,13 @@ function createPhecda() {
   return {
     load(state) {
       const instance = getActiveInstance();
-      instance.state = state;
+      if (state)
+        instance.state = state;
       return this;
     },
     async unmount() {
       const { state } = getActiveInstance();
-      await Object.values(state).map((ins) => unmountParallel(ins));
+      await Object.values(state).map((ins) => invokeHandler("unmount", ins));
       resetActiveInstance();
     }
   };
@@ -88,9 +69,9 @@ function useEvent(eventName, cb) {
   ];
 }
 __name(useEvent, "useEvent");
-function initialize(module, deleteOtherProperty = true) {
-  const instance = useO(module);
-  const newInstance = new module();
+function initialize(model, deleteOtherProperty = true) {
+  const instance = useO(model);
+  const newInstance = new model();
   Object.assign(instance, newInstance);
   if (deleteOtherProperty) {
     for (const key in instance) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-react",
-  "version": "0.1.0-alpha.9",
+  "version": "0.1.0-beta.15",
   "description": "provide phecda function to react by valtio",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,7 +14,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "valtio": "^1.13.0",
-    "phecda-web": "1.0.1-alpha.5"
+    "phecda-web": "1.0.1-beta.11"
   },
   "devDependencies": {
     "@types/react": "^18.2.48",