zova-module-a-router 5.1.41 → 5.1.43

package/dist/.metadata/component/routerViewEmpty.d.ts

@@ -1,4 +1,4 @@
-import { ControllerRouterViewEmpty } from '../../component/routerViewEmpty/controller.jsx';
+import { ControllerRouterViewEmpty } from '../../component/routerViewEmpty/controller.tsx';
 export type ZRouterViewEmptyProps = {
     controllerRef?: (ref: ControllerRouterViewEmpty) => void;
 };

package/dist/.metadata/index.d.ts

@@ -1,6 +1,6 @@
 /** model: begin */
-export * from '../model/pageData.js';
-import { IModelOptionsPageData } from '../model/pageData.js';
+export * from '../model/pageData.ts';
+import { IModelOptionsPageData } from '../model/pageData.ts';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
     interface IModelRecord {
@@ -18,7 +18,7 @@ declare module 'zova-module-a-router' {
 }
 /** model: end */
 /** model: begin */
-import type { ModelPageData } from '../model/pageData.js';
+import type { ModelPageData } from '../model/pageData.ts';
 import 'zova';
 declare module 'zova' {
     interface IBeanRecordGeneral {
@@ -27,7 +27,7 @@ declare module 'zova' {
 }
 /** model: end */
 /** sys: begin */
-export * from '../bean/sys.router.js';
+export * from '../bean/sys.router.ts';
 import 'zova';
 declare module 'zova' {
 }
@@ -41,7 +41,7 @@ declare module 'zova-module-a-router' {
 }
 /** sys: end */
 /** sys: begin */
-import type { SysRouter } from '../bean/sys.router.js';
+import type { SysRouter } from '../bean/sys.router.ts';
 import 'zova';
 declare module 'zova' {
     interface IBeanRecordGeneral {
@@ -50,8 +50,8 @@ declare module 'zova' {
 }
 /** sys: end */
 /** bean: begin */
-export * from '../bean/bean.router.js';
-export * from '../bean/bean.routerGuardsBase.js';
+export * from '../bean/bean.router.ts';
+export * from '../bean/bean.routerGuardsBase.ts';
 import 'zova';
 declare module 'zova' {
 }
@@ -65,8 +65,8 @@ declare module 'zova-module-a-router' {
 }
 /** bean: end */
 /** bean: begin */
-import type { BeanRouter } from '../bean/bean.router.js';
-import type { BeanRouterGuardsBase } from '../bean/bean.routerGuardsBase.js';
+import type { BeanRouter } from '../bean/bean.router.ts';
+import type { BeanRouterGuardsBase } from '../bean/bean.routerGuardsBase.ts';
 import 'zova';
 declare module 'zova' {
     interface IBeanRecordGeneral {
@@ -76,7 +76,7 @@ declare module 'zova' {
 }
 /** bean: end */
 /** service: begin */
-export * from '../service/routerGuards.js';
+export * from '../service/routerGuards.ts';
 import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
     interface IServiceRecord {
@@ -93,7 +93,7 @@ declare module 'zova-module-a-router' {
 }
 /** service: end */
 /** service: begin */
-import type { ServiceRouterGuards } from '../service/routerGuards.js';
+import type { ServiceRouterGuards } from '../service/routerGuards.ts';
 import 'zova';
 declare module 'zova' {
     interface IBeanRecordGeneral {
@@ -102,7 +102,7 @@ declare module 'zova' {
 }
 /** service: end */
 /** controller: begin */
-export * from '../component/routerViewEmpty/controller.jsx';
+export * from '../component/routerViewEmpty/controller.tsx';
 import 'zova';
 declare module 'zova' {
 }
@@ -112,7 +112,7 @@ declare module 'zova-module-a-router' {
 }
 /** controller: end */
 /** controller: begin */
-import type { ControllerRouterViewEmpty } from '../component/routerViewEmpty/controller.jsx';
+import type { ControllerRouterViewEmpty } from '../component/routerViewEmpty/controller.tsx';
 import 'zova';
 declare module 'zova' {
     interface IBeanRecordLocal {
@@ -121,8 +121,8 @@ declare module 'zova' {
 }
 /** controller: end */
 /** components: begin */
-export * from './component/routerViewEmpty.js';
-import { ZRouterViewEmpty } from './component/routerViewEmpty.js';
+export * from './component/routerViewEmpty.ts';
+import { ZRouterViewEmpty } from './component/routerViewEmpty.ts';
 export declare const components: {
     routerViewEmpty: import("vue").DefineSetupFnComponent<import("zova-module-a-router").ZRouterViewEmptyProps, import("vue").EmitsOptions, import("vue").SlotsType<Record<string, any>>, import("zova-module-a-router").ZRouterViewEmptyProps & ({
         [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
@@ -141,14 +141,14 @@ declare module 'zova' {
 }
 /** components: end */
 /** config: begin */
-export * from '../config/config.js';
-import { config } from '../config/config.js';
+export * from '../config/config.ts';
+import { config } from '../config/config.ts';
 /** config: end */
 /** monkey: begin */
-export * from '../monkey.js';
+export * from '../monkey.ts';
 /** monkey: end */
 /** monkeySys: begin */
-export * from '../monkeySys.js';
+export * from '../monkeySys.ts';
 /** monkeySys: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, TypeModuleConfig } from 'zova';

package/dist/.metadata/this.d.ts

@@ -1,3 +1,3 @@
 export declare const __ThisModule__ = "a-router";
-export { ScopeModuleARouter as ScopeModule } from './index.js';
+export { ScopeModuleARouter as ScopeModule } from './index.ts';
 //# sourceMappingURL=this.d.ts.map

package/dist/bean/bean.router.d.ts

@@ -1,10 +1,11 @@
 import type { NavigationGuardWithThis, NavigationHookAfter, RouteLocationNormalizedLoadedGeneric, Router, RouterOptions } from '@cabloy/vue-router';
 import { BeanBase } from 'zova';
-import { BeanRouterViewBase } from '../lib/routerViewBase.js';
-import { ModelPageData } from '../model/pageData.js';
-import { IPageMeta } from '../types/pageMeta.js';
-import { TypeErrorListener } from '../types/router.js';
-import { SysRouter } from './sys.router.js';
+import { BeanRouterViewBase } from '../lib/routerViewBase.tsx';
+import { ModelPageData } from '../model/pageData.ts';
+import { IPageMeta } from '../types/pageMeta.ts';
+import { IRouteDiscardItem, TypeRouteDiscardReason } from '../types/routeDiscard.ts';
+import { TypeErrorListener } from '../types/router.ts';
+import { SysRouter } from './sys.router.ts';
 export interface BeanRouterInitOptions {
     mainRouter?: boolean;
     routerOptions?: RouterOptions;
@@ -39,6 +40,7 @@ export declare class BeanRouter extends BeanBase {
     protected __init__(mainRouterOrOptions?: boolean | BeanRouterInitOptions): Promise<void>;
     addRouterView(routerView: BeanRouterViewBase): void;
     removeRouterView(routerView: BeanRouterViewBase): void;
+    notifyRouteDiscard(reason: TypeRouteDiscardReason, items: readonly IRouteDiscardItem[], ownerSelector?: string): Promise<void>;
     afterEachBackRoute(route: RouteLocationNormalizedLoadedGeneric): void;
     afterEachForwardRoute(route: RouteLocationNormalizedLoadedGeneric): void;
     beforeEach(guard: NavigationGuardWithThis<undefined>): () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"bean.router.d.ts","sourceRoot":"","sources":["../../src/bean/bean.router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACnB,oCAAoC,EACpC,MAAM,EACN,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAO,MAAM,MAAM,CAAC;AAIrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI,CACtC,SAAS,EACT,eAAe,GAAG,YAAY,GAAG,eAAe,CACjD;CAAG;AAEJ,qBACa,UAAW,SAAQ,QAAQ;IACtC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,SAAS,CAAS;IAG1B,WAAW,EAAE,SAAS,CAAC;IAGvB,eAAe,EAAE,aAAa,CAAC;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,UAAU,YAEb;IAED,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAwC;IAEnE;;;;;;OAMG;IACI,0BAA0B,CAAC,KAAK,EAAE,oCAAoC,GAAG,MAAM;IAK/E,OAAO;IAWd,SAAS,CAAC,WAAW;IAKrB,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;cAOd,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,qBAAqB;IAoB9E,aAAa,CAAC,UAAU,EAAE,kBAAkB;IAS5C,gBAAgB,CAAC,UAAU,EAAE,kBAAkB;IAO/C,kBAAkB,CAAC,KAAK,EAAE,oCAAoC;IAO9D,qBAAqB,CAAC,KAAK,EAAE,oCAAoC;IAOjE,UAAU,CAAC,KAAK,EAAE,uBAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI;IAIjE,aAAa,CAAC,KAAK,EAAE,uBAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI;IAIpE,SAAS,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,IAAI;IAIjD,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,IAAI;IAI/C,WAAW,CAAC,KAAK,EAAE,oCAAoC,EAAE,QAAQ,EAAE,SAAS;CAK7E"}
+{"version":3,"file":"bean.router.d.ts","sourceRoot":"","sources":["../../src/bean/bean.router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACnB,oCAAoC,EACpC,MAAM,EACN,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAO,MAAM,MAAM,CAAC;AAKrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI,CACtC,SAAS,EACT,eAAe,GAAG,YAAY,GAAG,eAAe,CACjD;CAAG;AAEJ,qBACa,UAAW,SAAQ,QAAQ;IACtC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,SAAS,CAAS;IAG1B,WAAW,EAAE,SAAS,CAAC;IAGvB,eAAe,EAAE,aAAa,CAAC;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,UAAU,YAEb;IAED,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAwC;IAEnE;;;;;;OAMG;IACI,0BAA0B,CAAC,KAAK,EAAE,oCAAoC,GAAG,MAAM;IAK/E,OAAO;IAWd,SAAS,CAAC,WAAW;IAKrB,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;cAOd,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,qBAAqB;IAoB9E,aAAa,CAAC,UAAU,EAAE,kBAAkB;IAS5C,gBAAgB,CAAC,UAAU,EAAE,kBAAkB;IAO/C,kBAAkB,CAChB,MAAM,EAAE,sBAAsB,EAC9B,KAAK,EAAE,SAAS,iBAAiB,EAAE,EACnC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;IAQhB,kBAAkB,CAAC,KAAK,EAAE,oCAAoC;IAO9D,qBAAqB,CAAC,KAAK,EAAE,oCAAoC;IAOjE,UAAU,CAAC,KAAK,EAAE,uBAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI;IAIjE,aAAa,CAAC,KAAK,EAAE,uBAAuB,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI;IAIpE,SAAS,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,IAAI;IAIjD,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,IAAI;IAI/C,WAAW,CAAC,KAAK,EAAE,oCAAoC,EAAE,QAAQ,EAAE,SAAS;CAK7E"}

package/dist/bean/bean.routerGuardsBase.d.ts

@@ -1,5 +1,5 @@
 import { BeanBase } from 'zova';
-import type { BeanRouter } from './bean.router.js';
+import type { BeanRouter } from './bean.router.ts';
 export declare class BeanRouterGuardsBase extends BeanBase {
     private _eventRouterGuards;
     protected __init__(): Promise<void>;

package/dist/bean/sys.router.d.ts

@@ -1,6 +1,6 @@
 import type { RouteLocationMatched, RouteLocationNormalizedLoaded, RouteLocationNormalizedLoadedGeneric, RouteLocationResolvedGeneric, Router, RouterOptions } from '@cabloy/vue-router';
 import { BeanBase } from 'zova';
-import { IModuleRouteComponent, IPageNameRecord, IPagePathRecord } from '../types/router.js';
+import { IModuleRouteComponent, IPageNameRecord, IPagePathRecord } from '../types/router.ts';
 export interface SysRouter extends Router {
 }
 export declare class SysRouter extends BeanBase {

package/dist/component/routerViewEmpty/controller.d.ts

@@ -1,4 +1,4 @@
-import { BeanRouterViewBase } from '../../lib/routerViewBase.js';
+import { BeanRouterViewBase } from '../../lib/routerViewBase.tsx';
 export declare class ControllerRouterViewEmpty extends BeanRouterViewBase {
     protected __init__(): Promise<void>;
     protected render(): import("vue/jsx-runtime").JSX.Element;

package/dist/component/routerViewEmpty/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/component/routerViewEmpty/controller.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,qBACa,yBAA0B,SAAQ,kBAAkB;cAC/C,QAAQ;IAExB,SAAS,CAAC,MAAM;CAajB"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/component/routerViewEmpty/controller.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,qBACa,yBAA0B,SAAQ,kBAAkB;cAC/C,QAAQ;IAExB,SAAS,CAAC,MAAM;CAajB"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './.metadata/index.js';
-export * from './lib/index.js';
-export * from './types/index.js';
+export * from './.metadata/index.ts';
+export * from './lib/index.ts';
+export * from './types/index.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -350,6 +350,26 @@ var SysRouter = (_dec$5 = Sys(), _dec2$5 = BeanInfo({ module: "a-router" }), _de
 	}
 }) || _class$5) || _class$5);
 //#endregion
+//#region src/lib/routeDiscard.ts
+function dispatchRouteDiscard(event, emit, onError) {
+	const cleanups = [];
+	const items = event.items.map((item) => ({ ...item }));
+	try {
+		emit({
+			...event,
+			items,
+			waitUntil: (cleanup) => {
+				cleanups.push(cleanup);
+			}
+		});
+	} catch (error) {
+		onError(error);
+	}
+	return Promise.allSettled(cleanups).then((results) => {
+		for (const result of results) if (result.status === "rejected") onError(result.reason);
+	});
+}
+//#endregion
 //#region src/lib/routerGuardDisposers.ts
 var RouterGuardDisposers = class {
 	constructor() {
@@ -460,6 +480,14 @@ var BeanRouter = (_dec$4 = Bean(), _dec2$4 = BeanInfo({ module: "a-router" }), _
 		const index = this._routerViews.findIndex((item) => item === routerView);
 		if (index > -1) this._routerViews.splice(index, 1);
 	}
+	notifyRouteDiscard(reason, items, ownerSelector) {
+		return dispatchRouteDiscard({
+			router: this,
+			reason,
+			items,
+			ownerSelector
+		}, (event) => this.app.meta.event.emitSync("a-router:routeDiscard", event), () => console.error("Route discard cleanup failed"));
+	}
 	afterEachBackRoute(route) {
 		for (const routerView of this._routerViews) if (routerView.backRoute(route)) break;
 	}
@@ -583,7 +611,9 @@ var ServiceRouterGuards = (_dec$2 = Service(), _dec2$2 = BeanInfo({ module: "a-r
 	}
 	_afterEachFrom(router, from, info) {
 		if (!info) return;
-		if (!(info.type === NavigationType.pop && info.direction === NavigationDirection.back || info.type === NavigationType.push && info.replace)) return;
+		const isBack = info.type === NavigationType.pop && info.direction === NavigationDirection.back;
+		if (!(isBack || info.type === NavigationType.push && info.replace)) return;
+		if (isBack) router.notifyRouteDiscard("back", [{ fullPath: from.fullPath }]);
 		router.afterEachBackRoute(from);
 	}
 	async _prepareCheck(pathMatched, pathTo) {
@@ -987,8 +1017,6 @@ function _fixReturnTo(app, returnTo) {
 }
 //#endregion
 //#region src/.metadata/index.ts
-/** monkeySys: end */
-/** scope: begin */
 var _dec;
 var _dec2;
 var _class;