cabloy 5.1.166 → 5.1.167

package/zova/src/suite-vendor/a-zova/modules/a-router/src/.metadata/index.ts

@@ -26,7 +26,7 @@ declare module 'zova-module-a-router' {
 }
 /** model: end */
 /** model: begin */
-import { ModelPageData } from '../model/pageData.js';
+import type { ModelPageData } from '../model/pageData.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -57,7 +57,7 @@ declare module 'zova-module-a-router' {
 }
 /** sys: end */
 /** sys: begin */
-import { SysRouter } from '../bean/sys.router.js';
+import type { SysRouter } from '../bean/sys.router.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -89,8 +89,8 @@ declare module 'zova-module-a-router' {
 }
 /** bean: end */
 /** bean: begin */
-import { BeanRouter } from '../bean/bean.router.js';
-import { BeanRouterGuardsBase } from '../bean/bean.routerGuardsBase.js';
+import type { BeanRouter } from '../bean/bean.router.js';
+import type { BeanRouterGuardsBase } from '../bean/bean.routerGuardsBase.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -126,7 +126,7 @@ declare module 'zova-module-a-router' {
 }
 /** service: end */
 /** service: begin */
-import { ServiceRouterGuards } from '../service/routerGuards.js';
+import type { ServiceRouterGuards } from '../service/routerGuards.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
@@ -151,7 +151,7 @@ declare module 'zova-module-a-router' {
 }
 /** controller: end */
 /** controller: begin */
-import { ControllerRouterViewEmpty } from '../component/routerViewEmpty/controller.jsx';
+import type { ControllerRouterViewEmpty } from '../component/routerViewEmpty/controller.jsx';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordLocal {

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

@@ -3,6 +3,7 @@ import type {
   NavigationHookAfter,
   RouteLocationNormalizedLoadedGeneric,
   Router,
+  RouterOptions,
 } from '@cabloy/vue-router';
 
 import { BeanBase, TypeEventOff, Use } from 'zova';
@@ -14,6 +15,13 @@ import { IPageMeta } from '../types/pageMeta.js';
 import { TypeErrorListener } from '../types/router.js';
 import { SysRouter } from './sys.router.js';
 
+export interface BeanRouterInitOptions {
+  mainRouter?: boolean;
+  routerOptions?: RouterOptions;
+  prepareNavigation?: (to: unknown) => Promise<void> | void;
+  embeddedView?: 'page';
+}
+
 export interface BeanRouter extends Omit<
   SysRouter,
   '$beanFullName' | '$onionName' | '$onionOptions'
@@ -24,6 +32,7 @@ export class BeanRouter extends BeanBase {
   private _vueRouterApp: Router;
   private _eventRouterGuards: TypeEventOff[] = [];
   private _routerViews: BeanRouterViewBase[] = [];
+  private _disposed = false;
 
   @Use()
   $$sysRouter: SysRouter;
@@ -35,10 +44,42 @@ export class BeanRouter extends BeanBase {
     return this._vueRouterApp;
   }
 
+  get isEmbedded() {
+    return this._isEmbedded;
+  }
+
+  private _isEmbedded = false;
+  private _embeddedView?: 'page';
+  private _prepareNavigation?: (to: unknown) => Promise<void> | void;
+
+  /**
+   * Returns the initial RouterView depth for an embedded page-only host.
+   *
+   * SysRouter records the synthetic layout parents it creates. The page-only
+   * host skips only those exact records; routes registered with
+   * `meta.layout: false` still start at depth zero.
+   */
+  public getEmbeddedRouterViewDepth(route: RouteLocationNormalizedLoadedGeneric): number {
+    if (this._embeddedView !== 'page') return 0;
+    return this.$$sysRouter.isSyntheticLayoutRouteRecord(route.matched[0]) ? 1 : 0;
+  }
+
+  public dispose() {
+    this.__dispose__();
+  }
+
   protected __dispose__() {
+    if (this._disposed) return;
+    this._disposed = true;
     for (const fn of this._eventRouterGuards) {
       fn();
     }
+    this._eventRouterGuards = [];
+    this._routerViews = [];
+    const router = this._vueRouterApp as Router & {
+      __prepareNavigation?: (to: unknown) => Promise<void> | void;
+    };
+    if (router) router.__prepareNavigation = undefined;
   }
 
   protected __get__(prop: string) {
@@ -48,10 +89,21 @@ export class BeanRouter extends BeanBase {
     return this.$$sysRouter?.[prop];
   }
 
-  protected async __init__(mainRouter?: boolean) {
+  protected async __init__(mainRouterOrOptions?: boolean | BeanRouterInitOptions) {
+    const options: BeanRouterInitOptions =
+      typeof mainRouterOrOptions === 'boolean'
+        ? { mainRouter: mainRouterOrOptions }
+        : (mainRouterOrOptions ?? {});
+    this._isEmbedded = options.mainRouter === false;
+    this._embeddedView = options.embeddedView;
+    this._prepareNavigation = options.prepareNavigation;
     // create router
-    this._vueRouterApp = this.$$sysRouter.createRouter();
-    if (!mainRouter) {
+    this._vueRouterApp = this.$$sysRouter.createRouter(options.routerOptions);
+    const router = this._vueRouterApp as Router & {
+      __prepareNavigation?: (to: unknown) => Promise<void> | void;
+    };
+    router.__prepareNavigation = this._prepareNavigation;
+    if (!options.mainRouter) {
       // emit event
       await this.app.meta.event.emit('a-router:routerGuards', this);
     }
@@ -59,6 +111,11 @@ export class BeanRouter extends BeanBase {
 
   addRouterView(routerView: BeanRouterViewBase) {
     this._routerViews.push(routerView);
+    if (!this._isEmbedded) return;
+    const route = this._vueRouterApp.currentRoute.value;
+    if (route?.matched.length > 0) {
+      routerView.forwardRoute(route);
+    }
   }
 
   removeRouterView(routerView: BeanRouterViewBase) {

package/zova/src/suite-vendor/a-zova/modules/a-router/src/bean/sys.router.ts

@@ -33,6 +33,7 @@ export interface SysRouter extends Router {}
 @Sys()
 export class SysRouter extends BeanBase {
   private _vueRouterSys: Router;
+  private _syntheticLayoutRouteNames = new Set<string>();
 
   get router(): Router {
     return this._vueRouterSys;
@@ -92,6 +93,14 @@ export class SysRouter extends BeanBase {
     return this.sys.meta.component.createAsyncComponent(component);
   }
 
+  public isSyntheticLayoutRouteRecord(record: RouteLocationMatched | undefined) {
+    const canonicalRecord = record?.aliasOf ?? record;
+    return (
+      typeof canonicalRecord?.name === 'string' &&
+      this._syntheticLayoutRouteNames.has(canonicalRecord.name)
+    );
+  }
+
   public getPagePath<K extends keyof IPagePathRecord>(
     path: K,
     options?: IPagePathRecord[K],
@@ -392,5 +401,8 @@ export class SysRouter extends BeanBase {
     }
     // add
     this.router.addRoute(routeData);
+    if (routeNameParent) {
+      this._syntheticLayoutRouteNames.add(routeNameParent);
+    }
   }
 }

package/zova/src/suite-vendor/a-zova/modules/a-router/src/component/routerViewEmpty/controller.tsx

@@ -14,7 +14,10 @@ export class ControllerRouterViewEmpty extends BeanRouterViewBase {
     const slots = {
       default: component => {
         const vnode = h(component.Component);
-        cast(vnode).zovaHostProviders = { [pageRouteKey]: component.route };
+        cast(vnode).zovaHostProviders = {
+          [pageRouteKey]: component.route,
+          'a-router.bean.router': this.$router,
+        };
         return vnode;
       },
     };

package/zova/src/suite-vendor/a-zova/modules/a-router/src/lib/routerViewBase.tsx

@@ -47,8 +47,12 @@ export class BeanRouterViewBase extends BeanControllerBase implements IRouterVie
           default: () => {
             const vnode = h(component.Component as any, {
               key: routeMeta.componentKey,
+              route: component.route,
             });
-            cast(vnode).zovaHostProviders = { [pageRouteKey]: component.route };
+            cast(vnode).zovaHostProviders = {
+              [pageRouteKey]: component.route,
+              'a-router.bean.router': this.$router,
+            };
             return [
               h(
                 KeepAlive,

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.157",
+  "version": "5.1.158",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "zova-module-a-meta": "^5.1.22",
     "zova-module-a-model": "^5.1.36",
     "zova-module-a-openapi": "^5.1.53",
-    "zova-module-a-router": "^5.1.34",
+    "zova-module-a-router": "^5.1.35",
     "zova-module-a-routerstack": "^5.1.27",
     "zova-module-a-routertabs": "^5.1.34",
     "zova-module-a-ssr": "^5.1.38",