@tyndall/react 0.0.1 → 0.0.2

package/README.md

@@ -7,6 +7,10 @@ React adapter package that implements UIAdapter contracts, routing integration,
 - Provide React-based rendering adapter, factory, and registry
 - Provide client router and navigation components
 - Integrate route payload transitions and head updates
+- Provide `_app` wrapper support and pass `{ Component, pageProps, routeData, routeId }` to App components
+- Expose `RouteDataProvider` and `useRouteData` for consuming route data maps
+- Provide `useBlockRouting` and navigation blocker hooks for client transitions and `beforeunload`
+- Support `router.softReload()` and scroll restoration during client-side transitions
 - Coordinate hydration lifecycle markers and mounted-state guards for payload-driven navigation
 - Guard dev runtime generation changes with controlled dispose/re-initialize flow to avoid mixed React hook dispatcher states during HMR
 - Compose nested layout trees when route metadata supplies `layoutFiles`

package/dist/adapter.d.ts

@@ -1,16 +1,25 @@
+import React from "react";
 import type { HmrIntegration, RouteGraph, UIAdapter, UIAdapterEntryContext, UIAdapterRenderContext, UIAdapterRenderResult } from "@tyndall/core";
 export interface ReactAdapterOptions {
     name?: string;
     createClientEntry?: (ctx: UIAdapterEntryContext) => string;
     createServerEntry?: (ctx: UIAdapterEntryContext) => string;
     renderToHtml?: (ctx: UIAdapterRenderContext) => Promise<UIAdapterRenderResult> | UIAdapterRenderResult;
-    render?: (ctx: UIAdapterRenderContext) => Promise<unknown> | unknown;
+    render?: (ctx: UIAdapterRenderContext) => Promise<React.ReactElement | null> | React.ReactElement | null;
     getHead?: UIAdapter["getHead"];
     hmrIntegration?: HmrIntegration;
     routeGraph?: RouteGraph;
     nestedLayouts?: boolean;
     rootDir?: string;
     routeRoot?: string;
+    appModule?: string;
+    appComponent?: React.ComponentType<AppComponentProps>;
+}
+export interface AppComponentProps {
+    Component: React.ComponentType<Record<string, unknown>>;
+    pageProps: Record<string, unknown>;
+    routeData: Record<string, unknown>;
+    routeId: string;
 }
 export declare const createReactAdapter: (options?: ReactAdapterOptions) => UIAdapter;
 //# sourceMappingURL=adapter.d.ts.map

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,SAAS,EACT,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAIvB,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,MAAM,CAAC;IAC3D,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,sBAAsB,KACxB,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAC5D,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,sBAAsB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACrE,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAizBD,eAAO,MAAM,kBAAkB,GAAI,UAAS,mBAAwB,KAAG,SAQrE,CAAC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,SAAS,EACT,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAKvB,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,qBAAqB,KAAK,MAAM,CAAC;IAC3D,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,sBAAsB,KACxB,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAC5D,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,sBAAsB,KACxB,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACpE,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;CACvD;AAMD,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAiiCD,eAAO,MAAM,kBAAkB,GAAI,UAAS,mBAAwB,KAAG,SAQrE,CAAC"}

package/dist/adapter.js

@@ -3,8 +3,13 @@ import { createRequire } from "node:module";
 import { join, relative, sep } from "node:path";
 import { mergeHeadDescriptors, serializeProps } from "@tyndall/core";
 import { collectHeadFromTree } from "./head.js";
+import { RouteDataProvider } from "./route-data.js";
 const REACT_ELEMENT = Symbol.for("react.element");
 const REACT_TRANSITIONAL_ELEMENT = Symbol.for("react.transitional.element");
+const REACT_FRAGMENT = Symbol.for("react.fragment");
+const REACT_PROVIDER = Symbol.for("react.provider");
+const REACT_MEMO = Symbol.for("react.memo");
+const REACT_FORWARD_REF = Symbol.for("react.forward_ref");
 const HEAD_ELEMENT = Symbol.for("hyper.head");
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const isElementLike = (value) => isRecord(value) &&
@@ -54,6 +59,30 @@ const renderElementToString = (node) => {
     if (isHeadMarker(node)) {
         return "";
     }
+    if (node.type === REACT_FRAGMENT) {
+        return renderElementToString(node.props.children);
+    }
+    if (isRecord(node.type) && node.type.$$typeof === REACT_PROVIDER) {
+        return renderElementToString(node.props.children);
+    }
+    if (isRecord(node.type) && node.type.$$typeof === REACT_MEMO) {
+        const innerType = node.type.type;
+        if (typeof innerType === "function") {
+            return renderElementToString(innerType(node.props));
+        }
+        if (typeof innerType === "string") {
+            return renderElementToString({ ...node, type: innerType });
+        }
+        return "";
+    }
+    if (isRecord(node.type) && node.type.$$typeof === REACT_FORWARD_REF) {
+        const render = node.type
+            .render;
+        if (typeof render === "function") {
+            return renderElementToString(render(node.props, null));
+        }
+        return "";
+    }
     if (typeof node.type === "function") {
         return renderElementToString(node.type(node.props));
     }
@@ -75,12 +104,7 @@ const resolveReactDomServer = async () => {
 const renderWithFallback = async (element) => {
     const reactDomServer = await resolveReactDomServer();
     if (reactDomServer?.renderToString) {
-        try {
-            return reactDomServer.renderToString(element);
-        }
-        catch {
-            // Fall back when custom markers (e.g., <Head>) are not React-renderable.
-        }
+        return reactDomServer.renderToString(element);
     }
     // Fallback renderer keeps local tests/dev flows working without react-dom.
     return renderElementToString(element);
@@ -91,6 +115,11 @@ const resolvePageImport = (ctx) => {
     const specifier = typeof pageModule === "string" ? pageModule : "./page";
     return JSON.stringify(specifier);
 };
+const resolveAppImport = (ctx) => {
+    const options = ctx.uiOptions ?? ctx.adapterOptions;
+    const appModule = options?.appModule;
+    return typeof appModule === "string" && appModule.length > 0 ? appModule : null;
+};
 const resolveHydrationMode = (ctx) => {
     const options = ctx.uiOptions ?? ctx.adapterOptions;
     return options?.hydration === "islands" ? "islands" : "full";
@@ -103,6 +132,13 @@ const resolveClientRenderMode = (ctx) => {
     const options = ctx.uiOptions ?? ctx.adapterOptions;
     return options?.clientRenderMode === "module" ? "module" : "payload";
 };
+const resolveScrollRestoration = (ctx) => {
+    const options = ctx.uiOptions ?? ctx.adapterOptions;
+    if (options && "scrollRestoration" in options) {
+        return options.scrollRestoration !== false;
+    }
+    return true;
+};
 const resolveClientRouteModules = (ctx) => {
     const options = ctx.uiOptions ?? ctx.adapterOptions;
     const raw = options?.clientRouteModules;
@@ -137,8 +173,8 @@ const resolveLayoutFilesForRoute = (routeGraph, routeId) => {
     const route = findRouteRecord(routeGraph, routeId);
     return route?.layoutFiles ?? [];
 };
-const resolveLayoutModulePath = (layoutFile, rootDir, routeRoot) => {
-    if (!rootDir || !routeRoot) {
+const resolveLayoutModulePath = (layoutFile, rootDir, routeRoot, preferRouteRoot) => {
+    if (!preferRouteRoot || !rootDir || !routeRoot) {
         return layoutFile;
     }
     const relativePath = relative(rootDir, layoutFile);
@@ -168,8 +204,18 @@ const resolveLayoutSpecifiersForRoute = (ctx, routeId) => {
     if (layoutFiles.length === 0) {
         return [];
     }
+    const preferRouteRoot = typeof ctx.routeId === "string" && ctx.routeId === routeId;
     return layoutFiles.map((layoutFile) => {
-        const modulePath = resolveLayoutModulePath(layoutFile, ctx.rootDir, ctx.routeRoot);
+        const modulePath = resolveLayoutModulePath(layoutFile, ctx.rootDir, ctx.routeRoot, preferRouteRoot);
+        return toImportSpecifier(ctx.entryDir ?? "", modulePath);
+    });
+};
+const resolveLayoutSpecifiersForEntry = (ctx, layoutFiles) => {
+    if (!ctx.entryDir || !layoutFiles || layoutFiles.length === 0) {
+        return [];
+    }
+    return layoutFiles.map((layoutFile) => {
+        const modulePath = resolveLayoutModulePath(layoutFile, ctx.rootDir, ctx.routeRoot, true);
         return toImportSpecifier(ctx.entryDir ?? "", modulePath);
     });
 };
@@ -195,6 +241,7 @@ const buildClientRouteLayoutLoaderSource = (layoutModules) => {
     };
 };
 const layoutComponentCache = new Map();
+const appComponentCache = new Map();
 const extractLayoutComponent = (loaded) => {
     if (loaded && typeof loaded === "object" && "default" in loaded) {
         const candidate = loaded.default;
@@ -207,8 +254,28 @@ const extractLayoutComponent = (loaded) => {
     }
     return null;
 };
+const extractAppComponent = (loaded) => {
+    if (loaded && typeof loaded === "object") {
+        if ("default" in loaded) {
+            const candidate = loaded.default;
+            if (typeof candidate === "function") {
+                return candidate;
+            }
+        }
+        if ("App" in loaded) {
+            const candidate = loaded.App;
+            if (typeof candidate === "function") {
+                return candidate;
+            }
+        }
+    }
+    if (typeof loaded === "function") {
+        return loaded;
+    }
+    return null;
+};
 const loadLayoutComponent = async (layoutFile, options) => {
-    const modulePath = resolveLayoutModulePath(layoutFile, options.rootDir, options.routeRoot);
+    const modulePath = resolveLayoutModulePath(layoutFile, options.rootDir, options.routeRoot, true);
     const cacheKey = `${options.routeRoot ?? ""}::${modulePath}`;
     if (layoutComponentCache.has(cacheKey)) {
         return layoutComponentCache.get(cacheKey);
@@ -233,6 +300,40 @@ const loadLayoutComponent = async (layoutFile, options) => {
         }
     }
 };
+const loadAppComponent = async (modulePath) => {
+    if (appComponentCache.has(modulePath)) {
+        return appComponentCache.get(modulePath);
+    }
+    try {
+        const moduleUrl = toFileUrl(modulePath);
+        const loaded = await import(moduleUrl);
+        const component = extractAppComponent(loaded);
+        appComponentCache.set(modulePath, component);
+        return component;
+    }
+    catch {
+        try {
+            const require = createRequire(import.meta.url);
+            const loaded = require(modulePath);
+            const component = extractAppComponent(loaded);
+            appComponentCache.set(modulePath, component);
+            return component;
+        }
+        catch {
+            return null;
+        }
+    }
+};
+const resolveAppComponentForRender = async (options) => {
+    if (typeof options.appComponent === "function") {
+        return options.appComponent;
+    }
+    if (!options.appModule) {
+        return null;
+    }
+    const loaded = await loadAppComponent(options.appModule);
+    return typeof loaded === "function" ? loaded : null;
+};
 const resolveLayoutComponentsForRender = async (routeId, options) => {
     if (!resolveNestedLayoutsEnabled(options)) {
         return [];
@@ -271,9 +372,11 @@ const buildClientRouteModuleLoaderSource = (modules) => {
 };
 const defaultClientEntry = (ctx) => {
     const pageImport = resolvePageImport(ctx);
+    const appImport = resolveAppImport(ctx);
     const hydrationMode = JSON.stringify(resolveHydrationMode(ctx));
     const navigationMode = JSON.stringify(resolveNavigationMode(ctx));
     const clientRenderMode = JSON.stringify(resolveClientRenderMode(ctx));
+    const scrollRestoration = JSON.stringify(resolveScrollRestoration(ctx));
     const routeGraph = JSON.stringify(ctx.routeGraph ?? { routes: [] });
     const entryRouteId = JSON.stringify(typeof ctx.routeId === "string" ? ctx.routeId : "");
     const routeModules = resolveClientRouteModules(ctx);
@@ -288,25 +391,49 @@ const defaultClientEntry = (ctx) => {
         : {};
     const routeLayoutLoaders = buildClientRouteLayoutLoaderSource(routeLayoutModules);
     const entryLayoutSpecifiers = nestedLayoutsEnabled && typeof ctx.routeId === "string"
-        ? resolveLayoutSpecifiersForRoute(ctx, ctx.routeId)
+        ? ctx.entryLayoutFiles && ctx.entryLayoutFiles.length > 0
+            ? resolveLayoutSpecifiersForEntry(ctx, ctx.entryLayoutFiles)
+            : resolveLayoutSpecifiersForRoute(ctx, ctx.routeId)
         : [];
     const entryLayoutImports = entryLayoutSpecifiers.map((specifier, index) => `import EntryLayout${index} from ${JSON.stringify(specifier)};`);
     const entryLayoutRefs = entryLayoutSpecifiers.map((_specifier, index) => `EntryLayout${index}`);
     const entryLayoutArray = entryLayoutRefs.length > 0 ? `[${entryLayoutRefs.join(", ")}]` : "[]";
+    const appImportSource = appImport ? `import * as AppModule from ${JSON.stringify(appImport)};` : "";
+    const appResolverSource = appImport
+        ? [
+            "const resolveAppComponent = (module) => {",
+            "  if (!module || typeof module !== \"object\") {",
+            "    return null;",
+            "  }",
+            "  if (typeof module.default === \"function\") {",
+            "    return module.default;",
+            "  }",
+            "  if (typeof module.App === \"function\") {",
+            "    return module.App;",
+            "  }",
+            "  return null;",
+            "};",
+            "const AppComponent = resolveAppComponent(AppModule);",
+        ]
+        : ["const AppComponent = null;"];
     return [
         "import React from \"react\";",
         "import { createRoot, hydrateRoot } from \"react-dom/client\";",
         "import {",
         "  RouterProvider,",
+        "  RouteDataProvider,",
         "  createClientRouteModuleResolver,",
         "  createRouter,",
         "  installRouterIslands,",
         "} from \"@tyndall/react\";",
         `import Page from ${pageImport};`,
+        ...(appImportSource ? [appImportSource] : []),
         ...entryLayoutImports,
         ...routeModuleLoaders.declarations,
         ...routeLayoutLoaders.declarations,
+        ...appResolverSource,
         "const ROUTE_PAYLOAD_EVENT = \"hyper:route-payload-applied\";",
+        "const ROUTE_DATA_EVENT = \"hyper:route-data-applied\";",
         "const HYDRATED_EVENT = \"hyper:hydrated\";",
         "const container = document.getElementById(\"app\");",
         "const readPropsPayload = () => {",
@@ -320,7 +447,20 @@ const defaultClientEntry = (ctx) => {
         "    return {};",
         "  }",
         "};",
+        "const readRouteDataPayload = () => {",
+        "  const dataEl = document.getElementById(\"__HYPER_ROUTE_DATA__\");",
+        "  if (!dataEl?.textContent) {",
+        "    return {};",
+        "  }",
+        "  try {",
+        "    return JSON.parse(dataEl.textContent);",
+        "  } catch {",
+        "    return {};",
+        "  }",
+        "};",
         "let props = readPropsPayload();",
+        "let routeData = readRouteDataPayload();",
+        "window.__HYPER_ROUTE_DATA__ = routeData;",
         `const entryRouteId = ${entryRouteId};`,
         "const runtimeModuleUrl = (() => {",
         "  try {",
@@ -346,6 +486,7 @@ const defaultClientEntry = (ctx) => {
         `const routeGraph = ${routeGraph};`,
         `const navigationMode = ${navigationMode};`,
         `const clientRenderMode = ${clientRenderMode};`,
+        `const scrollRestoration = ${scrollRestoration};`,
         `let routeModuleLoaders = ${routeModuleLoaders.objectLiteral};`,
         "window.__HYPER_CLIENT_ROUTE_MODULES__ = routeModuleLoaders;",
         `let routeLayoutLoaders = ${routeLayoutLoaders.objectLiteral};`,
@@ -360,6 +501,7 @@ const defaultClientEntry = (ctx) => {
         "      routeGraph,",
         "      navigationMode,",
         "      clientRenderMode,",
+        "      scrollRestoration,",
         "      resolveClientRouteModule: routeModuleResolver,",
         "    });",
         "if (!runtimeAlreadyInitialized) {",
@@ -387,6 +529,7 @@ const defaultClientEntry = (ctx) => {
         "}",
         "let activeLayouts = routeEntryLayouts[entryRouteId] ?? [];",
         "let activeProps = props;",
+        "let activeRouteData = routeData;",
         "let root = null;",
         "const runtimeDisposers = [];",
         "const registerRuntimeDisposer = (dispose) => {",
@@ -427,9 +570,22 @@ const defaultClientEntry = (ctx) => {
         "  if (!container || hydration === \"islands\") {",
         "    return;",
         "  }",
+        "  const routeId = typeof window.__HYPER_ROUTE_ID__ === \"string\"",
+        "    ? window.__HYPER_ROUTE_ID__",
+        "    : container.getAttribute(\"data-hyper-route\") || entryRouteId;",
+        "  const RoutedPage = (pageProps) => applyLayouts(activePage, pageProps, activeLayouts);",
+        "  const appTree = AppComponent",
+        "    ? React.createElement(AppComponent, {",
+        "        Component: RoutedPage,",
+        "        pageProps: activeProps,",
+        "        routeData: activeRouteData,",
+        "        routeId,",
+        "      })",
+        "    : React.createElement(RoutedPage, activeProps);",
         "  const element = React.createElement(",
-        "    RouterProvider,",
-        "    { router, children: applyLayouts(activePage, activeProps, activeLayouts) }",
+        "    RouteDataProvider,",
+        "    { value: activeRouteData },",
+        "    React.createElement(RouterProvider, { router, children: appTree })",
         "  );",
         "  if (root && typeof root.render === \"function\") {",
         "    window.__HYPER_CLIENT_APP_MOUNTED__ = true;",
@@ -509,6 +665,7 @@ const defaultClientEntry = (ctx) => {
         "  activePage = nextPage;",
         "  activeLayouts = nextLayouts;",
         "  activeProps = readPropsPayload();",
+        "  activeRouteData = readRouteDataPayload();",
         "  renderActivePage(false);",
         "};",
         "const applyRuntimeUpdate = (next) => {",
@@ -628,6 +785,10 @@ const defaultClientEntry = (ctx) => {
         "      : window.__HYPER_ROUTE_ID__;",
         "    void rerenderRoute(routeId);",
         "  };",
+        "  const onRouteDataApplied = () => {",
+        "    activeRouteData = readRouteDataPayload();",
+        "    renderActivePage(false);",
+        "  };",
         "  const onPopState = () => {",
         "    deferRouteSync(syncRouteFromDom);",
         "  };",
@@ -643,6 +804,7 @@ const defaultClientEntry = (ctx) => {
         "  patchHistoryForRouteSync();",
         "  renderActivePage(true);",
         "  addRuntimeListener(window, ROUTE_PAYLOAD_EVENT, onRoutePayloadApplied);",
+        "  addRuntimeListener(window, ROUTE_DATA_EVENT, onRouteDataApplied);",
         "  addRuntimeListener(window, \"popstate\", onPopState);",
         "} else if (runtimeAlreadyInitialized) {",
         "  const rerenderRuntime = window.__HYPER_CLIENT_RUNTIME_RERENDER__;",
@@ -657,6 +819,7 @@ const defaultClientEntry = (ctx) => {
 };
 const defaultServerEntry = (ctx) => {
     const pageImport = resolvePageImport(ctx);
+    const appImport = resolveAppImport(ctx);
     const hydrationMode = JSON.stringify(resolveHydrationMode(ctx));
     const adapterOptions = (ctx.uiOptions ?? ctx.adapterOptions);
     const nestedLayoutsEnabled = resolveNestedLayoutsEnabled(adapterOptions);
@@ -666,48 +829,94 @@ const defaultServerEntry = (ctx) => {
     const layoutImports = layoutSpecifiers.map((specifier, index) => `import Layout${index} from ${JSON.stringify(specifier)};`);
     const layoutRefs = layoutSpecifiers.map((_specifier, index) => `Layout${index}`);
     const layoutArray = layoutRefs.length > 0 ? `[${layoutRefs.join(", ")}]` : "[]";
+    const appImportSource = appImport ? `import * as AppModule from ${JSON.stringify(appImport)};` : "";
+    const appResolverSource = appImport
+        ? [
+            "const resolveAppComponent = (module) => {",
+            "  if (!module || typeof module !== \"object\") {",
+            "    return null;",
+            "  }",
+            "  if (typeof module.default === \"function\") {",
+            "    return module.default;",
+            "  }",
+            "  if (typeof module.App === \"function\") {",
+            "    return module.App;",
+            "  }",
+            "  return null;",
+            "};",
+            "const AppComponent = resolveAppComponent(AppModule);",
+        ]
+        : ["const AppComponent = null;"];
     return [
         "import React from \"react\";",
         "import { renderToString, renderToPipeableStream } from \"react-dom/server\";",
         "import { PassThrough } from \"stream\";",
-        "import { collectHeadFromTree } from \"@tyndall/react\";",
+        "import { collectHeadFromTree, RouteDataProvider } from \"@tyndall/react\";",
         `import Page from ${pageImport};`,
+        ...(appImportSource ? [appImportSource] : []),
         ...layoutImports,
+        ...appResolverSource,
         `export const hydration = ${hydrationMode};`,
         "export const renderToHtml = async (ctx) => {",
-        "  let element = React.createElement(Page, ctx.props);",
         `  const layouts = ${layoutArray};`,
-        "  if (Array.isArray(layouts) && layouts.length > 0) {",
-        "    for (let i = layouts.length - 1; i >= 0; i -= 1) {",
-        "      const Layout = layouts[i];",
-        "      if (typeof Layout === \"function\") {",
-        "        element = React.createElement(Layout, { ...ctx.props, children: element });",
+        "  const createRoutedTree = (pageProps) => {",
+        "    let element = React.createElement(Page, pageProps);",
+        "    if (Array.isArray(layouts) && layouts.length > 0) {",
+        "      for (let i = layouts.length - 1; i >= 0; i -= 1) {",
+        "        const Layout = layouts[i];",
+        "        if (typeof Layout === \"function\") {",
+        "          element = React.createElement(Layout, { ...pageProps, children: element });",
+        "        }",
         "      }",
         "    }",
-        "  }",
-        "  const html = renderToString(element);",
-        "  const head = collectHeadFromTree(element);",
+        "    return element;",
+        "  };",
+        "  const routedElement = createRoutedTree(ctx.props);",
+        "  const appTree = AppComponent",
+        "    ? React.createElement(AppComponent, {",
+        "        Component: createRoutedTree,",
+        "        pageProps: ctx.props,",
+        "        routeData: ctx.routeData ?? {},",
+        "        routeId: ctx.routeId,",
+        "      })",
+        "    : routedElement;",
+        "  const tree = React.createElement(RouteDataProvider, { value: ctx.routeData ?? {} }, appTree);",
+        "  const html = renderToString(tree);",
+        "  const head = collectHeadFromTree(tree);",
         "  return { html, head };",
         "};",
         "export const renderToStream = async (ctx) => {",
         "  if (typeof renderToPipeableStream !== \"function\") {",
         "    return null;",
         "  }",
-        "  let element = React.createElement(Page, ctx.props);",
         `  const layouts = ${layoutArray};`,
-        "  if (Array.isArray(layouts) && layouts.length > 0) {",
-        "    for (let i = layouts.length - 1; i >= 0; i -= 1) {",
-        "      const Layout = layouts[i];",
-        "      if (typeof Layout === \"function\") {",
-        "        element = React.createElement(Layout, { ...ctx.props, children: element });",
+        "  const createRoutedTree = (pageProps) => {",
+        "    let element = React.createElement(Page, pageProps);",
+        "    if (Array.isArray(layouts) && layouts.length > 0) {",
+        "      for (let i = layouts.length - 1; i >= 0; i -= 1) {",
+        "        const Layout = layouts[i];",
+        "        if (typeof Layout === \"function\") {",
+        "          element = React.createElement(Layout, { ...pageProps, children: element });",
+        "        }",
         "      }",
         "    }",
-        "  }",
-        "  const head = collectHeadFromTree(element);",
+        "    return element;",
+        "  };",
+        "  const routedElement = createRoutedTree(ctx.props);",
+        "  const appTree = AppComponent",
+        "    ? React.createElement(AppComponent, {",
+        "        Component: createRoutedTree,",
+        "        pageProps: ctx.props,",
+        "        routeData: ctx.routeData ?? {},",
+        "        routeId: ctx.routeId,",
+        "      })",
+        "    : routedElement;",
+        "  const tree = React.createElement(RouteDataProvider, { value: ctx.routeData ?? {} }, appTree);",
+        "  const head = collectHeadFromTree(tree);",
         "  return await new Promise((resolve, reject) => {",
         "    let didError = false;",
         "    const stream = new PassThrough();",
-        "    const { pipe, abort } = renderToPipeableStream(element, {",
+        "    const { pipe, abort } = renderToPipeableStream(tree, {",
         "      onShellReady() {",
         "        pipe(stream);",
         "        resolve({ stream, head, abort });",
@@ -733,8 +942,19 @@ const defaultRenderToHtml = async (ctx, options) => {
     const element = await options.render(ctx);
     const layouts = await resolveLayoutComponentsForRender(ctx.routeId, options);
     const composed = layouts.length > 0 ? applyLayoutsToElement(element, ctx.props, layouts) : element;
-    const html = await renderWithFallback(composed);
-    const collected = collectHeadFromTree(composed);
+    const appComponent = await resolveAppComponentForRender(options);
+    const RoutedPage = () => composed;
+    const appTree = appComponent
+        ? React.createElement(appComponent, {
+            Component: RoutedPage,
+            pageProps: ctx.props,
+            routeData: ctx.routeData ?? {},
+            routeId: ctx.routeId,
+        })
+        : composed;
+    const tree = React.createElement(RouteDataProvider, { value: ctx.routeData ?? {} }, appTree);
+    const html = await renderWithFallback(tree);
+    const collected = collectHeadFromTree(tree);
     const provided = options.getHead?.(ctx);
     const head = mergeHeadDescriptors(provided ?? {}, collected);
     return { html, head };

package/dist/hooks.d.ts

@@ -0,0 +1,2 @@
+export declare const useBlockRouting: (enabled: boolean, message?: string) => void;
+//# sourceMappingURL=hooks.d.ts.map

package/dist/hooks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,GAAI,SAAS,OAAO,EAAE,UAAU,MAAM,KAAG,IA8BpE,CAAC"}

package/dist/hooks.js

@@ -0,0 +1,31 @@
+import { useEffect, useRef } from "react";
+import { getRouter } from "./router.js";
+export const useBlockRouting = (enabled, message) => {
+    const messageRef = useRef(message);
+    messageRef.current = message;
+    useEffect(() => {
+        if (!enabled) {
+            return;
+        }
+        const router = getRouter();
+        const blocker = () => messageRef.current ?? "";
+        const unblock = router.block(blocker);
+        const handleBeforeUnload = (event) => {
+            const text = messageRef.current ?? "";
+            if (!text) {
+                return;
+            }
+            event.preventDefault();
+            event.returnValue = text;
+        };
+        if (typeof window !== "undefined") {
+            window.addEventListener("beforeunload", handleBeforeUnload);
+        }
+        return () => {
+            unblock();
+            if (typeof window !== "undefined") {
+                window.removeEventListener("beforeunload", handleBeforeUnload);
+            }
+        };
+    }, [enabled]);
+};

package/dist/index.d.ts

@@ -1,10 +1,13 @@
 export { createReactAdapter } from "./adapter.js";
-export type { ReactAdapterOptions } from "./adapter.js";
+export type { AppComponentProps, ReactAdapterOptions } from "./adapter.js";
 export { createReactUiAdapterFactory, createReactAdapterRegistry } from "./registry.js";
 export { Link, Head, RouterProvider } from "./components.js";
 export type { LinkProps, HeadProps, RouterProviderProps, ElementLike } from "./components.js";
+export { RouteDataProvider, useRouteData } from "./route-data.js";
+export type { RouteDataMap } from "./route-data.js";
 export { createRouter, getRouter, useRouter } from "./router.js";
-export type { ClientRenderMode, ClientRouteModule, ClientRouteModuleContext, ClientRouteModuleLoader, ClientRouteModuleLoaderMap, ClientRouteModuleResolver, ClientRouteModuleResolverContext, ClientRouteRenderResult, DynamicManifestEnvelope, DynamicManifestRenderer, DynamicManifestResolver, HydrationMode, NavigationMode, RenderPolicy, RoutePayload, RoutePayloadApplier, RoutePayloadResolver, Router, RouterOptions, RouterQuery, } from "./router.js";
+export { useBlockRouting } from "./hooks.js";
+export type { ClientRenderMode, ClientRouteModule, ClientRouteModuleContext, ClientRouteModuleLoader, ClientRouteModuleLoaderMap, ClientRouteModuleResolver, ClientRouteModuleResolverContext, ClientRouteRenderResult, DynamicManifestEnvelope, DynamicManifestRenderer, DynamicManifestResolver, HydrationMode, NavigationMode, NavigationBlockContext, NavigationBlocker, RenderPolicy, RoutePayload, RouteRedirectPayload, RoutePayloadApplier, RoutePayloadResolver, Router, RouterOptions, RouterQuery, } from "./router.js";
 export { createClientRouteModuleResolver } from "./router.js";
 export { installRouterIslands } from "./islands.js";
 export { collectHeadFromTree } from "./head.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAExF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7D,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACjE,YAAY,EACV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,EACzB,gCAAgC,EAChC,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,oBAAoB,EACpB,MAAM,EACN,aAAa,EACb,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,oBAAoB,EACpB,yBAAyB,EACzB,2BAA2B,EAC3B,8BAA8B,GAC/B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,YAAY,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAExF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7D,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,YAAY,EACV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,EACzB,gCAAgC,EAChC,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,MAAM,EACN,aAAa,EACb,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,oBAAoB,EACpB,yBAAyB,EACzB,2BAA2B,EAC3B,8BAA8B,GAC/B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,YAAY,CAAC"}

package/dist/index.js

@@ -1,7 +1,9 @@
 export { createReactAdapter } from "./adapter.js";
 export { createReactUiAdapterFactory, createReactAdapterRegistry } from "./registry.js";
 export { Link, Head, RouterProvider } from "./components.js";
+export { RouteDataProvider, useRouteData } from "./route-data.js";
 export { createRouter, getRouter, useRouter } from "./router.js";
+export { useBlockRouting } from "./hooks.js";
 export { createClientRouteModuleResolver } from "./router.js";
 export { installRouterIslands } from "./islands.js";
 export { collectHeadFromTree } from "./head.js";

package/dist/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAWzF,eAAO,MAAM,2BAA2B,QAAO,gBAiB9C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAE5C,CAAC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA8B,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAiBrG,eAAO,MAAM,2BAA2B,QAAO,gBAwB9C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAE5C,CAAC"}

package/dist/registry.js

@@ -1,3 +1,4 @@
+import { createElement } from "react";
 import { createReactAdapter } from "./adapter.js";
 const isFunction = (value) => typeof value === "function";
 export const createReactUiAdapterFactory = () => (options) => {
@@ -9,8 +10,14 @@ export const createReactUiAdapterFactory = () => (options) => {
         ? normalized.routeHead
         : undefined;
     return createReactAdapter({
-        render: routeRender ? ({ props }) => routeRender(props) : undefined,
+        render: routeRender ? ({ props }) => createElement(routeRender, props) : undefined,
         getHead: routeHead ? ({ props }) => routeHead(props) : undefined,
+        routeGraph: normalized.routeGraph,
+        rootDir: normalized.rootDir,
+        routeRoot: normalized.routeRoot,
+        nestedLayouts: normalized.nestedLayouts,
+        appModule: typeof normalized.appModule === "string" ? normalized.appModule : undefined,
+        appComponent: typeof normalized.appComponent === "function" ? normalized.appComponent : undefined,
     });
 };
 export const createReactAdapterRegistry = () => ({

package/dist/route-data.d.ts

@@ -0,0 +1,5 @@
+import React from "react";
+export type RouteDataMap = Record<string, unknown>;
+export declare const RouteDataProvider: React.Provider<RouteDataMap>;
+export declare const useRouteData: () => RouteDataMap;
+//# sourceMappingURL=route-data.d.ts.map

package/dist/route-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-data.d.ts","sourceRoot":"","sources":["../src/route-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAInD,eAAO,MAAM,iBAAiB,8BAA4B,CAAC;AAE3D,eAAO,MAAM,YAAY,QAAO,YAAkD,CAAC"}

package/dist/route-data.js

@@ -0,0 +1,4 @@
+import React from "react";
+const RouteDataContext = React.createContext({});
+export const RouteDataProvider = RouteDataContext.Provider;
+export const useRouteData = () => React.useContext(RouteDataContext);

package/dist/router.d.ts

@@ -20,9 +20,16 @@ export interface RoutePayload {
     routeId: string;
     appHtml: string;
     propsPayload: string;
+    routeDataPayload?: string;
     head?: HeadDescriptor;
     hydration?: HydrationMode;
 }
+export interface RouteRedirectPayload {
+    kind: "hyper-route-redirect";
+    destination: string;
+    status?: number;
+    replace?: boolean;
+}
 export interface ClientRouteModuleContext {
     href: string;
     pathname: string;
@@ -34,6 +41,8 @@ export interface ClientRouteRenderResult {
     routeId?: string;
     appHtml: string;
     propsPayload?: string;
+    routeDataPayload?: string;
+    routeData?: Record<string, unknown>;
     head?: HeadDescriptor;
     hydration?: HydrationMode;
 }
@@ -50,7 +59,7 @@ export interface ClientRouteModuleResolverContext {
 export type ClientRouteModuleResolver = (ctx: ClientRouteModuleResolverContext) => Promise<ClientRouteModule | null>;
 export type ClientRouteModuleLoader = () => Promise<unknown>;
 export type ClientRouteModuleLoaderMap = Record<string, ClientRouteModuleLoader>;
-export type RoutePayloadResolver = (href: string) => Promise<RoutePayload | null>;
+export type RoutePayloadResolver = (href: string) => Promise<RoutePayload | RouteRedirectPayload | null>;
 export type RoutePayloadApplier = (payload: RoutePayload) => void | Promise<void>;
 export interface RouterOptions {
     routeGraph?: RouteGraph;
@@ -65,15 +74,24 @@ export interface RouterOptions {
     buildMode?: "ssg" | "ssr";
     onWarning?: (message: string) => void;
     fallbackPolicy?: ResolverFallbackPolicy;
+    scrollRestoration?: boolean;
 }
 export interface Router {
     pathname: string;
     query: RouterQuery;
     push: (href: string) => Promise<void>;
     replace: (href: string) => Promise<void>;
+    softReload: () => Promise<void>;
     prefetch: (href: string) => Promise<void>;
     subscribe: (listener: (router: Router) => void) => () => void;
+    block: (blocker: NavigationBlocker) => () => void;
+}
+export interface NavigationBlockContext {
+    href: string;
+    replace: boolean;
+    type: "push" | "replace" | "popstate" | "softReload" | "redirect";
 }
+export type NavigationBlocker = (ctx: NavigationBlockContext) => boolean | string | void;
 export declare const createClientRouteModuleResolver: (loaders: ClientRouteModuleLoaderMap) => ClientRouteModuleResolver;
 export declare const createRouter: (initialHref?: string | RouterOptions, options?: RouterOptions) => Router;
 export declare const getRouter: () => Router;

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}

package/dist/router.js

@@ -1,10 +1,41 @@
-import { evaluateRenderPolicy, shouldForceDynamicFallback, } from "@tyndall/core";
+import { evaluateRenderPolicy, shouldForceDynamicFallback, ROUTE_DATA_SCRIPT_ID, } from "@tyndall/core";
 import { applyHead } from "./head-manager.js";
 import { createReactRouterRouteMatcher } from "./react-router-bridge.js";
 const NAVIGATION_HEADER = "x-hyper-navigation";
 const NAVIGATION_MODE = "csr";
 const ROUTE_PAYLOAD_EVENT = "hyper:route-payload-applied";
+const ROUTE_DATA_EVENT = "hyper:route-data-applied";
+const ROUTE_REDIRECT_KIND = "hyper-route-redirect";
 const inflightPrefetchRequests = new Map();
+const navigationBlockers = new Set();
+const resolveBlockDecision = (result) => {
+    if (typeof result === "string") {
+        if (typeof globalThis !== "undefined" && typeof globalThis.confirm === "function") {
+            return globalThis.confirm(result);
+        }
+        return false;
+    }
+    if (result === false) {
+        return false;
+    }
+    return true;
+};
+const runNavigationBlockers = (ctx) => {
+    if (navigationBlockers.size === 0) {
+        return true;
+    }
+    for (const blocker of navigationBlockers) {
+        const decision = resolveBlockDecision(blocker(ctx));
+        if (!decision) {
+            return false;
+        }
+    }
+    return true;
+};
+if (typeof globalThis !== "undefined") {
+    globalThis
+        .__HYPER_NAVIGATION_GUARD__ = runNavigationBlockers;
+}
 const hasBrowserHistory = () => typeof globalThis !== "undefined" &&
     "history" in globalThis &&
     Boolean(globalThis.history);
@@ -65,6 +96,17 @@ const parseHref = (href, baseUrl) => {
     return { pathname: url.pathname, query };
 };
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const parseJsonPayload = (value) => {
+    if (!value) {
+        return {};
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return {};
+    }
+};
 const isClientRouteRenderResult = (value) => {
     if (!isRecord(value) || typeof value.appHtml !== "string") {
         return false;
@@ -75,6 +117,12 @@ const isClientRouteRenderResult = (value) => {
     if (value.propsPayload !== undefined && typeof value.propsPayload !== "string") {
         return false;
     }
+    if (value.routeDataPayload !== undefined && typeof value.routeDataPayload !== "string") {
+        return false;
+    }
+    if (value.routeData !== undefined && !isRecord(value.routeData)) {
+        return false;
+    }
     if (value.hydration !== undefined &&
         value.hydration !== "full" &&
         value.hydration !== "islands") {
@@ -93,6 +141,9 @@ const isRoutePayload = (value) => {
         typeof payload.propsPayload !== "string") {
         return false;
     }
+    if (payload.routeDataPayload !== undefined && typeof payload.routeDataPayload !== "string") {
+        return false;
+    }
     if (payload.hydration !== undefined &&
         payload.hydration !== "full" &&
         payload.hydration !== "islands") {
@@ -100,6 +151,19 @@ const isRoutePayload = (value) => {
     }
     return true;
 };
+const isRouteRedirectPayload = (value) => {
+    if (!value || typeof value !== "object") {
+        return false;
+    }
+    const payload = value;
+    if (payload.kind !== ROUTE_REDIRECT_KIND) {
+        return false;
+    }
+    if (typeof payload.destination !== "string") {
+        return false;
+    }
+    return true;
+};
 const resolveRoutePayloadFromServer = async (href, baseUrl) => {
     if (typeof fetch === "undefined") {
         return null;
@@ -121,7 +185,13 @@ const resolveRoutePayloadFromServer = async (href, baseUrl) => {
             return null;
         }
         const json = (await response.json());
-        return isRoutePayload(json) ? json : null;
+        if (isRoutePayload(json)) {
+            return json;
+        }
+        if (isRouteRedirectPayload(json)) {
+            return json;
+        }
+        return null;
     }
     catch {
         return null;
@@ -154,6 +224,14 @@ const applyRoutePayloadToDom = (payload) => {
     if (propsScript) {
         propsScript.textContent = payload.propsPayload;
     }
+    const routeDataPayload = typeof payload.routeDataPayload === "string" ? payload.routeDataPayload : "{}";
+    const routeDataScript = document.getElementById(ROUTE_DATA_SCRIPT_ID);
+    if (routeDataScript) {
+        routeDataScript.textContent = routeDataPayload;
+    }
+    const routeData = parseJsonPayload(routeDataPayload);
+    globalThis.__HYPER_ROUTE_DATA__ =
+        routeData;
     if (payload.head) {
         applyHead(payload.head);
     }
@@ -163,19 +241,37 @@ const applyRoutePayloadToDom = (payload) => {
         globalThis.dispatchEvent?.(new CustomEvent(ROUTE_PAYLOAD_EVENT, {
             detail: { routeId: payload.routeId },
         }));
+        globalThis.dispatchEvent?.(new CustomEvent(ROUTE_DATA_EVENT, {
+            detail: { routeId: payload.routeId, routeData },
+        }));
     }
     catch {
         // Keep client navigation flow resilient if event dispatch is unavailable.
     }
 };
-const toRoutePayload = (rendered) => ({
-    kind: "hyper-route-payload",
-    routeId: rendered.routeId,
-    appHtml: rendered.appHtml,
-    propsPayload: rendered.propsPayload ?? "{}",
-    head: rendered.head,
-    hydration: rendered.hydration,
-});
+const toRoutePayload = (rendered) => {
+    let routeDataPayload = "{}";
+    if (typeof rendered.routeDataPayload === "string") {
+        routeDataPayload = rendered.routeDataPayload;
+    }
+    else if (rendered.routeData && typeof rendered.routeData === "object") {
+        try {
+            routeDataPayload = JSON.stringify(rendered.routeData);
+        }
+        catch {
+            routeDataPayload = "{}";
+        }
+    }
+    return {
+        kind: "hyper-route-payload",
+        routeId: rendered.routeId,
+        appHtml: rendered.appHtml,
+        propsPayload: rendered.propsPayload ?? "{}",
+        routeDataPayload,
+        head: rendered.head,
+        hydration: rendered.hydration,
+    };
+};
 const isMetaDefinition = (value) => {
     if (!value || typeof value !== "object") {
         return false;
@@ -232,20 +328,118 @@ export const createRouter = (initialHref, options) => {
     const baseUrl = getBaseUrl();
     const navigationMode = routerOptions.navigationMode ?? "client";
     const clientRenderMode = routerOptions.clientRenderMode ?? "payload";
+    const scrollRestoration = routerOptions.scrollRestoration !== false;
     const fallbackToUrl = routerOptions.fallbackToUrl ?? true;
     const hasCustomRoutePayloadResolver = typeof routerOptions.resolveRoutePayload === "function";
     const resolveRoutePayload = routerOptions.resolveRoutePayload ??
         ((href) => resolveRoutePayloadFromServer(href, baseUrl));
     const applyRoutePayload = routerOptions.applyRoutePayload ?? applyRoutePayloadToDom;
+    const existingScrollPositions = typeof globalThis !== "undefined"
+        ? globalThis.__HYPER_SCROLL_POSITIONS__
+        : undefined;
+    const scrollPositions = existingScrollPositions && typeof existingScrollPositions === "object"
+        ? existingScrollPositions
+        : {};
+    if (typeof globalThis !== "undefined") {
+        globalThis.__HYPER_SCROLL_POSITIONS__ = scrollPositions;
+    }
+    if (scrollRestoration && hasBrowserHistory()) {
+        try {
+            const history = globalThis.history;
+            if (history && "scrollRestoration" in history) {
+                history.scrollRestoration = "manual";
+            }
+        }
+        catch {
+            // Ignore browsers that block scrollRestoration assignment.
+        }
+    }
+    const toScrollKey = (href) => {
+        try {
+            const url = new URL(href, baseUrl);
+            return `${url.pathname}${url.search}`;
+        }
+        catch {
+            return href;
+        }
+    };
+    const saveScrollPosition = (href) => {
+        if (!scrollRestoration) {
+            return;
+        }
+        const key = toScrollKey(href);
+        if (!key) {
+            return;
+        }
+        if (typeof globalThis !== "undefined") {
+            const win = globalThis;
+            scrollPositions[key] = {
+                x: typeof win.scrollX === "number" ? win.scrollX : win.pageXOffset ?? 0,
+                y: typeof win.scrollY === "number" ? win.scrollY : win.pageYOffset ?? 0,
+            };
+        }
+    };
+    const scrollToHash = (href) => {
+        if (typeof document === "undefined") {
+            return false;
+        }
+        try {
+            const url = new URL(href, baseUrl);
+            if (!url.hash) {
+                return false;
+            }
+            const id = url.hash.slice(1);
+            if (!id) {
+                return false;
+            }
+            const node = document.getElementById(id);
+            if (node && typeof node.scrollIntoView === "function") {
+                node.scrollIntoView();
+                return true;
+            }
+        }
+        catch {
+            return false;
+        }
+        return false;
+    };
+    const restoreScrollPosition = (href, fromHistory) => {
+        if (!scrollRestoration || typeof globalThis === "undefined") {
+            return;
+        }
+        if (scrollToHash(href)) {
+            return;
+        }
+        const key = toScrollKey(href);
+        if (fromHistory && key && scrollPositions[key]) {
+            const position = scrollPositions[key];
+            const x = typeof position.x === "number" ? position.x : 0;
+            const y = typeof position.y === "number" ? position.y : 0;
+            globalThis.scrollTo?.(x, y);
+            return;
+        }
+        globalThis.scrollTo?.(0, 0);
+    };
     const listeners = new Set();
     const router = {
         pathname: "/",
         query: {},
         push: async (href) => {
-            await resolveAndNavigate(href, false);
+            await resolveAndNavigate(href, false, { type: "push" });
         },
         replace: async (href) => {
-            await resolveAndNavigate(href, true);
+            await resolveAndNavigate(href, true, { type: "replace" });
+        },
+        softReload: async () => {
+            const href = typeof globalThis !== "undefined" && "location" in globalThis
+                ? globalThis.location.href
+                : currentHref || "/";
+            await resolveAndNavigate(href, true, {
+                skipHistory: true,
+                skipScrollSave: true,
+                skipScrollRestore: true,
+                type: "softReload",
+            });
         },
         prefetch: async (href) => {
             await requestPrefetch(href);
@@ -271,26 +465,34 @@ export const createRouter = (initialHref, options) => {
                 listeners.delete(listener);
             };
         },
+        block: (blocker) => {
+            navigationBlockers.add(blocker);
+            return () => {
+                navigationBlockers.delete(blocker);
+            };
+        },
     };
+    let currentHref = "";
     const updateState = (href) => {
         const next = parseHref(href, baseUrl);
         router.pathname = next.pathname;
         router.query = next.query;
+        currentHref = href;
         for (const listener of listeners) {
             listener(router);
         }
     };
     const matchRouteGraph = (pathname) => routeMatcher?.match(pathname) ?? null;
-    const navigate = async (href, replace) => {
+    const navigate = async (href, replace, options = {}) => {
         // Important: only touch browser history when it exists (SSR-safe).
-        if (hasBrowserHistory()) {
+        if (!options.skipHistory && hasBrowserHistory()) {
             const history = globalThis.history;
             const method = replace ? "replaceState" : "pushState";
             history[method](null, "", href);
         }
         updateState(href);
     };
-    const navigateWithUrl = async (href, replace) => {
+    const navigateWithUrl = async (href, replace, _options = {}) => {
         const location = globalThis.location;
         if (location) {
             if (replace && typeof location.replace === "function") {
@@ -304,20 +506,34 @@ export const createRouter = (initialHref, options) => {
             location.href = href;
             return;
         }
-        await navigate(href, replace);
+        await navigate(href, replace, _options);
     };
-    const navigateWithPayload = async (href, replace) => {
+    const navigateWithPayload = async (href, replace, options = {}) => {
         const payload = await resolveRoutePayload(href);
-        if (payload) {
+        if (payload && payload.kind === ROUTE_REDIRECT_KIND) {
+            const destination = payload.destination;
+            if (destination) {
+                await resolveAndNavigate(destination, Boolean(payload.replace), {
+                    ...options,
+                    type: "redirect",
+                    skipScrollSave: true,
+                });
+                return true;
+            }
+        }
+        if (payload && payload.kind === "hyper-route-payload") {
             await applyRoutePayload(payload);
-            await navigate(href, replace);
+            await navigate(href, replace, options);
+            if (!options.skipScrollRestore) {
+                restoreScrollPosition(href, Boolean(options.fromHistory));
+            }
             return true;
         }
         if (fallbackToUrl) {
-            await navigateWithUrl(href, replace);
+            await navigateWithUrl(href, replace, options);
             return false;
         }
-        await navigate(href, replace);
+        await navigate(href, replace, options);
         return false;
     };
     const resolveClientRouteRender = async (href) => {
@@ -359,36 +575,39 @@ export const createRouter = (initialHref, options) => {
             return null;
         }
     };
-    const navigateWithClientModule = async (href, replace) => {
+    const navigateWithClientModule = async (href, replace, options = {}) => {
         const rendered = await resolveClientRouteRender(href);
         if (!rendered) {
             return false;
         }
         await applyRoutePayload(toRoutePayload(rendered));
-        await navigate(href, replace);
+        await navigate(href, replace, options);
+        if (!options.skipScrollRestore) {
+            restoreScrollPosition(href, Boolean(options.fromHistory));
+        }
         return true;
     };
-    const navigateWithClientRender = async (href, replace) => {
+    const navigateWithClientRender = async (href, replace, options = {}) => {
         if (clientRenderMode === "module") {
-            const moduleApplied = await navigateWithClientModule(href, replace);
+            const moduleApplied = await navigateWithClientModule(href, replace, options);
             if (moduleApplied) {
                 return;
             }
         }
-        await navigateWithPayload(href, replace);
+        await navigateWithPayload(href, replace, options);
     };
-    const navigateByMode = async (href, replace) => {
+    const navigateByMode = async (href, replace, options = {}) => {
         if (navigationMode === "url") {
-            await navigateWithUrl(href, replace);
+            await navigateWithUrl(href, replace, options);
             return;
         }
-        await navigateWithClientRender(href, replace);
+        await navigateWithClientRender(href, replace, options);
     };
-    const resolveDynamicFallback = async (href, replace) => {
+    const resolveDynamicFallback = async (href, replace, options = {}) => {
         const next = parseHref(href, baseUrl);
         const forceDynamic = shouldForceDynamicFallback(next.pathname, routerOptions.fallbackPolicy);
         if (routeMatcher && !forceDynamic && matchRouteGraph(next.pathname)) {
-            await navigateByMode(href, replace);
+            await navigateByMode(href, replace, options);
             return;
         }
         if (routerOptions.resolveDynamicManifest) {
@@ -396,7 +615,7 @@ export const createRouter = (initialHref, options) => {
             if (envelope) {
                 const policy = envelope.policy?.render ?? "auto";
                 if (policy === "redirect" && envelope.policy?.redirect) {
-                    await navigateByMode(envelope.policy.redirect, replace);
+                    await navigateByMode(envelope.policy.redirect, replace, options);
                     return;
                 }
                 let policyRender;
@@ -424,22 +643,30 @@ export const createRouter = (initialHref, options) => {
                     }
                 }
                 if (decision.mode === "ssr") {
-                    await navigateWithUrl(href, replace);
+                    await navigateWithUrl(href, replace, options);
                     return;
                 }
                 const meta = envelope.meta ??
                     (isMetaDefinition(envelope.definition) ? envelope.definition.root : undefined);
                 if (decision.mode === "csr" && meta !== undefined) {
                     await routerOptions.renderDynamic?.(meta, envelope);
-                    await navigateByMode(href, replace);
+                    await navigateByMode(href, replace, options);
                     return;
                 }
             }
         }
-        await navigateByMode(href, replace);
+        await navigateByMode(href, replace, options);
     };
-    const resolveAndNavigate = async (href, replace) => {
-        await resolveDynamicFallback(href, replace);
+    const resolveAndNavigate = async (href, replace, options = {}) => {
+        const navType = options.type ?? (replace ? "replace" : "push");
+        const allow = runNavigationBlockers({ href, replace, type: navType });
+        if (!allow) {
+            return;
+        }
+        if (!options.skipScrollSave) {
+            saveScrollPosition(currentHref || href);
+        }
+        await resolveDynamicFallback(href, replace, options);
     };
     const seed = resolved.initialHref ??
         (typeof globalThis !== "undefined" && "location" in globalThis
@@ -450,9 +677,30 @@ export const createRouter = (initialHref, options) => {
         // Keep router state in sync with back/forward navigation.
         globalThis.addEventListener("popstate", () => {
             const location = globalThis.location;
-            if (location?.href) {
-                updateState(location.href);
+            if (!location?.href) {
+                return;
             }
+            const nextHref = location.href;
+            const allow = runNavigationBlockers({ href: nextHref, replace: true, type: "popstate" });
+            if (!allow) {
+                if (hasBrowserHistory()) {
+                    const history = globalThis.history;
+                    try {
+                        history.pushState(null, "", currentHref);
+                        updateState(currentHref);
+                    }
+                    catch {
+                        // Ignore history reversal failures.
+                    }
+                }
+                return;
+            }
+            saveScrollPosition(currentHref || nextHref);
+            void resolveDynamicFallback(nextHref, true, {
+                fromHistory: true,
+                skipScrollSave: true,
+                type: "popstate",
+            });
         });
     }
     return router;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { GetServerProps as HyperGetServerProps, GetStaticPaths as HyperGetStaticPaths, GetStaticProps as HyperGetStaticProps, PageContextBase, PageComponent, StaticPropsContext, StaticPropsResult, StaticPathsResult, ServerPropsContext, ServerPropsResult } from "@tyndall/core";
+import type { ErrorDescriptor, GetServerProps as HyperGetServerProps, GetStaticPaths as HyperGetStaticPaths, GetStaticProps as HyperGetStaticProps, GetRouteData as HyperGetRouteData, InitServerHook, PageContextBase, PageComponent, RedirectDescriptor, RouteDataContext as HyperRouteDataContext, RouteDataMap as HyperRouteDataMap, RouteDataResult as HyperRouteDataResult, StaticPropsContext, StaticPropsResult, StaticPathsResult, ServerPropsContext, ServerPropsResult } from "@tyndall/core";
 export type NextPageContext = PageContextBase;
 export type NextPage<Props = Record<string, unknown>> = PageComponent<Props>;
 export type NextStaticPropsContext = StaticPropsContext;
@@ -14,4 +14,18 @@ export type GetStaticPaths = HyperGetStaticPaths;
 export type GetServerSidePropsContext = ServerPropsContext;
 export type GetServerSidePropsResult<Props = Record<string, unknown>> = ServerPropsResult<Props>;
 export type GetServerSideProps<Props = Record<string, unknown>> = HyperGetServerProps<Props>;
+export interface AppProps {
+    Component: PageComponent<Record<string, unknown>>;
+    pageProps: Record<string, unknown>;
+    routeData: HyperRouteDataMap;
+    routeId: string;
+}
+export type AppComponent = (props: AppProps) => unknown;
+export type GetRouteData<Data = unknown> = HyperGetRouteData<Data>;
+export type RouteDataResult<Data = unknown> = HyperRouteDataResult<Data>;
+export type RouteDataContext = HyperRouteDataContext;
+export type RouteDataMap = HyperRouteDataMap;
+export type InitServer = InitServerHook;
+export type RedirectResponse = RedirectDescriptor;
+export type ErrorResponse = ErrorDescriptor;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC;AAC9C,MAAM,MAAM,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAC7E,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC9F,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AACtD,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE9F,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACvD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC7F,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACrD,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACzF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC3D,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AACjG,MAAM,MAAM,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,YAAY,IAAI,iBAAiB,EACjC,cAAc,EACd,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,IAAI,qBAAqB,EACzC,YAAY,IAAI,iBAAiB,EACjC,eAAe,IAAI,oBAAoB,EACvC,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC;AAC9C,MAAM,MAAM,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAC7E,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC9F,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AACtD,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE9F,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACvD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC7F,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACrD,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACzF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC3D,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AACjG,MAAM,MAAM,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7F,MAAM,WAAW,QAAQ;IACvB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC;AAExD,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;AACnE,MAAM,MAAM,eAAe,CAAC,IAAI,GAAG,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACzE,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAC7C,MAAM,MAAM,UAAU,GAAG,cAAc,CAAC;AACxC,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyndall/react",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -21,8 +21,8 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@tyndall/core": "workspace:*",
-    "@tyndall/shared": "workspace:*",
+    "@tyndall/core": "^0.0.2",
+    "@tyndall/shared": "^0.0.2",
     "react-router": "^7.13.0"
   },
   "peerDependencies": {