@alepha/react 0.9.2 → 0.9.4

package/dist/index.d.cts

@@ -1,21 +1,15 @@
-import * as _alepha_core2 from "@alepha/core";
-import * as _alepha_core16 from "@alepha/core";
-import * as _alepha_core0$1 from "@alepha/core";
-import * as _alepha_core6 from "@alepha/core";
-import * as _alepha_core0 from "@alepha/core";
+import * as _alepha_core14 from "@alepha/core";
 import { Alepha, Async, Descriptor, KIND, Service, State, Static, TObject, TSchema } from "@alepha/core";
-import { ApiLinksResponse, RequestConfigSchema, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
-import * as react0$1 from "react";
-import * as react0 from "react";
-import * as react1 from "react";
-import React, { AnchorHTMLAttributes, ErrorInfo, FC, PropsWithChildren, ReactNode } from "react";
-import { ServerRouteCache } from "@alepha/server-cache";
+import { RequestConfigSchema, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
+import * as _alepha_logger1 from "@alepha/logger";
+import { DateTimeProvider } from "@alepha/datetime";
 import { ClientScope, HttpVirtualClient, LinkProvider, VirtualAction } from "@alepha/server-links";
 import { Root } from "react-dom/client";
 import { Route, RouterProvider } from "@alepha/router";
-import * as react_jsx_runtime1 from "react/jsx-runtime";
+import * as react0 from "react";
+import React, { AnchorHTMLAttributes, CSSProperties, ErrorInfo, FC, PropsWithChildren, ReactNode } from "react";
+import { ServerRouteCache } from "@alepha/server-cache";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
-import * as react_jsx_runtime2 from "react/jsx-runtime";
 import { ServerStaticProvider } from "@alepha/server-static";
 
 //#region src/components/ClientOnly.d.ts
@@ -35,6 +29,17 @@ interface ClientOnlyProps {
  */
 declare const ClientOnly: (props: PropsWithChildren<ClientOnlyProps>) => ReactNode;
 //#endregion
+//#region src/errors/Redirection.d.ts
+/**
+ * Used for Redirection during the page loading.
+ *
+ * Depends on the context, it can be thrown or just returned.
+ */
+declare class Redirection extends Error {
+  readonly redirect: string;
+  constructor(redirect: string);
+}
+//#endregion
 //#region src/descriptors/$page.d.ts
 /**
  * Main descriptor for defining a React route in the application.
@@ -109,30 +114,81 @@ interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSch
   children?: Array<PageDescriptor> | (() => Array<PageDescriptor>);
   parent?: PageDescriptor<PageConfigSchema, TPropsParent>;
   can?: () => boolean;
-  errorHandler?: (error: Error) => ReactNode;
   /**
-   * If true, the page will be rendered on the build time.
-   * Works only with viteAlepha plugin.
+   * Catch any error from the `resolve` function or during `rendering`.
+   *
+   * Expected to return one of the following:
+   * - a ReactNode to render an error page
+   * - a Redirection to redirect the user
+   * - undefined to let the error propagate
+   *
+   * If not defined, the error will be thrown and handled by the server or client error handler.
+   * If a leaf $page does not define an error handler, the error can be caught by parent pages.
    *
+   * @example Catch a 404 from API and render a custom not found component:
+   * ```ts
+   * resolve: async ({ params, query }) => {
+   *    api.fetch("/api/resource", { params, query });
+   * },
+   * errorHandler: (error, context) => {
+   *   if (HttpError.is(error, 404)) {
+   *     return <ResourceNotFound />;
+   *   }
+   * }
+   * ```
+   *
+   * @example Catch an 401 error and redirect the user to the login page:
+   * ```ts
+   * resolve: async ({ params, query }) => {
+   *   // but the user is not authenticated
+   *   api.fetch("/api/resource", { params, query });
+   * },
+   * errorHandler: (error, context) => {
+   *   if (HttpError.is(error, 401)) {
+   *     // throwing a Redirection is also valid!
+   *     return new Redirection("/login");
+   *   }
+   * }
+   * ```
+   */
+  errorHandler?: ErrorHandler;
+  /**
+   * If true, the page will be considered as a static page, immutable and cacheable.
    * Replace boolean by an object to define static entries. (e.g. list of params/query)
+   *
+   * For now, it only works with `@alepha/vite` which can pre-render the page at build time.
+   *
+   * It will act as timeless cached page server-side. You can use `cache` to configure the cache behavior.
    */
   static?: boolean | {
     entries?: Array<Partial<PageRequestConfig<TConfig>>>;
   };
+  cache?: ServerRouteCache;
   /**
-   * If true, the page will be rendered on the client-side.
+   * If true, force the page to be rendered only on the client-side.
+   * It uses the `<ClientOnly/>` component to render the page.
    */
   client?: boolean | ClientOnlyProps;
-  afterHandler?: (request: ServerRequest) => any;
-  cache?: ServerRouteCache;
+  /**
+   * Called before the server response is sent to the client.
+   */
+  onServerResponse?: (request: ServerRequest) => any;
+  /**
+   * Called when user leaves the page. (browser only)
+   */
+  onLeave?: () => void;
 }
+type ErrorHandler = (error: Error, state: ReactRouterState) => ReactNode | Redirection | undefined;
 declare class PageDescriptor<TConfig extends PageConfigSchema = PageConfigSchema, TProps extends object = TPropsDefault, TPropsParent extends object = TPropsParentDefault> extends Descriptor<PageDescriptorOptions<TConfig, TProps, TPropsParent>> {
+  protected onInit(): void;
   get name(): string;
   /**
    * For testing or build purposes, this will render the page (with or without the HTML layout) and return the HTML and context.
    * Only valid for server-side rendering, it will throw an error if called on the client-side.
    */
   render(options?: PageDescriptorRenderOptions): Promise<PageDescriptorRenderResult>;
+  match(url: string): boolean;
+  pathname(config: any): string;
 }
 interface PageConfigSchema {
   query?: TSchema;
@@ -148,24 +204,23 @@ interface PageDescriptorRenderOptions {
 }
 interface PageDescriptorRenderResult {
   html: string;
-  context: PageReactContext;
+  state: ReactRouterState;
 }
 interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema> {
   params: TConfig["params"] extends TSchema ? Static<TConfig["params"]> : Record<string, string>;
   query: TConfig["query"] extends TSchema ? Static<TConfig["query"]> : Record<string, string>;
 }
-type PageResolve<TConfig extends PageConfigSchema = PageConfigSchema, TPropsParent extends object = TPropsParentDefault> = PageRequestConfig<TConfig> & TPropsParent & PageReactContext;
-//# sourceMappingURL=$page.d.ts.map
+type PageResolve<TConfig extends PageConfigSchema = PageConfigSchema, TPropsParent extends object = TPropsParentDefault> = PageRequestConfig<TConfig> & TPropsParent & Omit<ReactRouterState, "layers" | "onError">;
 //#endregion
-//#region src/providers/PageDescriptorProvider.d.ts
-declare const envSchema$1: _alepha_core2.TObject<{
-  REACT_STRICT_MODE: _alepha_core2.TBoolean;
+//#region src/providers/ReactPageProvider.d.ts
+declare const envSchema$2: _alepha_core14.TObject<{
+  REACT_STRICT_MODE: _alepha_core14.TBoolean;
 }>;
 declare module "@alepha/core" {
-  interface Env extends Partial<Static<typeof envSchema$1>> {}
+  interface Env extends Partial<Static<typeof envSchema$2>> {}
 }
-declare class PageDescriptorProvider {
-  protected readonly log: _alepha_core2.Logger;
+declare class ReactPageProvider {
+  protected readonly log: _alepha_logger1.Logger;
   protected readonly env: {
     REACT_STRICT_MODE: boolean;
   };
@@ -173,13 +228,23 @@ declare class PageDescriptorProvider {
   protected readonly pages: PageRoute[];
   getPages(): PageRoute[];
   page(name: string): PageRoute;
+  pathname(name: string, options?: {
+    params?: Record<string, string>;
+    query?: Record<string, string>;
+  }): string;
   url(name: string, options?: {
     params?: Record<string, string>;
-    base?: string;
+    host?: string;
   }): URL;
-  root(state: RouterState, context: PageReactContext): ReactNode;
-  createLayers(route: PageRoute, request: PageRequest): Promise<CreateLayersResult>;
-  protected getErrorHandler(route: PageRoute): ((error: Error) => ReactNode) | undefined;
+  root(state: ReactRouterState): ReactNode;
+  /**
+   * Create a new RouterState based on a given route and request.
+   * This method resolves the layers for the route, applying any query and params schemas defined in the route.
+   * It also handles errors and redirects.
+   */
+  createLayers(route: PageRoute, state: ReactRouterState, previous?: PreviousLayerData[]): Promise<CreateLayersResult>;
+  protected createRedirectionLayer(redirect: string): CreateLayersResult;
+  protected getErrorHandler(route: PageRoute): ErrorHandler | undefined;
   protected createElement(page: PageRoute, props: Record<string, any>): Promise<ReactNode>;
   renderError(error: Error): ReactNode;
   renderEmptyView(): ReactNode;
@@ -190,7 +255,7 @@ declare class PageDescriptorProvider {
   }, params?: Record<string, any>): string;
   compile(path: string, params?: Record<string, string>): string;
   protected renderView(index: number, path: string, view: ReactNode | undefined, page: PageRoute): ReactNode;
-  protected readonly configure: _alepha_core2.HookDescriptor<"configure">;
+  protected readonly configure: _alepha_core14.HookDescriptor<"configure">;
   protected map(pages: Array<PageDescriptor>, target: PageDescriptor): PageRouteEntry;
   add(entry: PageRouteEntry): void;
   protected createMatch(page: PageRoute): string;
@@ -226,17 +291,29 @@ interface Layer {
 type PreviousLayerData = Omit<Layer, "element" | "index" | "path">;
 interface AnchorProps {
   href: string;
-  onClick: (ev: any) => any;
+  onClick: (ev?: any) => any;
 }
-interface RouterState {
-  pathname: string;
-  search: string;
+interface ReactRouterState {
+  /**
+   * Stack of layers for the current page.
+   */
   layers: Array<Layer>;
-}
-interface TransitionOptions {
-  state?: RouterState;
-  previous?: PreviousLayerData[];
-  context?: PageReactContext;
+  /**
+   * URL of the current page.
+   */
+  url: URL;
+  /**
+   * Error handler for the current page.
+   */
+  onError: ErrorHandler;
+  /**
+   * Params extracted from the URL for the current page.
+   */
+  params: Record<string, any>;
+  /**
+   * Query parameters extracted from the URL for the current page.
+   */
+  query: Record<string, string>;
 }
 interface RouterStackItem {
   route: PageRoute;
@@ -245,82 +322,98 @@ interface RouterStackItem {
   error?: Error;
   cache?: boolean;
 }
-interface RouterRenderResult {
-  state: RouterState;
-  context: PageReactContext;
-  redirect?: string;
-}
-interface PageRequest extends PageReactContext {
-  params: Record<string, any>;
-  query: Record<string, string>;
+interface TransitionOptions {
   previous?: PreviousLayerData[];
 }
-interface CreateLayersResult extends RouterState {
+interface CreateLayersResult {
   redirect?: string;
-}
-/**
- * It's like RouterState, but publicly available in React context.
- * This is where we store all plugin data!
- */
-interface PageReactContext {
-  url: URL;
-  onError: (error: Error) => ReactNode;
-  links?: ApiLinksResponse;
+  state?: ReactRouterState;
 }
 //#endregion
-//#region src/providers/BrowserRouterProvider.d.ts
+//#region src/providers/ReactBrowserRouterProvider.d.ts
 interface BrowserRoute extends Route {
   page: PageRoute;
 }
-declare class BrowserRouterProvider extends RouterProvider<BrowserRoute> {
-  protected readonly log: _alepha_core16.Logger;
+declare class ReactBrowserRouterProvider extends RouterProvider<BrowserRoute> {
+  protected readonly log: _alepha_logger1.Logger;
   protected readonly alepha: Alepha;
-  protected readonly pageDescriptorProvider: PageDescriptorProvider;
+  protected readonly pageApi: ReactPageProvider;
   add(entry: PageRouteEntry): void;
-  protected readonly configure: _alepha_core16.HookDescriptor<"configure">;
-  transition(url: URL, options?: TransitionOptions): Promise<RouterRenderResult>;
-  root(state: RouterState, context: PageReactContext): ReactNode;
+  protected readonly configure: _alepha_core14.HookDescriptor<"configure">;
+  transition(url: URL, previous?: PreviousLayerData[]): Promise<string | void>;
+  root(state: ReactRouterState): ReactNode;
 }
-//# sourceMappingURL=BrowserRouterProvider.d.ts.map
 //#endregion
 //#region src/providers/ReactBrowserProvider.d.ts
+declare const envSchema$1: _alepha_core14.TObject<{
+  REACT_ROOT_ID: _alepha_core14.TString;
+}>;
+declare module "@alepha/core" {
+  interface Env extends Partial<Static<typeof envSchema$1>> {}
+}
+interface ReactBrowserRendererOptions {
+  scrollRestoration?: "top" | "manual";
+}
 declare class ReactBrowserProvider {
-  protected readonly log: _alepha_core0$1.Logger;
+  protected readonly env: {
+    REACT_ROOT_ID: string;
+  };
+  protected readonly log: _alepha_logger1.Logger;
   protected readonly client: LinkProvider;
   protected readonly alepha: Alepha;
-  protected readonly router: BrowserRouterProvider;
-  protected root: Root;
+  protected readonly router: ReactBrowserRouterProvider;
+  protected readonly dateTimeProvider: DateTimeProvider;
+  protected root?: Root;
+  options: ReactBrowserRendererOptions;
+  protected getRootElement(): HTMLElement;
   transitioning?: {
     to: string;
+    from?: string;
   };
-  state: RouterState;
+  get state(): ReactRouterState;
+  /**
+   * Accessor for Document DOM API.
+   */
   get document(): Document;
+  /**
+   * Accessor for History DOM API.
+   */
   get history(): History;
+  /**
+   * Accessor for Location DOM API.
+   */
   get location(): Location;
+  get base(): string;
   get url(): string;
-  pushState(url: string, replace?: boolean): void;
+  pushState(path: string, replace?: boolean): void;
   invalidate(props?: Record<string, any>): Promise<void>;
   go(url: string, options?: RouterGoOptions): Promise<void>;
   protected render(options?: {
     url?: string;
     previous?: PreviousLayerData[];
-  }): Promise<RouterRenderResult>;
+  }): Promise<void>;
   /**
    * Get embedded layers from the server.
    */
   protected getHydrationState(): ReactHydrationState | undefined;
-  readonly ready: _alepha_core0$1.HookDescriptor<"ready">;
+  protected readonly onTransitionEnd: _alepha_core14.HookDescriptor<"react:transition:end">;
+  readonly ready: _alepha_core14.HookDescriptor<"ready">;
 }
 interface RouterGoOptions {
   replace?: boolean;
   match?: TransitionOptions;
   params?: Record<string, string>;
+  query?: Record<string, string>;
+  /**
+   * Recreate the whole page, ignoring the current state.
+   */
+  force?: boolean;
 }
-interface ReactHydrationState {
+type ReactHydrationState = {
   layers?: Array<PreviousLayerData>;
-  links?: ApiLinksResponse;
-}
-//# sourceMappingURL=ReactBrowserProvider.d.ts.map
+} & {
+  [key: string]: any;
+};
 //#endregion
 //#region src/components/ErrorBoundary.d.ts
 /**
@@ -362,12 +455,22 @@ declare class ErrorBoundary extends React.Component<PropsWithChildren<ErrorBound
   render(): ReactNode;
 }
 //#endregion
+//#region src/components/ErrorViewer.d.ts
+interface ErrorViewerProps {
+  error: Error;
+  alepha: Alepha;
+}
+declare const ErrorViewer: ({
+  error,
+  alepha
+}: ErrorViewerProps) => react_jsx_runtime0.JSX.Element;
+//#endregion
 //#region src/components/Link.d.ts
 interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
-  to: string | PageDescriptor;
+  to: string;
   children?: React.ReactNode;
 }
-declare const Link: (props: LinkProps) => react_jsx_runtime1.JSX.Element | null;
+declare const Link: (props: LinkProps) => react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/NestedView.d.ts
 interface NestedViewProps {
@@ -397,66 +500,102 @@ interface NestedViewProps {
 declare const NestedView: (props: NestedViewProps) => react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/NotFound.d.ts
-declare function NotFoundPage(): react_jsx_runtime2.JSX.Element;
-//# sourceMappingURL=NotFound.d.ts.map
+declare function NotFoundPage(props: {
+  style?: CSSProperties;
+}): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/contexts/AlephaContext.d.ts
-declare const AlephaContext: react0$1.Context<Alepha | undefined>;
-//# sourceMappingURL=AlephaContext.d.ts.map
-//#endregion
-//#region src/contexts/RouterContext.d.ts
-interface RouterContextValue {
-  state: RouterState;
-  context: PageReactContext;
-}
-declare const RouterContext: react0.Context<RouterContextValue | undefined>;
-//# sourceMappingURL=RouterContext.d.ts.map
+declare const AlephaContext: react0.Context<Alepha | undefined>;
 //#endregion
 //#region src/contexts/RouterLayerContext.d.ts
 interface RouterLayerContextValue {
   index: number;
   path: string;
 }
-declare const RouterLayerContext: react1.Context<RouterLayerContextValue | undefined>;
-//# sourceMappingURL=RouterLayerContext.d.ts.map
+declare const RouterLayerContext: react0.Context<RouterLayerContextValue | undefined>;
 //#endregion
-//#region src/hooks/RouterHookApi.d.ts
-declare class RouterHookApi {
-  private readonly pages;
-  private readonly context;
-  private readonly state;
-  private readonly layer;
-  private readonly browser?;
-  constructor(pages: PageRoute[], context: PageReactContext, state: RouterState, layer: {
-    path: string;
-  }, browser?: ReactBrowserProvider | undefined);
+//#region src/hooks/useActive.d.ts
+interface UseActiveOptions {
+  href: string;
+  startWith?: boolean;
+}
+declare const useActive: (args: string | UseActiveOptions) => UseActiveHook;
+interface UseActiveHook {
+  isActive: boolean;
+  anchorProps: AnchorProps;
+  isPending: boolean;
+  name?: string;
+}
+//#endregion
+//#region src/hooks/useAlepha.d.ts
+/**
+ * Main Alepha hook.
+ *
+ * It provides access to the Alepha instance within a React component.
+ *
+ * With Alepha, you can access the core functionalities of the framework:
+ *
+ * - alepha.state() for state management
+ * - alepha.inject() for dependency injection
+ * - alepha.emit() for event handling
+ * etc...
+ */
+declare const useAlepha: () => Alepha;
+//#endregion
+//#region src/hooks/useClient.d.ts
+/**
+ * Hook to get a virtual client for the specified scope.
+ *
+ * It's the React-hook version of `$client()`, from `AlephaServerLinks` module.
+ */
+declare const useClient: <T extends object>(scope?: ClientScope) => HttpVirtualClient<T>;
+//#endregion
+//#region src/hooks/useInject.d.ts
+/**
+ * Hook to inject a service instance.
+ * It's a wrapper of `useAlepha().inject(service)` with a memoization.
+ */
+declare const useInject: <T extends object>(service: Service<T>) => T;
+//#endregion
+//#region src/hooks/useQueryParams.d.ts
+/**
+ * Not well tested. Use with caution.
+ */
+declare const useQueryParams: <T extends TObject>(schema: T, options?: UseQueryParamsHookOptions) => [Static<T>, (data: Static<T>) => void];
+interface UseQueryParamsHookOptions {
+  format?: "base64" | "querystring";
+  key?: string;
+  push?: boolean;
+}
+//#endregion
+//#region src/services/ReactRouter.d.ts
+declare class ReactRouter<T extends object> {
+  protected readonly alepha: Alepha;
+  protected readonly pageApi: ReactPageProvider;
+  get state(): ReactRouterState;
+  get pages(): PageRoute[];
+  get browser(): ReactBrowserProvider | undefined;
+  path(name: keyof VirtualRouter<T>, config?: {
+    params?: Record<string, string>;
+    query?: Record<string, string>;
+  }): string;
   getURL(): URL;
   get location(): Location;
-  get current(): RouterState;
+  get current(): ReactRouterState;
   get pathname(): string;
   get query(): Record<string, string>;
   back(): Promise<void>;
   forward(): Promise<void>;
   invalidate(props?: Record<string, any>): Promise<void>;
-  /**
-   * Create a valid href for the given pathname.
-   *
-   * @param pathname
-   * @param layer
-   */
-  createHref(pathname: HrefLike, layer?: {
-    path: string;
-  }, options?: {
-    params?: Record<string, any>;
-  }): string;
   go(path: string, options?: RouterGoOptions): Promise<void>;
-  go<T extends object>(path: keyof VirtualRouter<T>, options?: RouterGoOptions): Promise<void>;
+  go(path: keyof VirtualRouter<T>, options?: RouterGoOptions): Promise<void>;
   anchor(path: string, options?: {
     params?: Record<string, any>;
   }): AnchorProps;
-  anchor<T extends object>(path: keyof VirtualRouter<T>, options?: {
+  anchor(path: keyof VirtualRouter<T>, options?: {
     params?: Record<string, any>;
   }): AnchorProps;
+  base(path: string): string;
   /**
    * Set query params.
    *
@@ -470,75 +609,44 @@ declare class RouterHookApi {
     push?: boolean;
   }): void;
 }
-type HrefLike = string | {
-  options: {
-    path?: string;
-    name?: string;
-  };
-};
 type VirtualRouter<T> = { [K in keyof T as T[K] extends PageDescriptor ? K : never]: T[K] };
-//# sourceMappingURL=RouterHookApi.d.ts.map
-//#endregion
-//#region src/errors/RedirectionError.d.ts
-declare class RedirectionError extends Error {
-  readonly page: HrefLike;
-  constructor(page: HrefLike);
-}
-//# sourceMappingURL=RedirectionError.d.ts.map
-//#endregion
-//#region src/hooks/useActive.d.ts
-declare const useActive: (path: HrefLike) => UseActiveHook;
-interface UseActiveHook {
-  isActive: boolean;
-  anchorProps: AnchorProps;
-  isPending: boolean;
-  name?: string;
-}
-//# sourceMappingURL=useActive.d.ts.map
-//#endregion
-//#region src/hooks/useAlepha.d.ts
-declare const useAlepha: () => Alepha;
-//# sourceMappingURL=useAlepha.d.ts.map
-//#endregion
-//#region src/hooks/useClient.d.ts
-declare const useClient: <T extends object>(_scope?: ClientScope) => HttpVirtualClient<T>;
-//# sourceMappingURL=useClient.d.ts.map
-//#endregion
-//#region src/hooks/useInject.d.ts
-declare const useInject: <T extends object>(service: Service<T>) => T;
-//# sourceMappingURL=useInject.d.ts.map
-//#endregion
-//#region src/hooks/useQueryParams.d.ts
-interface UseQueryParamsHookOptions {
-  format?: "base64" | "querystring";
-  key?: string;
-  push?: boolean;
-}
-declare const useQueryParams: <T extends TObject>(schema: T, options?: UseQueryParamsHookOptions) => [Static<T>, (data: Static<T>) => void];
-//# sourceMappingURL=useQueryParams.d.ts.map
 //#endregion
 //#region src/hooks/useRouter.d.ts
-declare const useRouter: () => RouterHookApi;
-//# sourceMappingURL=useRouter.d.ts.map
+/**
+ * Use this hook to access the React Router instance.
+ *
+ * You can add a type parameter to specify the type of your application.
+ * This will allow you to use the router in a typesafe way.
+ *
+ * @example
+ * class App {
+ *   home = $page();
+ * }
+ *
+ * const router = useRouter<App>();
+ * router.go("home"); // typesafe
+ */
+declare const useRouter: <T extends object = any>() => ReactRouter<T>;
 //#endregion
 //#region src/hooks/useRouterEvents.d.ts
+/**
+ * Subscribe to various router events.
+ */
 declare const useRouterEvents: (opts?: {
   onBegin?: (ev: {
-    state: RouterState;
+    state: ReactRouterState;
   }) => void;
   onEnd?: (ev: {
-    state: RouterState;
+    state: ReactRouterState;
   }) => void;
   onError?: (ev: {
-    state: RouterState;
+    state: ReactRouterState;
     error: Error;
   }) => void;
 }, deps?: any[]) => void;
-//# sourceMappingURL=useRouterEvents.d.ts.map
 //#endregion
 //#region src/hooks/useRouterState.d.ts
-declare const useRouterState: () => RouterState;
-//# sourceMappingURL=useRouterState.d.ts.map
+declare const useRouterState: () => ReactRouterState;
 //#endregion
 //#region src/hooks/useSchema.d.ts
 declare const useSchema: <TConfig extends RequestConfigSchema>(action: VirtualAction<TConfig>) => UseSchemaReturn<TConfig>;
@@ -551,22 +659,20 @@ type UseSchemaReturn<TConfig extends RequestConfigSchema> = TConfig & {
 declare const ssrSchemaLoading: (alepha: Alepha, name: string) => RequestConfigSchema | {
   loading: boolean;
 };
-//# sourceMappingURL=useSchema.d.ts.map
 //#endregion
 //#region src/hooks/useStore.d.ts
 /**
  * Hook to access and mutate the Alepha state.
  */
-declare const useStore: <Key extends keyof State>(key: Key) => [State[Key], (value: State[Key]) => void];
-//# sourceMappingURL=useStore.d.ts.map
+declare const useStore: <Key extends keyof State>(key: Key, defaultValue?: State[Key]) => [State[Key], (value: State[Key]) => void];
 //#endregion
 //#region src/providers/ReactServerProvider.d.ts
-declare const envSchema: _alepha_core6.TObject<{
-  REACT_SERVER_DIST: _alepha_core6.TString;
-  REACT_SERVER_PREFIX: _alepha_core6.TString;
-  REACT_SSR_ENABLED: _alepha_core6.TOptional<_alepha_core6.TBoolean>;
-  REACT_ROOT_ID: _alepha_core6.TString;
-  REACT_SERVER_TEMPLATE: _alepha_core6.TOptional<_alepha_core6.TString>;
+declare const envSchema: _alepha_core14.TObject<{
+  REACT_SERVER_DIST: _alepha_core14.TString;
+  REACT_SERVER_PREFIX: _alepha_core14.TString;
+  REACT_SSR_ENABLED: _alepha_core14.TOptional<_alepha_core14.TBoolean>;
+  REACT_ROOT_ID: _alepha_core14.TString;
+  REACT_SERVER_TEMPLATE: _alepha_core14.TOptional<_alepha_core14.TString>;
 }>;
 declare module "@alepha/core" {
   interface Env extends Partial<Static<typeof envSchema>> {}
@@ -575,9 +681,9 @@ declare module "@alepha/core" {
   }
 }
 declare class ReactServerProvider {
-  protected readonly log: _alepha_core6.Logger;
+  protected readonly log: _alepha_logger1.Logger;
   protected readonly alepha: Alepha;
-  protected readonly pageDescriptorProvider: PageDescriptorProvider;
+  protected readonly pageApi: ReactPageProvider;
   protected readonly serverStaticProvider: ServerStaticProvider;
   protected readonly serverRouterProvider: ServerRouterProvider;
   protected readonly serverTimingProvider: ServerTimingProvider;
@@ -589,7 +695,7 @@ declare class ReactServerProvider {
     REACT_ROOT_ID: string;
   };
   protected readonly ROOT_DIV_REGEX: RegExp;
-  readonly onConfigure: _alepha_core6.HookDescriptor<"configure">;
+  readonly onConfigure: _alepha_core14.HookDescriptor<"configure">;
   get template(): string;
   protected registerPages(templateLoader: TemplateLoader): Promise<void>;
   protected getPublicDirectory(): string;
@@ -599,15 +705,11 @@ declare class ReactServerProvider {
    * For testing purposes, creates a render function that can be used.
    */
   protected createRenderFunction(name: string, withIndex?: boolean): (options?: PageDescriptorRenderOptions) => Promise<{
-    context: PageRequest;
-    state: CreateLayersResult;
-    html: string;
-  } | {
-    context: PageRequest;
+    state: ReactRouterState;
     html: string;
   }>;
-  protected createHandler(page: PageRoute, templateLoader: TemplateLoader): ServerHandler;
-  renderToHtml(template: string, state: RouterState, context: PageReactContext, hydration?: boolean): string;
+  protected createHandler(route: PageRoute, templateLoader: TemplateLoader): ServerHandler;
+  renderToHtml(template: string, state: ReactRouterState, hydration?: boolean): string | Redirection;
   protected fillTemplate(response: {
     html: string;
   }, app: string, script: string): void;
@@ -616,43 +718,35 @@ type TemplateLoader = () => Promise<string | undefined>;
 //#endregion
 //#region src/index.d.ts
 declare module "@alepha/core" {
+  interface State {
+    "react.router.state"?: ReactRouterState;
+  }
   interface Hooks {
-    "react:router:createLayers": {
-      request: ServerRequest;
-      context: PageRequest;
-      layers: PageRequest[];
-    };
     "react:server:render:begin": {
       request?: ServerRequest;
-      context: PageRequest;
+      state: ReactRouterState;
     };
     "react:server:render:end": {
       request?: ServerRequest;
-      context: PageRequest;
-      state: RouterState;
+      state: ReactRouterState;
       html: string;
     };
     "react:browser:render": {
-      state: RouterState;
-      context: PageReactContext;
+      state: ReactRouterState;
       hydration?: ReactHydrationState;
     };
     "react:transition:begin": {
-      state: RouterState;
-      context: PageReactContext;
+      state: ReactRouterState;
     };
     "react:transition:success": {
-      state: RouterState;
-      context: PageReactContext;
+      state: ReactRouterState;
     };
     "react:transition:error": {
+      state: ReactRouterState;
       error: Error;
-      state: RouterState;
-      context: PageReactContext;
     };
     "react:transition:end": {
-      state: RouterState;
-      context: PageReactContext;
+      state: ReactRouterState;
     };
   }
 }
@@ -666,9 +760,7 @@ declare module "@alepha/core" {
  * @see {@link $page}
  * @module alepha.react
  */
-declare const AlephaReact: _alepha_core0.ModuleDescriptor;
-//# sourceMappingURL=index.d.ts.map
-
+declare const AlephaReact: _alepha_core14.Service<_alepha_core14.Module>;
 //#endregion
-export { $page, AlephaContext, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, HrefLike, Layer, Link, NestedView, NotFoundPage as NotFound, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorProvider, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageReactContext, PageRequest, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, RouterContextValue, RouterGoOptions, RouterHookApi, RouterLayerContext, RouterLayerContextValue, RouterRenderResult, RouterStackItem, RouterState, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseQueryParamsHookOptions, UseSchemaReturn, VirtualRouter, isPageRoute, ssrSchemaLoading, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState, useSchema, useStore };
+export { $page, AlephaContext, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, ErrorHandler, ErrorViewer, Layer, Link, LinkProps, NestedView, NotFoundPage as NotFound, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactBrowserRendererOptions, ReactHydrationState, ReactPageProvider, ReactRouter, ReactRouterState, ReactServerProvider, Redirection, RouterGoOptions, RouterLayerContext, RouterLayerContextValue, RouterStackItem, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseActiveOptions, UseQueryParamsHookOptions, UseSchemaReturn, VirtualRouter, isPageRoute, ssrSchemaLoading, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState, useSchema, useStore };
 //# sourceMappingURL=index.d.cts.map