vinext 0.0.49 → 0.0.51

package/dist/server/app-page-response.js

@@ -1,4 +1,5 @@
-import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
+import { VINEXT_CACHE_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
 //#region src/server/app-page-response.ts
@@ -7,9 +8,10 @@ function applyTimingHeader(headers, timing) {
 	const handlerStart = Math.round(timing.handlerStart);
 	const compileMs = timing.compileEnd !== void 0 ? Math.round(timing.compileEnd - timing.handlerStart) : -1;
 	const renderMs = timing.responseKind === "html" && timing.renderEnd !== void 0 && timing.compileEnd !== void 0 ? Math.round(timing.renderEnd - timing.compileEnd) : -1;
-	headers.set("x-vinext-timing", `${handlerStart},${compileMs},${renderMs}`);
+	headers.set(VINEXT_TIMING_HEADER, `${handlerStart},${compileMs},${renderMs}`);
 }
 function resolveAppPageRscResponsePolicy(options) {
+	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.revalidateSeconds === 0) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds || options.revalidateSeconds === Infinity) return {
@@ -23,6 +25,10 @@ function resolveAppPageRscResponsePolicy(options) {
 	return {};
 }
 function resolveAppPageHtmlResponsePolicy(options) {
+	if (options.isDraftMode) return {
+		cacheControl: NO_STORE_CACHE_CONTROL,
+		shouldWriteToCache: false
+	};
 	if (options.isForceDynamic) return {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
@@ -31,6 +37,10 @@ function resolveAppPageHtmlResponsePolicy(options) {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
 	};
+	if (options.isProgressiveActionRender) return {
+		cacheControl: NO_STORE_CACHE_CONTROL,
+		shouldWriteToCache: false
+	};
 	if (options.revalidateSeconds === 0) return {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		shouldWriteToCache: false
@@ -58,14 +68,15 @@ function resolveAppPageHtmlResponsePolicy(options) {
 }
 function buildAppPageRscResponse(body, options) {
 	const headers = new Headers({
-		"Content-Type": "text/x-component; charset=utf-8",
+		"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 		Vary: VINEXT_RSC_VARY_HEADER
 	});
-	if (options.params && Object.keys(options.params).length > 0) headers.set("X-Vinext-Params", encodeURIComponent(JSON.stringify(options.params)));
-	if (options.mountedSlotsHeader) headers.set("X-Vinext-Mounted-Slots", options.mountedSlotsHeader);
+	if (options.params && Object.keys(options.params).length > 0) headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(options.params)));
+	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
-	if (options.policy.cacheState) headers.set("X-Vinext-Cache", options.policy.cacheState);
+	if (options.policy.cacheState) headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
+	applyRscCompatibilityIdHeader(headers);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,
@@ -78,7 +89,7 @@ function buildAppPageHtmlResponse(body, options) {
 		Vary: VINEXT_RSC_VARY_HEADER
 	});
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
-	if (options.policy.cacheState) headers.set("X-Vinext-Cache", options.policy.cacheState);
+	if (options.policy.cacheState) headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);
 	if (options.draftCookie) headers.append("Set-Cookie", options.draftCookie);
 	if (options.fontLinkHeader) headers.set("Link", options.fontLinkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);

package/dist/server/app-page-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-page-response.js","names":[],"sources":["../../src/server/app-page-response.ts"],"sourcesContent":["import {\n  buildRevalidateCacheControl,\n  NO_STORE_CACHE_CONTROL,\n  STATIC_CACHE_CONTROL,\n} from \"./cache-control.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport { VINEXT_RSC_VARY_HEADER } from \"./app-rsc-cache-busting.js\";\n\nexport type AppPageMiddlewareContext = {\n  headers: Headers | null;\n  status: number | null;\n};\n\nexport type AppPageResponseTiming = {\n  compileEnd?: number;\n  handlerStart: number;\n  renderEnd?: number;\n  responseKind: \"html\" | \"rsc\";\n};\n\ntype AppPageResponsePolicy = {\n  cacheControl?: string;\n  cacheState?: \"MISS\" | \"STATIC\";\n};\n\ntype ResolveAppPageResponsePolicyBaseOptions = {\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isProduction: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageRscResponsePolicyOptions = {\n  dynamicUsedDuringBuild: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype ResolveAppPageHtmlResponsePolicyOptions = {\n  dynamicUsedDuringRender: boolean;\n  hasScriptNonce: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype AppPageHtmlResponsePolicy = {\n  shouldWriteToCache: boolean;\n} & AppPageResponsePolicy;\n\ntype BuildAppPageRscResponseOptions = {\n  middlewareContext: AppPageMiddlewareContext;\n  mountedSlotsHeader?: string | null;\n  params?: Record<string, unknown>;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\ntype BuildAppPageHtmlResponseOptions = {\n  draftCookie?: string | null;\n  fontLinkHeader?: string;\n  middlewareContext: AppPageMiddlewareContext;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\nfunction applyTimingHeader(headers: Headers, timing?: AppPageResponseTiming): void {\n  if (!timing) {\n    return;\n  }\n\n  const handlerStart = Math.round(timing.handlerStart);\n  const compileMs =\n    timing.compileEnd !== undefined ? Math.round(timing.compileEnd - timing.handlerStart) : -1;\n  const renderMs =\n    timing.responseKind === \"html\" &&\n    timing.renderEnd !== undefined &&\n    timing.compileEnd !== undefined\n      ? Math.round(timing.renderEnd - timing.compileEnd)\n      : -1;\n\n  headers.set(\"x-vinext-timing\", `${handlerStart},${compileMs},${renderMs}`);\n}\n\nexport function resolveAppPageRscResponsePolicy(\n  options: ResolveAppPageRscResponsePolicyOptions,\n): AppPageResponsePolicy {\n  if (options.isForceDynamic || options.dynamicUsedDuringBuild) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which uses !revalidateSeconds\n  // and would incorrectly catch 0 as a falsy value.\n  if (options.revalidateSeconds === 0) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (\n    ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds) ||\n    options.revalidateSeconds === Infinity\n  ) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n    };\n  }\n\n  if (options.revalidateSeconds) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      // Emit MISS as part of the initial RSC response shape rather than bolting\n      // it on later in the cache-write block so response construction stays\n      // centralized in this helper. This matches the eventual write path: the\n      // first ISR-eligible production response is a cache miss.\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n    };\n  }\n\n  return {};\n}\n\nexport function resolveAppPageHtmlResponsePolicy(\n  options: ResolveAppPageHtmlResponsePolicyOptions,\n): AppPageHtmlResponsePolicy {\n  if (options.isForceDynamic) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.hasScriptNonce) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which matches revalidateSeconds\n  // === 0 and would incorrectly return a static Cache-Control.\n  if (options.revalidateSeconds === 0) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.dynamicUsedDuringRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity\n  ) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n      shouldWriteToCache: options.isProduction,\n    };\n  }\n\n  if (options.revalidateSeconds === Infinity) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  return { shouldWriteToCache: false };\n}\n\nexport { mergeMiddlewareResponseHeaders };\n\nexport function buildAppPageRscResponse(\n  body: ReadableStream,\n  options: BuildAppPageRscResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/x-component; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.params && Object.keys(options.params).length > 0) {\n    // encodeURIComponent so non-ASCII params (e.g. Korean slugs) survive the\n    // HTTP ByteString constraint — Headers.set() rejects chars above U+00FF.\n    headers.set(\"X-Vinext-Params\", encodeURIComponent(JSON.stringify(options.params)));\n  }\n  if (options.mountedSlotsHeader) {\n    headers.set(\"X-Vinext-Mounted-Slots\", options.mountedSlotsHeader);\n  }\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(\"X-Vinext-Cache\", options.policy.cacheState);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n\nexport function buildAppPageHtmlResponse(\n  body: ReadableStream,\n  options: BuildAppPageHtmlResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(\"X-Vinext-Cache\", options.policy.cacheState);\n  }\n  if (options.draftCookie) {\n    headers.append(\"Set-Cookie\", options.draftCookie);\n  }\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-page-response.js","names":[],"sources":["../../src/server/app-page-response.ts"],"sourcesContent":["import {\n  buildRevalidateCacheControl,\n  NO_STORE_CACHE_CONTROL,\n  STATIC_CACHE_CONTROL,\n} from \"./cache-control.js\";\nimport {\n  VINEXT_CACHE_HEADER,\n  VINEXT_MOUNTED_SLOTS_HEADER,\n  VINEXT_PARAMS_HEADER,\n  VINEXT_TIMING_HEADER,\n} from \"./headers.js\";\nimport { mergeMiddlewareResponseHeaders } from \"./middleware-response-headers.js\";\nimport {\n  VINEXT_RSC_CONTENT_TYPE,\n  VINEXT_RSC_VARY_HEADER,\n  applyRscCompatibilityIdHeader,\n} from \"./app-rsc-cache-busting.js\";\n\nexport type AppPageMiddlewareContext = {\n  headers: Headers | null;\n  status: number | null;\n};\n\nexport type AppPageResponseTiming = {\n  compileEnd?: number;\n  handlerStart: number;\n  renderEnd?: number;\n  responseKind: \"html\" | \"rsc\";\n};\n\ntype AppPageResponsePolicy = {\n  cacheControl?: string;\n  cacheState?: \"MISS\" | \"STATIC\";\n};\n\ntype ResolveAppPageResponsePolicyBaseOptions = {\n  isDraftMode: boolean;\n  isDynamicError: boolean;\n  isForceDynamic: boolean;\n  isForceStatic: boolean;\n  isProduction: boolean;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n};\n\ntype ResolveAppPageRscResponsePolicyOptions = {\n  dynamicUsedDuringBuild: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype ResolveAppPageHtmlResponsePolicyOptions = {\n  dynamicUsedDuringRender: boolean;\n  isProgressiveActionRender?: boolean;\n  hasScriptNonce: boolean;\n} & ResolveAppPageResponsePolicyBaseOptions;\n\ntype AppPageHtmlResponsePolicy = {\n  shouldWriteToCache: boolean;\n} & AppPageResponsePolicy;\n\ntype BuildAppPageRscResponseOptions = {\n  middlewareContext: AppPageMiddlewareContext;\n  mountedSlotsHeader?: string | null;\n  params?: Record<string, unknown>;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\ntype BuildAppPageHtmlResponseOptions = {\n  draftCookie?: string | null;\n  fontLinkHeader?: string;\n  middlewareContext: AppPageMiddlewareContext;\n  policy: AppPageResponsePolicy;\n  timing?: AppPageResponseTiming;\n};\n\nfunction applyTimingHeader(headers: Headers, timing?: AppPageResponseTiming): void {\n  if (!timing) {\n    return;\n  }\n\n  const handlerStart = Math.round(timing.handlerStart);\n  const compileMs =\n    timing.compileEnd !== undefined ? Math.round(timing.compileEnd - timing.handlerStart) : -1;\n  const renderMs =\n    timing.responseKind === \"html\" &&\n    timing.renderEnd !== undefined &&\n    timing.compileEnd !== undefined\n      ? Math.round(timing.renderEnd - timing.compileEnd)\n      : -1;\n\n  headers.set(VINEXT_TIMING_HEADER, `${handlerStart},${compileMs},${renderMs}`);\n}\n\nexport function resolveAppPageRscResponsePolicy(\n  options: ResolveAppPageRscResponsePolicyOptions,\n): AppPageResponsePolicy {\n  if (options.isDraftMode) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (options.isForceDynamic || options.dynamicUsedDuringBuild) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which uses !revalidateSeconds\n  // and would incorrectly catch 0 as a falsy value.\n  if (options.revalidateSeconds === 0) {\n    return { cacheControl: NO_STORE_CACHE_CONTROL };\n  }\n\n  if (\n    ((options.isForceStatic || options.isDynamicError) && !options.revalidateSeconds) ||\n    options.revalidateSeconds === Infinity\n  ) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n    };\n  }\n\n  if (options.revalidateSeconds) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      // Emit MISS as part of the initial RSC response shape rather than bolting\n      // it on later in the cache-write block so response construction stays\n      // centralized in this helper. This matches the eventual write path: the\n      // first ISR-eligible production response is a cache miss.\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n    };\n  }\n\n  return {};\n}\n\nexport function resolveAppPageHtmlResponsePolicy(\n  options: ResolveAppPageHtmlResponsePolicyOptions,\n): AppPageHtmlResponsePolicy {\n  if (options.isDraftMode) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.isForceDynamic) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.hasScriptNonce) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.isProgressiveActionRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  // revalidate = 0 means \"always dynamic, never cache\" — equivalent to\n  // force-dynamic for caching purposes. Must be checked before the\n  // isForceStatic/isDynamicError branch below, which matches revalidateSeconds\n  // === 0 and would incorrectly return a static Cache-Control.\n  if (options.revalidateSeconds === 0) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (options.dynamicUsedDuringRender) {\n    return {\n      cacheControl: NO_STORE_CACHE_CONTROL,\n      shouldWriteToCache: false,\n    };\n  }\n\n  if (\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity\n  ) {\n    return {\n      cacheControl: buildRevalidateCacheControl(options.revalidateSeconds, options.expireSeconds),\n      cacheState: options.isProduction ? \"MISS\" : undefined,\n      shouldWriteToCache: options.isProduction,\n    };\n  }\n\n  if (options.revalidateSeconds === Infinity) {\n    return {\n      cacheControl: STATIC_CACHE_CONTROL,\n      cacheState: \"STATIC\",\n      shouldWriteToCache: false,\n    };\n  }\n\n  return { shouldWriteToCache: false };\n}\n\nexport { mergeMiddlewareResponseHeaders };\n\nexport function buildAppPageRscResponse(\n  body: ReadableStream,\n  options: BuildAppPageRscResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": VINEXT_RSC_CONTENT_TYPE,\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.params && Object.keys(options.params).length > 0) {\n    // encodeURIComponent so non-ASCII params (e.g. Korean slugs) survive the\n    // HTTP ByteString constraint — Headers.set() rejects chars above U+00FF.\n    headers.set(VINEXT_PARAMS_HEADER, encodeURIComponent(JSON.stringify(options.params)));\n  }\n  if (options.mountedSlotsHeader) {\n    headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);\n  }\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);\n  }\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n  applyRscCompatibilityIdHeader(headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n\nexport function buildAppPageHtmlResponse(\n  body: ReadableStream,\n  options: BuildAppPageHtmlResponseOptions,\n): Response {\n  const headers = new Headers({\n    \"Content-Type\": \"text/html; charset=utf-8\",\n    Vary: VINEXT_RSC_VARY_HEADER,\n  });\n\n  if (options.policy.cacheControl) {\n    headers.set(\"Cache-Control\", options.policy.cacheControl);\n  }\n  if (options.policy.cacheState) {\n    headers.set(VINEXT_CACHE_HEADER, options.policy.cacheState);\n  }\n  if (options.draftCookie) {\n    headers.append(\"Set-Cookie\", options.draftCookie);\n  }\n  if (options.fontLinkHeader) {\n    headers.set(\"Link\", options.fontLinkHeader);\n  }\n\n  mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);\n\n  applyTimingHeader(headers, options.timing);\n\n  return new Response(body, {\n    status: options.middlewareContext.status ?? 200,\n    headers,\n  });\n}\n"],"mappings":"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"}

package/dist/server/app-page-route-wiring.d.ts

@@ -1,7 +1,9 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
-import { AppElements } from "./app-elements-wire.js";
+import { AppElements, AppElementsInterception } from "./app-elements-wire.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
+import { resolveAppPageChildSegments } from "./app-page-segment-state.js";
 import { ComponentType, ReactNode } from "react";
 
 //#region src/server/app-page-route-wiring.d.ts
@@ -44,7 +46,9 @@ type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErro
 type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   ids?: AppRouteSemanticIds | null;
   error?: TErrorModule | null;
+  errorPaths?: readonly TErrorModule[] | null;
   errors?: readonly (TErrorModule | null | undefined)[] | null;
+  errorTreePositions?: readonly number[] | null;
   layoutTreePositions?: readonly number[] | null;
   layouts: readonly (TModule | null | undefined)[];
   loading?: TModule | null;
@@ -89,6 +93,7 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   makeThenableParams: (params: AppPageParams) => unknown;
   matchedParams: AppPageParams;
   resolvedMetadata: Metadata | null;
+  resolvedMetadataPathname?: string;
   resolvedViewport: Viewport;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
@@ -97,17 +102,18 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;
 };
 type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {
+  interception?: AppElementsInterception | null;
   interceptionContext?: string | null;
   isRscRequest?: boolean;
   mountedSlotIds?: ReadonlySet<string> | null;
+  renderMode?: AppRscRenderMode;
   routePath: string;
 };
 declare function createAppPageTreePath(routeSegments: readonly string[] | null | undefined, treePosition: number): string;
-declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
+declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(route: Pick<AppPageRouteWiringRoute<TModule, TErrorModule>, "errors" | "errorTreePositions" | "layoutTreePositions" | "layouts" | "notFounds" | "routeSegments"> & {
   forbiddens?: readonly (TModule | null | undefined)[] | null;
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
-declare function resolveAppPageChildSegments(routeSegments: readonly string[], treePosition: number, params: AppPageParams): string[];
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
 export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageTreePath, resolveAppPageChildSegments };

package/dist/server/app-page-route-wiring.js

@@ -1,11 +1,13 @@
-import { AppElementsWire } from "./app-elements-wire.js";
+import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
+import { AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
+import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
 import { createAppRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier } from "./app-render-dependency.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
+import { resolveAppPageChildSegments, resolveAppPageRouteStateKey, resolveAppPageSegmentStateKey } from "./app-page-segment-state.js";
 import { Suspense } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-page-route-wiring.tsx
@@ -25,7 +27,7 @@ function createAppPageLayoutEntries(route) {
 		const treePosition = route.layoutTreePositions?.[index] ?? 0;
 		const treePath = createAppPageTreePath(route.routeSegments, treePosition);
 		return {
-			errorModule: route.errors?.[index] ?? null,
+			errorModule: route.errorTreePositions ? null : route.errors?.[index] ?? null,
 			forbiddenModule: route.forbiddens?.[index] ?? null,
 			id: AppElementsWire.encodeLayoutId(treePath),
 			layoutModule,
@@ -48,40 +50,16 @@ function createAppPageTemplateEntries(route) {
 		};
 	});
 }
-function resolveAppPageChildSegments(routeSegments, treePosition, params) {
-	const rawSegments = routeSegments.slice(treePosition);
-	const resolvedSegments = [];
-	for (const segment of rawSegments) {
-		if (segment.startsWith("[[...") && segment.endsWith("]]") && segment.length > 7) {
-			const paramValue = params[segment.slice(5, -2)];
-			if (Array.isArray(paramValue) && paramValue.length === 0) continue;
-			if (paramValue === void 0) continue;
-			resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join("/") : paramValue);
-			continue;
-		}
-		if (segment.startsWith("[...") && segment.endsWith("]")) {
-			const paramValue = params[segment.slice(4, -1)];
-			if (Array.isArray(paramValue)) {
-				resolvedSegments.push(paramValue.join("/"));
-				continue;
-			}
-			resolvedSegments.push(paramValue ?? segment);
-			continue;
-		}
-		if (segment.startsWith("[") && segment.endsWith("]") && !segment.includes(".")) {
-			const paramValue = params[segment.slice(1, -1)];
-			resolvedSegments.push(Array.isArray(paramValue) ? paramValue.join("/") : paramValue ?? segment);
-			continue;
-		}
-		resolvedSegments.push(segment);
-	}
-	return resolvedSegments;
-}
-function resolveAppPageVisibleSegments(routeSegments, params) {
-	return resolveAppPageChildSegments(routeSegments, 0, params).filter((segment) => !(segment.startsWith("(") && segment.endsWith(")")));
-}
-function resolveAppPageTemplateKey(routeSegments, treePosition, params) {
-	return resolveAppPageVisibleSegments(routeSegments.slice(treePosition), params)[0] ?? "";
+function createAppPageErrorEntries(route) {
+	return (route.errorPaths ?? route.errors ?? []).flatMap((errorModule, index) => {
+		if (!errorModule) return [];
+		const treePosition = route.errorTreePositions?.[index];
+		if (treePosition === void 0) return [];
+		return [{
+			errorModule,
+			treePosition
+		}];
+	});
 }
 function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, getEffectiveSlotParams) {
 	const parallelSlots = {};
@@ -89,32 +67,64 @@ function createAppPageParallelSlotEntries(layoutIndex, layoutEntries, route, get
 		const slotName = slot.name;
 		const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;
 		if (targetIndex !== layoutIndex) continue;
-		const treePath = layoutEntries[targetIndex]?.treePath ?? "/";
+		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
 		parallelSlots[slotName] = /* @__PURE__ */ jsx(LayoutSegmentProvider, {
 			segmentMap: { children: slot.routeSegments ? resolveAppPageChildSegments(slot.routeSegments, 0, slotParams) : [] },
-			children: /* @__PURE__ */ jsx(Slot, { id: AppElementsWire.encodeSlotId(slotName, treePath) })
+			children: /* @__PURE__ */ jsx(Slot, { id: slotId })
 		});
 	}
 	return Object.keys(parallelSlots).length > 0 ? parallelSlots : void 0;
 }
-function createAppPageRouteHead(metadata, viewport) {
+function resolveAppPageSlotId(slot, treePath) {
+	const slotId = AppElementsWire.encodeSlotId(slot.name, treePath);
+	if (slot.id && slot.id !== slotId) throw new Error(`[vinext] App Router slot id mismatch for @${slot.name}: graph id ${slot.id} does not match wire id ${slotId}`);
+	return slotId;
+}
+function resolveAppPageSlotBindingState(slot, override) {
+	if (getDefaultExport(override?.pageModule) ?? getDefaultExport(slot.page)) return "active";
+	if (getDefaultExport(slot.default)) return "default";
+	return "unmatched";
+}
+function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride) {
+	const bindings = [];
+	for (const [slotKey, slot] of Object.entries(route.slots ?? {})) {
+		const layoutEntry = layoutEntries[slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1] ?? null;
+		const ownerLayoutId = layoutEntry?.id ?? null;
+		const override = resolveSlotOverride(slotKey, slot.name);
+		bindings.push({
+			ownerLayoutId,
+			slotId: resolveAppPageSlotId(slot, layoutEntry?.treePath ?? "/"),
+			state: resolveAppPageSlotBindingState(slot, override)
+		});
+	}
+	return normalizeAppElementsSlotBindings(bindings, { layoutIds: layoutEntries.map((entry) => entry.id) });
+}
+function createAppPageRouteHead(metadata, viewport, pathname) {
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
 		/* @__PURE__ */ jsx("meta", { charSet: "utf-8" }),
-		metadata ? /* @__PURE__ */ jsx(MetadataHead, { metadata }) : null,
+		metadata ? /* @__PURE__ */ jsx(MetadataHead, {
+			metadata,
+			pathname
+		}) : null,
 		/* @__PURE__ */ jsx(ViewportHead, { viewport })
 	] });
 }
 function buildAppPageElements(options) {
 	const interceptionContext = options.interceptionContext ?? null;
+	const routeSegments = options.route.routeSegments ?? [];
+	const routeResetKey = resolveAppPageRouteStateKey(routeSegments, options.matchedParams);
 	const routeId = AppElementsWire.encodeRouteId(options.routePath, interceptionContext);
 	const pageId = AppElementsWire.encodePageId(options.routePath, interceptionContext);
 	const layoutEntries = createAppPageLayoutEntries(options.route);
 	const templateEntries = createAppPageTemplateEntries(options.route);
+	const errorEntries = createAppPageErrorEntries(options.route);
 	const layoutEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const templateEntriesByTreePosition = /* @__PURE__ */ new Map();
+	const errorEntriesByTreePosition = /* @__PURE__ */ new Map();
 	for (const layoutEntry of layoutEntries) layoutEntriesByTreePosition.set(layoutEntry.treePosition, layoutEntry);
 	for (const templateEntry of templateEntries) templateEntriesByTreePosition.set(templateEntry.treePosition, templateEntry);
+	for (const errorEntry of errorEntries) errorEntriesByTreePosition.set(errorEntry.treePosition, errorEntry);
 	const layoutIndicesByTreePosition = /* @__PURE__ */ new Map();
 	for (let index = 0; index < layoutEntries.length; index++) layoutIndicesByTreePosition.set(layoutEntries[index].treePosition, index);
 	const layoutDependenciesByIndex = /* @__PURE__ */ new Map();
@@ -124,22 +134,29 @@ function buildAppPageElements(options) {
 	const templateDependenciesBeforeById = /* @__PURE__ */ new Map();
 	const pageDependencies = [];
 	const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;
-	const elements = { ...AppElementsWire.createMetadataEntries({
-		interceptionContext,
-		rootLayoutTreePath,
-		routeId
-	}) };
 	const slotNameCounts = /* @__PURE__ */ new Map();
 	for (const slot of Object.values(options.route.slots ?? {})) {
 		const slotName = slot.name;
 		slotNameCounts.set(slotName, (slotNameCounts.get(slotName) ?? 0) + 1);
 	}
-	const orderedTreePositions = Array.from(new Set([...layoutEntries.map((entry) => entry.treePosition), ...templateEntries.map((entry) => entry.treePosition)])).sort((left, right) => left - right);
+	const orderedTreePositions = Array.from(new Set([
+		...layoutEntries.map((entry) => entry.treePosition),
+		...templateEntries.map((entry) => entry.treePosition),
+		...errorEntries.map((entry) => entry.treePosition)
+	])).sort((left, right) => left - right);
 	const resolveSlotOverride = (slotKey, slotName) => {
 		const overrideByKey = options.slotOverrides?.[slotKey];
 		if (overrideByKey) return overrideByKey;
 		if (slotKey === slotName || (slotNameCounts.get(slotName) ?? 0) === 1) return options.slotOverrides?.[slotName];
 	};
+	const elements = { ...AppElementsWire.createMetadataEntries({
+		interception: options.interception ?? null,
+		interceptionContext,
+		layoutIds: options.route.ids?.layouts ?? layoutEntries.map((entry) => entry.id),
+		rootLayoutTreePath,
+		routeId,
+		slotBindings: createAppPageSlotBindings(options.route, layoutEntries, resolveSlotOverride)
+	}) };
 	const getEffectiveSlotParams = (slotKey, slotName) => resolveSlotOverride(slotKey, slotName)?.params ?? options.matchedParams;
 	for (const treePosition of orderedTreePositions) {
 		const layoutIndex = layoutIndicesByTreePosition.get(treePosition);
@@ -199,10 +216,10 @@ function buildAppPageElements(options) {
 	for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 		const slotName = slot.name;
 		const targetIndex = slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1;
-		const treePath = layoutEntries[targetIndex]?.treePath ?? "/";
-		const slotId = AppElementsWire.encodeSlotId(slotName, treePath);
+		const slotId = resolveAppPageSlotId(slot, layoutEntries[targetIndex]?.treePath ?? "/");
 		const slotOverride = resolveSlotOverride(slotKey, slotName);
 		const slotParams = getEffectiveSlotParams(slotKey, slotName);
+		const slotResetKey = resolveAppPageRouteStateKey(slot.routeSegments ?? [], slotParams);
 		const overrideOrPageComponent = getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page);
 		const defaultComponent = getDefaultExport(slot.default);
 		if (!overrideOrPageComponent && defaultComponent && options.isRscRequest && options.mountedSlotIds?.has(slotId)) continue;
@@ -230,12 +247,13 @@ function buildAppPageElements(options) {
 			children: slotElement
 		});
 		const slotLoadingComponent = getDefaultExport(slot.loading);
-		if (slotLoadingComponent) slotElement = /* @__PURE__ */ jsx(Suspense, {
+		if (slotLoadingComponent && !shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation")) slotElement = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(slotLoadingComponent, {}),
 			children: slotElement
-		});
+		}, slotResetKey);
 		const slotErrorComponent = getErrorBoundaryExport(slot.error);
 		if (slotErrorComponent) slotElement = /* @__PURE__ */ jsx(ErrorBoundary, {
+			resetKey: slotResetKey,
 			fallback: slotErrorComponent,
 			children: slotElement
 		});
@@ -245,70 +263,81 @@ function buildAppPageElements(options) {
 		segmentMap: { children: [] },
 		children: /* @__PURE__ */ jsx(Slot, { id: pageId })
 	});
+	routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
 	const routeLoadingComponent = getDefaultExport(options.route.loading);
-	if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
+	if (routeLoadingComponent && !shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation")) routeChildren = /* @__PURE__ */ jsx(Suspense, {
 		fallback: /* @__PURE__ */ jsx(routeLoadingComponent, {}),
 		children: routeChildren
-	});
-	const lastLayoutErrorModule = options.route.errors && options.route.errors.length > 0 ? options.route.errors[options.route.errors.length - 1] : null;
+	}, routeResetKey);
+	const lastLayoutErrorModule = errorEntries.length > 0 ? errorEntries[errorEntries.length - 1].errorModule : null;
 	const notFoundComponent = getDefaultExport(options.route.notFound) ?? getDefaultExport(options.rootNotFoundModule);
 	if (notFoundComponent) routeChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(notFoundComponent, {}),
 		children: routeChildren
 	});
 	const forbiddenComponent = getDefaultExport(options.route.forbidden) ?? getDefaultExport(options.rootForbiddenModule);
 	if (forbiddenComponent) routeChildren = /* @__PURE__ */ jsx(ForbiddenBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(forbiddenComponent, {}),
 		children: routeChildren
 	});
 	const unauthorizedComponent = getDefaultExport(options.route.unauthorized) ?? getDefaultExport(options.rootUnauthorizedModule);
 	if (unauthorizedComponent) routeChildren = /* @__PURE__ */ jsx(UnauthorizedBoundary, {
+		resetKey: routeResetKey,
 		fallback: /* @__PURE__ */ jsx(unauthorizedComponent, {}),
 		children: routeChildren
 	});
 	const pageErrorComponent = getErrorBoundaryExport(options.route.error);
 	if (pageErrorComponent && options.route.error !== lastLayoutErrorModule) routeChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
+		resetKey: routeResetKey,
 		fallback: pageErrorComponent,
 		children: routeChildren
 	});
 	for (let index = orderedTreePositions.length - 1; index >= 0; index--) {
 		const treePosition = orderedTreePositions[index];
+		const segmentResetKey = resolveAppPageSegmentStateKey(routeSegments, treePosition, options.matchedParams);
 		let segmentChildren = routeChildren;
 		const layoutEntry = layoutEntriesByTreePosition.get(treePosition);
 		const templateEntry = templateEntriesByTreePosition.get(treePosition);
+		const errorEntry = errorEntriesByTreePosition.get(treePosition);
 		if (layoutEntry) {
 			const layoutNotFoundComponent = getDefaultExport(layoutEntry.notFoundModule);
 			if (layoutNotFoundComponent) segmentChildren = /* @__PURE__ */ jsx(NotFoundBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutNotFoundComponent, {}),
 				children: segmentChildren
 			});
 			const layoutForbiddenComponent = getDefaultExport(layoutEntry.forbiddenModule);
 			if (layoutForbiddenComponent) segmentChildren = /* @__PURE__ */ jsx(ForbiddenBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutForbiddenComponent, {}),
 				children: segmentChildren
 			});
 			const layoutUnauthorizedComponent = getDefaultExport(layoutEntry.unauthorizedModule);
 			if (layoutUnauthorizedComponent) segmentChildren = /* @__PURE__ */ jsx(UnauthorizedBoundary, {
+				resetKey: segmentResetKey,
 				fallback: /* @__PURE__ */ jsx(layoutUnauthorizedComponent, {}),
 				children: segmentChildren
 			});
-			const layoutErrorComponent = getErrorBoundaryExport(layoutEntry.errorModule);
-			if (layoutErrorComponent) segmentChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
-				fallback: layoutErrorComponent,
-				children: segmentChildren
-			});
 		}
+		const segmentErrorComponent = getErrorBoundaryExport(errorEntry?.errorModule ?? layoutEntry?.errorModule);
+		if (segmentErrorComponent) segmentChildren = /* @__PURE__ */ jsx(ErrorBoundary, {
+			resetKey: segmentResetKey,
+			fallback: segmentErrorComponent,
+			children: segmentChildren
+		});
 		if (templateEntry && getDefaultExport(templateEntry.templateModule)) segmentChildren = /* @__PURE__ */ jsx(Slot, {
 			id: templateEntry.id,
 			children: segmentChildren
-		}, resolveAppPageTemplateKey(options.route.routeSegments ?? [], templateEntry.treePosition, options.matchedParams));
+		}, segmentResetKey);
 		if (!layoutEntry) {
 			routeChildren = segmentChildren;
 			continue;
 		}
 		const layoutHasElement = getDefaultExport(layoutEntry.layoutModule) !== null;
 		const layoutIndex = layoutIndicesByTreePosition.get(treePosition) ?? -1;
-		const segmentMap = { children: resolveAppPageChildSegments(options.route.routeSegments ?? [], layoutEntry.treePosition, options.matchedParams) };
+		const segmentMap = { children: resolveAppPageChildSegments(routeSegments, layoutEntry.treePosition, options.matchedParams) };
 		for (const [slotKey, slot] of Object.entries(options.route.slots ?? {})) {
 			const slotName = slot.name;
 			if ((slot.layoutIndex >= 0 ? slot.layoutIndex : layoutEntries.length - 1) !== layoutIndex) continue;
@@ -329,7 +358,7 @@ function buildAppPageElements(options) {
 		fallback: globalErrorComponent,
 		children: routeChildren
 	});
-	elements[routeId] = /* @__PURE__ */ jsxs(Fragment$1, { children: [createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport), routeChildren] });
+	elements[routeId] = /* @__PURE__ */ jsxs(Fragment$1, { children: [createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport, options.resolvedMetadataPathname ?? options.routePath), routeChildren] });
 	return elements;
 }
 //#endregion