phecda-vue 5.1.0 → 5.1.1

package/dist/index.js

@@ -552,16 +552,23 @@ function hasI(model) {
 __name(hasI, "hasI");
 function useIR(model, forceProvide = false) {
   const tag = (0, import_phecda_web4.getTag)(model);
+  const instance = (0, import_vue5.getCurrentInstance)();
+  if (!instance["phecda-vue"]) instance["phecda-vue"] = /* @__PURE__ */ new WeakMap();
+  const modelMap = instance["phecda-vue"];
   const injectKey = `phecda-vue:lib ${tag.toString()}`;
-  let existModule = (0, import_vue5.inject)(injectKey);
+  let existModule = modelMap.get(model) || (0, import_vue5.inject)(injectKey);
   if (!existModule || forceProvide) {
     const data = {
       // keep class name
       [model.name]: class extends model {
       }
     };
-    existModule = (0, import_phecda_web4.bindMethod)((0, import_vue5.reactive)(new data[model.name]()));
+    const paramtypes = (0, import_phecda_web4.getParamtypes)(model) || [];
+    existModule = (0, import_phecda_web4.bindMethod)((0, import_vue5.reactive)(new data[model.name](...paramtypes.map((param) => useIR(param)))));
+    (0, import_phecda_web4.invokeInit)(existModule);
     (0, import_vue5.provide)(injectKey, existModule);
+    modelMap.set(model, existModule);
+    (0, import_vue5.onBeforeUnmount)(() => (0, import_phecda_web4.invokeUnmount)(existModule));
     return existModule;
   } else {
     return existModule;

package/dist/index.mjs

@@ -501,8 +501,8 @@ function WatchEffect(option) {
 __name(WatchEffect, "WatchEffect");
 
 // src/lib.ts
-import { bindMethod as bindMethod3, getTag as getTag3 } from "phecda-web";
-import { inject as inject2, provide, reactive as reactive2, toRef as toRef2 } from "vue";
+import { bindMethod as bindMethod3, getParamtypes, getTag as getTag3, invokeInit, invokeUnmount } from "phecda-web";
+import { getCurrentInstance as getCurrentInstance2, inject as inject2, onBeforeUnmount as onBeforeUnmount2, provide, reactive as reactive2, toRef as toRef2 } from "vue";
 function hasI(model) {
   const tag = getTag3(model);
   const injectKey = `phecda-vue:lib ${tag.toString()}`;
@@ -511,16 +511,23 @@ function hasI(model) {
 __name(hasI, "hasI");
 function useIR(model, forceProvide = false) {
   const tag = getTag3(model);
+  const instance = getCurrentInstance2();
+  if (!instance["phecda-vue"]) instance["phecda-vue"] = /* @__PURE__ */ new WeakMap();
+  const modelMap = instance["phecda-vue"];
   const injectKey = `phecda-vue:lib ${tag.toString()}`;
-  let existModule = inject2(injectKey);
+  let existModule = modelMap.get(model) || inject2(injectKey);
   if (!existModule || forceProvide) {
     const data = {
       // keep class name
       [model.name]: class extends model {
       }
     };
-    existModule = bindMethod3(reactive2(new data[model.name]()));
+    const paramtypes = getParamtypes(model) || [];
+    existModule = bindMethod3(reactive2(new data[model.name](...paramtypes.map((param) => useIR(param)))));
+    invokeInit(existModule);
     provide(injectKey, existModule);
+    modelMap.set(model, existModule);
+    onBeforeUnmount2(() => invokeUnmount(existModule));
     return existModule;
   } else {
     return existModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "provide phecda function to vue",
   "author": "fgsreally",
   "license": "MIT",