vinext 0.0.41 → 0.0.43

package/dist/shims/navigation.js

@@ -1,6 +1,7 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
+import { createAppPayloadCacheKey } from "../server/app-elements.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
@@ -115,6 +116,14 @@ function toRscUrl(href) {
 	const query = qIdx === -1 ? "" : beforeHash.slice(qIdx);
 	return (pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname) + ".rsc" + query;
 }
+function getCurrentInterceptionContext() {
+	if (isServer) return null;
+	return stripBasePath(window.location.pathname, __basePath);
+}
+function getCurrentNextUrl() {
+	if (isServer) return "/";
+	return window.location.pathname + window.location.search;
+}
 /** Get or create the shared in-memory RSC prefetch cache on window. */
 function getPrefetchCache() {
 	if (isServer) return /* @__PURE__ */ new Map();
@@ -123,7 +132,7 @@ function getPrefetchCache() {
 }
 /**
 * Get or create the shared set of already-prefetched RSC URLs on window.
-* Keyed by rscUrl so that the browser entry can clear entries when consumed.
+* Keyed by interception-aware cache key so distinct source routes do not alias.
 */
 function getPrefetchedUrls() {
 	if (isServer) return /* @__PURE__ */ new Set();
@@ -158,23 +167,27 @@ function evictPrefetchCacheIfNeeded() {
 * (the caller falls back to a fresh fetch, which is acceptable).
 *
 * Prefer prefetchRscResponse() for new call-sites — it handles the full
-* prefetch lifecycle including dedup.  storePrefetchResponse() is kept for
-* backward compatibility and test helpers.
+* prefetch lifecycle including dedup and explicit slot context.
+* storePrefetchResponse() is kept for backward compatibility and test
+* helpers. It is slot-unaware: the snapshot's mountedSlotsHeader comes
+* from the response headers, not the caller, so consumePrefetchResponse
+* may reject the entry if the caller's slot context differs.
 *
 * NB: Caller is responsible for managing getPrefetchedUrls() — this
 * function only stores the response in the prefetch cache.
 */
-function storePrefetchResponse(rscUrl, response) {
+function storePrefetchResponse(rscUrl, response, interceptionContext = null) {
+	const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
 	evictPrefetchCacheIfNeeded();
 	const entry = { timestamp: Date.now() };
 	entry.pending = snapshotRscResponse(response).then((snapshot) => {
 		entry.snapshot = snapshot;
 	}).catch(() => {
-		getPrefetchCache().delete(rscUrl);
+		getPrefetchCache().delete(cacheKey);
 	}).finally(() => {
 		entry.pending = void 0;
 	});
-	getPrefetchCache().set(rscUrl, entry);
+	getPrefetchCache().set(cacheKey, entry);
 }
 /**
 * Snapshot an RSC response to an ArrayBuffer for caching and replay.
@@ -184,6 +197,7 @@ async function snapshotRscResponse(response) {
 	return {
 		buffer: await response.arrayBuffer(),
 		contentType: response.headers.get("content-type") ?? "text/x-component",
+		mountedSlotsHeader: response.headers.get("X-Vinext-Mounted-Slots"),
 		paramsHeader: response.headers.get("X-Vinext-Params"),
 		url: response.url
 	};
@@ -205,6 +219,7 @@ async function snapshotRscResponse(response) {
 */
 function restoreRscResponse(cached, copy = true) {
 	const headers = new Headers({ "content-type": cached.contentType });
+	if (cached.mountedSlotsHeader != null) headers.set("X-Vinext-Mounted-Slots", cached.mountedSlotsHeader);
 	if (cached.paramsHeader != null) headers.set("X-Vinext-Params", cached.paramsHeader);
 	return new Response(copy ? cached.buffer.slice(0) : cached.buffer, {
 		status: 200,
@@ -218,23 +233,27 @@ function restoreRscResponse(cached, copy = true) {
 * Enforces a maximum cache size to prevent unbounded memory growth on
 * link-heavy pages.
 */
-function prefetchRscResponse(rscUrl, fetchPromise) {
+function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, mountedSlotsHeader = null) {
+	const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
 	const cache = getPrefetchCache();
 	const prefetched = getPrefetchedUrls();
 	const entry = { timestamp: Date.now() };
 	entry.pending = fetchPromise.then(async (response) => {
-		if (response.ok) entry.snapshot = await snapshotRscResponse(response);
+		if (response.ok) entry.snapshot = {
+			...await snapshotRscResponse(response),
+			mountedSlotsHeader
+		};
 		else {
-			prefetched.delete(rscUrl);
-			cache.delete(rscUrl);
+			prefetched.delete(cacheKey);
+			cache.delete(cacheKey);
 		}
 	}).catch(() => {
-		prefetched.delete(rscUrl);
-		cache.delete(rscUrl);
+		prefetched.delete(cacheKey);
+		cache.delete(cacheKey);
 	}).finally(() => {
 		entry.pending = void 0;
 	});
-	cache.set(rscUrl, entry);
+	cache.set(cacheKey, entry);
 	evictPrefetchCacheIfNeeded();
 }
 /**
@@ -242,20 +261,32 @@ function prefetchRscResponse(rscUrl, fetchPromise) {
 * Only returns settled (non-pending) snapshots synchronously.
 * Returns null if the entry is still in flight or doesn't exist.
 */
-function consumePrefetchResponse(rscUrl) {
+function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
+	const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
 	const cache = getPrefetchCache();
-	const entry = cache.get(rscUrl);
+	const entry = cache.get(cacheKey);
 	if (!entry) return null;
 	if (entry.pending) return null;
-	cache.delete(rscUrl);
-	getPrefetchedUrls().delete(rscUrl);
+	cache.delete(cacheKey);
+	getPrefetchedUrls().delete(cacheKey);
 	if (entry.snapshot) {
+		if ((entry.snapshot.mountedSlotsHeader ?? null) !== mountedSlotsHeader) return null;
 		if (Date.now() - entry.timestamp >= 3e4) return null;
 		return entry.snapshot;
 	}
 	return null;
 }
 const _CLIENT_NAV_STATE_KEY = Symbol.for("vinext.clientNavigationState");
+const _MOUNTED_SLOTS_HEADER_KEY = Symbol.for("vinext.mountedSlotsHeader");
+function setMountedSlotsHeader(header) {
+	if (isServer) return;
+	const globalState = window;
+	globalState[_MOUNTED_SLOTS_HEADER_KEY] = header;
+}
+function getMountedSlotsHeader() {
+	if (isServer) return null;
+	return window[_MOUNTED_SLOTS_HEADER_KEY] ?? null;
+}
 function getClientNavigationState() {
 	if (isServer) return null;
 	const globalState = window;
@@ -268,6 +299,8 @@ function getClientNavigationState() {
 		clientParamsJson: "{}",
 		pendingClientParams: null,
 		pendingClientParamsJson: null,
+		pendingPathname: null,
+		pendingPathnameNavId: null,
 		originalPushState: window.history.pushState.bind(window.history),
 		originalReplaceState: window.history.replaceState.bind(window.history),
 		patchInstalled: false,
@@ -413,6 +446,30 @@ function replaceClientParamsWithoutNotify(params) {
 function getClientParams() {
 	return getClientNavigationState()?.clientParams ?? _fallbackClientParams;
 }
+/**
+* Set the pending pathname for client-side navigation.
+* Strips the base path before storing. Associates the pathname with the given navId
+* so only that navigation (or a newer one) can clear it.
+*/
+function setPendingPathname(pathname, navId) {
+	const state = getClientNavigationState();
+	if (!state) return;
+	state.pendingPathname = stripBasePath(pathname, __basePath);
+	state.pendingPathnameNavId = navId;
+}
+/**
+* Clear the pending pathname, but only if the given navId matches the one
+* that set it, or if pendingPathnameNavId is null (no active owner).
+* This prevents superseded navigations from clearing state belonging to newer navigations.
+*/
+function clearPendingPathname(navId) {
+	const state = getClientNavigationState();
+	if (!state) return;
+	if (state.pendingPathnameNavId === null || state.pendingPathnameNavId === navId) {
+		state.pendingPathname = null;
+		state.pendingPathnameNavId = null;
+	}
+}
 function getClientParamsSnapshot() {
 	return getClientNavigationState()?.clientParams ?? _EMPTY_PARAMS;
 }
@@ -500,7 +557,14 @@ function withSuppressedUrlNotifications(fn) {
 		state.suppressUrlNotifyCount -= 1;
 	}
 }
-function commitClientNavigationState() {
+/**
+* Commit pending client navigation state to committed snapshots.
+*
+* navId is optional: callers that don't own pendingPathname (for example,
+* superseded pre-paint cleanup) may pass undefined to flush snapshot/params
+* state without clearing pendingPathname owned by the active navigation.
+*/
+function commitClientNavigationState(navId) {
 	if (isServer) return;
 	const state = getClientNavigationState();
 	if (!state) return;
@@ -512,6 +576,10 @@ function commitClientNavigationState() {
 		state.pendingClientParams = null;
 		state.pendingClientParamsJson = null;
 	}
+	if (state.pendingPathnameNavId === null || navId !== void 0 && state.pendingPathnameNavId === navId) {
+		state.pendingPathname = null;
+		state.pendingPathnameNavId = null;
+	}
 	const shouldNotify = urlChanged || state.hasPendingNavigationUpdate;
 	state.hasPendingNavigationUpdate = false;
 	if (shouldNotify) notifyNavigationListeners();
@@ -574,7 +642,7 @@ function restoreScrollPosition(state) {
 /**
 * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
 */
-async function navigateClientSide(href, mode, scroll) {
+async function navigateClientSide(href, mode, scroll, programmaticTransition = false) {
 	let normalizedHref = href;
 	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
@@ -598,7 +666,7 @@ async function navigateClientSide(href, mode, scroll) {
 	}
 	const hashIdx = fullHref.indexOf("#");
 	const hash = hashIdx !== -1 ? fullHref.slice(hashIdx) : "";
-	if (typeof window.__VINEXT_RSC_NAVIGATE__ === "function") await window.__VINEXT_RSC_NAVIGATE__(fullHref, 0, "navigate", mode);
+	if (typeof window.__VINEXT_RSC_NAVIGATE__ === "function") await window.__VINEXT_RSC_NAVIGATE__(fullHref, 0, "navigate", mode, void 0, programmaticTransition);
 	else {
 		if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", fullHref);
 		else pushHistoryStateWithoutNotify(null, "", fullHref);
@@ -610,11 +678,15 @@ async function navigateClientSide(href, mode, scroll) {
 const _appRouter = {
 	push(href, options) {
 		if (isServer) return;
-		navigateClientSide(href, "push", options?.scroll !== false);
+		React$1.startTransition(() => {
+			navigateClientSide(href, "push", options?.scroll !== false, true);
+		});
 	},
 	replace(href, options) {
 		if (isServer) return;
-		navigateClientSide(href, "replace", options?.scroll !== false);
+		React$1.startTransition(() => {
+			navigateClientSide(href, "replace", options?.scroll !== false, true);
+		});
 	},
 	back() {
 		if (isServer) return;
@@ -626,19 +698,31 @@ const _appRouter = {
 	},
 	refresh() {
 		if (isServer) return;
-		if (typeof window.__VINEXT_RSC_NAVIGATE__ === "function") window.__VINEXT_RSC_NAVIGATE__(window.location.href, 0, "refresh");
+		const rscNavigate = window.__VINEXT_RSC_NAVIGATE__;
+		if (typeof rscNavigate === "function") {
+			const navigate = () => {
+				rscNavigate(window.location.href, 0, "refresh", void 0, void 0, true);
+			};
+			React$1.startTransition(navigate);
+		}
 	},
 	prefetch(href) {
 		if (isServer) return;
 		const rscUrl = toRscUrl(toBrowserNavigationHref(href, window.location.href, __basePath));
+		const interceptionContext = getCurrentInterceptionContext();
+		const cacheKey = createAppPayloadCacheKey(rscUrl, interceptionContext);
 		const prefetched = getPrefetchedUrls();
-		if (prefetched.has(rscUrl)) return;
-		prefetched.add(rscUrl);
+		if (prefetched.has(cacheKey)) return;
+		prefetched.add(cacheKey);
+		const mountedSlotsHeader = getMountedSlotsHeader();
+		const headers = new Headers({ Accept: "text/x-component" });
+		if (mountedSlotsHeader) headers.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
+		if (interceptionContext !== null) headers.set("X-Vinext-Interception-Context", interceptionContext);
 		prefetchRscResponse(rscUrl, fetch(rscUrl, {
-			headers: { Accept: "text/x-component" },
+			headers,
 			credentials: "include",
 			priority: "low"
-		}));
+		}), interceptionContext, mountedSlotsHeader);
 	}
 };
 /**
@@ -838,6 +922,6 @@ if (!isServer) {
 	}
 }
 //#endregion
-export { GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, __basePath, _registerStateAccessors, activateNavigationSnapshot, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getClientNavigationRenderContext, getClientParams, getLayoutSegmentContext, getNavigationContext, getPrefetchCache, getPrefetchedUrls, isHTTPAccessFallbackError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setNavigationContext, snapshotRscResponse, storePrefetchResponse, toRscUrl, unauthorized, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, __basePath, _registerStateAccessors, activateNavigationSnapshot, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, createClientNavigationRenderSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchedUrls, isHTTPAccessFallbackError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, toRscUrl, unauthorized, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
 
 //# sourceMappingURL=navigation.js.map