cabloy 5.1.172 → 5.1.174

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/monkey.ts

@@ -2,6 +2,7 @@ import type { IModule } from '@cabloy/module-info';
 import type {
   BeanBase,
   BeanContainer,
+  IControllerLoadEvent,
   IMonkeyAppContextInitialize,
   IMonkeyAppInitialize,
   IMonkeyBeanInit,
@@ -23,11 +24,22 @@ export class Monkey
 {
   appContextInitialize(ctx: ZovaContext): void {
     ctx.meta.$ssr = ctx.app.ctx.meta.$ssr;
+    if (process.env.CLIENT) {
+      ctx.meta.$ssr.handleDirectOrOnHydrated(() => {
+        if (!ctx.disposed) {
+          ctx.meta.hooks.invokeHook('hydrated');
+        }
+      });
+    }
     if (process.env.SERVER) {
       ctx.meta.$ssr._registerServerContext(ctx);
     }
   }
 
+  controllerLoad(event: IControllerLoadEvent) {
+    event.ctx.meta.$ssr.controllerLoad(event);
+  }
+
   async appInitialize() {
     this.app.meta.event.on('a-router:routerGuards', async (router, next) => {
       if (process.env.CLIENT) {
@@ -104,8 +116,16 @@ export class Monkey
 
   private _ssrErrorHandler() {
     if (!process.env.SERVER) return;
-    const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', (_data, next) => {
+    const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', (data, next) => {
       const err = next();
+      if (data.load?.kind === 'controller-load') {
+        if (_isLoadErrorHandledServer(data.err)) {
+          data.load.disposition = 'handled';
+          if (!err || !(err instanceof Error)) return err;
+          return this._errorHandlerDefaultServer(err);
+        }
+        return err;
+      }
       if (!err || !(err instanceof Error)) return err;
       return this._errorHandlerDefaultServer(err);
     });
@@ -133,3 +153,7 @@ export class Monkey
     return undefined;
   }
 }
+
+function _isLoadErrorHandledServer(err: Error) {
+  return isNavigationFailure(err) || [301, 302, 401].includes(Number((err as any).code));
+}

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/types/ssr.ts

@@ -66,7 +66,21 @@ export interface SSRContextState {
   ssrProfile?: TypeSsrProfile;
   ssrProfileOptions?: Readonly<ISsrProfileOptions>;
 }
-export interface SSRContextStateDefer {}
+export interface SSRControllerLoadErrorSnapshot {
+  version: 1;
+  controllerBeanName?: string;
+  name: string;
+  message: string;
+  code?: number | string;
+  status?: number | string;
+  pagePath?: string;
+  url?: string;
+  controllerRecorded: boolean;
+}
+
+export interface SSRContextStateDefer {
+  controllerLoad?: Record<string, SSRControllerLoadErrorSnapshot>;
+}
 
 // from: quasar/dist/types/meta.d.ts
 // Cannot use `Record<string, string>` as TS would error out about `template` signature

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.104",
+  "version": "5.1.105",
   "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.89"
+    "zova-jsx": "^1.1.90"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.29",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.161",
+  "version": "5.1.162",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "dependencies": {
     "zova-module-a-api": "^5.1.22",
     "zova-module-a-app": "^5.1.26",
-    "zova-module-a-bean": "^5.1.35",
+    "zova-module-a-bean": "^5.1.36",
     "zova-module-a-behavior": "^5.1.26",
     "zova-module-a-behaviors": "^5.1.22",
     "zova-module-a-boundary": "^5.1.22",
@@ -21,18 +21,18 @@
     "zova-module-a-interceptor": "^5.1.31",
     "zova-module-a-logger": "^5.1.28",
     "zova-module-a-meta": "^5.1.22",
-    "zova-module-a-model": "^5.1.36",
+    "zova-module-a-model": "^5.1.37",
     "zova-module-a-openapi": "^5.1.54",
-    "zova-module-a-router": "^5.1.37",
+    "zova-module-a-router": "^5.1.38",
     "zova-module-a-routerstack": "^5.1.29",
     "zova-module-a-routertabs": "^5.1.34",
-    "zova-module-a-ssr": "^5.1.39",
+    "zova-module-a-ssr": "^5.1.40",
     "zova-module-a-ssrhmr": "^5.1.23",
     "zova-module-a-ssrserver": "^5.1.26",
     "zova-module-a-style": "^5.1.35",
     "zova-module-a-table": "^5.1.43",
     "zova-module-a-zod": "^5.1.37",
-    "zova-module-a-zova": "^5.1.104"
+    "zova-module-a-zova": "^5.1.105"
   },
   "title": "a-zova"
 }