phecda-web 2.0.8 → 3.0.1

package/dist/index.d.mts

@@ -16,7 +16,6 @@ type DeepPartial<T> = {
 declare const emitter: PhecdaEmitter;
 declare function defaultWebInject(): void;
 
-declare function wait(...instances: InstanceType<Construct>[]): Promise<any[]>;
 declare function getParamtypes(Model: Construct): any;
 declare const phecdaNamespace: Map<string, WebPhecda>;
 declare function setDefaultPhecda(namespace: string, phecda: WebPhecda): void;
@@ -89,4 +88,4 @@ declare class WebBase extends Base {
     emitter: PhecdaEmitter;
 }
 
-export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, getParamtypes, phecdaNamespace, setDefaultPhecda, wait };
+export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, getParamtypes, phecdaNamespace, setDefaultPhecda };

package/dist/index.d.ts

@@ -16,7 +16,6 @@ type DeepPartial<T> = {
 declare const emitter: PhecdaEmitter;
 declare function defaultWebInject(): void;
 
-declare function wait(...instances: InstanceType<Construct>[]): Promise<any[]>;
 declare function getParamtypes(Model: Construct): any;
 declare const phecdaNamespace: Map<string, WebPhecda>;
 declare function setDefaultPhecda(namespace: string, phecda: WebPhecda): void;
@@ -89,4 +88,4 @@ declare class WebBase extends Base {
     emitter: PhecdaEmitter;
 }
 
-export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, getParamtypes, phecdaNamespace, setDefaultPhecda, wait };
+export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, getParamtypes, phecdaNamespace, setDefaultPhecda };

package/dist/index.js

@@ -42,8 +42,7 @@ __export(src_exports, {
   getDefaultPhecda: () => getDefaultPhecda,
   getParamtypes: () => getParamtypes,
   phecdaNamespace: () => phecdaNamespace,
-  setDefaultPhecda: () => setDefaultPhecda,
-  wait: () => wait
+  setDefaultPhecda: () => setDefaultPhecda
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("phecda-core"), module.exports);
@@ -54,8 +53,8 @@ var import_mitt = __toESM(require("mitt"));
 var emitter = (0, import_mitt.default)();
 function defaultWebInject() {
   if (!(0, import_phecda_core.getInject)("watcher")) {
-    (0, import_phecda_core.setInject)("watcher", ({ eventName, instance, key, options }) => {
-      const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+    (0, import_phecda_core.setInject)("watcher", ({ eventName, instance, property, options }) => {
+      const fn = typeof instance[property] === "function" ? instance[property].bind(instance) : (v) => instance[property] = v;
       if (options?.once) {
         const handler = /* @__PURE__ */ __name(() => {
           fn();
@@ -69,22 +68,22 @@ function defaultWebInject() {
     });
   }
   if (!(0, import_phecda_core.getInject)("storage")) {
-    (0, import_phecda_core.setInject)("storage", ({ tag, key, instance, toJSON, toString }) => {
-      tag = `phecda:${key ? `${tag}-${key}` : tag}`;
+    (0, import_phecda_core.setInject)("storage", ({ tag, property, instance, toJSON, toString }) => {
+      tag = `phecda:${property ? `${tag}-${property}` : tag}`;
       const initstr = localStorage.getItem(tag);
       if (initstr) {
         const data = toJSON(initstr);
-        if (key) {
-          instance[key] = data;
+        if (property) {
+          instance[property] = data;
         } else {
           for (const i in data) {
             if (i) instance[i] = data[i];
           }
         }
       }
-      localStorage.setItem(tag, toString(key ? instance[key] : instance));
+      localStorage.setItem(tag, toString(property ? instance[property] : instance));
       globalThis.addEventListener("beforeunload", () => {
-        localStorage.setItem(tag, toString(key ? instance[key] : instance));
+        localStorage.setItem(tag, toString(property ? instance[property] : instance));
       });
     });
   }
@@ -117,10 +116,6 @@ function deepMerge(target, patchToApply) {
 __name(deepMerge, "deepMerge");
 
 // src/core.ts
-function wait(...instances) {
-  return Promise.all(instances.map((i) => i.__PROMISE_SYMBOL__));
-}
-__name(wait, "wait");
 function getParamtypes(Model) {
   return Reflect.getMetadata("design:paramtypes", Model);
 }
@@ -184,7 +179,7 @@ var WebPhecda = class {
   then(onfulfilled, onrejected) {
     const then = this.then;
     this.then = void 0;
-    wait(...Object.values(this.state)).then(() => onfulfilled?.(this), onrejected).then(() => {
+    (0, import_phecda_core2.wait)(...Object.values(this.state)).then(() => onfulfilled?.(this), onrejected).then(() => {
       this.then = then;
     });
     return this;
@@ -212,7 +207,7 @@ var WebPhecda = class {
         this.emit("Initialize", {
           tag
         });
-        (0, import_phecda_core2.invokeHandler)("init", instance2);
+        (0, import_phecda_core2.invokeInit)(instance2);
       }
       return instance2;
     }, "initModel");
@@ -284,7 +279,7 @@ var WebPhecda = class {
       tag
     });
     const { state } = this;
-    await (0, import_phecda_core2.invokeHandler)("unmount", this.get(tag));
+    await (0, import_phecda_core2.invokeUnmount)(this.get(tag));
     delete state[tag];
   }
   async unmountAll() {
@@ -345,6 +340,5 @@ var import_ts_mixer = require("ts-mixer");
   getParamtypes,
   phecdaNamespace,
   setDefaultPhecda,
-  wait,
   ...require("phecda-core")
 });

package/dist/index.mjs

@@ -10,8 +10,8 @@ import mitt from "mitt";
 var emitter = mitt();
 function defaultWebInject() {
   if (!getInject("watcher")) {
-    setInject("watcher", ({ eventName, instance, key, options }) => {
-      const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+    setInject("watcher", ({ eventName, instance, property, options }) => {
+      const fn = typeof instance[property] === "function" ? instance[property].bind(instance) : (v) => instance[property] = v;
       if (options?.once) {
         const handler = /* @__PURE__ */ __name(() => {
           fn();
@@ -25,22 +25,22 @@ function defaultWebInject() {
     });
   }
   if (!getInject("storage")) {
-    setInject("storage", ({ tag, key, instance, toJSON, toString }) => {
-      tag = `phecda:${key ? `${tag}-${key}` : tag}`;
+    setInject("storage", ({ tag, property, instance, toJSON, toString }) => {
+      tag = `phecda:${property ? `${tag}-${property}` : tag}`;
       const initstr = localStorage.getItem(tag);
       if (initstr) {
         const data = toJSON(initstr);
-        if (key) {
-          instance[key] = data;
+        if (property) {
+          instance[property] = data;
         } else {
           for (const i in data) {
             if (i) instance[i] = data[i];
           }
         }
       }
-      localStorage.setItem(tag, toString(key ? instance[key] : instance));
+      localStorage.setItem(tag, toString(property ? instance[property] : instance));
       globalThis.addEventListener("beforeunload", () => {
-        localStorage.setItem(tag, toString(key ? instance[key] : instance));
+        localStorage.setItem(tag, toString(property ? instance[property] : instance));
       });
     });
   }
@@ -48,7 +48,7 @@ function defaultWebInject() {
 __name(defaultWebInject, "defaultWebInject");
 
 // src/core.ts
-import { get, getTag, invokeHandler } from "phecda-core";
+import { get, getTag, invokeInit, invokeUnmount, wait } from "phecda-core";
 import "reflect-metadata";
 import mitt2 from "mitt";
 
@@ -73,10 +73,6 @@ function deepMerge(target, patchToApply) {
 __name(deepMerge, "deepMerge");
 
 // src/core.ts
-function wait(...instances) {
-  return Promise.all(instances.map((i) => i.__PROMISE_SYMBOL__));
-}
-__name(wait, "wait");
 function getParamtypes(Model) {
   return Reflect.getMetadata("design:paramtypes", Model);
 }
@@ -168,7 +164,7 @@ var WebPhecda = class {
         this.emit("Initialize", {
           tag
         });
-        invokeHandler("init", instance2);
+        invokeInit(instance2);
       }
       return instance2;
     }, "initModel");
@@ -240,7 +236,7 @@ var WebPhecda = class {
       tag
     });
     const { state } = this;
-    await invokeHandler("unmount", this.get(tag));
+    await invokeUnmount(this.get(tag));
     delete state[tag];
   }
   async unmountAll() {
@@ -299,6 +295,5 @@ export {
   getDefaultPhecda,
   getParamtypes,
   phecdaNamespace,
-  setDefaultPhecda,
-  wait
+  setDefaultPhecda
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-web",
-  "version": "2.0.8",
+  "version": "3.0.1",
   "description": "using proxy, provide phecda function to web app",
   "author": "fgsreally",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "mitt": "^3.0.0",
     "reflect-metadata": "^0.1.13",
     "ts-mixer": "^6.0.4",
-    "phecda-core": "3.1.1"
+    "phecda-core": "4.0.1"
   },
   "devDependencies": {
     "tsup": "^8.1.0"