@tanstack/router-core 1.171.14 → 1.171.16-pre.0

package/dist/cjs/router.d.cts

@@ -1,12 +1,13 @@
-import { loadRouteChunk } from './load-matches.cjs';
+import { loadRouteChunk, ActivePreload, LoadTransaction, LoaderFlight, PendingSession } from './load-client.cjs';
 import { LRUCache } from './lru-cache.cjs';
 import { ProcessRouteTreeResult, ProcessedTree } from './new-process-route-tree.cjs';
 import { SearchParser, SearchSerializer } from './searchParams.cjs';
 import { AnyRedirect, ResolvedRedirect } from './redirect.cjs';
+import { ServerLoadResult } from './load-server.cjs';
 import { HistoryAction, HistoryLocation, HistoryState, ParsedHistoryState, RouterHistory } from '@tanstack/history';
-import { Awaitable, Constrain, ControlledPromise, NoInfer, NonNullableUpdater, PickAsRequired, Updater } from './utils.cjs';
+import { Awaitable, Constrain, NoInfer, NonNullableUpdater, PickAsRequired, Updater } from './utils.cjs';
 import { ParsedLocation } from './location.cjs';
-import { AnyContext, AnyRoute, AnyRouteWithContext, LoaderStaleReloadMode, MakeRemountDepsOptionsUnion, RouteLike, RouteMask } from './route.cjs';
+import { AnyContext, AnyRoute, AnyRouteWithContext, LoaderStaleReloadMode, MakeRemountDepsOptionsUnion, RouteMask } from './route.cjs';
 import { FullSearchSchema, RouteById, RoutePaths, RoutesById, RoutesByPath } from './routeInfo.cjs';
 import { AnyRouteMatch, MakeRouteMatchUnion, MatchRouteOptions } from './Matches.cjs';
 import { BuildLocationFn, CommitLocationOptions, NavigateFn } from './RouterProvider.cjs';
@@ -135,9 +136,9 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
      */
     defaultPreloadStaleTime?: number;
     /**
-     * The default `defaultPreloadGcTime` a route should use if no preloadGcTime is provided.
+     * The default `preloadGcTime` a route should use if none is provided.
      *
-     * @default 1_800_000 `(30 minutes)`
+     * @default 300_000 `(5 minutes)`
      * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultpreloadgctime-property)
      * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/preloading)
      */
@@ -169,7 +170,7 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
     /**
      * The default `gcTime` a route should use if no gcTime is provided.
      *
-     * @default 1_800_000 `(30 minutes)`
+     * @default 300_000 `(5 minutes)`
      * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultgctime-property)
      * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/data-loading#key-options)
      */
@@ -389,14 +390,10 @@ export type LocationRewriteFunction = ({ url, }: {
 }) => undefined | string | URL;
 export interface RouterState<in out TRouteTree extends AnyRoute = AnyRoute, in out TRouteMatch = MakeRouteMatchUnion> {
     status: 'pending' | 'idle';
-    loadedAt: number;
     isLoading: boolean;
-    isTransitioning: boolean;
     matches: Array<TRouteMatch>;
     location: ParsedLocation<FullSearchSchema<TRouteTree>>;
     resolvedLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>;
-    statusCode: number;
-    redirect?: AnyRedirect;
 }
 export interface BuildNextOptions {
     to?: string | number | null;
@@ -453,9 +450,7 @@ export type RouterListener<TRouterEvent extends RouterEvent> = {
 };
 export type SubscribeFn = <TType extends keyof RouterEvents>(eventType: TType, fn: ListenerFn<RouterEvents[TType]>) => () => void;
 export interface MatchRoutesOpts {
-    preload?: boolean;
     throwOnError?: boolean;
-    dest?: BuildNextOptions;
 }
 export type InferRouterContext<TRouteTree extends AnyRoute> = TRouteTree['types']['routerContext'];
 export type RouterContextOptions<TRouteTree extends AnyRoute> = AnyContext extends InferRouterContext<TRouteTree> ? {
@@ -486,9 +481,11 @@ export type LoadFn = (opts?: {
     action?: {
         type: HistoryAction;
     };
+    _signal?: AbortSignal;
+    _dedupe?: boolean;
 }) => Promise<void>;
 export type CommitLocationFn = ({ viewTransition, ignoreBlocker, ...next }: ParsedLocation & CommitLocationOptions) => Promise<void>;
-export type StartTransitionFn = (fn: () => void) => void;
+export type StartTransitionFn = (fn: () => void, expected: Array<AnyRouteMatch>, urgent?: boolean) => Promise<boolean>;
 export interface MatchRoutesFn {
     (pathname: string, locationSearch?: AnySchema, opts?: MatchRoutesOpts): Array<MakeRouteMatchUnion>;
     /**
@@ -497,8 +494,6 @@ export interface MatchRoutesFn {
     (next: ParsedLocation, opts?: MatchRoutesOpts): Array<AnyRouteMatch>;
     (pathnameOrNext: string | ParsedLocation, locationSearchOrOpts?: AnySchema | MatchRoutesOpts, opts?: MatchRoutesOpts): Array<AnyRouteMatch>;
 }
-export type GetMatchFn = (matchId: string) => AnyRouteMatch | undefined;
-export type UpdateMatchFn = (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => void;
 export type LoadRouteChunkFn = (route: AnyRoute) => Promise<Array<void>>;
 export type ResolveRedirect = (err: AnyRedirect) => ResolvedRedirect;
 export type ClearCacheFn<TRouter extends AnyRouter> = (opts?: {
@@ -585,7 +580,14 @@ export declare function getLocationChangeInfo(location: ParsedLocation, resolved
     hrefChanged: boolean;
     hashChanged: boolean;
 };
-export declare const locationHistoryActions: WeakMap<ParsedLocation<{}>, HistoryAction>;
+/**
+ * Return only state owned by the application, excluding volatile history
+ * bookkeeping. Mask payloads (`__tempLocation`/`__tempKey`) are kept: they
+ * distinguish otherwise-identical locations.
+ */
+export declare function _getUserHistoryState({ key: _key, __TSR_key: _tsrKey, __TSR_index: _tsrIndex, __hashScrollIntoViewOptions: _hashScroll, ...state }: ParsedHistoryState): HistoryState;
+/** Run route lifecycle callbacks in leave/enter/stay phases. */
+export declare function runRouteLifecycle(router: AnyRouter, previous: Array<AnyRouteMatch>, matches: Array<AnyRouteMatch>, isCurrent?: () => boolean): void;
 export type CreateRouterFn = <TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption = 'never', TDefaultStructuralSharingOption extends boolean = false, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record<string, any> = Record<string, any>>(options: undefined extends number ? 'strictNullChecks must be enabled in tsconfig.json' : RouterConstructorOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>) => RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>;
 declare global {
     var __TSR_CACHE__: {
@@ -594,6 +596,33 @@ declare global {
         resolvePathCache: LRUCache<string, string>;
     } | undefined;
 }
+export interface RouterCore<in out TRouteTree extends AnyRoute, in out TTrailingSlashOption extends TrailingSlashOption, in out TDefaultStructuralSharingOption extends boolean, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record<string, any> = Record<string, any>> {
+    shouldViewTransition?: boolean | ViewTransitionOptions;
+    /** Current client load transaction and owner of navigation writes. */
+    _tx?: LoadTransaction;
+    /** Joinable in-flight loader generations keyed by match ID. */
+    _flights?: Map<string, LoaderFlight>;
+    /** Whole speculative lanes that an identical navigation may adopt. */
+    _preloads?: Map<string, ActivePreload>;
+    /** Owns cancellable work before a client transaction publishes. */
+    _preflight?: AbortController;
+    /** Transfers one reconstructed SSR prefix into its initial client load. */
+    _handoff?: HydrationHandoff;
+    /** Pending-boundary reveal and minimum-visible timing state. */
+    _pending?: PendingSession;
+    /** Result of the latest server load, used to render or redirect. */
+    _serverResult?: ServerLoadResult;
+    /** Framework callback that acknowledges an exact matches publication. */
+    _rendered?: (matches: Array<AnyRouteMatch>) => void;
+    /** Development-only HMR reload for a route and its descendants. */
+    _refreshRoute: (() => Promise<void>) | undefined;
+    /** Development-only replacement for a route's lazy chunk owner. */
+    _replaceRouteChunk: ((route: AnyRoute, lazyFn: AnyRoute['lazyFn']) => void) | undefined;
+}
+export type HydrationHandoff = [
+    claim: () => AbortController | undefined,
+    finish: (matches?: Array<AnyRouteMatch>) => number | undefined
+];
 /**
  * Core, framework-agnostic router engine that powers TanStack Router.
  *
@@ -607,14 +636,16 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     tempLocationKey: string | undefined;
     _scroll: {
         next: boolean;
+        hash?: boolean;
         restoring?: boolean;
         restoration?: boolean;
         reset?: boolean;
     };
-    shouldViewTransition?: boolean | ViewTransitionOptions;
-    isViewTransitionTypesSupported?: boolean;
     subscribers: Set<RouterListener<RouterEvent>>;
-    viewTransitionPromise?: ControlledPromise<true>;
+    /** Accepted off-screen loader generations keyed by match ID. */
+    _cache: Map<string, AnyRouteMatch>;
+    /** Accepted semantic lane, excluding temporary pending presentation. */
+    _committed: Array<AnyRouteMatch>;
     stores: RouterStores<TRouteTree>;
     private getStoreConfig;
     batch: (fn: () => void) => void;
@@ -623,7 +654,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     rewrite?: LocationRewrite;
     origin?: string;
     latestLocation: ParsedLocation<FullSearchSchema<TRouteTree>>;
-    pendingBuiltLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>;
+    _pendingLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>;
     basepath: string;
     routeTree: TRouteTree;
     routesById: RoutesById<TRouteTree>;
@@ -641,7 +672,6 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     constructor(options: RouterConstructorOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>, getStoreConfig: GetStoreConfig);
     startTransition: StartTransitionFn;
     isShell(): boolean;
-    isPrerendering(): boolean;
     update: UpdateFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>;
     get state(): RouterState<TRouteTree>;
     updateLatestLocation: () => void;
@@ -663,19 +693,15 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     /** Resolve a path using the router's trailing-slash policy. */
     resolvePathWithBase: (from: string, path: string) => string;
     private getRouteBranch;
-    get looseRoutesById(): Record<string, AnyRoute>;
     matchRoutes: MatchRoutesFn;
-    private getParentContext;
     private matchRoutesInternal;
     getMatchedRoutes: GetMatchRoutesFn;
     /**
      * Lightweight route matching for buildLocation.
      * Only computes fullPath, accumulated search, and params - skipping expensive
-     * operations like AbortController, ControlledPromise, loaderDeps, and full match objects.
+     * operations like AbortController, loaderDeps, and full match objects.
      */
     private matchRoutesLightweight;
-    cancelMatch: (id: string) => void;
-    cancelMatches: () => void;
     /**
      * Build the next ParsedLocation from navigation options without committing.
      * Resolves `to`/`from`, params/search/hash/state, applies search validation
@@ -684,14 +710,18 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
      * @link https://tanstack.com/router/latest/docs/framework/react/api/router/RouterType#buildlocation-method
      */
     buildLocation: BuildLocationFn;
-    commitLocationPromise: undefined | ControlledPromise<void>;
+    _commitPromise: (Promise<void> & {
+        resolve: () => void;
+    }) | undefined;
     /**
      * Commit a previously built location to history (push/replace), optionally
      * using view transitions and scroll restoration options.
      */
     commitLocation: CommitLocationFn;
     /** Convenience helper: build a location from options, then commit it. */
-    buildAndCommitLocation: ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest }?: BuildNextOptions & CommitLocationOptions) => Promise<void>;
+    buildAndCommitLocation: ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, _redirects, href, ...rest }?: BuildNextOptions & CommitLocationOptions & {
+        _redirects?: number;
+    }) => Promise<void>;
     /**
      * Imperatively navigate using standard `NavigateOptions`. When `reloadDocument`
      * or an absolute `href` is provided, performs a full document navigation.
@@ -700,25 +730,19 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
      * @link https://tanstack.com/router/latest/docs/framework/react/api/router/NavigateOptionsType
      */
     navigate: NavigateFn;
-    latestLoadPromise: undefined | Promise<void>;
-    beforeLoad: () => void;
     load: LoadFn;
-    startViewTransition: (fn: () => Promise<void>) => void;
-    updateMatch: UpdateMatchFn;
-    getMatch: GetMatchFn;
+    startViewTransition: (fn: () => Promise<void>) => any;
     /**
      * Invalidate the current matches and optionally force them back into a pending state.
      *
      * - Marks all matches that pass the optional `filter` as `invalid: true`.
-     * - If `forcePending` is true, or a match is currently in `'error'` or `'notFound'` status,
-     *   its status is reset to `'pending'` and its `error` cleared so that the loader is re-run
-     *   on the next `load()` call (eg. after HMR or a manual invalidation).
+     *
+     * The next load decides when to publish pending UI, so invalidation does not
+     * mutate the currently rendered status.
      */
     invalidate: InvalidateFn<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>>;
-    getParsedLocationHref: (location: ParsedLocation) => string;
     resolveRedirect: (redirect: AnyRedirect) => AnyRedirect;
     clearCache: ClearCacheFn<this>;
-    clearExpiredCache: () => void;
     loadRouteChunk: typeof loadRouteChunk;
     preloadRoute: PreloadRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
     matchRoute: MatchRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
@@ -727,7 +751,6 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     };
     serverSsr?: ServerSsr;
     serverSsrLifecycle?: RouterSsrLifecycle;
-    hasNotFoundMatch: () => boolean;
 }
 /** Error thrown when search parameter validation fails. */
 export declare class SearchParamError extends Error {
@@ -742,17 +765,4 @@ export declare class PathParamError extends Error {
 export declare function lazyFn<T extends Record<string, (...args: Array<any>) => any>, TKey extends keyof T = 'default'>(fn: () => Promise<T>, key?: TKey): (...args: Parameters<T[TKey]>) => Promise<Awaited<ReturnType<T[TKey]>>>;
 /** Create an initial RouterState from a parsed location. */
 export declare function getInitialRouterState(location: ParsedLocation): RouterState<any>;
-/**
- * Build the matched route chain and extract params for a pathname.
- * Falls back to the root route if no specific route is found.
- */
-export declare function getMatchedRoutes<TRouteLike extends RouteLike>({ pathname, routesById, processedTree, }: {
-    pathname: string;
-    routesById: Record<string, TRouteLike>;
-    processedTree: ProcessedTree<any, any, any>;
-}): {
-    matchedRoutes: readonly TRouteLike[];
-    routeParams: Record<string, string>;
-    foundRoute: TRouteLike | undefined;
-};
 export {};

package/dist/cjs/scroll-restoration.cjs

@@ -1,4 +1,3 @@
-const require_router = require("./router.cjs");
 let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
 //#region src/scroll-restoration.ts
 function getSafeSessionStorage() {
@@ -67,11 +66,11 @@ function getElement(selector) {
 	} catch {}
 }
 function getScrollToTopElements(scrollToTopSelectors) {
-	const elements = [];
+	const elements = /* @__PURE__ */ new Set();
 	for (const selector of scrollToTopSelectors) {
 		if (selector === windowScrollTarget) continue;
 		const element = getElement(selector);
-		if (element) elements.push(element);
+		if (element) elements.add(element);
 	}
 	return elements;
 }
@@ -81,35 +80,29 @@ function setupScrollRestoration(router, force) {
 	if (shouldSetupScrollRestoration) scroll.restoring = true;
 	if (_tanstack_router_core_isServer.isServer ?? router.isServer) return;
 	const getKey = router.options.getScrollRestorationKey || defaultGetScrollRestorationKey;
-	const trackedScrollEntries = /* @__PURE__ */ new Map();
-	const setTrackedScrollEntry = (target, scrollX, scrollY) => {
-		const entry = trackedScrollEntries.get(target) || {};
-		entry.scrollX = scrollX;
-		entry.scrollY = scrollY;
-		trackedScrollEntries.set(target, entry);
-	};
-	const onScroll = (event) => {
-		if (ignoreScroll || !scroll.restoring) return;
-		if (event.target === document) setTrackedScrollEntry(windowScrollTarget, scrollX, scrollY);
-		else {
-			const target = event.target;
-			setTrackedScrollEntry(target, target.scrollLeft, target.scrollTop);
-		}
-	};
+	const trackedScrollTargets = /* @__PURE__ */ new Set();
 	const snapshotCurrentScrollTargets = (restoreKey) => {
-		if (!scroll.restoring) return;
 		const keyEntry = scrollRestorationCache[restoreKey] ||= {};
-		for (const [target, position] of trackedScrollEntries) if (target === windowScrollTarget) keyEntry[windowScrollTarget] = position;
-		else if (target.isConnected) keyEntry[getScrollRestorationSelector(target)] = position;
+		for (const target of trackedScrollTargets) if (target === document) keyEntry[windowScrollTarget] = {
+			scrollX,
+			scrollY
+		};
+		else if (target.isConnected) keyEntry[getScrollRestorationSelector(target)] = {
+			scrollX: target.scrollLeft,
+			scrollY: target.scrollTop
+		};
 	};
 	if (shouldSetupScrollRestoration && !scroll.restoration) {
 		scroll.restoration = true;
 		ignoreScroll = false;
 		history.scrollRestoration = "manual";
-		document.addEventListener("scroll", onScroll, true);
+		document.addEventListener("scroll", (event) => {
+			if (ignoreScroll) return;
+			trackedScrollTargets.add(event.target);
+		}, true);
 		router.subscribe("onBeforeLoad", (event) => {
 			if (event.fromLocation) snapshotCurrentScrollTargets(getKey(event.fromLocation));
-			trackedScrollEntries.clear();
+			trackedScrollTargets.clear();
 		});
 		addEventListener("pagehide", () => {
 			snapshotCurrentScrollTargets(getKey(router.stores.resolvedLocation.get() ?? router.stores.location.get()));
@@ -122,9 +115,11 @@ function setupScrollRestoration(router, force) {
 		const behavior = router.options.scrollRestorationBehavior;
 		const scrollToTopSelectors = router.options.scrollToTopSelectors;
 		const shouldResetScroll = scroll.next;
+		const hashNavigation = scroll.hash;
 		let scrollToTopElements;
-		trackedScrollEntries.clear();
-		if (!shouldResetScroll) scroll.next = true;
+		trackedScrollTargets.clear();
+		scroll.next = true;
+		scroll.hash = false;
 		if (typeof router.options.scrollRestoration === "function" && !router.options.scrollRestoration({ location: router.latestLocation })) return;
 		const cacheKey = getKey(event.toLocation);
 		const fromCacheKey = event.fromLocation && getKey(event.fromLocation);
@@ -140,7 +135,7 @@ function setupScrollRestoration(router, force) {
 						if (!element) continue;
 						if (shouldResetScroll && scrollToTopSelectors) {
 							scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors);
-							if (scrollToTopElements.includes(element)) continue;
+							if (scrollToTopElements.has(element)) continue;
 						}
 					}
 					if (!toElementEntries) toElementEntries = scrollRestorationCache[cacheKey] = {};
@@ -154,8 +149,8 @@ function setupScrollRestoration(router, force) {
 			const hashScrollIntoViewOptions = event.toLocation.state.__hashScrollIntoViewOptions ?? true;
 			let windowRestored = false;
 			if (shouldResetScroll) {
-				const action = require_router.locationHistoryActions.get(event.toLocation);
-				const skipWindowRestore = hash && hashScrollIntoViewOptions && (action === "PUSH" || action === "REPLACE");
+				if (!hash && scrollToTopSelectors) scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors);
+				const skipWindowRestore = hash && hashScrollIntoViewOptions && hashNavigation;
 				const elementEntries = scroll.restoring ? scrollRestorationCache[cacheKey] : void 0;
 				if (elementEntries) for (const elementSelector in elementEntries) {
 					const { scrollX, scrollY } = elementEntries[elementSelector];
@@ -172,20 +167,18 @@ function setupScrollRestoration(router, force) {
 						if (element) {
 							element.scrollLeft = scrollX;
 							element.scrollTop = scrollY;
+							scrollToTopElements?.delete(element);
 						}
 					}
 				}
-				if (!windowRestored && !hash) {
+				if (!hash) {
 					const scrollOptions = {
 						top: 0,
 						left: 0,
 						behavior
 					};
-					scrollTo(scrollOptions);
-					if (scrollToTopSelectors) {
-						scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors);
-						for (const element of scrollToTopElements) element.scrollTo(scrollOptions);
-					}
+					if (!windowRestored) scrollTo(scrollOptions);
+					if (scrollToTopElements) for (const element of scrollToTopElements) element.scrollTo(scrollOptions);
 				}
 			}
 			if (!windowRestored && hash && hashScrollIntoViewOptions) document.getElementById(hash)?.scrollIntoView(hashScrollIntoViewOptions);

package/dist/cjs/scroll-restoration.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.cjs","names":[],"sources":["../../src/scroll-restoration.ts"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { locationHistoryActions } from './router'\nimport type { AnyRouter } from './router'\nimport type { ParsedLocation } from './location'\n\nexport type ScrollRestorationEntry = { scrollX: number; scrollY: number }\n\ntype ScrollRestorationByElement = Record<string, ScrollRestorationEntry>\n\ntype ScrollRestorationByKey = Record<string, ScrollRestorationByElement>\n\nexport type ScrollRestorationOptions = {\n  getKey?: (location: ParsedLocation) => string\n  scrollBehavior?: ScrollToOptions['behavior']\n}\n\nfunction getSafeSessionStorage() {\n  try {\n    // Accessing sessionStorage itself can throw SecurityError in locked-down\n    // contexts, e.g. sandboxed/opaque origins or blocked storage policies.\n    return sessionStorage\n  } catch {\n    return\n  }\n}\n\n// SessionStorage key used to store scroll positions across navigations.\nexport const storageKey = 'tsr-scroll-restoration-v1_3'\nconst safeSessionStorage = getSafeSessionStorage()\n\nfunction createScrollRestorationCache() {\n  try {\n    return JSON.parse(\n      safeSessionStorage?.getItem(storageKey) || '{}',\n    ) as ScrollRestorationByKey\n  } catch {\n    // ignore invalid session storage payloads\n    return {}\n  }\n}\n\nfunction persistScrollRestorationCache() {\n  try {\n    safeSessionStorage?.setItem(\n      storageKey,\n      JSON.stringify(scrollRestorationCache),\n    )\n  } catch {\n    if (process.env.NODE_ENV !== 'production') {\n      console.warn(\n        '[ts-router] Could not persist scroll restoration state to sessionStorage.',\n      )\n    }\n  }\n}\n\nconst scrollRestorationCache = /* @__PURE__ */ createScrollRestorationCache()\nconst scrollRestorationIdAttribute = 'data-scroll-restoration-id'\n\n/**\n * The default `getKey` function for `useScrollRestoration`.\n * It returns the `key` from the location state or the `href` of the location.\n *\n * The `location.href` is used as a fallback to support the use case where the location state is not available like the initial render.\n */\nexport const defaultGetScrollRestorationKey = (location: ParsedLocation) => {\n  return location.state.__TSR_key! || location.href\n}\n\nfunction getScrollRestorationSelector(element: Element): string {\n  const attrId = element.getAttribute(scrollRestorationIdAttribute)\n  if (attrId) {\n    return `[${scrollRestorationIdAttribute}=\"${attrId}\"]`\n  }\n\n  let selector = ''\n  let el: any = element\n  let parent: HTMLElement\n\n  while ((parent = el.parentNode)) {\n    let index = 1\n    let sibling = el\n    while ((sibling = sibling.previousElementSibling)) {\n      index++\n    }\n\n    const part = `${el.localName}:nth-child(${index})`\n    selector = selector ? `${part} > ${selector}` : part\n    el = parent\n  }\n\n  return selector\n}\n\nexport function getElementScrollRestorationEntry(\n  router: AnyRouter,\n  options: (\n    | {\n        id: string\n        getElement?: () => Window | Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Window | Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n): ScrollRestorationEntry | undefined {\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n  const restoreKey = getKey(router.latestLocation)\n  const entries = scrollRestorationCache[restoreKey]\n\n  if (!entries) {\n    return\n  }\n\n  if (options.id) {\n    return entries[`[${scrollRestorationIdAttribute}=\"${options.id}\"]`]\n  }\n\n  const element = options.getElement?.()\n  if (!element) {\n    return\n  }\n\n  return entries[\n    element === window\n      ? windowScrollTarget\n      : getScrollRestorationSelector(element as Element)\n  ]\n}\n\nlet ignoreScroll = false\nconst windowScrollTarget = 'window'\ntype ScrollTarget = typeof windowScrollTarget | Element\n\nfunction getElement(selector: string | (() => Element | null | undefined)) {\n  try {\n    return typeof selector === 'function'\n      ? selector()\n      : document.querySelector(selector)\n  } catch {}\n  return\n}\n\nfunction getScrollToTopElements(\n  scrollToTopSelectors: NonNullable<\n    AnyRouter['options']['scrollToTopSelectors']\n  >,\n): Array<Element> {\n  const elements: Array<Element> = []\n\n  for (const selector of scrollToTopSelectors) {\n    if (selector === windowScrollTarget) {\n      continue\n    }\n\n    const element = getElement(selector)\n    if (element) {\n      elements.push(element)\n    }\n  }\n\n  return elements\n}\n\nexport function setupScrollRestoration(router: AnyRouter, force?: boolean) {\n  // Keep hash/top scrolling active even when sessionStorage is unavailable.\n  const shouldSetupScrollRestoration = force ?? router.options.scrollRestoration\n  const scroll = router._scroll\n\n  if (shouldSetupScrollRestoration) {\n    scroll.restoring = true\n  }\n\n  if (isServer ?? router.isServer) {\n    return\n  }\n\n  const getKey =\n    router.options.getScrollRestorationKey || defaultGetScrollRestorationKey\n  const trackedScrollEntries = new Map<ScrollTarget, ScrollRestorationEntry>()\n  const setTrackedScrollEntry = (\n    target: ScrollTarget,\n    scrollX: number,\n    scrollY: number,\n  ) => {\n    const entry =\n      trackedScrollEntries.get(target) || ({} as ScrollRestorationEntry)\n    entry.scrollX = scrollX\n    entry.scrollY = scrollY\n    trackedScrollEntries.set(target, entry)\n  }\n\n  const onScroll = (event: Event) => {\n    if (ignoreScroll || !scroll.restoring) {\n      return\n    }\n\n    if (event.target === document) {\n      setTrackedScrollEntry(windowScrollTarget, scrollX, scrollY)\n    } else {\n      const target = event.target as Element\n      setTrackedScrollEntry(target, target.scrollLeft, target.scrollTop)\n    }\n  }\n\n  // Snapshot the current page's tracked scroll targets before navigation or unload.\n  const snapshotCurrentScrollTargets = (restoreKey: string) => {\n    if (!scroll.restoring) {\n      return\n    }\n\n    const keyEntry = (scrollRestorationCache[restoreKey] ||=\n      {} as ScrollRestorationByElement)\n\n    for (const [target, position] of trackedScrollEntries) {\n      if (target === windowScrollTarget) {\n        keyEntry[windowScrollTarget] = position\n      } else if (target.isConnected) {\n        keyEntry[getScrollRestorationSelector(target)] = position\n      }\n    }\n  }\n\n  if (shouldSetupScrollRestoration && !scroll.restoration) {\n    scroll.restoration = true\n    ignoreScroll = false\n\n    history.scrollRestoration = 'manual'\n\n    document.addEventListener('scroll', onScroll, true)\n    router.subscribe('onBeforeLoad', (event) => {\n      if (event.fromLocation) {\n        snapshotCurrentScrollTargets(getKey(event.fromLocation))\n      }\n      trackedScrollEntries.clear()\n    })\n    addEventListener('pagehide', () => {\n      snapshotCurrentScrollTargets(\n        getKey(\n          router.stores.resolvedLocation.get() ?? router.stores.location.get(),\n        ),\n      )\n      persistScrollRestorationCache()\n    })\n  }\n\n  if (scroll.reset) {\n    return\n  }\n\n  scroll.reset = true\n\n  // Restore destination scroll after the new route has rendered.\n  router.subscribe('onRendered', (event) => {\n    const behavior = router.options.scrollRestorationBehavior\n    const scrollToTopSelectors = router.options.scrollToTopSelectors\n    const shouldResetScroll = scroll.next\n    let scrollToTopElements: Array<Element> | undefined\n    trackedScrollEntries.clear()\n\n    if (!shouldResetScroll) {\n      scroll.next = true\n    }\n\n    if (\n      typeof router.options.scrollRestoration === 'function' &&\n      !router.options.scrollRestoration({ location: router.latestLocation })\n    ) {\n      return\n    }\n\n    const cacheKey = getKey(event.toLocation)\n    const fromCacheKey = event.fromLocation && getKey(event.fromLocation)\n\n    if (scroll.restoring && fromCacheKey && fromCacheKey !== cacheKey) {\n      const fromElementEntries = scrollRestorationCache[fromCacheKey]\n\n      if (fromElementEntries) {\n        let toElementEntries = scrollRestorationCache[cacheKey]\n\n        for (const elementSelector in fromElementEntries) {\n          if (elementSelector === windowScrollTarget) {\n            if (shouldResetScroll) {\n              continue\n            }\n          } else {\n            const element = getElement(elementSelector)\n            if (!element) {\n              continue\n            }\n\n            if (shouldResetScroll && scrollToTopSelectors) {\n              scrollToTopElements ??=\n                getScrollToTopElements(scrollToTopSelectors)\n              if (scrollToTopElements.includes(element)) {\n                continue\n              }\n            }\n          }\n\n          if (!toElementEntries) {\n            toElementEntries = scrollRestorationCache[cacheKey] =\n              {} as ScrollRestorationByElement\n          }\n\n          toElementEntries[elementSelector] ??=\n            fromElementEntries[elementSelector]!\n        }\n      }\n    }\n\n    ignoreScroll = true\n\n    try {\n      const hash = event.toLocation.hash\n      const hashScrollIntoViewOptions =\n        event.toLocation.state.__hashScrollIntoViewOptions ?? true\n      let windowRestored = false\n\n      if (shouldResetScroll) {\n        const action = locationHistoryActions.get(event.toLocation)\n        const skipWindowRestore =\n          hash &&\n          hashScrollIntoViewOptions &&\n          (action === 'PUSH' || action === 'REPLACE')\n\n        const elementEntries = scroll.restoring\n          ? scrollRestorationCache[cacheKey]\n          : undefined\n\n        if (elementEntries) {\n          for (const elementSelector in elementEntries) {\n            const { scrollX, scrollY } = elementEntries[elementSelector]!\n\n            if (elementSelector === windowScrollTarget) {\n              if (skipWindowRestore) {\n                continue\n              }\n\n              scrollTo({\n                top: scrollY,\n                left: scrollX,\n                behavior,\n              })\n              windowRestored = true\n            } else {\n              const element = getElement(elementSelector)\n              if (element) {\n                element.scrollLeft = scrollX\n                element.scrollTop = scrollY\n              }\n            }\n          }\n        }\n\n        if (!windowRestored && !hash) {\n          const scrollOptions = {\n            top: 0,\n            left: 0,\n            behavior,\n          }\n\n          scrollTo(scrollOptions)\n          if (scrollToTopSelectors) {\n            scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors)\n            for (const element of scrollToTopElements) {\n              element.scrollTo(scrollOptions)\n            }\n          }\n        }\n      }\n\n      if (!windowRestored && hash && hashScrollIntoViewOptions) {\n        document.getElementById(hash)?.scrollIntoView(hashScrollIntoViewOptions)\n      }\n    } finally {\n      ignoreScroll = false\n    }\n  })\n}\n"],"mappings":"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"}
+{"version":3,"file":"scroll-restoration.cjs","names":[],"sources":["../../src/scroll-restoration.ts"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport type { AnyRouter } from './router'\nimport type { ParsedLocation } from './location'\n\nexport type ScrollRestorationEntry = { scrollX: number; scrollY: number }\n\ntype ScrollRestorationByElement = Record<string, ScrollRestorationEntry>\n\ntype ScrollRestorationByKey = Record<string, ScrollRestorationByElement>\n\nexport type ScrollRestorationOptions = {\n  getKey?: (location: ParsedLocation) => string\n  scrollBehavior?: ScrollToOptions['behavior']\n}\n\nfunction getSafeSessionStorage() {\n  try {\n    // Accessing sessionStorage itself can throw SecurityError in locked-down\n    // contexts, e.g. sandboxed/opaque origins or blocked storage policies.\n    return sessionStorage\n  } catch {\n    return\n  }\n}\n\n// SessionStorage key used to store scroll positions across navigations.\nexport const storageKey = 'tsr-scroll-restoration-v1_3'\nconst safeSessionStorage = getSafeSessionStorage()\n\nfunction createScrollRestorationCache() {\n  try {\n    return JSON.parse(\n      safeSessionStorage?.getItem(storageKey) || '{}',\n    ) as ScrollRestorationByKey\n  } catch {\n    // ignore invalid session storage payloads\n    return {}\n  }\n}\n\nfunction persistScrollRestorationCache() {\n  try {\n    safeSessionStorage?.setItem(\n      storageKey,\n      JSON.stringify(scrollRestorationCache),\n    )\n  } catch {\n    if (process.env.NODE_ENV !== 'production') {\n      console.warn(\n        '[ts-router] Could not persist scroll restoration state to sessionStorage.',\n      )\n    }\n  }\n}\n\nconst scrollRestorationCache = /* @__PURE__ */ createScrollRestorationCache()\nconst scrollRestorationIdAttribute = 'data-scroll-restoration-id'\n\n/**\n * The default `getKey` function for `useScrollRestoration`.\n * It returns the `key` from the location state or the `href` of the location.\n *\n * The `location.href` is used as a fallback to support the use case where the location state is not available like the initial render.\n */\nexport const defaultGetScrollRestorationKey = (location: ParsedLocation) => {\n  return location.state.__TSR_key! || location.href\n}\n\nfunction getScrollRestorationSelector(element: Element): string {\n  const attrId = element.getAttribute(scrollRestorationIdAttribute)\n  if (attrId) {\n    return `[${scrollRestorationIdAttribute}=\"${attrId}\"]`\n  }\n\n  let selector = ''\n  let el: any = element\n  let parent: HTMLElement\n\n  while ((parent = el.parentNode)) {\n    let index = 1\n    let sibling = el\n    while ((sibling = sibling.previousElementSibling)) {\n      index++\n    }\n\n    const part = `${el.localName}:nth-child(${index})`\n    selector = selector ? `${part} > ${selector}` : part\n    el = parent\n  }\n\n  return selector\n}\n\nexport function getElementScrollRestorationEntry(\n  router: AnyRouter,\n  options: (\n    | {\n        id: string\n        getElement?: () => Window | Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Window | Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n): ScrollRestorationEntry | undefined {\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n  const restoreKey = getKey(router.latestLocation)\n  const entries = scrollRestorationCache[restoreKey]\n\n  if (!entries) {\n    return\n  }\n\n  if (options.id) {\n    return entries[`[${scrollRestorationIdAttribute}=\"${options.id}\"]`]\n  }\n\n  const element = options.getElement?.()\n  if (!element) {\n    return\n  }\n\n  return entries[\n    element === window\n      ? windowScrollTarget\n      : getScrollRestorationSelector(element as Element)\n  ]\n}\n\nlet ignoreScroll = false\nconst windowScrollTarget = 'window'\n\nfunction getElement(selector: string | (() => Element | null | undefined)) {\n  try {\n    return typeof selector === 'function'\n      ? selector()\n      : document.querySelector(selector)\n  } catch {}\n  return\n}\n\nfunction getScrollToTopElements(\n  scrollToTopSelectors: NonNullable<\n    AnyRouter['options']['scrollToTopSelectors']\n  >,\n) {\n  const elements = new Set<Element>()\n\n  for (const selector of scrollToTopSelectors) {\n    if (selector === windowScrollTarget) {\n      continue\n    }\n\n    const element = getElement(selector)\n    if (element) {\n      elements.add(element)\n    }\n  }\n\n  return elements\n}\n\nexport function setupScrollRestoration(router: AnyRouter, force?: boolean) {\n  // Keep hash/top scrolling active even when sessionStorage is unavailable.\n  const shouldSetupScrollRestoration = force ?? router.options.scrollRestoration\n  const scroll = router._scroll\n\n  if (shouldSetupScrollRestoration) {\n    scroll.restoring = true\n  }\n\n  if (isServer ?? router.isServer) {\n    return\n  }\n\n  const getKey =\n    router.options.getScrollRestorationKey || defaultGetScrollRestorationKey\n  const trackedScrollTargets = new Set<Document | Element>()\n\n  // Snapshot the current page's tracked scroll targets before navigation or unload.\n  const snapshotCurrentScrollTargets = (restoreKey: string) => {\n    const keyEntry = (scrollRestorationCache[restoreKey] ||=\n      {} as ScrollRestorationByElement)\n\n    for (const target of trackedScrollTargets) {\n      if (target === document) {\n        keyEntry[windowScrollTarget] = { scrollX, scrollY }\n      } else if ((target as Element).isConnected) {\n        keyEntry[getScrollRestorationSelector(target as Element)] = {\n          scrollX: (target as Element).scrollLeft,\n          scrollY: (target as Element).scrollTop,\n        }\n      }\n    }\n  }\n\n  if (shouldSetupScrollRestoration && !scroll.restoration) {\n    scroll.restoration = true\n    ignoreScroll = false\n\n    history.scrollRestoration = 'manual'\n\n    document.addEventListener(\n      'scroll',\n      (event) => {\n        if (ignoreScroll) {\n          return\n        }\n        trackedScrollTargets.add(event.target as Document | Element)\n      },\n      true,\n    )\n    router.subscribe('onBeforeLoad', (event) => {\n      if (event.fromLocation) {\n        snapshotCurrentScrollTargets(getKey(event.fromLocation))\n      }\n      trackedScrollTargets.clear()\n    })\n    addEventListener('pagehide', () => {\n      snapshotCurrentScrollTargets(\n        getKey(\n          router.stores.resolvedLocation.get() ?? router.stores.location.get(),\n        ),\n      )\n      persistScrollRestorationCache()\n    })\n  }\n\n  if (scroll.reset) {\n    return\n  }\n\n  scroll.reset = true\n\n  // Restore destination scroll after the new route has rendered.\n  router.subscribe('onRendered', (event) => {\n    const behavior = router.options.scrollRestorationBehavior\n    const scrollToTopSelectors = router.options.scrollToTopSelectors\n    const shouldResetScroll = scroll.next\n    const hashNavigation = scroll.hash\n    let scrollToTopElements: Set<Element> | undefined\n    trackedScrollTargets.clear()\n    scroll.next = true\n    scroll.hash = false\n\n    if (\n      typeof router.options.scrollRestoration === 'function' &&\n      !router.options.scrollRestoration({ location: router.latestLocation })\n    ) {\n      return\n    }\n\n    const cacheKey = getKey(event.toLocation)\n    const fromCacheKey = event.fromLocation && getKey(event.fromLocation)\n\n    if (scroll.restoring && fromCacheKey && fromCacheKey !== cacheKey) {\n      const fromElementEntries = scrollRestorationCache[fromCacheKey]\n\n      if (fromElementEntries) {\n        let toElementEntries = scrollRestorationCache[cacheKey]\n\n        for (const elementSelector in fromElementEntries) {\n          if (elementSelector === windowScrollTarget) {\n            if (shouldResetScroll) {\n              continue\n            }\n          } else {\n            const element = getElement(elementSelector)\n            if (!element) {\n              continue\n            }\n\n            if (shouldResetScroll && scrollToTopSelectors) {\n              scrollToTopElements ??=\n                getScrollToTopElements(scrollToTopSelectors)\n              if (scrollToTopElements.has(element)) {\n                continue\n              }\n            }\n          }\n\n          if (!toElementEntries) {\n            toElementEntries = scrollRestorationCache[cacheKey] =\n              {} as ScrollRestorationByElement\n          }\n\n          toElementEntries[elementSelector] ??=\n            fromElementEntries[elementSelector]!\n        }\n      }\n    }\n\n    ignoreScroll = true\n\n    try {\n      const hash = event.toLocation.hash\n      const hashScrollIntoViewOptions =\n        event.toLocation.state.__hashScrollIntoViewOptions ?? true\n      let windowRestored = false\n\n      if (shouldResetScroll) {\n        if (!hash && scrollToTopSelectors) {\n          scrollToTopElements ??= getScrollToTopElements(scrollToTopSelectors)\n        }\n\n        const skipWindowRestore =\n          hash && hashScrollIntoViewOptions && hashNavigation\n\n        const elementEntries = scroll.restoring\n          ? scrollRestorationCache[cacheKey]\n          : undefined\n\n        if (elementEntries) {\n          for (const elementSelector in elementEntries) {\n            const { scrollX, scrollY } = elementEntries[elementSelector]!\n\n            if (elementSelector === windowScrollTarget) {\n              if (skipWindowRestore) {\n                continue\n              }\n\n              scrollTo({\n                top: scrollY,\n                left: scrollX,\n                behavior,\n              })\n              windowRestored = true\n            } else {\n              const element = getElement(elementSelector)\n              if (element) {\n                element.scrollLeft = scrollX\n                element.scrollTop = scrollY\n                scrollToTopElements?.delete(element)\n              }\n            }\n          }\n        }\n\n        if (!hash) {\n          const scrollOptions = {\n            top: 0,\n            left: 0,\n            behavior,\n          }\n\n          if (!windowRestored) {\n            scrollTo(scrollOptions)\n          }\n          if (scrollToTopElements) {\n            for (const element of scrollToTopElements) {\n              element.scrollTo(scrollOptions)\n            }\n          }\n        }\n      }\n\n      if (!windowRestored && hash && hashScrollIntoViewOptions) {\n        document.getElementById(hash)?.scrollIntoView(hashScrollIntoViewOptions)\n      }\n    } finally {\n      ignoreScroll = false\n    }\n  })\n}\n"],"mappings":"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"}

package/dist/cjs/ssr/client.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_load_client = require("../load-client.cjs");
 const require_headers = require("./headers.cjs");
 const require_json = require("./json.cjs");
-const require_ssr_client = require("./ssr-client.cjs");
-exports.hydrate = require_ssr_client.hydrate;
+exports.hydrate = require_load_client.hydrate;
 exports.json = require_json.json;
 exports.mergeHeaders = require_headers.mergeHeaders;

package/dist/cjs/ssr/createRequestHandler.cjs

@@ -1,16 +1,59 @@
+const require_load_client = require("../load-client.cjs");
 const require_headers = require("./headers.cjs");
 const require_ssr_server = require("./ssr-server.cjs");
 const require_handlerCallback = require("./handlerCallback.cjs");
 let _tanstack_history = require("@tanstack/history");
 //#region src/ssr/createRequestHandler.ts
+const requestWaiters = /* @__PURE__ */ new WeakMap();
+function removeRequestWaiter(waiters, index, reject) {
+	if (waiters[index] !== reject) return;
+	if (index !== waiters.length - 1) {
+		waiters[index] = void 0;
+		return;
+	}
+	waiters.pop();
+	while (waiters.length && waiters[waiters.length - 1] === void 0) waiters.pop();
+}
+function waitForRequest(value, signal, onLate) {
+	const promise = Promise.resolve(value);
+	if (signal.aborted) {
+		promise.then(onLate, () => {});
+		return Promise.reject(signal.reason);
+	}
+	return new Promise((resolve, reject) => {
+		let waiters = requestWaiters.get(signal);
+		let index;
+		if (waiters) index = waiters.push(reject) - 1;
+		else {
+			const newWaiters = [reject];
+			waiters = newWaiters;
+			index = 0;
+			requestWaiters.set(signal, newWaiters);
+			signal.addEventListener("abort", () => {
+				requestWaiters.delete(signal);
+				for (const rejectWaiter of newWaiters) rejectWaiter?.(signal.reason);
+				newWaiters.length = 0;
+			}, { once: true });
+		}
+		promise.then((result) => {
+			removeRequestWaiter(waiters, index, reject);
+			if (signal.aborted) onLate?.(result);
+			else resolve(result);
+		}, (error) => {
+			removeRequestWaiter(waiters, index, reject);
+			reject(error);
+		});
+	});
+}
 function createRequestHandler({ createRouter, request, getRouterManifest }) {
 	return async (cb) => {
+		request.signal.throwIfAborted();
 		const router = createRouter();
 		let responseOwnsCleanup = false;
 		try {
 			require_ssr_server.attachRouterServerSsrUtils({
 				router,
-				manifest: await getRouterManifest?.()
+				manifest: await waitForRequest(getRouterManifest?.(), request.signal)
 			});
 			const { url } = require_ssr_server.getNormalizedURL(request.url, "http://localhost");
 			const origin = require_ssr_server.getOrigin(request);
@@ -19,13 +62,22 @@ function createRequestHandler({ createRouter, request, getRouterManifest }) {
 				history,
 				origin: router.options.origin ?? origin
 			});
-			await router.load();
-			await router.serverSsr?.dehydrate();
-			const ssrResponse = require_handlerCallback.normalizeSsrResponse(await cb({
+			await router.load({ _signal: request.signal });
+			request.signal.throwIfAborted();
+			const result = router._serverResult;
+			if (result?.type === "redirect") return result.redirect;
+			await waitForRequest(router.serverSsr?.dehydrate(), request.signal);
+			request.signal.throwIfAborted();
+			const responseHeaders = getRequestHeaders({ router });
+			request.signal.throwIfAborted();
+			const ssrResponse = require_handlerCallback.bindSsrResponseToRequest(router, await waitForRequest(cb({
 				request,
 				router,
-				responseHeaders: getRequestHeaders({ router })
-			}));
+				responseHeaders
+			}), request.signal, (late) => {
+				require_handlerCallback.disposeSsrResponseDetached(late, request.signal.reason);
+			}), request.signal);
+			request.signal.throwIfAborted();
 			responseOwnsCleanup = ssrResponse.serverSsrCleanup === "stream";
 			return ssrResponse.response;
 		} finally {
@@ -35,12 +87,11 @@ function createRequestHandler({ createRouter, request, getRouterManifest }) {
 }
 function getRequestHeaders(opts) {
 	const matchHeaders = [];
-	for (const match of opts.router.stores.matches.get()) matchHeaders.push(match.headers);
-	const redirect = opts.router.stores.redirect.get();
-	if (redirect) matchHeaders.push(redirect.headers);
+	for (const match of require_load_client._getRenderedMatches(opts.router.stores.matches.get())) matchHeaders.push(match.headers);
 	return require_headers.mergeHeaders({ "Content-Type": "text/html; charset=UTF-8" }, ...matchHeaders);
 }
 //#endregion
 exports.createRequestHandler = createRequestHandler;
+exports.waitForRequest = waitForRequest;
 
 //# sourceMappingURL=createRequestHandler.cjs.map

package/dist/cjs/ssr/createRequestHandler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createRequestHandler.cjs","names":[],"sources":["../../../src/ssr/createRequestHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { mergeHeaders } from './headers'\nimport {\n  attachRouterServerSsrUtils,\n  getNormalizedURL,\n  getOrigin,\n} from './ssr-server'\nimport { normalizeSsrResponse } from './handlerCallback'\nimport type { HandlerCallback } from './handlerCallback'\nimport type { AnyHeaders } from './headers'\nimport type { AnyRouter } from '../router'\nimport type { ServerManifest } from '../manifest'\n\nexport type RequestHandler<TRouter extends AnyRouter> = (\n  cb: HandlerCallback<TRouter>,\n) => Promise<Response>\n\nexport function createRequestHandler<TRouter extends AnyRouter>({\n  createRouter,\n  request,\n  getRouterManifest,\n}: {\n  createRouter: () => TRouter\n  request: Request\n  getRouterManifest?: () => ServerManifest | Promise<ServerManifest>\n}): RequestHandler<TRouter> {\n  return async (cb) => {\n    const router = createRouter()\n    let responseOwnsCleanup = false\n\n    try {\n      attachRouterServerSsrUtils({\n        router,\n        manifest: await getRouterManifest?.(),\n      })\n\n      // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR.\n      const { url } = getNormalizedURL(request.url, 'http://localhost')\n      const origin = getOrigin(request)\n      const href = url.href.replace(url.origin, '')\n\n      // Create a history for the router\n      const history = createMemoryHistory({\n        initialEntries: [href],\n      })\n\n      // Update the router with the history and context\n      router.update({\n        history,\n        origin: router.options.origin ?? origin,\n      })\n\n      await router.load()\n\n      await router.serverSsr?.dehydrate()\n\n      const responseHeaders = getRequestHeaders({\n        router,\n      })\n\n      const response = await cb({\n        request,\n        router,\n        responseHeaders,\n      })\n      const ssrResponse = normalizeSsrResponse(response)\n      responseOwnsCleanup = ssrResponse.serverSsrCleanup === 'stream'\n      return ssrResponse.response\n    } finally {\n      if (!responseOwnsCleanup) {\n        // Clean up router SSR state if the callback won't handle it\n        // (e.g., if an error occurred before the callback was invoked).\n        // Transformed streaming response bodies clean up when consumed/cancelled.\n        router.serverSsr?.cleanup()\n      }\n    }\n  }\n}\n\nfunction getRequestHeaders(opts: { router: AnyRouter }): Headers {\n  const matchHeaders: Array<AnyHeaders> = []\n  for (const match of opts.router.stores.matches.get()) {\n    matchHeaders.push(match.headers)\n  }\n\n  // Handle Redirects\n  const redirect = opts.router.stores.redirect.get()\n  if (redirect) {\n    matchHeaders.push(redirect.headers)\n  }\n\n  return mergeHeaders(\n    {\n      'Content-Type': 'text/html; charset=UTF-8',\n    },\n    ...matchHeaders,\n  )\n}\n"],"mappings":";;;;;AAiBA,SAAgB,qBAAgD,EAC9D,cACA,SACA,qBAK0B;CAC1B,OAAO,OAAO,OAAO;EACnB,MAAM,SAAS,aAAa;EAC5B,IAAI,sBAAsB;EAE1B,IAAI;GACF,mBAAA,2BAA2B;IACzB;IACA,UAAU,MAAM,oBAAoB;GACtC,CAAC;GAGD,MAAM,EAAE,QAAQ,mBAAA,iBAAiB,QAAQ,KAAK,kBAAkB;GAChE,MAAM,SAAS,mBAAA,UAAU,OAAO;GAIhC,MAAM,WAAA,GAAA,kBAAA,qBAA8B,EAClC,gBAAgB,CAJL,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAIvB,CAAI,EACvB,CAAC;GAGD,OAAO,OAAO;IACZ;IACA,QAAQ,OAAO,QAAQ,UAAU;GACnC,CAAC;GAED,MAAM,OAAO,KAAK;GAElB,MAAM,OAAO,WAAW,UAAU;GAWlC,MAAM,cAAc,wBAAA,qBAAqB,MALlB,GAAG;IACxB;IACA;IACA,iBAPsB,kBAAkB,EACxC,OACF,CAKE;GACF,CAAC,CACgD;GACjD,sBAAsB,YAAY,qBAAqB;GACvD,OAAO,YAAY;EACrB,UAAU;GACR,IAAI,CAAC,qBAIH,OAAO,WAAW,QAAQ;EAE9B;CACF;AACF;AAEA,SAAS,kBAAkB,MAAsC;CAC/D,MAAM,eAAkC,CAAC;CACzC,KAAK,MAAM,SAAS,KAAK,OAAO,OAAO,QAAQ,IAAI,GACjD,aAAa,KAAK,MAAM,OAAO;CAIjC,MAAM,WAAW,KAAK,OAAO,OAAO,SAAS,IAAI;CACjD,IAAI,UACF,aAAa,KAAK,SAAS,OAAO;CAGpC,OAAO,gBAAA,aACL,EACE,gBAAgB,2BAClB,GACA,GAAG,YACL;AACF"}
+{"version":3,"file":"createRequestHandler.cjs","names":[],"sources":["../../../src/ssr/createRequestHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { _getRenderedMatches } from '../load-client'\nimport { mergeHeaders } from './headers'\nimport {\n  attachRouterServerSsrUtils,\n  getNormalizedURL,\n  getOrigin,\n} from './ssr-server'\nimport {\n  bindSsrResponseToRequest,\n  disposeSsrResponseDetached,\n} from './handlerCallback'\nimport type { HandlerCallback } from './handlerCallback'\nimport type { AnyHeaders } from './headers'\nimport type { AnyRouter } from '../router'\nimport type { ServerManifest } from '../manifest'\n\nexport type RequestHandler<TRouter extends AnyRouter> = (\n  cb: HandlerCallback<TRouter>,\n) => Promise<Response>\n\ntype RequestWaiter = ((reason: unknown) => void) | undefined\n\nconst requestWaiters = new WeakMap<AbortSignal, Array<RequestWaiter>>()\n\nfunction removeRequestWaiter(\n  waiters: Array<RequestWaiter>,\n  index: number,\n  reject: (reason: unknown) => void,\n) {\n  if (waiters[index] !== reject) {\n    return\n  }\n  if (index !== waiters.length - 1) {\n    waiters[index] = undefined\n    return\n  }\n\n  waiters.pop()\n  while (waiters.length && waiters[waiters.length - 1] === undefined) {\n    waiters.pop()\n  }\n}\n\nexport function waitForRequest<T>(\n  value: T | PromiseLike<T>,\n  signal: AbortSignal,\n  onLate?: (value: T) => void,\n): Promise<T> {\n  const promise = Promise.resolve(value)\n  if (signal.aborted) {\n    void promise.then(onLate, () => {})\n    return Promise.reject(signal.reason)\n  }\n\n  return new Promise<T>((resolve, reject) => {\n    let waiters = requestWaiters.get(signal)\n    let index: number\n    if (waiters) {\n      index = waiters.push(reject) - 1\n    } else {\n      const newWaiters: Array<RequestWaiter> = [reject]\n      waiters = newWaiters\n      index = 0\n      requestWaiters.set(signal, newWaiters)\n      signal.addEventListener(\n        'abort',\n        () => {\n          requestWaiters.delete(signal)\n          for (const rejectWaiter of newWaiters) {\n            rejectWaiter?.(signal.reason)\n          }\n          newWaiters.length = 0\n        },\n        { once: true },\n      )\n    }\n    void promise.then(\n      (result) => {\n        removeRequestWaiter(waiters, index, reject)\n        if (signal.aborted) {\n          onLate?.(result)\n        } else {\n          resolve(result)\n        }\n      },\n      (error) => {\n        removeRequestWaiter(waiters, index, reject)\n        reject(error)\n      },\n    )\n  })\n}\n\nexport function createRequestHandler<TRouter extends AnyRouter>({\n  createRouter,\n  request,\n  getRouterManifest,\n}: {\n  createRouter: () => TRouter\n  request: Request\n  getRouterManifest?: () => ServerManifest | Promise<ServerManifest>\n}): RequestHandler<TRouter> {\n  return async (cb) => {\n    request.signal.throwIfAborted()\n    const router = createRouter()\n    let responseOwnsCleanup = false\n\n    try {\n      attachRouterServerSsrUtils({\n        router,\n        manifest: await waitForRequest(getRouterManifest?.(), request.signal),\n      })\n\n      // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR.\n      const { url } = getNormalizedURL(request.url, 'http://localhost')\n      const origin = getOrigin(request)\n      const href = url.href.replace(url.origin, '')\n\n      // Create a history for the router\n      const history = createMemoryHistory({\n        initialEntries: [href],\n      })\n\n      // Update the router with the history and context\n      router.update({\n        history,\n        origin: router.options.origin ?? origin,\n      })\n\n      await router.load({\n        _signal: request.signal,\n      })\n      request.signal.throwIfAborted()\n\n      const result = router._serverResult\n      if (result?.type === 'redirect') {\n        return result.redirect\n      }\n\n      await waitForRequest(router.serverSsr?.dehydrate(), request.signal)\n      request.signal.throwIfAborted()\n\n      const responseHeaders = getRequestHeaders({\n        router,\n      })\n\n      request.signal.throwIfAborted()\n      const response = await waitForRequest(\n        cb({\n          request,\n          router,\n          responseHeaders,\n        }),\n        request.signal,\n        (late) => {\n          disposeSsrResponseDetached(late, request.signal.reason)\n        },\n      )\n      const ssrResponse = bindSsrResponseToRequest(\n        router,\n        response,\n        request.signal,\n      )\n      request.signal.throwIfAborted()\n      responseOwnsCleanup = ssrResponse.serverSsrCleanup === 'stream'\n      return ssrResponse.response\n    } finally {\n      if (!responseOwnsCleanup) {\n        // Clean up router SSR state if the callback won't handle it\n        // (e.g., if an error occurred before the callback was invoked).\n        // Transformed streaming response bodies clean up when consumed/cancelled.\n        router.serverSsr?.cleanup()\n      }\n    }\n  }\n}\n\nfunction getRequestHeaders(opts: { router: AnyRouter }): Headers {\n  const matchHeaders: Array<AnyHeaders> = []\n  for (const match of _getRenderedMatches(opts.router.stores.matches.get())) {\n    matchHeaders.push(match.headers)\n  }\n\n  return mergeHeaders(\n    {\n      'Content-Type': 'text/html; charset=UTF-8',\n    },\n    ...matchHeaders,\n  )\n}\n"],"mappings":"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"}

package/dist/cjs/ssr/createRequestHandler.d.cts

@@ -2,6 +2,7 @@ import { HandlerCallback } from './handlerCallback.cjs';
 import { AnyRouter } from '../router.cjs';
 import { ServerManifest } from '../manifest.cjs';
 export type RequestHandler<TRouter extends AnyRouter> = (cb: HandlerCallback<TRouter>) => Promise<Response>;
+export declare function waitForRequest<T>(value: T | PromiseLike<T>, signal: AbortSignal, onLate?: (value: T) => void): Promise<T>;
 export declare function createRequestHandler<TRouter extends AnyRouter>({ createRouter, request, getRouterManifest, }: {
     createRouter: () => TRouter;
     request: Request;