@finesoft/front 0.1.38 → 0.1.39

package/dist/browser.d.cts

@@ -173,6 +173,88 @@ interface MakeDependenciesOptions {
 }
 declare function makeDependencies(container: Container, options?: MakeDependenciesOptions): void;
 
+/**
+ * BasePage — 所有页面共享的基础属性
+ *
+ * 具体页面类型由应用层定义并扩展此接口。
+ */
+interface BasePage {
+    id: string;
+    pageType: string;
+    title: string;
+    description?: string;
+    url?: string;
+}
+
+/**
+ * Navigation Middleware — 类型定义
+ *
+ * 两阶段导航中间件管线：
+ * 1. beforeLoad — 路由匹配后、数据加载前（认证守卫、权限检查、早期重定向）
+ * 2. afterLoad  — 数据加载后、渲染前（URL 规范化、基于数据的守卫）
+ *
+ * SSR 和 CSR 共享同一套中间件定义。
+ */
+
+/** 导航上下文（beforeLoad 阶段可用） */
+interface NavigationContext {
+    /** 完整 URL（path + query） */
+    readonly url: string;
+    /** 仅路径部分 */
+    readonly path: string;
+    /** 路由参数 + 查询参数 */
+    readonly params: Record<string, string>;
+    /** 匹配的 Intent */
+    readonly intent: Intent;
+    /** 是否在服务端运行 */
+    readonly isServer: boolean;
+    /** DI 容器（可获取自定义服务） */
+    readonly container: Container;
+    /** 获取 Cookie 值（两端均可用） */
+    getCookie(name: string): string | undefined;
+    /** 获取请求头值（仅服务端有值，客户端始终返回 undefined） */
+    getHeader(name: string): string | undefined;
+}
+/** 后置上下文（afterLoad 阶段，包含页面数据） */
+interface PostLoadContext extends NavigationContext {
+    /** 控制器返回的页面数据 */
+    readonly page: BasePage;
+}
+/** 继续执行下一个中间件 */
+interface NextResult {
+    readonly kind: "next";
+}
+/** 重定向（服务端: HTTP 301/302，客户端: 触发新导航） */
+interface RedirectResult {
+    readonly kind: "redirect";
+    readonly url: string;
+    readonly status: number;
+}
+/** URL 重写（服务端: HTTP 301，客户端: replaceState 仅更新地址栏） */
+interface RewriteResult {
+    readonly kind: "rewrite";
+    readonly url: string;
+}
+/** 拒绝访问 */
+interface DenyResult {
+    readonly kind: "deny";
+    readonly status: number;
+    readonly message: string;
+}
+type MiddlewareResult = NextResult | RedirectResult | RewriteResult | DenyResult;
+/** 继续执行 */
+declare function next(): NextResult;
+/** 重定向到新 URL */
+declare function redirect(url: string, status?: 301 | 302): RedirectResult;
+/** URL 重写（不重新加载数据） */
+declare function rewrite(url: string): RewriteResult;
+/** 拒绝访问 */
+declare function deny(status?: number, message?: string): DenyResult;
+/** beforeLoad 守卫：路由匹配后、数据加载前 */
+type BeforeLoadGuard = (ctx: NavigationContext) => MiddlewareResult | Promise<MiddlewareResult>;
+/** afterLoad 守卫：数据加载后、渲染前 */
+type AfterLoadGuard = (ctx: PostLoadContext) => MiddlewareResult | Promise<MiddlewareResult>;
+
 /**
  * URL 路由器 — URL pattern → Intent + FlowAction
  */
@@ -182,11 +264,21 @@ interface RouteMatch {
     intent: Intent;
     action: FlowAction;
     renderMode?: string;
+    /** 该路由绑定的 beforeLoad 守卫 */
+    beforeGuards?: BeforeLoadGuard[];
+    /** 该路由绑定的 afterLoad 守卫 */
+    afterGuards?: AfterLoadGuard[];
+}
+/** 路由添加选项 */
+interface RouteAddOptions {
+    renderMode?: string;
+    beforeGuards?: BeforeLoadGuard[];
+    afterGuards?: AfterLoadGuard[];
 }
 declare class Router {
     private routes;
     /** 添加路由规则 */
-    add(pattern: string, intentId: string, renderMode?: string): this;
+    add(pattern: string, intentId: string, renderModeOrOptions?: string | RouteAddOptions): this;
     /** 解析 URL → RouteMatch */
     resolve(urlOrPath: string): RouteMatch | null;
     /** 获取所有已注册的路由 */
@@ -253,19 +345,6 @@ declare class ConsoleLoggerFactory implements LoggerFactory {
 declare function shouldLog(name: string, level: Level): boolean;
 declare function resetFilterCache(): void;
 
-/**
- * BasePage — 所有页面共享的基础属性
- *
- * 具体页面类型由应用层定义并扩展此接口。
- */
-interface BasePage {
-    id: string;
-    pageType: string;
-    title: string;
-    description?: string;
-    url?: string;
-}
-
 /**
  * PrefetchedIntents — SSR 数据缓存
  *
@@ -315,6 +394,8 @@ declare class Framework {
     readonly actionDispatcher: ActionDispatcher;
     readonly router: Router;
     readonly prefetchedIntents: PrefetchedIntents;
+    private readonly beforeGuards;
+    private readonly afterGuards;
     private constructor();
     /** 创建并初始化 Framework 实例 */
     static create(config?: FrameworkConfig): Framework;
@@ -330,6 +411,14 @@ declare class Framework {
     onAction<A extends Action>(kind: string, handler: ActionHandler<A>): void;
     /** 注册 Intent Controller */
     registerIntent(controller: IntentController): void;
+    /** 注册 beforeLoad 守卫（路由匹配后、数据加载前） */
+    beforeLoad(guard: BeforeLoadGuard): void;
+    /** 注册 afterLoad 守卫（数据加载后、渲染前） */
+    afterLoad(guard: AfterLoadGuard): void;
+    /** 执行所有 beforeLoad 守卫（全局 → 路由级） */
+    runBeforeLoad(ctx: NavigationContext, routeGuards?: BeforeLoadGuard[]): Promise<MiddlewareResult>;
+    /** 执行所有 afterLoad 守卫（全局 → 路由级） */
+    runAfterLoad(ctx: PostLoadContext, routeGuards?: AfterLoadGuard[]): Promise<MiddlewareResult>;
     /** 销毁 Framework 实例 */
     dispose(): void;
 }
@@ -555,6 +644,16 @@ interface RouteDefinition {
      * - "prerender": 预渲染（构建时生成静态 HTML + ISR 缓存）
      */
     renderMode?: RenderMode;
+    /**
+     * 路由级 beforeLoad 守卫（可选）。
+     * 在全局守卫之后执行，仅对匹配此路由的请求生效。
+     */
+    beforeLoad?: BeforeLoadGuard[];
+    /**
+     * 路由级 afterLoad 守卫（可选）。
+     * 在全局守卫之后执行，仅对匹配此路由的请求生效。
+     */
+    afterLoad?: AfterLoadGuard[];
 }
 /**
  * 声明式注册路由和 Controller
@@ -617,6 +716,40 @@ declare function buildUrl(path: string, params?: Record<string, string | undefin
  */
 declare function generateUuid(): string;
 
+/**
+ * Navigation Context — 构建器
+ *
+ * 为 SSR（服务端）和 Browser（客户端）两种环境创建统一的 NavigationContext。
+ */
+
+interface ServerContextOptions {
+    url: string;
+    intent: Intent;
+    container: Container;
+    /** 原始 Request 对象（提取 cookie 和 header） */
+    request?: Request;
+}
+/** 从 Request 对象构建服务端上下文 */
+declare function createServerContext(options: ServerContextOptions): NavigationContext;
+interface BrowserContextOptions {
+    url: string;
+    intent: Intent;
+    container: Container;
+}
+/** 从 document.cookie 构建浏览器端上下文 */
+declare function createBrowserContext(options: BrowserContextOptions): NavigationContext;
+
+/**
+ * Guard Pipeline — 顺序执行守卫链
+ *
+ * 按注册顺序执行守卫，遇到第一个非 `next` 结果立即短路返回。
+ */
+
+/** 执行 beforeLoad 守卫链 */
+declare function runBeforeLoadGuards(guards: BeforeLoadGuard[], ctx: NavigationContext): Promise<MiddlewareResult>;
+/** 执行 afterLoad 守卫链 */
+declare function runAfterLoadGuards(guards: AfterLoadGuard[], ctx: PostLoadContext): Promise<MiddlewareResult>;
+
 /**
  * ExternalUrl Action Handler — 外部链接处理器
  */
@@ -768,4 +901,4 @@ declare function deserializeServerData(): PrefetchedIntent[] | undefined;
  */
 declare function createPrefetchedIntentsFromDom(): PrefetchedIntents;
 
-export { ACTION_KINDS, type Action, ActionDispatcher, type ActionHandler, type ActionHandlerDependencies, type AsyncMapper, BaseController, type BaseItem, BaseLogger, type BasePage, type BaseShelf, type BrowserAppConfig, CompositeLogger, CompositeLoggerFactory, type CompoundAction, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, type ExternalUrlAction, type ExternalUrlDependencies, type FeatureFlags, type FlowAction, type FlowActionCallbacks, type FlowActionDependencies, Framework, type FrameworkConfig, History, HttpClient, type HttpClientConfig, HttpError, type Intent, type IntentController, IntentDispatcher, type Locale, type Logger, type LoggerFactory, type Logger as LoggerInterface, LruMap, type Mapper, type MetricsRecorder, type Net, type None, type Optional, type PrefetchedIntent, PrefetchedIntents, type RenderMode, type RouteDefinition, type RouteMatch, Router, type Storage, buildUrl, createPrefetchedIntentsFromDom, defineRoutes, deserializeServerData, generateUuid, getBaseUrl, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, mapEach, pipe, pipeAsync, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, removeHost, removeQueryParams, removeScheme, resetFilterCache, shouldLog, stableStringify, startBrowserApp, tryScroll };
+export { ACTION_KINDS, type Action, ActionDispatcher, type ActionHandler, type ActionHandlerDependencies, type AfterLoadGuard, type AsyncMapper, BaseController, type BaseItem, BaseLogger, type BasePage, type BaseShelf, type BeforeLoadGuard, type BrowserAppConfig, type BrowserContextOptions, CompositeLogger, CompositeLoggerFactory, type CompoundAction, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, type DenyResult, type ExternalUrlAction, type ExternalUrlDependencies, type FeatureFlags, type FlowAction, type FlowActionCallbacks, type FlowActionDependencies, Framework, type FrameworkConfig, History, HttpClient, type HttpClientConfig, HttpError, type Intent, type IntentController, IntentDispatcher, type Locale, type Logger, type LoggerFactory, type Logger as LoggerInterface, LruMap, type Mapper, type MetricsRecorder, type MiddlewareResult, type NavigationContext, type Net, type NextResult, type None, type Optional, type PostLoadContext, type PrefetchedIntent, PrefetchedIntents, type RedirectResult, type RenderMode, type RewriteResult, type RouteAddOptions, type RouteDefinition, type RouteMatch, Router, type ServerContextOptions, type Storage, buildUrl, createBrowserContext, createPrefetchedIntentsFromDom, createServerContext, defineRoutes, deny, deserializeServerData, generateUuid, getBaseUrl, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, mapEach, next, pipe, pipeAsync, redirect, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, removeHost, removeQueryParams, removeScheme, resetFilterCache, rewrite, runAfterLoadGuards, runBeforeLoadGuards, shouldLog, stableStringify, startBrowserApp, tryScroll };

package/dist/browser.d.ts

@@ -173,6 +173,88 @@ interface MakeDependenciesOptions {
 }
 declare function makeDependencies(container: Container, options?: MakeDependenciesOptions): void;
 
+/**
+ * BasePage — 所有页面共享的基础属性
+ *
+ * 具体页面类型由应用层定义并扩展此接口。
+ */
+interface BasePage {
+    id: string;
+    pageType: string;
+    title: string;
+    description?: string;
+    url?: string;
+}
+
+/**
+ * Navigation Middleware — 类型定义
+ *
+ * 两阶段导航中间件管线：
+ * 1. beforeLoad — 路由匹配后、数据加载前（认证守卫、权限检查、早期重定向）
+ * 2. afterLoad  — 数据加载后、渲染前（URL 规范化、基于数据的守卫）
+ *
+ * SSR 和 CSR 共享同一套中间件定义。
+ */
+
+/** 导航上下文（beforeLoad 阶段可用） */
+interface NavigationContext {
+    /** 完整 URL（path + query） */
+    readonly url: string;
+    /** 仅路径部分 */
+    readonly path: string;
+    /** 路由参数 + 查询参数 */
+    readonly params: Record<string, string>;
+    /** 匹配的 Intent */
+    readonly intent: Intent;
+    /** 是否在服务端运行 */
+    readonly isServer: boolean;
+    /** DI 容器（可获取自定义服务） */
+    readonly container: Container;
+    /** 获取 Cookie 值（两端均可用） */
+    getCookie(name: string): string | undefined;
+    /** 获取请求头值（仅服务端有值，客户端始终返回 undefined） */
+    getHeader(name: string): string | undefined;
+}
+/** 后置上下文（afterLoad 阶段，包含页面数据） */
+interface PostLoadContext extends NavigationContext {
+    /** 控制器返回的页面数据 */
+    readonly page: BasePage;
+}
+/** 继续执行下一个中间件 */
+interface NextResult {
+    readonly kind: "next";
+}
+/** 重定向（服务端: HTTP 301/302，客户端: 触发新导航） */
+interface RedirectResult {
+    readonly kind: "redirect";
+    readonly url: string;
+    readonly status: number;
+}
+/** URL 重写（服务端: HTTP 301，客户端: replaceState 仅更新地址栏） */
+interface RewriteResult {
+    readonly kind: "rewrite";
+    readonly url: string;
+}
+/** 拒绝访问 */
+interface DenyResult {
+    readonly kind: "deny";
+    readonly status: number;
+    readonly message: string;
+}
+type MiddlewareResult = NextResult | RedirectResult | RewriteResult | DenyResult;
+/** 继续执行 */
+declare function next(): NextResult;
+/** 重定向到新 URL */
+declare function redirect(url: string, status?: 301 | 302): RedirectResult;
+/** URL 重写（不重新加载数据） */
+declare function rewrite(url: string): RewriteResult;
+/** 拒绝访问 */
+declare function deny(status?: number, message?: string): DenyResult;
+/** beforeLoad 守卫：路由匹配后、数据加载前 */
+type BeforeLoadGuard = (ctx: NavigationContext) => MiddlewareResult | Promise<MiddlewareResult>;
+/** afterLoad 守卫：数据加载后、渲染前 */
+type AfterLoadGuard = (ctx: PostLoadContext) => MiddlewareResult | Promise<MiddlewareResult>;
+
 /**
  * URL 路由器 — URL pattern → Intent + FlowAction
  */
@@ -182,11 +264,21 @@ interface RouteMatch {
     intent: Intent;
     action: FlowAction;
     renderMode?: string;
+    /** 该路由绑定的 beforeLoad 守卫 */
+    beforeGuards?: BeforeLoadGuard[];
+    /** 该路由绑定的 afterLoad 守卫 */
+    afterGuards?: AfterLoadGuard[];
+}
+/** 路由添加选项 */
+interface RouteAddOptions {
+    renderMode?: string;
+    beforeGuards?: BeforeLoadGuard[];
+    afterGuards?: AfterLoadGuard[];
 }
 declare class Router {
     private routes;
     /** 添加路由规则 */
-    add(pattern: string, intentId: string, renderMode?: string): this;
+    add(pattern: string, intentId: string, renderModeOrOptions?: string | RouteAddOptions): this;
     /** 解析 URL → RouteMatch */
     resolve(urlOrPath: string): RouteMatch | null;
     /** 获取所有已注册的路由 */
@@ -253,19 +345,6 @@ declare class ConsoleLoggerFactory implements LoggerFactory {
 declare function shouldLog(name: string, level: Level): boolean;
 declare function resetFilterCache(): void;
 
-/**
- * BasePage — 所有页面共享的基础属性
- *
- * 具体页面类型由应用层定义并扩展此接口。
- */
-interface BasePage {
-    id: string;
-    pageType: string;
-    title: string;
-    description?: string;
-    url?: string;
-}
-
 /**
  * PrefetchedIntents — SSR 数据缓存
  *
@@ -315,6 +394,8 @@ declare class Framework {
     readonly actionDispatcher: ActionDispatcher;
     readonly router: Router;
     readonly prefetchedIntents: PrefetchedIntents;
+    private readonly beforeGuards;
+    private readonly afterGuards;
     private constructor();
     /** 创建并初始化 Framework 实例 */
     static create(config?: FrameworkConfig): Framework;
@@ -330,6 +411,14 @@ declare class Framework {
     onAction<A extends Action>(kind: string, handler: ActionHandler<A>): void;
     /** 注册 Intent Controller */
     registerIntent(controller: IntentController): void;
+    /** 注册 beforeLoad 守卫（路由匹配后、数据加载前） */
+    beforeLoad(guard: BeforeLoadGuard): void;
+    /** 注册 afterLoad 守卫（数据加载后、渲染前） */
+    afterLoad(guard: AfterLoadGuard): void;
+    /** 执行所有 beforeLoad 守卫（全局 → 路由级） */
+    runBeforeLoad(ctx: NavigationContext, routeGuards?: BeforeLoadGuard[]): Promise<MiddlewareResult>;
+    /** 执行所有 afterLoad 守卫（全局 → 路由级） */
+    runAfterLoad(ctx: PostLoadContext, routeGuards?: AfterLoadGuard[]): Promise<MiddlewareResult>;
     /** 销毁 Framework 实例 */
     dispose(): void;
 }
@@ -555,6 +644,16 @@ interface RouteDefinition {
      * - "prerender": 预渲染（构建时生成静态 HTML + ISR 缓存）
      */
     renderMode?: RenderMode;
+    /**
+     * 路由级 beforeLoad 守卫（可选）。
+     * 在全局守卫之后执行，仅对匹配此路由的请求生效。
+     */
+    beforeLoad?: BeforeLoadGuard[];
+    /**
+     * 路由级 afterLoad 守卫（可选）。
+     * 在全局守卫之后执行，仅对匹配此路由的请求生效。
+     */
+    afterLoad?: AfterLoadGuard[];
 }
 /**
  * 声明式注册路由和 Controller
@@ -617,6 +716,40 @@ declare function buildUrl(path: string, params?: Record<string, string | undefin
  */
 declare function generateUuid(): string;
 
+/**
+ * Navigation Context — 构建器
+ *
+ * 为 SSR（服务端）和 Browser（客户端）两种环境创建统一的 NavigationContext。
+ */
+
+interface ServerContextOptions {
+    url: string;
+    intent: Intent;
+    container: Container;
+    /** 原始 Request 对象（提取 cookie 和 header） */
+    request?: Request;
+}
+/** 从 Request 对象构建服务端上下文 */
+declare function createServerContext(options: ServerContextOptions): NavigationContext;
+interface BrowserContextOptions {
+    url: string;
+    intent: Intent;
+    container: Container;
+}
+/** 从 document.cookie 构建浏览器端上下文 */
+declare function createBrowserContext(options: BrowserContextOptions): NavigationContext;
+
+/**
+ * Guard Pipeline — 顺序执行守卫链
+ *
+ * 按注册顺序执行守卫，遇到第一个非 `next` 结果立即短路返回。
+ */
+
+/** 执行 beforeLoad 守卫链 */
+declare function runBeforeLoadGuards(guards: BeforeLoadGuard[], ctx: NavigationContext): Promise<MiddlewareResult>;
+/** 执行 afterLoad 守卫链 */
+declare function runAfterLoadGuards(guards: AfterLoadGuard[], ctx: PostLoadContext): Promise<MiddlewareResult>;
+
 /**
  * ExternalUrl Action Handler — 外部链接处理器
  */
@@ -768,4 +901,4 @@ declare function deserializeServerData(): PrefetchedIntent[] | undefined;
  */
 declare function createPrefetchedIntentsFromDom(): PrefetchedIntents;
 
-export { ACTION_KINDS, type Action, ActionDispatcher, type ActionHandler, type ActionHandlerDependencies, type AsyncMapper, BaseController, type BaseItem, BaseLogger, type BasePage, type BaseShelf, type BrowserAppConfig, CompositeLogger, CompositeLoggerFactory, type CompoundAction, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, type ExternalUrlAction, type ExternalUrlDependencies, type FeatureFlags, type FlowAction, type FlowActionCallbacks, type FlowActionDependencies, Framework, type FrameworkConfig, History, HttpClient, type HttpClientConfig, HttpError, type Intent, type IntentController, IntentDispatcher, type Locale, type Logger, type LoggerFactory, type Logger as LoggerInterface, LruMap, type Mapper, type MetricsRecorder, type Net, type None, type Optional, type PrefetchedIntent, PrefetchedIntents, type RenderMode, type RouteDefinition, type RouteMatch, Router, type Storage, buildUrl, createPrefetchedIntentsFromDom, defineRoutes, deserializeServerData, generateUuid, getBaseUrl, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, mapEach, pipe, pipeAsync, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, removeHost, removeQueryParams, removeScheme, resetFilterCache, shouldLog, stableStringify, startBrowserApp, tryScroll };
+export { ACTION_KINDS, type Action, ActionDispatcher, type ActionHandler, type ActionHandlerDependencies, type AfterLoadGuard, type AsyncMapper, BaseController, type BaseItem, BaseLogger, type BasePage, type BaseShelf, type BeforeLoadGuard, type BrowserAppConfig, type BrowserContextOptions, CompositeLogger, CompositeLoggerFactory, type CompoundAction, ConsoleLogger, ConsoleLoggerFactory, Container, DEP_KEYS, type DenyResult, type ExternalUrlAction, type ExternalUrlDependencies, type FeatureFlags, type FlowAction, type FlowActionCallbacks, type FlowActionDependencies, Framework, type FrameworkConfig, History, HttpClient, type HttpClientConfig, HttpError, type Intent, type IntentController, IntentDispatcher, type Locale, type Logger, type LoggerFactory, type Logger as LoggerInterface, LruMap, type Mapper, type MetricsRecorder, type MiddlewareResult, type NavigationContext, type Net, type NextResult, type None, type Optional, type PostLoadContext, type PrefetchedIntent, PrefetchedIntents, type RedirectResult, type RenderMode, type RewriteResult, type RouteAddOptions, type RouteDefinition, type RouteMatch, Router, type ServerContextOptions, type Storage, buildUrl, createBrowserContext, createPrefetchedIntentsFromDom, createServerContext, defineRoutes, deny, deserializeServerData, generateUuid, getBaseUrl, isCompoundAction, isExternalUrlAction, isFlowAction, isNone, isSome, makeDependencies, makeExternalUrlAction, makeFlowAction, mapEach, next, pipe, pipeAsync, redirect, registerActionHandlers, registerExternalUrlHandler, registerFlowActionHandler, removeHost, removeQueryParams, removeScheme, resetFilterCache, rewrite, runAfterLoadGuards, runBeforeLoadGuards, shouldLog, stableStringify, startBrowserApp, tryScroll };

package/dist/browser.js

@@ -7,7 +7,7 @@ import {
   registerFlowActionHandler,
   startBrowserApp,
   tryScroll
-} from "./chunk-PHDR7PIL.js";
+} from "./chunk-4PPCVAKZ.js";
 import {
   ACTION_KINDS,
   ActionDispatcher,
@@ -27,7 +27,10 @@ import {
   PrefetchedIntents,
   Router,
   buildUrl,
+  createBrowserContext,
+  createServerContext,
   defineRoutes,
+  deny,
   generateUuid,
   getBaseUrl,
   isCompoundAction,
@@ -39,15 +42,20 @@ import {
   makeExternalUrlAction,
   makeFlowAction,
   mapEach,
+  next,
   pipe,
   pipeAsync,
+  redirect,
   removeHost,
   removeQueryParams,
   removeScheme,
   resetFilterCache,
+  rewrite,
+  runAfterLoadGuards,
+  runBeforeLoadGuards,
   shouldLog,
   stableStringify
-} from "./chunk-OXKFPW4U.js";
+} from "./chunk-SDPWQT2T.js";
 export {
   ACTION_KINDS,
   ActionDispatcher,
@@ -68,8 +76,11 @@ export {
   PrefetchedIntents,
   Router,
   buildUrl,
+  createBrowserContext,
   createPrefetchedIntentsFromDom,
+  createServerContext,
   defineRoutes,
+  deny,
   deserializeServerData,
   generateUuid,
   getBaseUrl,
@@ -82,8 +93,10 @@ export {
   makeExternalUrlAction,
   makeFlowAction,
   mapEach,
+  next,
   pipe,
   pipeAsync,
+  redirect,
   registerActionHandlers,
   registerExternalUrlHandler,
   registerFlowActionHandler,
@@ -91,6 +104,9 @@ export {
   removeQueryParams,
   removeScheme,
   resetFilterCache,
+  rewrite,
+  runAfterLoadGuards,
+  runBeforeLoadGuards,
   shouldLog,
   stableStringify,
   startBrowserApp,

package/dist/{chunk-PHDR7PIL.js → chunk-4PPCVAKZ.js}

@@ -4,8 +4,9 @@ import {
   Framework,
   LruMap,
   PrefetchedIntents,
+  createBrowserContext,
   generateUuid
-} from "./chunk-OXKFPW4U.js";
+} from "./chunk-SDPWQT2T.js";
 
 // ../browser/src/action-handlers/external-url-action.ts
 function registerExternalUrlHandler(deps) {
@@ -169,31 +170,49 @@ function registerFlowActionHandler(deps) {
   const { framework, log, callbacks, updateApp } = deps;
   let isFirstPage = true;
   let navigationId = 0;
+  const MAX_REDIRECTS = 5;
   const defaultGetScrollable = () => document.getElementById("scrollable-page-override") || document.getElementById("scrollable-page") || document.documentElement;
   const history = new History(log, {
     getScrollablePageElement: deps.getScrollablePageElement ?? defaultGetScrollable
   });
-  framework.onAction(ACTION_KINDS.FLOW, async (action) => {
-    const flowAction = action;
-    const url = flowAction.url;
-    log.debug(`FlowAction \u2192 ${url}`);
-    if (flowAction.presentationContext === "modal") {
-      const match2 = framework.routeUrl(url);
-      if (match2) {
-        const page = await framework.dispatch(
-          match2.intent
-        );
-        callbacks.onModal(page);
-      }
+  async function navigateTo(url, redirectCount, thisNav) {
+    if (redirectCount >= MAX_REDIRECTS) {
+      log.error(
+        `Navigation redirect loop detected (${MAX_REDIRECTS} redirects), stopping at: ${url}`
+      );
       return;
     }
-    const thisNav = ++navigationId;
     const shouldReplace = isFirstPage || url === window.location.pathname + window.location.search;
     const match = framework.routeUrl(url);
     if (!match) {
       log.warn(`FlowAction: no route for ${url}`);
       return;
     }
+    const navCtx = createBrowserContext({
+      url,
+      intent: match.intent,
+      container: framework.container
+    });
+    const beforeResult = await framework.runBeforeLoad(
+      navCtx,
+      match.beforeGuards
+    );
+    if (beforeResult.kind === "redirect") {
+      log.debug(`beforeLoad \u2192 redirect to ${beforeResult.url}`);
+      await navigateTo(beforeResult.url, redirectCount + 1, thisNav);
+      return;
+    }
+    if (beforeResult.kind === "deny") {
+      log.warn(
+        `beforeLoad \u2192 denied (${beforeResult.status}): ${beforeResult.message}`
+      );
+      return;
+    }
+    if (beforeResult.kind === "rewrite") {
+      log.debug(`beforeLoad \u2192 rewrite to ${beforeResult.url}`);
+      await navigateTo(beforeResult.url, redirectCount + 1, thisNav);
+      return;
+    }
     const pagePromise = framework.dispatch(
       match.intent
     );
@@ -209,12 +228,33 @@ function registerFlowActionHandler(deps) {
     history.beforeTransition();
     updateApp({
       page: pagePromise.then(
-        (page) => {
+        async (page) => {
           if (thisNav !== navigationId) {
             log.info("FlowAction commit superseded", url);
             return page;
           }
-          const canonicalURL = url;
+          const postCtx = {
+            ...navCtx,
+            page
+          };
+          const afterResult = await framework.runAfterLoad(
+            postCtx,
+            match.afterGuards
+          );
+          if (afterResult.kind === "redirect") {
+            log.debug(`afterLoad \u2192 redirect to ${afterResult.url}`);
+            navigateTo(afterResult.url, redirectCount + 1, thisNav);
+            return page;
+          }
+          let canonicalURL = url;
+          if (afterResult.kind === "rewrite") {
+            canonicalURL = afterResult.url;
+            log.debug(`afterLoad \u2192 rewrite URL to ${canonicalURL}`);
+          }
+          if (afterResult.kind === "deny") {
+            log.warn(`afterLoad \u2192 denied (${afterResult.status})`);
+            return page;
+          }
           if (shouldReplace) {
             history.replaceState({ page }, canonicalURL);
           } else {
@@ -244,6 +284,23 @@ function registerFlowActionHandler(deps) {
       isFirstPage
     });
     isFirstPage = false;
+  }
+  framework.onAction(ACTION_KINDS.FLOW, async (action) => {
+    const flowAction = action;
+    const url = flowAction.url;
+    log.debug(`FlowAction \u2192 ${url}`);
+    if (flowAction.presentationContext === "modal") {
+      const match = framework.routeUrl(url);
+      if (match) {
+        const page = await framework.dispatch(
+          match.intent
+        );
+        callbacks.onModal(page);
+      }
+      return;
+    }
+    const thisNav = ++navigationId;
+    await navigateTo(url, 0, thisNav);
   });
   history.onPopState(async (url, cachedState) => {
     log.debug(`popstate \u2192 ${url}, cached=${!!cachedState}`);
@@ -268,6 +325,30 @@ function registerFlowActionHandler(deps) {
       });
       return;
     }
+    const navCtx = createBrowserContext({
+      url: parsed.pathname + parsed.search,
+      intent: routeMatch.intent,
+      container: framework.container
+    });
+    const beforeResult = await framework.runBeforeLoad(
+      navCtx,
+      routeMatch.beforeGuards
+    );
+    if (beforeResult.kind === "redirect") {
+      log.debug(`popstate beforeLoad \u2192 redirect to ${beforeResult.url}`);
+      const thisNav = ++navigationId;
+      await navigateTo(beforeResult.url, 0, thisNav);
+      return;
+    }
+    if (beforeResult.kind === "deny" || beforeResult.kind === "rewrite") {
+      if (beforeResult.kind === "deny") {
+        log.warn(`popstate beforeLoad \u2192 denied`);
+      } else {
+        const thisNav = ++navigationId;
+        await navigateTo(beforeResult.url, 0, thisNav);
+      }
+      return;
+    }
     const pagePromise = framework.dispatch(
       routeMatch.intent
     );
@@ -379,4 +460,4 @@ export {
   createPrefetchedIntentsFromDom,
   startBrowserApp
 };
-//# sourceMappingURL=chunk-PHDR7PIL.js.map
+//# sourceMappingURL=chunk-4PPCVAKZ.js.map