cabloy 5.1.51 → 5.1.53

package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/src/service/ssrHandler.ts

@@ -72,42 +72,83 @@ export class ServiceSsrHandler extends BeanBase {
         onRenderedList.push(fn);
       },
     };
-    // render
-    const renderFn = await serverEntry(ssrContext);
-    const [runtimePageContent, err] = await catchError(() => {
-      return renderToString(renderFn, ssrContext);
-    });
+    let renderFn;
+    let runtimePageContent = '';
+    let renderedError;
+    let onRenderedFlushed = false;
+    let renderedFinalized = false;
+    try {
+      // render
+      renderFn = await serverEntry(ssrContext);
+      const [runtimePageContentInner, err] = await catchError(() => {
+        return renderToString(renderFn, ssrContext);
+      });
+      if (runtimePageContentInner) {
+        runtimePageContent = runtimePageContentInner as string;
+      }
 
-    const error = ssrContext._meta.renderError ?? err;
-    onRenderedList.forEach(fn => {
-      fn(error);
-    });
-    cast(ssrContext).rendered(error);
-    if (error) {
-      if (error instanceof Error) throw error;
-      return error;
-    }
+      const error = ssrContext._meta.renderError ?? err;
+      renderedError = error;
+      onRenderedList.forEach(fn => {
+        fn(error);
+      });
+      onRenderedFlushed = true;
+      cast(ssrContext).rendered(error);
+      renderedFinalized = true;
+      if (error) {
+        if (error instanceof Error) throw error;
+        return error;
+      }
 
-    ssrContext._meta.runtimePageContent = runtimePageContent;
+      ssrContext._meta.runtimePageContent = runtimePageContent;
+
+      // @vitejs/plugin-vue injects code into a component's setup() that registers
+      // itself on ctx.modules. After the render, ctx.modules would contain all the
+      // components that have been instantiated during this render call.
+      const modules = cast(ssrContext).modules;
+      if (modules) {
+        ssrContext._meta.endingHeadTags += this._renderModulesPreload_zova(modules, {
+          ssrContext,
+        });
+        ssrContext._meta.endingHeadTags += this._renderModulesPreload(modules, {
+          ssrContext,
+        });
+      }
 
-    // @vitejs/plugin-vue injects code into a component's setup() that registers
-    // itself on ctx.modules. After the render, ctx.modules would contain all the
-    // components that have been instantiated during this render call.
-    ssrContext._meta.endingHeadTags += this._renderModulesPreload_zova(cast(ssrContext).modules, {
-      ssrContext,
-    });
-    ssrContext._meta.endingHeadTags += this._renderModulesPreload(cast(ssrContext).modules, {
-      ssrContext,
-    });
+      const html = renderTemplate(ssrContext);
 
-    const html = renderTemplate(ssrContext);
+      // transferCache
+      await this._renderTransferCache(options, route);
 
-    // transferCache
-    await this._renderTransferCache(options, route);
+      // todo: ssg
 
-    // todo: ssg
+      return html;
+    } finally {
+      const context = cast(ssrContext);
+      if (!onRenderedFlushed) {
+        onRenderedList.forEach(fn => {
+          fn(renderedError);
+        });
+      }
+      if (!renderedFinalized && typeof context.rendered === 'function') {
+        context.rendered(renderedError);
+      }
+      onRenderedList.length = 0;
+      this._clearSsrContext(context);
+      renderFn = undefined;
+    }
+  }
 
-    return html;
+  private _clearSsrContext(context): void {
+    context.modules?.clear?.();
+    if (context.__qMetaList?.length) {
+      context.__qMetaList.length = 0;
+    }
+    context.state = undefined;
+    context.stateDefer = undefined;
+    context.performAction = undefined;
+    context.rendered = undefined;
+    context._meta = undefined;
   }
 
   public async ensureReady(handlerNonce: number) {

package/zova/src/suite-vendor/a-zova/modules/a-style/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-style",
-  "version": "5.1.25",
+  "version": "5.1.26",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "style",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-style/src/bean/bean.theme.ts

@@ -66,7 +66,7 @@ export class BeanTheme extends BeanModelBase {
     }
 
     // not use watch.immediate for await done
-    await this._applyThemeWrapper();
+    await this._applyInitialThemeAndSsrDualOutput();
   }
 
   protected __dispose__() {
@@ -77,9 +77,12 @@ export class BeanTheme extends BeanModelBase {
     this._dark = this._getDarkFromDarkMode(this.darkMode);
   }
 
-  async _applyThemeWrapper() {
+  async _applyInitialThemeAndSsrDualOutput() {
+    // When server-side theme cookies are disabled, apply twice during SSR initialization so the
+    // server emits both data-ssr-theme-dark-false/true markers and the browser can resolve the
+    // final data-theme during bootstrap.
     await this._applyTheme();
-    if (this.sys.config.ssr.ignoreCookieOnServer) {
+    if (this.sys.config.ssr.cookieDisabledOnServer) {
       this.toggleDark();
       await this._applyTheme();
     }

package/zova/src/suite-vendor/a-zova/modules/a-zod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zod",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-zod/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `a-zod::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.60",
+  "version": "5.1.62",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.54"
+    "zova-jsx": "^1.1.56"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.14",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.92",
+  "version": "5.1.94",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -18,21 +18,21 @@
     "zova-module-a-fetch": "^5.1.17",
     "zova-module-a-form": "^5.1.32",
     "zova-module-a-icon": "^5.1.20",
-    "zova-module-a-interceptor": "^5.1.22",
+    "zova-module-a-interceptor": "^5.1.23",
     "zova-module-a-logger": "^5.1.20",
     "zova-module-a-meta": "^5.1.15",
-    "zova-module-a-model": "^5.1.23",
-    "zova-module-a-openapi": "^5.1.30",
+    "zova-module-a-model": "^5.1.24",
+    "zova-module-a-openapi": "^5.1.31",
     "zova-module-a-router": "^5.1.23",
     "zova-module-a-routerstack": "^5.1.20",
     "zova-module-a-routertabs": "^5.1.25",
-    "zova-module-a-ssr": "^5.1.18",
+    "zova-module-a-ssr": "^5.1.20",
     "zova-module-a-ssrhmr": "^5.1.16",
-    "zova-module-a-ssrserver": "^5.1.15",
-    "zova-module-a-style": "^5.1.25",
+    "zova-module-a-ssrserver": "^5.1.16",
+    "zova-module-a-style": "^5.1.26",
     "zova-module-a-table": "^5.1.27",
-    "zova-module-a-zod": "^5.1.23",
-    "zova-module-a-zova": "^5.1.60"
+    "zova-module-a-zod": "^5.1.24",
+    "zova-module-a-zova": "^5.1.62"
   },
   "title": "a-zova"
 }