zova-core 5.1.48 → 5.1.50

package/dist/bean/beanControllerPageBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"beanControllerPageBase.d.ts","sourceRoot":"","sources":["../../src/bean/beanControllerPageBase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,qBAAa,sBAAuB,SAAQ,QAAQ;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CAmBxB"}
+{"version":3,"file":"beanControllerPageBase.d.ts","sourceRoot":"","sources":["../../src/bean/beanControllerPageBase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,qBAAa,sBAAuB,SAAQ,QAAQ;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CAoBxB"}

package/dist/core/context/component.d.ts

@@ -1,6 +1,9 @@
 import { BeanSimple } from '../../bean/beanSimple.ts';
 export declare class CtxComponent extends BeanSimple {
     private _bean_render_original;
+    private _instance_ssrRender_original;
+    private _renderPatched;
+    private _ssrRenderReset;
     activate(): void;
     private _getRender;
 }

package/dist/core/context/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/core/context/component.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAItD,qBAAa,YAAa,SAAQ,UAAU;IAC1C,OAAO,CAAC,qBAAqB,CAAM;IAEnC,QAAQ;IAsCR,OAAO,CAAC,UAAU;CAOnB"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/core/context/component.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAOtD,qBAAa,YAAa,SAAQ,UAAU;IAC1C,OAAO,CAAC,qBAAqB,CAAM;IACnC,OAAO,CAAC,4BAA4B,CAAM;IAC1C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,eAAe,CAAS;IAEhC,QAAQ;IAgER,OAAO,CAAC,UAAU;CAOnB"}

package/dist/core/context/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/core/context/util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,qBAAa,OAAQ,SAAQ,UAAU;IACrC,aAAa,CAAC,EAAE,KAAA,EAAE,QAAQ,CAAC,EAAE,OAAO;CAiBrC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/core/context/util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,qBAAa,OAAQ,SAAQ,UAAU;IACrC,aAAa,CAAC,EAAE,KAAA,EAAE,QAAQ,CAAC,EAAE,OAAO;CAqBrC"}

package/dist/core/sys/config.d.ts

@@ -23,7 +23,7 @@ export interface ZovaConfig {
     ssr: {
         cookie: boolean;
         withVona: boolean;
-        ignoreCookieOnServer: boolean;
+        cookieDisabledOnServer: boolean;
         hmr: boolean;
     };
     ws: {

package/dist/core/sys/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/sys/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,CAS1E;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,GAAG,EAAE;QACH,MAAM,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;QAClB,oBAAoB,EAAE,OAAO,CAAC;QAC9B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,EAAE,EAAE;QACF,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,aAAa,CAAC;QAC7B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,aAAa,EAAE,MAAM,CAAC,CAAC;KAC5C,CAAC;IACF,EAAE,EAAE;QACF,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,EAAE;QACN,GAAG,EAAE;YACH,SAAS,EAAE,MAAM,sBAAsB,CAAC;SACzC,CAAC;QACF,SAAS,EAAE;aACR,CAAC,IAAI,MAAM,aAAa,GAAG,MAAM,yBAAyB;SAC5D,CAAC;QACF,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC;YACpB,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/sys/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EACV,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,CAS1E;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,GAAG,EAAE;QACH,MAAM,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;QAClB,sBAAsB,EAAE,OAAO,CAAC;QAChC,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;IACF,EAAE,EAAE;QACF,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,aAAa,CAAC;QAC7B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,aAAa,EAAE,MAAM,CAAC,CAAC;KAC5C,CAAC;IACF,EAAE,EAAE;QACF,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,MAAM,EAAE;QACN,GAAG,EAAE;YACH,SAAS,EAAE,MAAM,sBAAsB,CAAC;SACzC,CAAC;QACF,SAAS,EAAE;aACR,CAAC,IAAI,MAAM,aAAa,GAAG,MAAM,yBAAyB;SAC5D,CAAC;QACF,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC;YACpB,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}

package/dist/index.js

@@ -17,7 +17,7 @@ import '@vue/runtime-dom';
 import { Logger, format, NpmConfigSetLevels, print, colorize } from '@cabloy/logger';
 import * as localeutil from '@cabloy/localeutil';
 import * as ModuleInfo from '@cabloy/module-info';
-import { setCurrentInstance } from '@cabloy/vue-runtime-core';
+import { withCurrentInstanceScopeSSR, withCurrentInstanceScope } from '@cabloy/vue-runtime-core';
 
 function cast(source) {
   return source;
@@ -1183,7 +1183,7 @@ class BeanContainer {
         } else {
           this.app.meta.module._monkeyModuleSync(false, 'beanDispose', undefined, this, beanInstance);
           this.runWithInstanceScopeOrAppContext(() => {
-            beanInstance.__dispose__();
+            return beanInstance.__dispose__();
           });
           this.app.meta.module._monkeyModuleSync(false, 'beanDisposed', undefined, this, beanInstance);
         }
@@ -1518,8 +1518,8 @@ 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') {
@@ -2284,6 +2284,7 @@ class BeanControllerPageBase extends BeanBase {
 
   /** @internal */
   __updateControllerData() {
+    if (!this.app) return;
     this.app.meta.module._monkeyModuleSync(true, 'controllerDataUpdate', undefined, this);
   }
 }
@@ -3443,17 +3444,22 @@ const ClientOnly = defineComponent({
   }
 });
 
+const SymbolTypeSSRRenderOriginal = Symbol('SymbolTypeSSRRenderOriginal');
+const SymbolTypeSSRRenderResetCount = Symbol('SymbolTypeSSRRenderResetCount');
 class CtxComponent extends BeanSimple {
   constructor(...args) {
     super(...args);
     this._bean_render_original = void 0;
+    this._instance_ssrRender_original = void 0;
+    this._renderPatched = false;
+    this._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 (...args) {
       if (instance.isUnmounted) return;
       if (!self.ctx.meta.state.inited.state) {
@@ -3474,16 +3480,42 @@ 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 */
   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;
   }
   _getRender() {
     const render = this.bean._getBeanSyncOnly(BeanControllerIdentifier);
@@ -3584,18 +3616,22 @@ class CtxUtil extends BeanSimple {
     if (this.ctx.disposed) {
       throwErrorComponentUnmounted();
     }
-    const reset = setCurrentInstance(this.ctx.instance);
-    if (!tracking) {
-      pauseTracking();
-    }
-    try {
-      return fn();
-    } finally {
+    const instance = this.ctx.instance;
+    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;
   }
 }
 
@@ -4017,8 +4053,8 @@ 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);
         });
       }
     }
@@ -4028,13 +4064,13 @@ 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);
             }
           });
         }
@@ -4043,13 +4079,13 @@ 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);
         }
       });
     }
@@ -4064,8 +4100,8 @@ 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);
         });
       }
     }
@@ -4075,13 +4111,13 @@ 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);
             }
           });
         }
@@ -4090,13 +4126,13 @@ 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);
         }
       });
     }