vinext 1.3.1 → 1.4.1

package/dist/server/app-worker-stages.js

@@ -1,30 +1,102 @@
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { cacheabilityManifestPageState, cacheabilityRequestIdentity, cacheabilityRoutePathname } from "./cacheability-manifest.js";
 import { keepOnlyValidatedRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { isTrustedPrerenderState } from "./prerender-route-params.js";
+import { VINEXT_CACHE_IDENTITY_ORIGIN, withCacheIdentityOrigin } from "./multi-stage.js";
 //#region src/server/app-worker-stages.ts
-const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
+const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 13;
 const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 const STATIC_FILE_SIGNAL_TOKEN_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 /** Normalize a shared App page HEAD request onto its method-invariant GET representation. */
 function prepareSharedAppPageDispatch(request, cache) {
 	return cache !== "bypass" && request.method.toUpperCase() === "HEAD" ? new Request(request, { method: "GET" }) : request;
 }
+function sharedAppCacheIdentity(requestUrl, init, props) {
+	return {
+		props: {
+			...props,
+			requestOrigin: VINEXT_CACHE_IDENTITY_ORIGIN
+		},
+		request: new Request(withCacheIdentityOrigin(requestUrl), init)
+	};
+}
+/**
+* Build the cache identity of a shared App Router dispatch: the dispatched
+* request and props under the cache identity origin.
+*/
+function createSharedAppCacheIdentity(request, props) {
+	return sharedAppCacheIdentity(request.url, {
+		headers: new Headers(request.headers),
+		method: request.method
+	}, props);
+}
 /**
 * Build the query-free cache identity of a shared App page dispatch. The user
-* query leaves both the URL and `resolvedUrl`; the `.rsc` suffix, an RSC
-* request's validated `_rsc`, and the render mode stay because they select the
-* representation. HTML identities also drop the RSC selector headers.
+* query leaves both the URL and `resolvedUrl`; an RSC request's validated
+* `_rsc` and the render mode stay because they select the representation. HTML identities also drop the RSC selector headers.
 */
 function createSharedAppPageCacheIdentity(request, props) {
 	const queryFree = withoutAppPageDispatchQuery(request.url, props);
 	const headers = new Headers(request.headers);
 	if (!props.isRscRequest) for (const name of VINEXT_RSC_VARY_HEADER.split(",")) headers.delete(name.trim());
 	return {
-		props: queryFree.props,
-		request: new Request(queryFree.url, {
+		...sharedAppCacheIdentity(queryFree.url, {
 			headers,
 			method: request.method
+		}, queryFree.props),
+		queryFree: true
+	};
+}
+/**
+* Build the query-free cache identity of a shared Route Handler or metadata
+* route dispatch. Next.js keys a route handler by its pathname: the query and
+* the RSC selectors pick no representation of a handler's response, and a
+* handler that reads the request's URL or headers is dynamic, so admission
+* refuses its response. Keeping them in the identity would only let a client
+* store one entry per query or selector value. The method, path and route
+* props stay; the selector headers and the props derived from them leave.
+*/
+function createSharedAppRouteCacheIdentity(request, props) {
+	const url = new URL(request.url);
+	url.search = "";
+	const headers = new Headers(request.headers);
+	for (const name of VINEXT_RSC_VARY_HEADER.split(",")) headers.delete(name.trim());
+	const searchIndex = props.resolvedUrl.indexOf("?");
+	return {
+		...sharedAppCacheIdentity(url.toString(), {
+			headers,
+			method: request.method
+		}, {
+			...props,
+			...props.kind === "app-metadata" ? {} : {
+				interceptionContext: null,
+				interceptionId: null
+			},
+			isRscRequest: false,
+			mountedSlotsHeader: null,
+			renderMode: APP_RSC_RENDER_MODE_NAVIGATION,
+			resolvedUrl: searchIndex === -1 ? props.resolvedUrl : props.resolvedUrl.slice(0, searchIndex)
+		}),
+		queryFree: true
+	};
+}
+/**
+* Build the cache identity of a shared hybrid Pages page dispatch: the
+* dispatched request and props under `origin`, so every host that names it
+* shares one entry.
+*/
+function createSharedHybridPagesCacheIdentity(request, props, origin) {
+	return {
+		props: {
+			...props,
+			requestOrigin: origin,
+			requestUrl: withCacheIdentityOrigin(props.requestUrl, origin)
+		},
+		regenerateFromDispatch: true,
+		request: new Request(withCacheIdentityOrigin(request.url, origin), {
+			headers: new Headers(request.headers),
+			method: request.method
 		})
 	};
 }
@@ -80,12 +152,12 @@ function isCanonicalHttpOrigin(value) {
 function isAppWorkerResponseStageProps(value) {
 	if (!value || typeof value !== "object") return false;
 	const props = value;
-	if (props.protocolVersion !== 11 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
+	if (props.protocolVersion !== 13 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
 	if (props.kind === "app-full-request") return typeof props.headRequest === "boolean" && typeof props.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
 	if (props.kind === "hybrid-pages") {
 		const hybrid = props;
 		const appRouteMatch = hybrid.appRouteMatch;
-		return typeof hybrid.allowRscDocumentFallback === "boolean" && (appRouteMatch === null || typeof appRouteMatch === "object" && typeof appRouteMatch.isDynamic === "boolean" && typeof appRouteMatch.pattern === "string" && appRouteMatch.pattern.startsWith("/")) && typeof hybrid.canonicalPathname === "string" && hybrid.canonicalPathname.startsWith("/") && typeof hybrid.cleanPathname === "string" && hybrid.cleanPathname.startsWith("/") && typeof hybrid.isDataRequest === "boolean" && typeof hybrid.isRscRequest === "boolean" && (hybrid.matchKind === "dynamic" || hybrid.matchKind === "static") && (hybrid.preHandlerHeaders === null || isSerializedHeaders(hybrid.preHandlerHeaders)) && (hybrid.resourceKind === "api" || hybrid.resourceKind === "page") && typeof hybrid.requestUrl === "string" && typeof hybrid.resolvedUrl === "string" && hybrid.resolvedUrl.startsWith("/");
+		return typeof hybrid.allowRscDocumentFallback === "boolean" && (appRouteMatch === null || typeof appRouteMatch === "object" && typeof appRouteMatch.isDynamic === "boolean" && typeof appRouteMatch.pattern === "string" && appRouteMatch.pattern.startsWith("/")) && typeof hybrid.canonicalPathname === "string" && hybrid.canonicalPathname.startsWith("/") && typeof hybrid.cleanPathname === "string" && hybrid.cleanPathname.startsWith("/") && typeof hybrid.isDataRequest === "boolean" && typeof hybrid.isRscRequest === "boolean" && (hybrid.matchKind === "dynamic" || hybrid.matchKind === "static") && (hybrid.preHandlerHeaders === null || isSerializedHeaders(hybrid.preHandlerHeaders)) && (hybrid.resourceKind === "api" || hybrid.resourceKind === "page") && typeof hybrid.requestUrl === "string" && typeof hybrid.resolvedUrl === "string" && hybrid.resolvedUrl.startsWith("/") && typeof hybrid.sharedAcrossHosts === "boolean";
 	}
 	if (props.kind === "app-metadata" || props.kind === "app-not-found") {
 		const special = props;
@@ -102,4 +174,4 @@ function isResponseStageCacheability(value) {
 	return (cacheability.probeMode === null || cacheability.probeMode === "probe" || cacheability.probeMode === "identity") && (cacheability.policyHeaders === null || Array.isArray(cacheability.policyHeaders) && cacheability.policyHeaders.every((entry) => Array.isArray(entry) && entry.length === 2 && typeof entry[0] === "string" && typeof entry[1] === "string")) && (cacheability.representation === void 0 || cacheability.representation === "app-route" || cacheability.representation === "html" || cacheability.representation === "pages-data" || cacheability.representation === "rsc-full" || cacheability.representation === "rsc-loading-shell") && typeof cacheability.resolvedRoutePathname === "string" && cacheability.resolvedRoutePathname.startsWith("/");
 }
 //#endregion
-export { APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER, APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION, createSharedAppPageCacheIdentity, isAppWorkerResponseStageProps, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery };
+export { APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER, APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION, createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isAppWorkerResponseStageProps, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery };

package/dist/server/artifact-compatibility.d.ts

@@ -11,7 +11,6 @@ export type ArtifactCompatibilityEnvelope = Readonly<{
   rootBoundaryId: string | null;
   renderEpoch: string | null;
 }>;
-export declare const ARTIFACT_COMPATIBILITY_PROOF_FIELDS: readonly (keyof ArtifactCompatibilityEnvelope)[];
 type ArtifactCompatibilityEnvelopeInput = Readonly<{
   graphVersion?: string | null;
   deploymentVersion?: string | null;

package/dist/server/artifact-compatibility.js

@@ -4,15 +4,6 @@ import { fnv1a64 } from "../utils/hash.js";
 const ARTIFACT_COMPATIBILITY_SCHEMA_VERSION = 1;
 const APP_ELEMENTS_SCHEMA_VERSION = 1;
 const RSC_PAYLOAD_SCHEMA_VERSION = 1;
-const ARTIFACT_COMPATIBILITY_PROOF_FIELDS = [
-	"schemaVersion",
-	"graphVersion",
-	"deploymentVersion",
-	"appElementsSchemaVersion",
-	"rscPayloadSchemaVersion",
-	"rootBoundaryId",
-	"renderEpoch"
-];
 function createArtifactCompatibilityEnvelope(input = {}) {
 	return {
 		schemaVersion: 1,
@@ -88,4 +79,4 @@ function evaluateArtifactCompatibility(current, candidate, options = {}) {
 	return { kind: "compatible" };
 }
 //#endregion
-export { APP_ELEMENTS_SCHEMA_VERSION, ARTIFACT_COMPATIBILITY_PROOF_FIELDS, ARTIFACT_COMPATIBILITY_SCHEMA_VERSION, RSC_PAYLOAD_SCHEMA_VERSION, createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion, evaluateArtifactCompatibility, parseArtifactCompatibilityEnvelope };
+export { APP_ELEMENTS_SCHEMA_VERSION, ARTIFACT_COMPATIBILITY_SCHEMA_VERSION, RSC_PAYLOAD_SCHEMA_VERSION, createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion, evaluateArtifactCompatibility, parseArtifactCompatibilityEnvelope };

package/dist/server/bfcache-identity.d.ts

@@ -3,6 +3,13 @@ type ParallelSlotBindingState = "active" | "default" | "unmatched";
 export declare function createNestedBfcacheSlotSegmentId(parentSlotId: string, level: number): string;
 export declare function isNestedBfcacheSlotSegmentId(id: string): boolean;
 export declare function isNestedBfcacheSlotSegmentIdFor(id: string, parentSlotId: string): boolean;
+/**
+ * Activity key for a route segment whose directory has no layout of its own.
+ * Next.js keeps a layout-router Activity list at every segment level, implicit
+ * layouts included, keyed by the child segment. The tag keeps these keys apart
+ * from identity strings, whose kinds never use it, and from BFCache ids.
+ */
+export declare function createBfcacheChildSegmentStateKey(segmentPathKey: string): string;
 export type BfcacheSegmentIdentity = string;
 export type BfcacheSegmentDescriptor = {
   kind: "page";

package/dist/server/bfcache-identity.js

@@ -13,6 +13,15 @@ function isNestedBfcacheSlotSegmentId(id) {
 function isNestedBfcacheSlotSegmentIdFor(id, parentSlotId) {
 	return isNestedBfcacheSlotSegmentId(id) && id.startsWith(createNestedBfcacheSlotParentPrefix(parentSlotId));
 }
+/**
+* Activity key for a route segment whose directory has no layout of its own.
+* Next.js keeps a layout-router Activity list at every segment level, implicit
+* layouts included, keyed by the child segment. The tag keeps these keys apart
+* from identity strings, whose kinds never use it, and from BFCache ids.
+*/
+function createBfcacheChildSegmentStateKey(segmentPathKey) {
+	return JSON.stringify(["segment", segmentPathKey]);
+}
 function deriveBfcacheSegmentIdentity(descriptor) {
 	switch (descriptor.kind) {
 		case "page":
@@ -49,4 +58,4 @@ function deriveBfcacheSegmentIdentity(descriptor) {
 	}
 }
 //#endregion
-export { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor };
+export { createBfcacheChildSegmentStateKey, createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor };

package/dist/server/cache-proof.d.ts

@@ -1,5 +1,4 @@
-import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
-import { ArtifactCompatibilityEnvelope, ArtifactCompatibilityEvaluationOptions } from "./artifact-compatibility.js";
+import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 //#region src/server/cache-proof.d.ts
 export declare const CACHE_PROOF_MODEL_SCHEMA_VERSION = 1;
 export type CacheProofModelSchemaVersion = 1;
@@ -25,22 +24,8 @@ export type CacheVariantBudget = Readonly<{
   maxValuesPerDimension: number;
   maxVariantsPerRoute: number;
 }>;
-export declare const DEFAULT_CACHE_VARIANT_BUDGET: {
-  maxDimensionCount: number;
-  maxDimensionNameLength: number;
-  maxDimensionValueLength: number;
-  maxEncodedLength: number;
-  maxValuesPerDimension: number;
-  maxVariantsPerRoute: number;
-};
 export type CacheVariantDimensionSource = "auth" | "cookie" | "custom" | "draft-mode" | "header" | "interception" | "mounted-slots" | "params" | "route" | "search" | "session";
 export type CacheVariantDimensionPrivacy = "internal" | "private" | "public";
-export type CacheVariantDimensionInput = Readonly<{
-  name: string;
-  privacy: CacheVariantDimensionPrivacy;
-  source: CacheVariantDimensionSource;
-  values: readonly string[];
-}>;
 export type CacheVariantDimension = Readonly<{
   encoded: string;
   name: string;
@@ -96,47 +81,6 @@ export type CacheVariant = Readonly<{
   output: CacheProofOutputScope;
   schemaVersion: CacheProofModelSchemaVersion;
 }>;
-export type BuildCacheVariantInput = Readonly<{
-  budget: CacheVariantBudget;
-  dimensions: readonly CacheVariantDimensionInput[];
-  output: CacheProofOutputScope;
-}>;
-export type BuildCacheVariantResult = Readonly<{
-  kind: "variant";
-  variant: CacheVariant;
-}> | Readonly<{
-  kind: "breakerFallback";
-  fallback: CacheProofBreakerFallback;
-}>;
-export type CacheVariantRouteBudget = Readonly<{
-  routeId: string;
-  variantCacheKeys: readonly string[];
-}>;
-export type CacheVariantRouteBudgetAdmission = Readonly<{
-  didConsumeRouteVariantBudget: boolean;
-  kind: "variant";
-  routeBudget: CacheVariantRouteBudget;
-  variant: CacheVariant;
-}> | Readonly<{
-  fallback: CacheProofBreakerFallback;
-  kind: "breakerFallback";
-  routeBudget: CacheVariantRouteBudget | null;
-}>;
-export type BuildCacheVariantWithRouteBudgetInput = BuildCacheVariantInput & Readonly<{
-  routeBudget: CacheVariantRouteBudget | null;
-}>;
-export type BuildCacheVariantWithRouteBudgetResult = CacheVariantRouteBudgetAdmission;
-export type AppRouteCacheProofGraphScopeInput = Readonly<{
-  ids: AppRouteSemanticIds;
-}>;
-export type AppRouteCacheProofGraphScope = Readonly<{
-  layoutIds: readonly string[];
-  pageId: string | null;
-  routeHandlerId: string | null;
-  routeId: string;
-  slotIds: readonly string[];
-  templateIds: readonly string[];
-}>;
 export type BoundaryOutcome = Readonly<{
   kind: "error";
   digest?: string;
@@ -158,16 +102,6 @@ export type BoundaryOutcome = Readonly<{
 }> | Readonly<{
   kind: "unknown";
 }>;
-export type BoundaryOutcomeCompatibility = Readonly<{
-  kind: "compatible";
-  outcome: BoundaryOutcome;
-  reason: "CP_BOUNDARY_OUTCOME_MATCH";
-}> | Readonly<{
-  candidate: BoundaryOutcome;
-  expected: BoundaryOutcome;
-  fallback: CacheProofBreakerFallback;
-  kind: "incompatible";
-}>;
 export type RenderObservationCompleteness = "complete" | "partial" | "unknown";
 export type RenderCacheability = "private" | "public" | "uncacheable" | "unknown";
 export type RenderRequestApiKind = "connection" | "cookies" | "draftMode" | "headers" | "params" | "searchParams";
@@ -233,7 +167,6 @@ export type ClassifyRenderObservationDowngradeInput = Readonly<{
   dynamicFetches: readonly string[];
   requestApis: readonly RenderRequestApiObservation[];
 }>;
-export type ClassifyCacheVariantDimensionDowngradeInput = Pick<CacheVariantDimensionInput, "source">;
 export type RenderObservation = Readonly<{
   boundaryOutcome: BoundaryOutcome;
   cacheTags: readonly string[];
@@ -260,18 +193,6 @@ export type StaticLayoutReuseProof = Readonly<{
 export type StaticLayoutArtifactReuseProof = StaticLayoutReuseProof & Readonly<{
   candidateArtifactCompatibility: ArtifactCompatibilityEnvelope;
 }>;
-export type BuildStaticLayoutReuseProofInput = Readonly<{
-  candidateObservation: RenderObservation;
-  candidateVariant: CacheVariant;
-  currentOutput: CacheProofOutputScope;
-}>;
-export type BuildStaticLayoutReuseProofResult = Readonly<{
-  kind: "proof";
-  proof: StaticLayoutReuseProof;
-}> | Readonly<{
-  kind: "rejected";
-  fallback: CacheProofBreakerFallback;
-}>;
 export type CacheProofHotPathMetric = Readonly<{
   code: CacheProofTraceCode;
   fields: CacheProofTraceFields;
@@ -305,13 +226,6 @@ export type CacheEntryReuseProof = Readonly<{
   decision: CacheEntryReuseDecision | null;
   kind: "runtime-cache-entry";
 }>;
-export type CreateStaticLayoutArtifactReuseDecisionInput = Readonly<{
-  candidateArtifactCompatibility: ArtifactCompatibilityEnvelope;
-  candidateObservation: RenderObservation;
-  candidateVariant: BuildCacheVariantWithRouteBudgetResult;
-  currentArtifactCompatibility: ArtifactCompatibilityEnvelope;
-  currentOutput: CacheProofOutputScope;
-}> & ArtifactCompatibilityEvaluationOptions;
 export type BuildRenderObservationInput = Readonly<{
   boundaryOutcome: BoundaryOutcome;
   cacheTags: readonly string[];
@@ -326,31 +240,6 @@ export type BuildRenderRequestApiObservationsInput = Readonly<{
   completeness: RenderObservationCompleteness;
   observed: readonly RenderRequestApiKind[];
 }>;
-export type DisabledCacheProofDecision = Readonly<{
-  canReuse: false;
-  fallback: CacheProofBreakerFallback;
-  kind: "disabled";
-  observation: RenderObservation;
-  staticLayoutProof?: StaticLayoutReuseProof;
-  variant: CacheVariant;
-}>;
-export type CreateDisabledCacheProofDecisionInput = Readonly<{
-  observation: RenderObservation;
-  staticLayoutProof?: StaticLayoutReuseProof;
-  variant: CacheVariant;
-}>;
-export declare function createAppRouteCacheProofGraphScope(route: AppRouteCacheProofGraphScopeInput): AppRouteCacheProofGraphScope;
-export declare function buildCacheVariant(input: BuildCacheVariantInput): BuildCacheVariantResult;
-export declare function enforceCacheVariantRouteBudget(input: {
-  routeBudget: CacheVariantRouteBudget | null;
-  variant: CacheVariant;
-}): CacheVariantRouteBudgetAdmission;
-export declare function buildCacheVariantWithRouteBudget(input: BuildCacheVariantWithRouteBudgetInput): BuildCacheVariantWithRouteBudgetResult;
-export declare function buildBoundaryOutcomeCompatibility(input: {
-  candidate: BoundaryOutcome;
-  expected: BoundaryOutcome;
-}): BoundaryOutcomeCompatibility;
-export declare function classifyCacheVariantDimensionDowngrade(input: ClassifyCacheVariantDimensionDowngradeInput): CacheProofDowngradeReason | null;
 export declare function classifyRenderObservationDowngrade(input: ClassifyRenderObservationDowngradeInput): CacheProofDowngradeClassification;
 export declare function buildRenderRequestApiObservations(input: BuildRenderRequestApiObservationsInput): RenderRequestApiObservation[];
 export declare function buildRenderObservation(input: BuildRenderObservationInput): RenderObservation;
@@ -361,8 +250,5 @@ export declare function hasCompleteNegativeRequestApiProof(observation: RenderOb
  * entries with this proof.
  */
 export declare function hasQueryInvariantRenderProof(observation: RenderObservation | undefined): boolean;
-export declare function buildStaticLayoutReuseProof(input: BuildStaticLayoutReuseProofInput): BuildStaticLayoutReuseProofResult;
-export declare function createStaticLayoutArtifactReuseDecision(input: CreateStaticLayoutArtifactReuseDecisionInput): StaticLayoutArtifactReuseDecision;
 export declare function createCacheEntryReuseProof(decision: StaticLayoutArtifactReuseDecision | null): CacheEntryReuseProof;
-export declare function createDisabledCacheProofDecision(input: CreateDisabledCacheProofDecisionInput): DisabledCacheProofDecision;
 //#endregion