veryfront 0.1.992 → 0.1.994

package/esm/src/react/runtime/core.js

@@ -50,11 +50,160 @@ function collectHead(data) {
     const collector = dntShim.dntGlobalThis[HEAD_COLLECTOR_SYMBOL];
     collector?.(data);
 }
-/** Provides the router context value used by `useRouter()`. */
-export function RouterProvider({ children, router, }) {
-    return React.createElement(RouterContext.Provider, { value: router ?? defaultRouter }, children);
+const NAVIGATION_STORE_KEY = Symbol.for("veryfront.navigation.store.v1");
+function getNavigationStore() {
+    const holder = dntShim.dntGlobalThis;
+    const existing = holder[NAVIGATION_STORE_KEY];
+    if (existing)
+        return existing;
+    const listeners = new Set();
+    let navigator = null;
+    const store = {
+        subscribe(listener) {
+            listeners.add(listener);
+            return () => {
+                listeners.delete(listener);
+            };
+        },
+        getHref() {
+            const loc = globalThis.location;
+            return loc ? `${loc.pathname}${loc.search}${loc.hash}` : "/";
+        },
+        notify() {
+            for (const listener of [...listeners]) {
+                try {
+                    listener();
+                }
+                catch {
+                    // A subscriber threw; ignore it and continue notifying the others.
+                }
+            }
+        },
+        navigate(href, options) {
+            if (navigator)
+                return navigator(href, options);
+            globalThis.location?.assign(href);
+            return Promise.resolve();
+        },
+        setNavigator(next) {
+            navigator = next;
+        },
+    };
+    holder[NAVIGATION_STORE_KEY] = store;
+    return store;
+}
+function hrefFromRouter(router) {
+    if (!router)
+        return undefined;
+    const search = new URLSearchParams(router.query ?? {}).toString();
+    return search ? `${router.pathname}?${search}` : router.pathname;
+}
+function splitHref(href) {
+    const queryIndex = href.indexOf("?");
+    if (queryIndex === -1) {
+        const hashIndex = href.indexOf("#");
+        return { pathname: hashIndex === -1 ? href : href.slice(0, hashIndex), search: "" };
+    }
+    const afterQuery = href.slice(queryIndex + 1);
+    const hashIndex = afterQuery.indexOf("#");
+    return {
+        pathname: href.slice(0, queryIndex),
+        search: hashIndex === -1 ? afterQuery : afterQuery.slice(0, hashIndex),
+    };
+}
+/**
+ * Provides the router context. `pathname`/`query` track the live URL through the
+ * shared navigation store's `useSyncExternalStore` surface; `params`/`domain`
+ * are seeded from the `router` prop. One component serves both sides: React uses
+ * `getServerSnapshot` (the seed href) during SSR and the live store on the
+ * client, so there is no environment branch — the server render and the first
+ * client render match by construction.
+ *
+ * The store is a stable singleton that exists on first access, so there is no
+ * "is the router mounted yet?" race: the subscription is live from the first
+ * render, and the router's navigations notify through the same object. Page
+ * context (frontmatter/slug/headings) is a separate concern, provided by
+ * `PageContextProvider`, which derives its live location from this router.
+ */
+export function RouterProvider({ router, children }) {
+    const store = getNavigationStore();
+    const seed = router ?? defaultRouter;
+    // The server snapshot is derived from the router itself, so the first client
+    // render matches the server exactly (both come from one `RouterValue`).
+    const seedHref = hrefFromRouter(router) ?? "/";
+    const getServerSnapshot = React.useCallback(() => seedHref, [seedHref]);
+    const href = React.useSyncExternalStore(store.subscribe, store.getHref, getServerSnapshot);
+    const { pathname, search } = splitHref(href);
+    const query = React.useMemo(() => Object.fromEntries(new URLSearchParams(search)), [search]);
+    // `isMounted` is `false` on the server and the first client render (so they
+    // agree — hydration-safe), then flips `true` after mount. Consumers guard on
+    // this (e.g. `if (!router.isMounted) return null`).
+    const [isMounted, setIsMounted] = React.useState(false);
+    React.useEffect(() => setIsMounted(true), []);
+    const routerValue = React.useMemo(() => ({
+        domain: seed.domain || (globalThis.location?.hostname ?? ""),
+        path: pathname,
+        pathname,
+        params: seed.params,
+        query,
+        isPreview: seed.isPreview,
+        isMounted,
+        navigate: (url) => store.navigate(url, { history: "push" }),
+        push: (url) => store.navigate(url, { history: "push" }),
+        replace: (url) => store.navigate(url, { history: "replace" }),
+        reload: async () => {
+            globalThis.location?.reload();
+        },
+    }), [pathname, query, seed.params, seed.domain, seed.isPreview, isMounted, store]);
+    return React.createElement(RouterContext.Provider, { value: routerValue }, children);
+}
+/**
+ * Wraps a hydrated client component in `RouterProvider` (router state) nested
+ * with `PageContextProvider` (frontmatter), seeded from the live location plus
+ * the initial route match — mirroring how SSR wraps the tree.
+ *
+ * The RSC hydration path calls this through a runtime import of
+ * `veryfront/router`, so it runs under the app's React instance — the same one
+ * the hydrated component uses, and the same providers and `React` this module
+ * already reference. That is why the caller does not (and must not) pass a
+ * `React` across the module boundary: the wrapping happens here, inside the
+ * module that owns React.
+ */
+export function wrapForHydration(child, options = {}) {
+    const loc = globalThis.location;
+    const pathname = loc?.pathname ?? "/";
+    const params = options.params ?? {};
+    const query = loc
+        ? Object.fromEntries(new URLSearchParams(loc.search))
+        : {};
+    const router = {
+        ...defaultRouter,
+        domain: loc?.hostname ?? "",
+        path: pathname,
+        pathname,
+        params,
+        query,
+    };
+    // `PageContextProvider` derives its live location from the router above; only
+    // the page-authored bits (frontmatter/slug) are seeded here.
+    const pageContext = {
+        ...defaultPageContext,
+        slug: pathname,
+        path: pathname,
+        params,
+        query,
+        frontmatter: options.frontmatter ?? {},
+    };
+    return React.createElement(RouterProvider, {
+        router,
+        children: React.createElement(PageContextProvider, { pageContext, children: child }),
+    });
 }
-/** Reads the current router context. */
+/**
+ * Reads the router context: `pathname`, `query`, `params`, and the navigation
+ * actions. Reactive across client-side navigation — this is the single hook for
+ * location and navigation state.
+ */
 export function useRouter() {
     return React.useContext(RouterContext);
 }
@@ -62,9 +211,22 @@ export function useRouter() {
 export function Link({ prefetch = true, children, ...rest }) {
     return React.createElement("a", { ...rest, "data-prefetch": prefetch ? "true" : "false" }, children);
 }
-/** Provides page context to route and MDX descendants. */
+/**
+ * Provides page context to route and MDX descendants. Page-authored fields
+ * (`frontmatter`, `slug`, `headings`) come from the `pageContext` prop; the
+ * location fields (`path`, `query`, `params`) are derived from the router so
+ * they stay reactive and there is a single source of truth — `usePageContext()`
+ * exposes the same `query`/`pathname` as `useRouter()`. When rendered outside a
+ * `RouterProvider` (no live router) it falls back to the seed's own location.
+ */
 export function PageContextProvider({ children, pageContext, }) {
-    return React.createElement(PageContextContext.Provider, { value: pageContext ?? defaultPageContext }, children);
+    const seed = pageContext ?? defaultPageContext;
+    const router = React.useContext(RouterContext);
+    const hasRouter = router !== defaultRouter;
+    const value = React.useMemo(() => hasRouter
+        ? { ...seed, path: router.pathname, query: router.query, params: router.params }
+        : seed, [seed, hasRouter, router.pathname, router.query, router.params]);
+    return React.createElement(PageContextContext.Provider, { value }, children);
 }
 /** Reads the current page context. */
 export function usePageContext() {

package/esm/src/rendering/layouts/layout-applicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-applicator.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/layouts/layout-applicator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,YAAY,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAKzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAiBxE,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;IAClC,gBAAgB,EAAE,aAAa,CAAC;IAChC,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,UAAU,CAAC,CAAM;IACzB,OAAO,CAAC,MAAM,CAAC,CAAoC;IACnD,OAAO,CAAC,WAAW,CAAC,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAqD;IACtE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,kBAAkB,CAAC,CAAyB;IACpD,OAAO,CAAC,+BAA+B,CAAC,CAGrC;gBAES,OAAO,EAAE,wBAAwB;IAiBvC,YAAY,CAChB,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;YA+FvB,gBAAgB;YAuDhB,sBAAsB;YAWtB,8BAA8B;YA4D9B,oBAAoB;YAqDpB,mBAAmB;YAuCnB,0BAA0B;CAgEzC"}
+{"version":3,"file":"layout-applicator.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/layouts/layout-applicator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,YAAY,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAKzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAiBxE,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;IAClC,gBAAgB,EAAE,aAAa,CAAC;IAChC,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,UAAU,CAAC,CAAM;IACzB,OAAO,CAAC,MAAM,CAAC,CAAoC;IACnD,OAAO,CAAC,WAAW,CAAC,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAqD;IACtE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,kBAAkB,CAAC,CAAyB;IACpD,OAAO,CAAC,+BAA+B,CAAC,CAGrC;gBAES,OAAO,EAAE,wBAAwB;IAiBvC,YAAY,CAChB,WAAW,EAAE,YAAY,CAAC,YAAY,EACtC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,aAAa,EAAE,UAAU,EAAE,EAC3B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;YAyFvB,gBAAgB;YAuDhB,sBAAsB;YAWtB,8BAA8B;YA4D9B,oBAAoB;YAqDpB,mBAAmB;YAuCnB,0BAA0B;CAgEzC"}

package/esm/src/rendering/layouts/layout-applicator.js

@@ -1,5 +1,6 @@
 import { dirname, join } from "../../platform/compat/path/index.js";
 import { rendererLogger } from "../../utils/index.js";
+import { flattenRouteParams } from "../../routing/index.js";
 import { withSpan } from "../../observability/tracing/otlp-setup.js";
 import { SpanNames } from "../../observability/tracing/span-names.js";
 import { resolve as resolveContract } from "../../extensions/contracts.js";
@@ -66,11 +67,7 @@ export class LayoutApplicator {
             }
             const React = await getProjectReact();
             const headingsArray = this.headings ?? [];
-            const flatParams = this.params
-                ? Object.fromEntries(Object.entries(this.params)
-                    .map(([key, value]) => [key, Array.isArray(value) ? value[0] : value])
-                    .filter((entry) => entry[1] !== undefined))
-                : {};
+            const flatParams = flattenRouteParams(this.params);
             const query = this.requestUrl ? Object.fromEntries(this.requestUrl.searchParams) : {};
             const pageContext = {
                 slug: pageInfo.entity.slug || "",

package/esm/src/rendering/orchestrator/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAClF,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA+FlF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAqEZ,sBAAsB;YAuDtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAoF9B;;;;OAIG;YACW,gBAAgB;CAc/B"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/html.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAClF,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AA+FlF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB;IAIjC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BjE,kBAAkB,CACtB,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAqEZ,sBAAsB;YAwDtB,4BAA4B;YAiB5B,wBAAwB;YAmBxB,gBAAgB;YAyBhB,kBAAkB;IAwDhC,OAAO,CAAC,cAAc;YAQR,eAAe;YAaf,gBAAgB;IAoF9B;;;;OAIG;YACW,gBAAgB;CAc/B"}

package/esm/src/rendering/orchestrator/html.js

@@ -163,6 +163,7 @@ export class HTMLGenerator {
             pagePath,
             projectDir: this.config.projectDir,
             isClientPage,
+            params: context.options?.params,
             environment: context.options?.environment,
             isLocalProject: this.config.mode === "development",
             nonce: context.options?.nonce,

package/esm/src/rendering/page-rendering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page-rendering.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/page-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,YAAY,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAQrG,UAAU,aAAa;IACrB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAInE;AAED,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,UAAU,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GACA,OAAO,CAAC,sBAAsB,CAAC,CA4CjC;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CAyHxB"}
+{"version":3,"file":"page-rendering.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/page-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,YAAY,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAa,UAAU,EAAE,MAAM,mBAAmB,CAAC;AASrG,UAAU,aAAa;IACrB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC;IACvC,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,0BAA0B;IAClC,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAInE;AAED,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,UAAU,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IACR,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GACA,OAAO,CAAC,sBAAsB,CAAC,CA4CjC;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,aAAa,EAC/B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,SAAS,CAAC,EACvB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gFAAgF;IAChF,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CAmHxB"}

package/esm/src/rendering/page-rendering.js

@@ -3,6 +3,7 @@ import { RENDER_ERROR } from "../errors/error-registry.js";
 import { mdxRenderer } from "../transforms/mdx/index.js";
 import { clearMdxEsmCacheNamespace } from "../transforms/mdx/esm-module-loader/index.js";
 import { getProjectReact } from "../react/index.js";
+import { flattenRouteParams } from "../routing/index.js";
 import { compileContent } from "../transforms/mdx/compiler/index.js";
 import { ensureError, getErrorMessage } from "../errors/veryfront-error.js";
 import { withSpan } from "../observability/tracing/otlp-setup.js";
@@ -77,11 +78,7 @@ export function handleMDXPage(pageInfo, slug, projectDir, mergedComponents, _com
             }
             if (typeof mod.generateMetadata === "function") {
                 try {
-                    const params = options?.params
-                        ? Object.fromEntries(Object.entries(options.params)
-                            .map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])
-                            .filter((entry) => entry[1] !== undefined))
-                        : {};
+                    const params = flattenRouteParams(options?.params);
                     const query = options?.url ? Object.fromEntries(options.url.searchParams) : {};
                     const gen = await mod.generateMetadata({
                         params,

package/esm/src/rendering/rsc/client-boot.ts

@@ -14,6 +14,7 @@ import {
 import { validateTrustedHtml } from "#veryfront/security/client/html-sanitizer.ts";
 import { consumeNdjsonStream, getContainer } from "./client-dom.ts";
 import { hydrateAllClientBoundaries } from "./hydrate-client.ts";
+import { wrapWithRouterProvider } from "./hydration-router.ts";
 import { RSC_PATH_PREFIX, RSC_ROOT_ID } from "./constants.ts";
 
 /**
@@ -173,7 +174,10 @@ async function hydratePageComponent(
     const hydrationRoot = shouldWrapPageHydrationRoot(root, document.body)
       ? createPageHydrationRoot(bodyChildren, document.body)
       : root;
-    const component = React.createElement(Component, {});
+    const component = await wrapWithRouterProvider(
+      React.createElement(Component, {}),
+      readHydrationData(document),
+    );
 
     if (shouldRenderPageComponent(strategy)) {
       ReactDOM.createRoot(hydrationRoot).render(component);

package/esm/src/rendering/rsc/client-module-strategy.d.ts

@@ -7,6 +7,12 @@ export interface ClientRuntimeHydrationData {
     pagePath?: string;
     clientModuleStrategy?: ClientModuleStrategy;
     dev?: boolean;
+    /** Route slug for the current page (from the route match). */
+    slug?: string;
+    /** Route params from the initial match — used to seed the reactive router. */
+    params?: Record<string, string | string[]>;
+    /** Page frontmatter — exposed reactively via `usePageContext()`. */
+    frontmatter?: Record<string, unknown>;
 }
 export interface ClientModuleUrlOptions {
     strategy: ClientModuleStrategy;
@@ -24,4 +30,12 @@ export declare function getHydrationReactImportSpecifiers(doc?: Document, versio
     react: string;
     reactDomClient: string;
 };
+/**
+ * The import specifier for the framework router module, or `null` if the page's
+ * import map does not own it. Returned as a value (not a literal) so callers can
+ * `import(specifier)` and have the bundler leave it as a runtime import — the
+ * module resolves to the app's React instance, which is required for the
+ * provider's hooks to run under the same React as the hydrated component.
+ */
+export declare function getHydrationRouterImportSpecifier(doc?: Document): string | null;
 //# sourceMappingURL=client-module-strategy.d.ts.map

package/esm/src/rendering/rsc/client-module-strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-module-strategy.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/client-module-strategy.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,oBAAoB,GAAG,IAAI,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,2BAA2B;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CACxC;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,2BAA2B,GACnC,oBAAoB,CAUtB;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,GAAE,QAAmB,GACvB,0BAA0B,GAAG,IAAI,CASnC;AAED,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,0BAA0B,GAAG,IAAI,GAC/C,oBAAoB,CAMtB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAGvE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAOnF;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,GAAE,QAAmB,EACxB,OAAO,GAAE,MAA8B,GACtC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAS3C"}
+{"version":3,"file":"client-module-strategy.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/rsc/client-module-strategy.ts"],"names":[],"mappings":"AAYA,MAAM,MAAM,oBAAoB,GAAG,IAAI,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,2BAA2B;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;CACxC;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,2BAA2B,GACnC,oBAAoB,CAUtB;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,GAAE,QAAmB,GACvB,0BAA0B,GAAG,IAAI,CASnC;AAED,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,0BAA0B,GAAG,IAAI,GAC/C,oBAAoB,CAMtB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAGvE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAOnF;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,GAAE,QAAmB,EACxB,OAAO,GAAE,MAA8B,GACtC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAS3C;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,GAAG,GAAE,QAAmB,GAAG,MAAM,GAAG,IAAI,CAGzF"}

package/esm/src/rendering/rsc/client-module-strategy.js

@@ -54,3 +54,14 @@ export function getHydrationReactImportSpecifiers(doc = document, version = REAC
             : getReactDOMClientCDNUrl(version),
     };
 }
+/**
+ * The import specifier for the framework router module, or `null` if the page's
+ * import map does not own it. Returned as a value (not a literal) so callers can
+ * `import(specifier)` and have the bundler leave it as a runtime import — the
+ * module resolves to the app's React instance, which is required for the
+ * provider's hooks to run under the same React as the hydrated component.
+ */
+export function getHydrationRouterImportSpecifier(doc = document) {
+    const imports = getDocumentImportMapImports(doc);
+    return importMapOwnsSpecifier("veryfront/router", imports) ? "veryfront/router" : null;
+}

package/esm/src/rendering/rsc/hydrate-client.ts

@@ -10,6 +10,7 @@ import {
   readHydrationData,
   resolveClientModuleStrategy,
 } from "./client-module-strategy.ts";
+import { wrapWithRouterProvider } from "./hydration-router.ts";
 type Manifest = {
   version: number;
   hash?: string;
@@ -143,7 +144,8 @@ export async function hydrateAllClientBoundaries(doc: Document = document): Prom
     return;
   }
 
-  const clientModuleStrategy = resolveClientModuleStrategy(readHydrationData(doc));
+  const hydrationData = readHydrationData(doc);
+  const clientModuleStrategy = resolveClientModuleStrategy(hydrationData);
 
   try {
     if (globalThis.__VF_TEST_MODE__) {
@@ -176,7 +178,12 @@ export async function hydrateAllClientBoundaries(doc: Document = document): Prom
 
     try {
       const root: ReactRoot = createRoot(el);
-      root.render(React.createElement(Cmp as React.FC, {}));
+      const tree = await wrapWithRouterProvider(
+        React.createElement(Cmp as React.FC, {}),
+        hydrationData,
+        doc,
+      );
+      root.render(tree);
       el.dataset.hydrated = "true";
     } catch (e) {
       rscLogger.warn("hydrate: render failed", e);

package/esm/src/rendering/script-page-handling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-page-handling.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/script-page-handling.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EAGV,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAenE,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAqHD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,YAAY,CAAC,CAiDvB"}
+{"version":3,"file":"script-page-handling.d.ts","sourceRoot":"","sources":["../../../src/src/rendering/script-page-handling.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EAGV,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAenE,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA+GD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,YAAY,CAAC,CAiDvB"}

package/esm/src/rendering/script-page-handling.js

@@ -9,6 +9,7 @@ import { rewriteNpmImports } from "../transforms/npm-import-rewrites.js";
 import { dirname, join } from "../platform/compat/path/index.js";
 import { cwd } from "../platform/compat/process.js";
 import { RENDER_ERROR } from "../errors/error-registry.js";
+import { flattenRouteParams } from "../routing/index.js";
 import { createError, toError } from "../errors/veryfront-error.js";
 import { computeHash } from "./utils/index.js";
 import { wrapInHTMLShell } from "../html/index.js";
@@ -75,11 +76,7 @@ function extractHtmlAndMetadata(output) {
     }));
 }
 function buildPageContext(pageInfo, slug, params, url) {
-    const flatParams = params
-        ? Object.fromEntries(Object.entries(params)
-            .map(([k, v]) => [k, Array.isArray(v) ? v[0] : v])
-            .filter((entry) => entry[1] !== undefined))
-        : {};
+    const flatParams = flattenRouteParams(params);
     return {
         params: flatParams,
         query: url ? Object.fromEntries(url.searchParams) : {},

package/esm/src/routing/api/context-builder.d.ts

@@ -16,5 +16,9 @@ export interface APIContext {
     fs: FileSystemAdapter;
 }
 export declare function createContext(request: Request, match: RouteMatch, fs: FileSystemAdapter): APIContext;
+/**
+ * @deprecated Use {@link flattenRouteParams} directly. Kept as a thin alias so
+ * the routing barrel exposes a single flattener implementation (issue #2742).
+ */
 export declare function normalizeParams(params: Record<string, string | string[]>): Record<string, string>;
 //# sourceMappingURL=context-builder.d.ts.map

package/esm/src/routing/api/context-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-builder.d.ts","sourceRoot":"","sources":["../../../../src/src/routing/api/context-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,CAAC;AAExB,mDAAmD;AACnD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,YAAY,KAAK,QAAQ,CAAC;IACvD,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,KAAK,QAAQ,CAAC;IACtD,EAAE,EAAE,iBAAiB,CAAC;CACvB;AAgBD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,iBAAiB,GACpB,UAAU,CAmBZ;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}
+{"version":3,"file":"context-builder.d.ts","sourceRoot":"","sources":["../../../../src/src/routing/api/context-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,CAAC;AAExB,mDAAmD;AACnD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,YAAY,KAAK,QAAQ,CAAC;IACvD,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,KAAK,QAAQ,CAAC;IACtD,EAAE,EAAE,iBAAiB,CAAC;CACvB;AAgBD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,iBAAiB,GACpB,UAAU,CAmBZ;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAExB"}

package/esm/src/routing/api/context-builder.js

@@ -1,4 +1,5 @@
 import { parseCookies } from "../../utils/cookie-utils.js";
+import { flattenRouteParams } from "../flatten-route-params.js";
 export { parseCookies };
 function createResponse(body, contentType, init) {
     return new Response(body, {
@@ -26,10 +27,10 @@ export function createContext(request, match, fs) {
         fs,
     };
 }
+/**
+ * @deprecated Use {@link flattenRouteParams} directly. Kept as a thin alias so
+ * the routing barrel exposes a single flattener implementation (issue #2742).
+ */
 export function normalizeParams(params) {
-    const out = {};
-    for (const [key, value] of Object.entries(params)) {
-        out[key] = Array.isArray(value) ? value.join("/") : value;
-    }
-    return out;
+    return flattenRouteParams(params);
 }

package/esm/src/routing/flatten-route-params.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Flattens matched route params (which may be arrays for catch-all `[...slug]`
+ * segments) into the `Record<string, string>` shape the router value exposes.
+ *
+ * Catch-all segments are **joined with `/`** so no path information is lost —
+ * `/docs/guides/intro` -> `{ slug: "guides/intro" }`, not `{ slug: "guides" }`.
+ * This matches the client SPA normalizer and the RSC hydration normalizer, so
+ * server and client agree.
+ */
+export declare function flattenRouteParams(params?: Record<string, string | string[]>): Record<string, string>;
+//# sourceMappingURL=flatten-route-params.d.ts.map

package/esm/src/routing/flatten-route-params.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flatten-route-params.d.ts","sourceRoot":"","sources":["../../../src/src/routing/flatten-route-params.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GACzC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}

package/esm/src/routing/flatten-route-params.js

@@ -0,0 +1,20 @@
+/**
+ * Flattens matched route params (which may be arrays for catch-all `[...slug]`
+ * segments) into the `Record<string, string>` shape the router value exposes.
+ *
+ * Catch-all segments are **joined with `/`** so no path information is lost —
+ * `/docs/guides/intro` -> `{ slug: "guides/intro" }`, not `{ slug: "guides" }`.
+ * This matches the client SPA normalizer and the RSC hydration normalizer, so
+ * server and client agree.
+ */
+export function flattenRouteParams(params) {
+    if (!params)
+        return {};
+    const flat = {};
+    for (const [key, value] of Object.entries(params)) {
+        if (value === undefined)
+            continue;
+        flat[key] = Array.isArray(value) ? value.join("/") : value;
+    }
+    return flat;
+}

package/esm/src/routing/index.d.ts

@@ -5,6 +5,7 @@
  * @module routing
  */
 export type { Route, RouteMatch } from "./matchers/index.js";
+export { flattenRouteParams } from "./flatten-route-params.js";
 export { getSpecificityScore, matchRoute, normalizePath, PageRouteMatcher, parseRoute, } from "./matchers/index.js";
 export type { PathCandidates, RouteParams } from "./slug-mapper/index.js";
 export { extractParams, getPathCandidates, getSlugFromPath, getSupportedExtensions, isDynamicRoute, matchesPattern, normalizeSlug, pathToSlug, slugToPath, } from "./slug-mapper/index.js";

package/esm/src/routing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/src/routing/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,UAAU,GACX,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,cAAc,EACd,aAAa,EACb,UAAU,EACV,UAAU,GACX,MAAM,wBAAwB,CAAC;AAEhC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACpF,OAAO,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,mBAAmB,EACnB,IAAI,EACJ,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,YAAY,GACb,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/src/routing/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,UAAU,GACX,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,cAAc,EACd,aAAa,EACb,UAAU,EACV,UAAU,GACX,MAAM,wBAAwB,CAAC;AAEhC,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAE3B,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACpF,OAAO,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,mBAAmB,EACnB,IAAI,EACJ,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,YAAY,GACb,MAAM,gBAAgB,CAAC"}

package/esm/src/routing/index.js

@@ -4,6 +4,7 @@
  *
  * @module routing
  */
+export { flattenRouteParams } from "./flatten-route-params.js";
 export { getSpecificityScore, matchRoute, normalizePath, PageRouteMatcher, parseRoute, } from "./matchers/index.js";
 export { extractParams, getPathCandidates, getSlugFromPath, getSupportedExtensions, isDynamicRoute, matchesPattern, normalizeSlug, pathToSlug, slugToPath, } from "./slug-mapper/index.js";
 export { extractPageDataFromScript, NavigationHandlers, PageLoader, PageTransition, ViewportPrefetch, } from "./client/index.js";

package/esm/src/server/services/rsc/endpoints/rsc-bundles.generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsc-bundles.generated.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/services/rsc/endpoints/rsc-bundles.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,kBAAkB,EAAE,MAC2u2B,CAAC;AAE7w2B,eAAO,MAAM,iBAAiB,EAAE,MACsunB,CAAC"}
+{"version":3,"file":"rsc-bundles.generated.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/services/rsc/endpoints/rsc-bundles.generated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,kBAAkB,EAAE,MAC8v3B,CAAC;AAEhy3B,eAAO,MAAM,iBAAiB,EAAE,MACsunB,CAAC"}