@rsc-kit/core 0.22.4 → 0.22.5

package/dist/host.js

@@ -268,6 +268,22 @@ function refererPath(referer, origin, hosts = []) {
         return null;
     }
 }
+/**
+ * The url of the page an action was invoked from, query string included -
+ * or undefined. On this origin whatever the header names: it only ever
+ * decides what a render reads from searchParams(), never where anything goes.
+ */
+function pageHref(referer, origin) {
+    if (!referer)
+        return undefined;
+    try {
+        const parsed = new URL(referer, origin);
+        return new URL(parsed.pathname + parsed.search, origin).href;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * How large a query url may be before it is refused.
  *
@@ -392,11 +408,15 @@ export function createRscHandler(options) {
             return false;
         return (await source(`${patternKey(match.route)}.ppr.html`)) !== null;
     }
-    function pageContext(match, props, url) {
+    function pageContext(match, props, url, href) {
         return {
             component: match.route.component,
             props,
             url,
+            // The page's whole url, query string included, for what an action
+            // re-renders of it - see withUrl in request.ts. `url` is the path the
+            // route matched and the key a navigation to it renders under.
+            href,
             layouts: match.route.layouts.map((component) => ({
                 component,
                 props: {},
@@ -1564,7 +1584,7 @@ export function createRscHandler(options) {
         const from = refererPath(request.headers.get(HEADER.referer), url.origin, siteHosts);
         const match = from ? matchRoute(routes, from) : null;
         const page = match
-            ? pageContext(match, await propsFor(match, request), from ?? undefined)
+            ? pageContext(match, await propsFor(match, request), from ?? undefined, pageHref(request.headers.get(HEADER.referer), url.origin))
             : undefined;
         // Scoped to this action: revalidate() called anywhere inside it, at any
         // depth, marks here and nowhere else — two requests can be in flight and