vinext 0.0.54 → 0.1.0

package/dist/server/server-globals.js

@@ -33,5 +33,3 @@ function installServerGlobals() {
 installServerGlobals();
 //#endregion
 export { installServerGlobals };
-
-//# sourceMappingURL=server-globals.js.map

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

@@ -1,6 +1,7 @@
 import { ArtifactCompatibilityEnvelope, ArtifactCompatibilityEvaluationOptions } from "./artifact-compatibility.js";
 import { StaticLayoutArtifactReuseDecision } from "./cache-proof.js";
-import { ClientReuseManifestEntry, ClientReuseManifestEntryRejection, ClientReuseManifestSkipDisposition, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
+import { ClientReuseManifestEntry, ClientReuseManifestEntryRejection, ClientReuseManifestParseResult, ClientReuseManifestRejection, ClientReuseManifestSkipDisposition, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
+import { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId } from "./static-layout-client-reuse-proof.js";
 
 //#region src/server/skip-cache-proof.d.ts
 type SkipCacheInvalidationProof = Readonly<{
@@ -35,7 +36,26 @@ type CrossCheckClientReuseManifestEntryWithCacheInput = Readonly<{
   cacheDecision: StaticLayoutArtifactReuseDecision | null;
   entry: ClientReuseManifestEntry;
 }> & ArtifactCompatibilityEvaluationOptions;
+type ClientReuseSkipTransportPlan = Readonly<{
+  entryRejections: readonly ClientReuseManifestEntryRejection[];
+  kind: "renderAndSend";
+  manifestRejection?: ClientReuseManifestRejection;
+  skipDisposition: ClientReuseManifestSkipDisposition;
+  skipIneligibleEntryIds: readonly string[];
+  skippedEntryIds: readonly string[];
+}> | Readonly<{
+  entryRejections: readonly ClientReuseManifestEntryRejection[];
+  kind: "skip";
+  skipDisposition: ClientReuseManifestSkipDisposition;
+  skipIneligibleEntryIds: readonly string[];
+  skippedEntryIds: readonly string[];
+}>;
+type CreateClientReuseSkipTransportPlanInput = Readonly<{
+  manifest: ClientReuseManifestParseResult;
+  maxWireEntriesToVerify?: number;
+  verifyEntry: (entry: ClientReuseManifestEntry) => SkipCacheCrossCheckResult;
+}>;
 declare function crossCheckClientReuseManifestEntryWithCache(input: CrossCheckClientReuseManifestEntryWithCacheInput): SkipCacheCrossCheckResult;
+declare function createClientReuseSkipTransportPlan(input: CreateClientReuseSkipTransportPlanInput): ClientReuseSkipTransportPlan;
 //#endregion
-export { SkipCacheInvalidationProof, crossCheckClientReuseManifestEntryWithCache };
-//# sourceMappingURL=skip-cache-proof.d.ts.map
+export { SkipCacheInvalidationProof, createClientReuseSkipTransportPlan, createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId, crossCheckClientReuseManifestEntryWithCache };

package/dist/server/skip-cache-proof.js

@@ -1,15 +1,7 @@
-import { evaluateArtifactCompatibility } from "./artifact-compatibility.js";
+import { ARTIFACT_COMPATIBILITY_PROOF_FIELDS, evaluateArtifactCompatibility } from "./artifact-compatibility.js";
 import { createClientReusePayloadHash } from "./client-reuse-manifest.js";
+import { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId } from "./static-layout-client-reuse-proof.js";
 //#region src/server/skip-cache-proof.ts
-const ARTIFACT_COMPATIBILITY_PROOF_FIELDS = [
-	"schemaVersion",
-	"graphVersion",
-	"deploymentVersion",
-	"appElementsSchemaVersion",
-	"rscPayloadSchemaVersion",
-	"rootBoundaryId",
-	"renderEpoch"
-];
 function createDisabledSkipDisposition() {
 	return {
 		code: "SKIP_MODEL_DISABLED",
@@ -17,6 +9,14 @@ function createDisabledSkipDisposition() {
 		mode: "renderAndSend"
 	};
 }
+function createStaticLayoutSkipDisposition(skippedEntryIds) {
+	return {
+		code: "SKIP_STATIC_LAYOUT_VERIFIED",
+		enabled: true,
+		mode: "skipStaticLayout",
+		skippedEntryIds: [...skippedEntryIds]
+	};
+}
 function rejectSkipCacheCrossCheck(entry, code, fields = {}) {
 	return {
 		kind: "rejected",
@@ -33,9 +33,31 @@ function collectArtifactCompatibilityProofMismatches(artifactCompatibility, proo
 	for (const field of ARTIFACT_COMPATIBILITY_PROOF_FIELDS) if (artifactCompatibility[field] !== proofCompatibility[field]) mismatchedFields.push(field);
 	return mismatchedFields;
 }
+function isExactArtifactCompatibility(artifactCompatibility, entryCompatibility) {
+	return collectArtifactCompatibilityProofMismatches(artifactCompatibility, entryCompatibility).length === 0;
+}
 function assertNever(value) {
 	throw new Error(`Unhandled skip/cache proof state: ${String(value)}`);
 }
+function createRenderAndSendPlan(options) {
+	return {
+		kind: "renderAndSend",
+		entryRejections: options.entryRejections ?? [],
+		...options.manifestRejection ? { manifestRejection: options.manifestRejection } : {},
+		skipDisposition: createDisabledSkipDisposition(),
+		skipIneligibleEntryIds: options.skipIneligibleEntryIds ?? [],
+		skippedEntryIds: []
+	};
+}
+function createVerificationBudgetExceededRejection(totalWireEntries, maxWireEntriesToVerify) {
+	return {
+		code: "SKIP_VERIFICATION_BUDGET_EXCEEDED",
+		fields: {
+			totalWireEntries,
+			maxWireEntriesToVerify
+		}
+	};
+}
 function crossCheckInvalidationProof(entry, invalidation) {
 	switch (invalidation.kind) {
 		case "valid": return null;
@@ -83,6 +105,7 @@ function crossCheckClientReuseManifestEntryWithCache(input) {
 	});
 	const invalidationRejection = crossCheckInvalidationProof(entry, input.artifact.invalidation);
 	if (invalidationRejection) return invalidationRejection;
+	const skipDisposition = isExactArtifactCompatibility(input.artifact.compatibility, entry.artifactCompatibility) ? createStaticLayoutSkipDisposition([entry.id]) : createDisabledSkipDisposition();
 	return {
 		kind: "verified",
 		code: "SKIP_CACHE_CROSS_CHECK_PASSED",
@@ -92,10 +115,54 @@ function crossCheckClientReuseManifestEntryWithCache(input) {
 			reuseClass: proof.reuseClass,
 			variantCacheKeyHash: createClientReusePayloadHash(proof.variant.cacheKey)
 		},
-		skipDisposition: createDisabledSkipDisposition()
+		skipDisposition
+	};
+}
+function createClientReuseSkipTransportPlan(input) {
+	const { manifest } = input;
+	if (manifest.kind === "absent") return createRenderAndSendPlan({});
+	if (manifest.kind === "rejected") return createRenderAndSendPlan({ manifestRejection: manifest.rejection });
+	const maxWireEntriesToVerify = input.maxWireEntriesToVerify ?? 8;
+	if (!Number.isSafeInteger(maxWireEntriesToVerify) || maxWireEntriesToVerify < 0) throw new RangeError("maxWireEntriesToVerify must be a non-negative safe integer");
+	const totalWireEntries = manifest.manifest.entries.length + manifest.entryRejections.length;
+	if (totalWireEntries > maxWireEntriesToVerify) return createRenderAndSendPlan({
+		entryRejections: manifest.entryRejections,
+		manifestRejection: createVerificationBudgetExceededRejection(totalWireEntries, maxWireEntriesToVerify)
+	});
+	const skippedEntryIds = [];
+	const skipIneligibleEntryIds = [];
+	const entryRejections = [...manifest.entryRejections];
+	for (const entry of manifest.manifest.entries) {
+		const verification = input.verifyEntry(entry);
+		if (verification.kind === "rejected") {
+			entryRejections.push(verification.rejection);
+			continue;
+		}
+		if (verification.entryId !== entry.id) {
+			entryRejections.push({
+				code: "SKIP_CACHE_ENTRY_ID_MISMATCH",
+				entryId: entry.id,
+				fields: {
+					verifierEntryId: verification.entryId,
+					manifestEntryId: entry.id
+				}
+			});
+			continue;
+		}
+		if (verification.skipDisposition.enabled) skippedEntryIds.push(entry.id);
+		else skipIneligibleEntryIds.push(entry.id);
+	}
+	if (skippedEntryIds.length === 0) return createRenderAndSendPlan({
+		entryRejections,
+		skipIneligibleEntryIds
+	});
+	return {
+		kind: "skip",
+		entryRejections,
+		skipDisposition: createStaticLayoutSkipDisposition(skippedEntryIds),
+		skipIneligibleEntryIds,
+		skippedEntryIds
 	};
 }
 //#endregion
-export { crossCheckClientReuseManifestEntryWithCache };
-
-//# sourceMappingURL=skip-cache-proof.js.map
+export { createClientReuseSkipTransportPlan, createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId, crossCheckClientReuseManifestEntryWithCache };

package/dist/server/socket-error-backstop.d.ts

@@ -13,5 +13,4 @@ declare function peerDisconnectCode(err: unknown): string | undefined;
 declare function isSocketErrorBackstopInstalled(): boolean;
 declare function installSocketErrorBackstop(): void;
 //#endregion
-export { installSocketErrorBackstop, isSocketErrorBackstopInstalled, peerDisconnectCode };
-//# sourceMappingURL=socket-error-backstop.d.ts.map
+export { installSocketErrorBackstop, isSocketErrorBackstopInstalled, peerDisconnectCode };

package/dist/server/socket-error-backstop.js

@@ -125,5 +125,3 @@ function installSocketErrorBackstop() {
 }
 //#endregion
 export { installSocketErrorBackstop, isSocketErrorBackstopInstalled, peerDisconnectCode };
-
-//# sourceMappingURL=socket-error-backstop.js.map

package/dist/server/static-file-cache.d.ts

@@ -53,5 +53,4 @@ declare class StaticFileCache {
  */
 declare function etagFromFilenameHash(relativePath: string, ext: string): string | null;
 //#endregion
-export { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash };
-//# sourceMappingURL=static-file-cache.d.ts.map
+export { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash };

package/dist/server/static-file-cache.js

@@ -217,5 +217,3 @@ async function* walkFilesWithStats(dir, base = dir) {
 }
 //#endregion
 export { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash };
-
-//# sourceMappingURL=static-file-cache.js.map

package/dist/server/static-layout-client-reuse-proof.d.ts

@@ -0,0 +1,15 @@
+import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
+
+//#region src/server/static-layout-client-reuse-proof.d.ts
+type StaticLayoutClientReuseProofInput = Readonly<{
+  artifactCompatibility: ArtifactCompatibilityEnvelope;
+  layoutId: string;
+  rootBoundaryId: string | null;
+  routeId: string;
+  variantCacheKey: string;
+}>;
+declare function createStaticLayoutClientReuseRouteId(layoutId: string): string;
+declare function createStaticLayoutClientReusePayloadHash(input: StaticLayoutClientReuseProofInput): string;
+declare function createStaticLayoutClientReuseArtifactCompatibility(input: StaticLayoutClientReuseProofInput): ArtifactCompatibilityEnvelope;
+//#endregion
+export { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId };

package/dist/server/static-layout-client-reuse-proof.js

@@ -0,0 +1,33 @@
+import { ARTIFACT_COMPATIBILITY_PROOF_FIELDS } from "./artifact-compatibility.js";
+import { createClientReusePayloadHash } from "./client-reuse-manifest.js";
+//#region src/server/static-layout-client-reuse-proof.ts
+function createStaticLayoutClientReuseRouteId(layoutId) {
+	return `static-layout:${createClientReusePayloadHash(layoutId)}`;
+}
+function createCanonicalProofPairs(input) {
+	return ARTIFACT_COMPATIBILITY_PROOF_FIELDS.map((field) => [field, input.artifactCompatibility[field]]);
+}
+function createStaticLayoutClientReusePayloadHash(input) {
+	return createClientReusePayloadHash(JSON.stringify({
+		artifactCompatibilityPairs: createCanonicalProofPairs(input),
+		layoutId: input.layoutId,
+		rootBoundaryId: input.rootBoundaryId,
+		variantCacheKey: input.variantCacheKey
+	}));
+}
+function createStaticLayoutClientReuseArtifactCompatibility(input) {
+	return {
+		...input.artifactCompatibility,
+		graphVersion: `static-layout-graph:${createClientReusePayloadHash(JSON.stringify({
+			layoutId: input.layoutId,
+			rootBoundaryId: input.rootBoundaryId
+		}))}`,
+		renderEpoch: `static-layout:${createClientReusePayloadHash(JSON.stringify({
+			layoutId: input.layoutId,
+			rootBoundaryId: input.rootBoundaryId,
+			variantCacheKey: input.variantCacheKey
+		}))}`
+	};
+}
+//#endregion
+export { createStaticLayoutClientReuseArtifactCompatibility, createStaticLayoutClientReusePayloadHash, createStaticLayoutClientReuseRouteId };

package/dist/server/streaming-metadata.d.ts

@@ -1,5 +1,4 @@
 //#region src/server/streaming-metadata.d.ts
 declare function shouldServeStreamingMetadata(userAgent: string, htmlLimitedBots: string | undefined): boolean;
 //#endregion
-export { shouldServeStreamingMetadata };
-//# sourceMappingURL=streaming-metadata.d.ts.map
+export { shouldServeStreamingMetadata };

package/dist/server/streaming-metadata.js

@@ -6,5 +6,3 @@ function shouldServeStreamingMetadata(userAgent, htmlLimitedBots) {
 }
 //#endregion
 export { shouldServeStreamingMetadata };
-
-//# sourceMappingURL=streaming-metadata.js.map

package/dist/server/worker-utils.d.ts

@@ -4,5 +4,4 @@ declare function resolveStaticAssetSignal(signalResponse: Response, options: {
   fetchAsset(path: string): Promise<Response>;
 }): Promise<Response | null>;
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
-//# sourceMappingURL=worker-utils.d.ts.map
+export { mergeHeaders, resolveStaticAssetSignal };

package/dist/server/worker-utils.js

@@ -3,16 +3,15 @@ import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 /**
 * Shared utilities for Cloudflare Worker entries.
 *
-* Used by hand-written example worker entries and can be imported as
-* "vinext/server/worker-utils". The generated worker entry (deploy.ts)
-* inlines these functions in its template string.
+* Used by hand-written example worker entries and by the generated Pages
+* Router worker entry through "vinext/server/worker-utils".
 */
 /**
 * Merge middleware/config headers into a response.
 * Response headers take precedence over middleware headers for all headers
 * except Set-Cookie, which is additive (both middleware and response cookies
 * are preserved). Uses getSetCookie() to preserve multiple Set-Cookie values.
-* Keep this in sync with prod-server.ts and the generated copy in deploy.ts.
+* Keep this in sync with prod-server.ts.
 */
 const NO_BODY_RESPONSE_STATUSES = new Set([
 	204,
@@ -98,5 +97,3 @@ async function resolveStaticAssetSignal(signalResponse, options) {
 }
 //#endregion
 export { mergeHeaders, resolveStaticAssetSignal };
-
-//# sourceMappingURL=worker-utils.js.map

package/dist/shims/amp.d.ts

@@ -16,5 +16,4 @@ declare function useAmp(): boolean;
  */
 declare function isInAmpMode(): boolean;
 //#endregion
-export { isInAmpMode, useAmp };
-//# sourceMappingURL=amp.d.ts.map
+export { isInAmpMode, useAmp };

package/dist/shims/amp.js

@@ -21,5 +21,3 @@ function isInAmpMode() {
 }
 //#endregion
 export { isInAmpMode, useAmp };
-
-//# sourceMappingURL=amp.js.map

package/dist/shims/app-router-scroll-state.d.ts

@@ -10,5 +10,4 @@ declare function getPendingAppRouterScrollIntent(): AppRouterScrollIntent | null
 declare function claimAppRouterScrollIntentForCommit(expected: AppRouterScrollIntent | null | undefined, commitId: number): void;
 declare function consumeAppRouterScrollIntent(expected: AppRouterScrollIntent | null | undefined, commitId?: number): AppRouterScrollIntent | null;
 //#endregion
-export { AppRouterScrollIntent, beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent };
-//# sourceMappingURL=app-router-scroll-state.d.ts.map
+export { AppRouterScrollIntent, beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent };

package/dist/shims/app-router-scroll-state.js

@@ -47,5 +47,3 @@ function consumeAppRouterScrollIntent(expected, commitId) {
 }
 //#endregion
 export { beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent };
-
-//# sourceMappingURL=app-router-scroll-state.js.map

package/dist/shims/app-router-scroll.d.ts

@@ -1,5 +1,4 @@
 import * as React$1 from "react";
-import * as _$react_jsx_runtime0 from "react/jsx-runtime";
 
 //#region src/shims/app-router-scroll.d.ts
 declare class AppRouterScrollTargetInner extends React$1.Component<{
@@ -17,12 +16,11 @@ declare function AppRouterScrollCommitProvider({
 }: {
   children?: React$1.ReactNode;
   commitId: number | null;
-}): _$react_jsx_runtime0.JSX.Element;
+}): React$1.JSX.Element;
 declare function AppRouterScrollTarget({
   children
 }: {
   children: React$1.ReactNode;
-}): _$react_jsx_runtime0.JSX.Element;
+}): React$1.JSX.Element;
 //#endregion
-export { AppRouterScrollCommitProvider, AppRouterScrollTarget, AppRouterScrollTargetInner };
-//# sourceMappingURL=app-router-scroll.d.ts.map
+export { AppRouterScrollCommitProvider, AppRouterScrollTarget, AppRouterScrollTargetInner };

package/dist/shims/app-router-scroll.js

@@ -111,5 +111,3 @@ function AppRouterScrollTarget({ children }) {
 }
 //#endregion
 export { AppRouterScrollCommitProvider, AppRouterScrollTarget, AppRouterScrollTargetInner };
-
-//# sourceMappingURL=app-router-scroll.js.map

package/dist/shims/app.d.ts

@@ -39,5 +39,4 @@ declare class App<P = any, CP = any, S = any> extends React.Component<P & AppPro
   render(): React.ReactNode;
 }
 //#endregion
-export { AppContext, AppInitialProps, AppProps, App as default };
-//# sourceMappingURL=app.d.ts.map
+export { AppContext, AppInitialProps, AppProps, App as default };

package/dist/shims/app.js

@@ -46,5 +46,3 @@ var App = class extends React.Component {
 };
 //#endregion
 export { App as default };
-
-//# sourceMappingURL=app.js.map

package/dist/shims/before-interactive-context.d.ts

@@ -26,5 +26,4 @@ type RegisterBeforeInteractiveInlineScript = (script: BeforeInteractiveInlineScr
 declare const BeforeInteractiveContext: React.Context<RegisterBeforeInteractiveInlineScript | null>;
 declare function useBeforeInteractiveRegister(): RegisterBeforeInteractiveInlineScript | null;
 //#endregion
-export { BeforeInteractiveContext, BeforeInteractiveInlineScript, RegisterBeforeInteractiveInlineScript, useBeforeInteractiveRegister };
-//# sourceMappingURL=before-interactive-context.d.ts.map
+export { BeforeInteractiveContext, BeforeInteractiveInlineScript, RegisterBeforeInteractiveInlineScript, useBeforeInteractiveRegister };

package/dist/shims/before-interactive-context.js

@@ -6,5 +6,3 @@ function useBeforeInteractiveRegister() {
 }
 //#endregion
 export { BeforeInteractiveContext, useBeforeInteractiveRegister };
-
-//# sourceMappingURL=before-interactive-context.js.map

package/dist/shims/cache-for-request.d.ts

@@ -54,5 +54,4 @@
  */
 declare function cacheForRequest<T>(factory: () => T): () => T;
 //#endregion
-export { cacheForRequest };
-//# sourceMappingURL=cache-for-request.d.ts.map
+export { cacheForRequest };

package/dist/shims/cache-for-request.js

@@ -70,5 +70,3 @@ function cacheForRequest(factory) {
 }
 //#endregion
 export { cacheForRequest };
-
-//# sourceMappingURL=cache-for-request.js.map

package/dist/shims/cache-runtime.d.ts

@@ -1,5 +1,4 @@
 import { CacheLifeConfig } from "./cache.js";
-import * as _$node_async_hooks0 from "node:async_hooks";
 
 //#region src/shims/cache-runtime.d.ts
 /**
@@ -23,8 +22,14 @@ type CacheContext = {
    * cache. Used as `cause` for the nested-dynamic cache error.
    */
   dynamicNestedCacheError: Error | undefined;
+  /**
+   * Dynamic request API error recorded inside this cache scope. This persists
+   * even if user code catches the original throw, so the wrapper can avoid
+   * storing request-specific output under a shared cache key.
+   */
+  invalidDynamicUsageError?: unknown;
 };
-declare const cacheContextStorage: _$node_async_hooks0.AsyncLocalStorage<CacheContext>;
+declare const cacheContextStorage: import("node:async_hooks").AsyncLocalStorage<CacheContext>;
 /**
  * Get the current cache context. Returns null if not inside a "use cache" function.
  */
@@ -53,6 +58,17 @@ declare function runWithPrivateCache<T>(fn: () => T | Promise<T>): T | Promise<T
  * Only needed when not using runWithPrivateCache() (legacy path).
  */
 declare function clearPrivateCache(): void;
+declare function markAppPagePropsForUseCache<T extends object>(props: T): T;
+type RegisterCachedFunctionOptions = {
+  /**
+   * Internal transform metadata for file-level `"use cache"` default exports
+   * in App Router `page.*` files. Page components receive framework-owned
+   * `{ params, searchParams }` props. React may copy that props object before
+   * invocation, so this invariant must live at the cached function boundary
+   * rather than on the intermediate createElement config object.
+   */
+  appPageDefaultExport?: boolean;
+};
 /**
  * Register a function as a cached function. This is called by the Vite
  * transform for each "use cache" function.
@@ -62,7 +78,6 @@ declare function clearPrivateCache(): void;
  * @param variant - Cache variant: "" (default/shared), "remote", "private"
  * @returns A wrapper function that checks cache before calling the original
  */
-declare function registerCachedFunction<TArgs extends unknown[], TResult>(fn: (...args: TArgs) => Promise<TResult>, id: string, variant?: string): (...args: TArgs) => Promise<TResult>;
+declare function registerCachedFunction<TArgs extends unknown[], TResult>(fn: (...args: TArgs) => Promise<TResult>, id: string, variant?: string, options?: RegisterCachedFunctionOptions): (...args: TArgs) => Promise<TResult>;
 //#endregion
-export { CacheContext, NestedDynamicUseCacheError, PrivateCacheState, cacheContextStorage, clearPrivateCache, getCacheContext, registerCachedFunction, replyToCacheKey, runWithPrivateCache };
-//# sourceMappingURL=cache-runtime.d.ts.map
+export { CacheContext, NestedDynamicUseCacheError, PrivateCacheState, cacheContextStorage, clearPrivateCache, getCacheContext, markAppPagePropsForUseCache, registerCachedFunction, replyToCacheKey, runWithPrivateCache };

package/dist/shims/cache-runtime.js

@@ -2,7 +2,7 @@ import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { VINEXT_RSC_MARKER_HEADER } from "../server/headers.js";
 import { markDynamicUsage } from "./headers.js";
-import { _registerCacheContextAccessor, _setRequestScopedCacheLife, cacheLifeProfiles, getCacheHandler } from "./cache.js";
+import { _registerCacheContextAccessor, _setRequestScopedCacheLife, cacheLifeProfiles, getDataCacheHandler } from "./cache.js";
 //#region src/shims/cache-runtime.ts
 /**
 * "use cache" runtime
@@ -33,6 +33,7 @@ import { _registerCacheContextAccessor, _setRequestScopedCacheLife, cacheLifePro
 * - "use cache: remote"   — shared cache (explicit)
 * - "use cache: private"  — per-request cache (not shared across requests)
 */
+const APP_PAGE_PROPS_CACHE_KEY_MARKER = Symbol.for("vinext.appPagePropsCacheKeyMarker");
 /** Threshold below which expire is considered "dynamic" (5 minutes in seconds). */
 const DYNAMIC_EXPIRE = 300;
 /**
@@ -219,6 +220,15 @@ function clearPrivateCache() {
 	if (state) state._privateCache = /* @__PURE__ */ new Map();
 	else _privateFallbackState._privateCache = /* @__PURE__ */ new Map();
 }
+function markAppPagePropsForUseCache(props) {
+	Object.defineProperty(props, APP_PAGE_PROPS_CACHE_KEY_MARKER, {
+		configurable: false,
+		enumerable: false,
+		value: true,
+		writable: false
+	});
+	return props;
+}
 /**
 * Register a function as a cached function. This is called by the Vite
 * transform for each "use cache" function.
@@ -228,19 +238,20 @@ function clearPrivateCache() {
 * @param variant - Cache variant: "" (default/shared), "remote", "private"
 * @returns A wrapper function that checks cache before calling the original
 */
-function registerCachedFunction(fn, id, variant) {
+function registerCachedFunction(fn, id, variant, options = {}) {
 	const cacheVariant = variant ?? "";
+	const omitAppPageSearchParamsFromFirstArg = options.appPageDefaultExport === true;
 	const isDev = typeof process !== "undefined" && process.env.NODE_ENV === "development";
 	const cachedFn = async (...args) => {
 		const rsc = await getRscModule();
 		const keySeed = getUseCacheKeySeed();
 		let cacheKey;
 		try {
+			const processedArgs = args.length > 0 ? unwrapThenableObjectArray(args, { omitAppPageSearchParamsFromFirstArg }) : [];
 			if (rsc && args.length > 0) {
 				const tempRefs = rsc.createClientTemporaryReferenceSet();
-				const processedArgs = unwrapThenableObjectArray(args);
 				cacheKey = buildUseCacheKey(id, keySeed, await replyToCacheKey(await rsc.encodeReply(processedArgs, { temporaryReferences: tempRefs })));
-			} else cacheKey = buildUseCacheKey(id, keySeed, args.length > 0 ? stableStringify(args) : void 0);
+			} else cacheKey = buildUseCacheKey(id, keySeed, processedArgs.length > 0 ? stableStringify(processedArgs) : void 0);
 		} catch {
 			return fn(...args);
 		}
@@ -256,7 +267,7 @@ function registerCachedFunction(fn, id, variant) {
 			return result;
 		}
 		if (isDev) return executeWithContext(fn, args, cacheVariant);
-		const handler = getCacheHandler();
+		const handler = getDataCacheHandler();
 		const existing = await handler.get(cacheKey, { kind: "FETCH" });
 		if (existing?.value && existing.value.kind === "FETCH" && existing.cacheState !== "stale") try {
 			if (rsc && existing.value.data.headers["x-vinext-rsc"] === "1") {
@@ -303,6 +314,10 @@ function registerCachedFunction(fn, id, variant) {
 		} catch {}
 		return result;
 	};
+	Object.defineProperty(cachedFn, "length", {
+		value: fn.length,
+		configurable: true
+	});
 	return cachedFn;
 }
 function throwPrivateUseCacheInsidePublicUseCacheError() {
@@ -339,9 +354,11 @@ async function runCachedFunctionWithContext(fn, args, variant) {
 		variant: variant || "default",
 		hasExplicitRevalidate: false,
 		hasExplicitExpire: false,
-		dynamicNestedCacheError: void 0
+		dynamicNestedCacheError: void 0,
+		invalidDynamicUsageError: void 0
 	};
 	const result = await cacheContextStorage.run(ctx, () => fn(...args));
+	if (ctx.invalidDynamicUsageError) throw ctx.invalidDynamicUsageError;
 	const effectiveLife = resolveCacheLife(ctx.lifeConfigs);
 	if (parentCtx) parentCtx.lifeConfigs.push(effectiveLife);
 	if (parentCtx && eagerError && (effectiveLife.revalidate === 0 || effectiveLife.expire !== void 0 && effectiveLife.expire < DYNAMIC_EXPIRE)) parentCtx.dynamicNestedCacheError ??= eagerError;
@@ -355,25 +372,9 @@ async function runCachedFunctionWithContext(fn, args, variant) {
 		effectiveLife
 	};
 }
-/**
-* Recursively unwrap "thenable objects" — values created by
-* `Object.assign(Promise.resolve(obj), obj)` — into plain objects.
-*
-* Next.js 16 params and searchParams are passed as Promise-augmented objects
-* that work both as `await params` and `params.key`. When these are fed to
-* `encodeReply` with `temporaryReferences`, the Promise is treated as a
-* temporary reference and its actual values are **excluded** from the
-* serialized output. This means different param values (e.g.,
-* `section:"sports"` vs `section:"electronics"`) produce identical cache keys.
-*
-* This function extracts the own enumerable properties into plain objects
-* so `encodeReply` can serialize the actual values into the cache key.
-* Only used for cache key generation — the original Promise-augmented
-* objects are still passed to the actual function on cache miss.
-*/
-function unwrapThenableObjects(value) {
+function unwrapThenableObjects(value, options = {}) {
 	if (value === null || value === void 0 || typeof value !== "object") return value;
-	if (Array.isArray(value)) return value.map(unwrapThenableObjects);
+	if (Array.isArray(value)) return value.map((item) => unwrapThenableObjects(item));
 	if (typeof value.then === "function") {
 		const keys = Object.keys(value);
 		if (keys.length > 0) {
@@ -384,11 +385,17 @@ function unwrapThenableObjects(value) {
 		return value;
 	}
 	const result = {};
-	for (const key of Object.keys(value)) result[key] = unwrapThenableObjects(value[key]);
+	for (const key of Object.keys(value)) {
+		if (key === "searchParams" && (options.omitAppPageSearchParamsAtRoot || isMarkedAppPagePropsObject(value))) continue;
+		result[key] = unwrapThenableObjects(value[key]);
+	}
 	return result;
 }
-function unwrapThenableObjectArray(values) {
-	return values.map(unwrapThenableObjects);
+function isMarkedAppPagePropsObject(value) {
+	return Reflect.get(value, APP_PAGE_PROPS_CACHE_KEY_MARKER) === true;
+}
+function unwrapThenableObjectArray(values, options) {
+	return values.map((value, index) => unwrapThenableObjects(value, { omitAppPageSearchParamsAtRoot: index === 0 && options.omitAppPageSearchParamsFromFirstArg }));
 }
 function stableStringify(value, seen) {
 	if (value === void 0) return "undefined";
@@ -415,6 +422,4 @@ function stableStringify(value, seen) {
 	return JSON.stringify(value);
 }
 //#endregion
-export { NestedDynamicUseCacheError, cacheContextStorage, clearPrivateCache, getCacheContext, registerCachedFunction, replyToCacheKey, runWithPrivateCache };
-
-//# sourceMappingURL=cache-runtime.js.map
+export { NestedDynamicUseCacheError, cacheContextStorage, clearPrivateCache, getCacheContext, markAppPagePropsForUseCache, registerCachedFunction, replyToCacheKey, runWithPrivateCache };