@rsc-kit/core 0.23.0 → 0.24.1

package/dist/host.d.ts

@@ -1,3 +1,5 @@
+/** Whether a page or guard of this app answered the request with notFound(). */
+export declare function pageSaidNotFound(request: Request): boolean;
 export { revalidate } from "./revalidate.js";
 import { type CriticalAssets } from "./earlyHints.js";
 /**

package/dist/host.js

@@ -13,7 +13,7 @@
 //
 //   const rsc = createRscHandler({ engine, manifest, assets })
 //   Bun.serve({ fetch: (req) => rsc(req).then((r) => r ?? new Response('', { status: 404 })) })
-import { allowFor, matchApiRoute, matchIntercept, matchRoute, retentionKey, sharedDepth, } from "./routing.js";
+import { allowFor, matchApiRoute, matchIntercept, layoutChain, matchRoute, retentionKey, sharedDepth, } from "./routing.js";
 import { PARAM_PLACEHOLDER, pathKey, patternKey } from "./prerender.js";
 import { apiKey } from "./apiPrerender.js";
 import { hostPath, hostSegment, routableHost } from "./hostRouting.js";
@@ -28,6 +28,24 @@ import { withRevalidation } from "./revalidate.js";
  * internal endpoints answer a plain 404.
  */
 const RENDER_NOT_FOUND = Symbol("render-not-found");
+/**
+ * Requests a matched page or its guard answered with notFound().
+ *
+ * The handler answers both those and urls with no route at all with null,
+ * and the server in front used to tell them apart by nothing: with a
+ * backend configured, a page that called notFound() was forwarded to the
+ * backend as though it were not this app's, and its not-found.tsx never
+ * showed. Asked with pageSaidNotFound().
+ */
+const notFoundRequests = new WeakSet();
+function saidNotFound(request) {
+    notFoundRequests.add(request);
+    return null;
+}
+/** Whether a page or guard of this app answered the request with notFound(). */
+export function pageSaidNotFound(request) {
+    return notFoundRequests.has(request);
+}
 export { revalidate } from "./revalidate.js";
 import { currentNotFound, withRedirect } from "./redirect.js";
 import { compressed } from "./compress.js";
@@ -770,7 +788,7 @@ export function createRscHandler(options) {
             // Null, as a render that calls notFound() answers: the caller in front
             // serves not-found.tsx with a 404, the same for a guard as for a page.
             if (refusal === RENDER_NOT_FOUND)
-                return null;
+                return saidNotFound(request);
             if (refusal)
                 return refusal;
             const frozen = await servePrerendered(request, url, match, options.prerendered);
@@ -788,7 +806,7 @@ export function createRscHandler(options) {
             component,
             props: {},
         }));
-        const chain = match.route.layouts;
+        const chain = layoutChain(match.route.layouts, match.params);
         // A payload request says so with a header on the page's own url, so one
         // route serves both the document and the navigation that follows it.
         if (request.headers.get(HEADER.rsc) === null) {
@@ -829,7 +847,7 @@ export function createRscHandler(options) {
                     // route are indistinguishable to whoever is asking — which is the
                     // point of a 404.
                     if (currentNotFound())
-                        return null;
+                        return saidNotFound(request);
                     // A guard refusing is not a failed render. Without this a visitor
                     // who may not see the page gets a 500, which reads as the
                     // application being broken rather than them being turned away —
@@ -848,7 +866,7 @@ export function createRscHandler(options) {
                 // — the digest carries it to the boundary instead, and the status
                 // stays 200 because the status line has gone.
                 if (currentNotFound())
-                    return null;
+                    return saidNotFound(request);
                 return new Response(appendLateRedirect(htmlStream, taken), {
                     headers: withVersion({
                         "Content-Type": HTML_TYPE,
@@ -893,7 +911,7 @@ export function createRscHandler(options) {
                 // Same answer the document path gives, so a client navigating to a
                 // url and a browser loading it fresh agree about whether it exists.
                 if (currentNotFound())
-                    return null;
+                    return saidNotFound(request);
                 // A payload request is guarded exactly as the document is. Narrowing
                 // a request must never narrow what is checked.
                 const status = refusalStatus(error);
@@ -1278,7 +1296,9 @@ export function createRscHandler(options) {
         // boundary it does not have.
         if (meta === null)
             return null;
-        const chain = (JSON.parse(meta).layouts ?? []);
+        // By identity, as the client holds it: the stored file names the layouts,
+        // and the url says which values they were rendered for.
+        const chain = layoutChain((JSON.parse(meta).layouts ?? []), route?.params ?? {});
         const shared = sharedDepth(request.headers.get(HEADER.segments), chain);
         // The variant for exactly this depth, or the whole document. Anything else
         // would be a payload for a boundary the client is not holding.
@@ -1428,6 +1448,8 @@ export function createRscHandler(options) {
         const component = under ? under.route.component : intercept.component;
         const props = under ? await propsFor(under, request) : intercept.params;
         const chain = under ? under.route.layouts : [];
+        // Compared and sent by identity; see layoutChain.
+        const held = under ? layoutChain(under.route.layouts, under.params) : [];
         const slots = under ? under.route.slots : {};
         const loadings = under ? under.route.loadings : [];
         // The interceptor alone, when there is a page to open it over and this
@@ -1463,12 +1485,12 @@ export function createRscHandler(options) {
                 }),
             });
         }
-        const { stream, segmentDepth } = await engine.handleRscStream(component, props, chain.map((layout) => ({ component: layout, props: {} })), loadings, slots, {}, sharedDepth(request.headers.get(HEADER.segments), chain), retentionKey(url.pathname, slot));
+        const { stream, segmentDepth } = await engine.handleRscStream(component, props, chain.map((layout) => ({ component: layout, props: {} })), loadings, slots, {}, sharedDepth(request.headers.get(HEADER.segments), held), retentionKey(url.pathname, slot));
         return new Response(stream, {
             headers: withVersion({
                 "Content-Type": FLIGHT_TYPE,
                 [HEADER.segmentDepth]: String(segmentDepth),
-                [HEADER.layouts]: chain.join(","),
+                [HEADER.layouts]: held.join(","),
                 Vary: VARY_ON_RSC,
                 "Cache-Control": PER_CLIENT,
             }),