zova-core 5.1.48 → 5.1.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-core",
-  "version": "5.1.48",
-  "gitHead": "b0e8d884b1c6adc601f6efe1f90c9051cc8a1648",
+  "version": "5.1.49",
+  "gitHead": "7332ce2a4b44504a88c64da981b60336ebef7e9b",
   "description": "A vue3 framework with ioc",
   "keywords": [
     "ioc",
@@ -51,7 +51,7 @@
     "@cabloy/vue-compiler-sfc": "^3.5.14",
     "@cabloy/vue-reactivity": "^3.5.16",
     "@cabloy/vue-router": "^4.4.16",
-    "@cabloy/vue-runtime-core": "^3.5.53",
+    "@cabloy/vue-runtime-core": "^3.5.56",
     "@cabloy/vue-runtime-dom": "^3.5.13",
     "@cabloy/vue-server-renderer": "^3.5.18",
     "@cabloy/word-utils": "^2.1.14",

package/src/bean/beanContainer.ts

@@ -103,7 +103,7 @@ export class BeanContainer {
             beanInstance,
           );
           this.runWithInstanceScopeOrAppContext(() => {
-            beanInstance.__dispose__();
+            return beanInstance.__dispose__();
           });
           this.app.meta.module._monkeyModuleSync(
             false,
@@ -630,8 +630,8 @@ export class BeanContainer {
       await this.app?.meta.module._monkeyModule(true, 'beanInit', undefined, this, beanInstance);
     }
     if (!(beanInstance instanceof BeanAopBase) && beanInstance.__init__) {
-      await this.runWithInstanceScopeOrAppContext(async () => {
-        await beanInstance.__init__(...args);
+      await this.runWithInstanceScopeOrAppContext(() => {
+        return beanInstance.__init__(...args);
       });
     }
     if (this.containerType === 'sys') {

package/src/bean/beanControllerPageBase.ts

@@ -21,6 +21,7 @@ export class BeanControllerPageBase extends BeanBase {
 
   /** @internal */
   public __updateControllerData() {
+    if (!this.app) return;
     this.app.meta.module._monkeyModuleSync(true, 'controllerDataUpdate', undefined, this);
   }
 }

package/src/core/component/module.ts

@@ -186,8 +186,8 @@ export class AppModule extends BeanSimple {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
       if (mainInstance && mainInstance[monkeyName]) {
         // @ts-ignore ignore
-        await this.app.vue.runWithContext(async () => {
-          await mainInstance[monkeyName](...monkeyData);
+        await this.app.vue.runWithContext(() => {
+          return mainInstance[monkeyName](...monkeyData);
         });
       }
     }
@@ -197,13 +197,13 @@ export class AppModule extends BeanSimple {
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
-          await this.app.vue.runWithContext(async () => {
+          await this.app.vue.runWithContext(() => {
             if (moduleTarget === undefined) {
               // @ts-ignore ignore
-              await monkeyInstance[monkeyName](...monkeyData);
+              return monkeyInstance[monkeyName](...monkeyData);
             } else {
               // @ts-ignore ignore
-              await monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
+              return monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
             }
           });
         }
@@ -212,13 +212,13 @@ export class AppModule extends BeanSimple {
     // app monkey
     const appMonkey = this.app.meta.appMonkey;
     if (appMonkey && appMonkey[monkeyName]) {
-      await this.app.vue.runWithContext(async () => {
+      await this.app.vue.runWithContext(() => {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
-          await appMonkey[monkeyName](...monkeyData);
+          return appMonkey[monkeyName](...monkeyData);
         } else {
           // @ts-ignore ignore
-          await appMonkey[monkeyName](moduleTarget, ...monkeyData);
+          return appMonkey[monkeyName](moduleTarget, ...monkeyData);
         }
       });
     }
@@ -238,8 +238,8 @@ export class AppModule extends BeanSimple {
       const mainInstance = this.mainInstances[moduleTarget.info.relativeName];
       if (mainInstance && mainInstance[monkeyName]) {
         // @ts-ignore ignore
-        this.app.vue.runWithContext(async () => {
-          mainInstance[monkeyName](...monkeyData);
+        this.app.vue.runWithContext(() => {
+          return mainInstance[monkeyName](...monkeyData);
         });
       }
     }
@@ -249,13 +249,13 @@ export class AppModule extends BeanSimple {
       if (moduleMonkey.info.capabilities?.monkey) {
         const monkeyInstance = this.monkeyInstances[key];
         if (monkeyInstance && monkeyInstance[monkeyName]) {
-          this.app.vue.runWithContext(async () => {
+          this.app.vue.runWithContext(() => {
             if (moduleTarget === undefined) {
               // @ts-ignore ignore
-              monkeyInstance[monkeyName](...monkeyData);
+              return monkeyInstance[monkeyName](...monkeyData);
             } else {
               // @ts-ignore ignore
-              monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
+              return monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
             }
           });
         }
@@ -264,13 +264,13 @@ export class AppModule extends BeanSimple {
     // app monkey
     const appMonkey = this.app.meta.appMonkey;
     if (appMonkey && appMonkey[monkeyName]) {
-      this.app.vue.runWithContext(async () => {
+      this.app.vue.runWithContext(() => {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
-          appMonkey[monkeyName](...monkeyData);
+          return appMonkey[monkeyName](...monkeyData);
         } else {
           // @ts-ignore ignore
-          appMonkey[monkeyName](moduleTarget, ...monkeyData);
+          return appMonkey[monkeyName](moduleTarget, ...monkeyData);
         }
       });
     }

package/src/core/context/component.ts

@@ -4,15 +4,21 @@ import { BeanSimple } from '../../bean/beanSimple.ts';
 import { BeanControllerIdentifier, BeanRenderIdentifier } from '../../bean/type.ts';
 import { cast } from '../../types/utils/cast.ts';
 
+const SymbolTypeSSRRenderOriginal = Symbol('SymbolTypeSSRRenderOriginal');
+const SymbolTypeSSRRenderResetCount = Symbol('SymbolTypeSSRRenderResetCount');
+
 export class CtxComponent extends BeanSimple {
   private _bean_render_original: any;
+  private _instance_ssrRender_original: any;
+  private _renderPatched = false;
+  private _ssrRenderReset = false;
 
   activate() {
     if (this.ctx.disposed) return;
     const renderMethod = 'render';
-    const self = this;
     const instance = cast(this.ctx.instance);
     this._bean_render_original = instance[renderMethod];
+    const self = this;
     instance[renderMethod] = function (this, ...args) {
       if (instance.isUnmounted) return;
       if (!self.ctx.meta.state.inited.state) {
@@ -33,16 +39,42 @@ export class CtxComponent extends BeanSimple {
       //   return render.render();
       // }
     };
-    instance.type.ssrRender = null;
+    this._renderPatched = true;
+    const componentType = cast(instance.type);
+    const ssrRenderResetCount = componentType[SymbolTypeSSRRenderResetCount] ?? 0;
+    if (ssrRenderResetCount === 0) {
+      componentType[SymbolTypeSSRRenderOriginal] = componentType.ssrRender;
+      componentType.ssrRender = null;
+    }
+    componentType[SymbolTypeSSRRenderResetCount] = ssrRenderResetCount + 1;
+    this._instance_ssrRender_original = instance.ssrRender;
     instance.ssrRender = null;
+    this._ssrRenderReset = true;
   }
 
   /** @internal */
   public dispose() {
     const renderMethod = 'render';
     const instance = cast(this.ctx.instance);
-    instance[renderMethod] = this._bean_render_original;
+    if (this._renderPatched) {
+      instance[renderMethod] = this._bean_render_original;
+    }
+    if (this._ssrRenderReset) {
+      instance.ssrRender = this._instance_ssrRender_original;
+      const componentType = cast(instance.type);
+      const ssrRenderResetCount = componentType[SymbolTypeSSRRenderResetCount] ?? 0;
+      if (ssrRenderResetCount <= 1) {
+        componentType.ssrRender = componentType[SymbolTypeSSRRenderOriginal];
+        componentType[SymbolTypeSSRRenderOriginal] = undefined;
+        componentType[SymbolTypeSSRRenderResetCount] = 0;
+      } else {
+        componentType[SymbolTypeSSRRenderResetCount] = ssrRenderResetCount - 1;
+      }
+    }
     this._bean_render_original = null;
+    this._instance_ssrRender_original = null;
+    this._renderPatched = false;
+    this._ssrRenderReset = false;
   }
 
   private _getRender(): any {

package/src/core/context/util.ts

@@ -1,4 +1,4 @@
-import { setCurrentInstance } from '@cabloy/vue-runtime-core';
+import { withCurrentInstanceScope, withCurrentInstanceScopeSSR } from '@cabloy/vue-runtime-core';
 import { pauseTracking, resetTracking } from '@vue/reactivity';
 
 import { BeanSimple } from '../../bean/beanSimple.ts';
@@ -9,17 +9,21 @@ export class CtxUtil extends BeanSimple {
     if (this.ctx.disposed) {
       throwErrorComponentUnmounted();
     }
-    const reset = setCurrentInstance(this.ctx.instance as any);
-    if (!tracking) {
-      pauseTracking();
-    }
-    try {
-      return fn();
-    } finally {
+    const instance = this.ctx.instance as any;
+    const runner = process.env.SERVER ? withCurrentInstanceScopeSSR : withCurrentInstanceScope;
+    const result = runner(instance, () => {
       if (!tracking) {
-        resetTracking();
+        pauseTracking();
       }
-      reset();
-    }
+      try {
+        const result = fn();
+        return result;
+      } finally {
+        if (!tracking) {
+          resetTracking();
+        }
+      }
+    });
+    return result;
   }
 }