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

package/dist/esm/scroll-restoration.js

@@ -1,4 +1,3 @@
-import { locationHistoryActions } from "./router.js";
 import { isServer } from "@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 (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 = 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/esm/scroll-restoration.js.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.js","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.js","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/esm/ssr/client.js

@@ -1,4 +1,4 @@
+import { hydrate } from "../load-client.js";
 import { mergeHeaders } from "./headers.js";
 import { json } from "./json.js";
-import { hydrate } from "./ssr-client.js";
 export { hydrate, json, mergeHeaders };

package/dist/esm/ssr/createRequestHandler.d.ts

@@ -2,6 +2,7 @@ import { HandlerCallback } from './handlerCallback.js';
 import { AnyRouter } from '../router.js';
 import { ServerManifest } from '../manifest.js';
 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;

package/dist/esm/ssr/createRequestHandler.js

@@ -1,16 +1,59 @@
+import { _getRenderedMatches } from "../load-client.js";
 import { mergeHeaders } from "./headers.js";
 import { attachRouterServerSsrUtils, getNormalizedURL, getOrigin } from "./ssr-server.js";
-import { normalizeSsrResponse } from "./handlerCallback.js";
+import { bindSsrResponseToRequest, disposeSsrResponseDetached } from "./handlerCallback.js";
 import { createMemoryHistory } from "@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 {
 			attachRouterServerSsrUtils({
 				router,
-				manifest: await getRouterManifest?.()
+				manifest: await waitForRequest(getRouterManifest?.(), request.signal)
 			});
 			const { url } = getNormalizedURL(request.url, "http://localhost");
 			const origin = 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 = 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 = bindSsrResponseToRequest(router, await waitForRequest(cb({
 				request,
 				router,
-				responseHeaders: getRequestHeaders({ router })
-			}));
+				responseHeaders
+			}), request.signal, (late) => {
+				disposeSsrResponseDetached(late, request.signal.reason);
+			}), request.signal);
+			request.signal.throwIfAborted();
 			responseOwnsCleanup = ssrResponse.serverSsrCleanup === "stream";
 			return ssrResponse.response;
 		} finally {
@@ -35,12 +87,10 @@ 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 _getRenderedMatches(opts.router.stores.matches.get())) matchHeaders.push(match.headers);
 	return mergeHeaders({ "Content-Type": "text/html; charset=UTF-8" }, ...matchHeaders);
 }
 //#endregion
-export { createRequestHandler };
+export { createRequestHandler, waitForRequest };
 
 //# sourceMappingURL=createRequestHandler.js.map

package/dist/esm/ssr/createRequestHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRequestHandler.js","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,2BAA2B;IACzB;IACA,UAAU,MAAM,oBAAoB;GACtC,CAAC;GAGD,MAAM,EAAE,QAAQ,iBAAiB,QAAQ,KAAK,kBAAkB;GAChE,MAAM,SAAS,UAAU,OAAO;GAIhC,MAAM,UAAU,oBAAoB,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,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,aACL,EACE,gBAAgB,2BAClB,GACA,GAAG,YACL;AACF"}
+{"version":3,"file":"createRequestHandler.js","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/esm/ssr/handlerCallback.d.ts

@@ -10,7 +10,10 @@ export type SsrResponse = {
 export type HandlerCallbackResult = Response | SsrResponse;
 export declare function isSsrResponse(value: unknown): value is SsrResponse;
 export declare function normalizeSsrResponse(result: HandlerCallbackResult): SsrResponse;
+export declare function disposeSsrResponse(response: SsrResponse, reason?: unknown): Promise<void>;
+export declare function disposeSsrResponseDetached(result: HandlerCallbackResult, reason?: unknown, onError?: (error: unknown) => void): void;
 export declare function createSsrStreamResponse<TRouter extends AnyRouter>(router: TRouter, response: Response): SsrResponse;
+export declare function bindSsrResponseToRequest(router: AnyRouter | undefined, result: HandlerCallbackResult, signal: AbortSignal): SsrResponse;
 export declare function replaceSsrResponse(result: HandlerCallbackResult, response: Response, reason?: unknown): Promise<SsrResponse>;
 export declare function stripSsrResponseBody(result: HandlerCallbackResult, reason?: unknown): Promise<SsrResponse>;
 export interface HandlerCallback<TRouter extends AnyRouter> {

package/dist/esm/ssr/handlerCallback.js

@@ -8,6 +8,26 @@ function normalizeSsrResponse(result) {
 		serverSsrCleanup: "none"
 	};
 }
+function disposeSsrResponse(response, reason) {
+	if (response.serverSsrCleanup !== "stream") return Promise.resolve();
+	try {
+		return Promise.resolve(response.dispose(reason));
+	} catch (error) {
+		return Promise.reject(error);
+	}
+}
+function disposeSsrResponseDetached(result, reason, onError = console.error) {
+	const ssrResponse = normalizeSsrResponse(result);
+	if (ssrResponse.serverSsrCleanup === "stream") {
+		disposeSsrResponse(ssrResponse, reason).catch(onError);
+		return;
+	}
+	if (ssrResponse.response.body) try {
+		ssrResponse.response.body.cancel(reason).catch(onError);
+	} catch (error) {
+		onError(error);
+	}
+}
 function createSsrStreamResponse(router, response) {
 	if (!response.body) throw new Error("Invariant failed: SSR stream response requires a body");
 	let disposed = false;
@@ -17,16 +37,38 @@ function createSsrStreamResponse(router, response) {
 		async dispose(reason) {
 			if (disposed) return;
 			disposed = true;
+			router.serverSsr?.cleanup();
 			try {
 				await response.body.cancel(reason);
 			} catch {}
-			router.serverSsr?.cleanup();
 		}
 	};
 }
-async function replaceSsrResponse(result, response, reason) {
+function bindSsrResponseToRequest(router, result, signal) {
 	const ssrResponse = normalizeSsrResponse(result);
-	if (ssrResponse.serverSsrCleanup === "stream") await ssrResponse.dispose(reason);
+	if (ssrResponse.serverSsrCleanup !== "stream") {
+		if (signal.aborted) disposeSsrResponseDetached(result, signal.reason);
+		return ssrResponse;
+	}
+	const failed = (error) => {
+		router?.serverSsr?.cleanup();
+		console.error(error);
+	};
+	const abort = () => {
+		disposeSsrResponseDetached(ssrResponse, signal.reason, failed);
+	};
+	if (signal.aborted) {
+		abort();
+		return ssrResponse;
+	}
+	signal.addEventListener("abort", abort, { once: true });
+	router?.serverSsr?.onCleanup(() => {
+		signal.removeEventListener("abort", abort);
+	});
+	return ssrResponse;
+}
+async function replaceSsrResponse(result, response, reason) {
+	await disposeSsrResponse(normalizeSsrResponse(result), reason);
 	return {
 		response,
 		serverSsrCleanup: "none"
@@ -34,7 +76,7 @@ async function replaceSsrResponse(result, response, reason) {
 }
 async function stripSsrResponseBody(result, reason) {
 	const ssrResponse = normalizeSsrResponse(result);
-	if (ssrResponse.serverSsrCleanup === "stream") await ssrResponse.dispose(reason);
+	await disposeSsrResponse(ssrResponse, reason);
 	return {
 		response: new Response(null, ssrResponse.response),
 		serverSsrCleanup: "none"
@@ -44,6 +86,6 @@ function defineHandlerCallback(handler) {
 	return handler;
 }
 //#endregion
-export { createSsrStreamResponse, defineHandlerCallback, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody };
+export { bindSsrResponseToRequest, createSsrStreamResponse, defineHandlerCallback, disposeSsrResponse, disposeSsrResponseDetached, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody };
 
 //# sourceMappingURL=handlerCallback.js.map

package/dist/esm/ssr/handlerCallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlerCallback.js","names":[],"sources":["../../../src/ssr/handlerCallback.ts"],"sourcesContent":["import type { AnyRouter } from '../router'\n\nexport type SsrResponse =\n  | {\n      response: Response\n      serverSsrCleanup: 'none'\n    }\n  | {\n      response: Response\n      serverSsrCleanup: 'stream'\n      dispose: (reason?: unknown) => Promise<void>\n    }\n\nexport type HandlerCallbackResult = Response | SsrResponse\n\nexport function isSsrResponse(value: unknown): value is SsrResponse {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'response' in value &&\n    'serverSsrCleanup' in value\n  )\n}\n\nexport function normalizeSsrResponse(\n  result: HandlerCallbackResult,\n): SsrResponse {\n  return isSsrResponse(result)\n    ? result\n    : { response: result, serverSsrCleanup: 'none' }\n}\n\nexport function createSsrStreamResponse<TRouter extends AnyRouter>(\n  router: TRouter,\n  response: Response,\n): SsrResponse {\n  if (!response.body) {\n    throw new Error('Invariant failed: SSR stream response requires a body')\n  }\n\n  let disposed = false\n  return {\n    response,\n    serverSsrCleanup: 'stream',\n    async dispose(reason?: unknown) {\n      if (disposed) return\n      disposed = true\n\n      try {\n        await response.body!.cancel(reason)\n      } catch {\n        // ignore; fallback cleanup below still releases router SSR state\n      }\n\n      router.serverSsr?.cleanup()\n    },\n  }\n}\n\nexport async function replaceSsrResponse(\n  result: HandlerCallbackResult,\n  response: Response,\n  reason?: unknown,\n): Promise<SsrResponse> {\n  const ssrResponse = normalizeSsrResponse(result)\n  if (ssrResponse.serverSsrCleanup === 'stream') {\n    await ssrResponse.dispose(reason)\n  }\n  return { response, serverSsrCleanup: 'none' }\n}\n\nexport async function stripSsrResponseBody(\n  result: HandlerCallbackResult,\n  reason?: unknown,\n): Promise<SsrResponse> {\n  const ssrResponse = normalizeSsrResponse(result)\n  if (ssrResponse.serverSsrCleanup === 'stream') {\n    await ssrResponse.dispose(reason)\n  }\n  return {\n    response: new Response(null, ssrResponse.response),\n    serverSsrCleanup: 'none',\n  }\n}\n\nexport interface HandlerCallback<TRouter extends AnyRouter> {\n  (ctx: {\n    request: Request\n    router: TRouter\n    responseHeaders: Headers\n  }): HandlerCallbackResult | Promise<HandlerCallbackResult>\n}\n\nexport function defineHandlerCallback<TRouter extends AnyRouter>(\n  handler: HandlerCallback<TRouter>,\n): HandlerCallback<TRouter> {\n  return handler\n}\n"],"mappings":";AAeA,SAAgB,cAAc,OAAsC;CAClE,OACE,OAAO,UAAU,YACjB,UAAU,QACV,cAAc,SACd,sBAAsB;AAE1B;AAEA,SAAgB,qBACd,QACa;CACb,OAAO,cAAc,MAAM,IACvB,SACA;EAAE,UAAU;EAAQ,kBAAkB;CAAO;AACnD;AAEA,SAAgB,wBACd,QACA,UACa;CACb,IAAI,CAAC,SAAS,MACZ,MAAM,IAAI,MAAM,uDAAuD;CAGzE,IAAI,WAAW;CACf,OAAO;EACL;EACA,kBAAkB;EAClB,MAAM,QAAQ,QAAkB;GAC9B,IAAI,UAAU;GACd,WAAW;GAEX,IAAI;IACF,MAAM,SAAS,KAAM,OAAO,MAAM;GACpC,QAAQ,CAER;GAEA,OAAO,WAAW,QAAQ;EAC5B;CACF;AACF;AAEA,eAAsB,mBACpB,QACA,UACA,QACsB;CACtB,MAAM,cAAc,qBAAqB,MAAM;CAC/C,IAAI,YAAY,qBAAqB,UACnC,MAAM,YAAY,QAAQ,MAAM;CAElC,OAAO;EAAE;EAAU,kBAAkB;CAAO;AAC9C;AAEA,eAAsB,qBACpB,QACA,QACsB;CACtB,MAAM,cAAc,qBAAqB,MAAM;CAC/C,IAAI,YAAY,qBAAqB,UACnC,MAAM,YAAY,QAAQ,MAAM;CAElC,OAAO;EACL,UAAU,IAAI,SAAS,MAAM,YAAY,QAAQ;EACjD,kBAAkB;CACpB;AACF;AAUA,SAAgB,sBACd,SAC0B;CAC1B,OAAO;AACT"}
+{"version":3,"file":"handlerCallback.js","names":[],"sources":["../../../src/ssr/handlerCallback.ts"],"sourcesContent":["import type { AnyRouter } from '../router'\n\nexport type SsrResponse =\n  | {\n      response: Response\n      serverSsrCleanup: 'none'\n    }\n  | {\n      response: Response\n      serverSsrCleanup: 'stream'\n      dispose: (reason?: unknown) => Promise<void>\n    }\n\nexport type HandlerCallbackResult = Response | SsrResponse\n\nexport function isSsrResponse(value: unknown): value is SsrResponse {\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    'response' in value &&\n    'serverSsrCleanup' in value\n  )\n}\n\nexport function normalizeSsrResponse(\n  result: HandlerCallbackResult,\n): SsrResponse {\n  return isSsrResponse(result)\n    ? result\n    : { response: result, serverSsrCleanup: 'none' }\n}\n\nexport function disposeSsrResponse(\n  response: SsrResponse,\n  reason?: unknown,\n): Promise<void> {\n  if (response.serverSsrCleanup !== 'stream') {\n    return Promise.resolve()\n  }\n  try {\n    return Promise.resolve(response.dispose(reason))\n  } catch (error) {\n    return Promise.reject(error)\n  }\n}\n\nexport function disposeSsrResponseDetached(\n  result: HandlerCallbackResult,\n  reason?: unknown,\n  onError: (error: unknown) => void = console.error,\n): void {\n  const ssrResponse = normalizeSsrResponse(result)\n  if (ssrResponse.serverSsrCleanup === 'stream') {\n    void disposeSsrResponse(ssrResponse, reason).catch(onError)\n    return\n  }\n\n  if (ssrResponse.response.body) {\n    try {\n      void ssrResponse.response.body.cancel(reason).catch(onError)\n    } catch (error) {\n      onError(error)\n    }\n  }\n}\n\nexport function createSsrStreamResponse<TRouter extends AnyRouter>(\n  router: TRouter,\n  response: Response,\n): SsrResponse {\n  if (!response.body) {\n    throw new Error('Invariant failed: SSR stream response requires a body')\n  }\n\n  let disposed = false\n  return {\n    response,\n    serverSsrCleanup: 'stream',\n    async dispose(reason?: unknown) {\n      if (disposed) {\n        return\n      }\n      disposed = true\n\n      // Sever router ownership before asking user/renderer stream machinery to\n      // cancel. A custom stream is allowed to ignore cancellation forever.\n      router.serverSsr?.cleanup()\n\n      try {\n        await response.body!.cancel(reason)\n      } catch {\n        // Cleanup above already released router SSR state.\n      }\n    },\n  }\n}\n\nexport function bindSsrResponseToRequest(\n  router: AnyRouter | undefined,\n  result: HandlerCallbackResult,\n  signal: AbortSignal,\n): SsrResponse {\n  const ssrResponse = normalizeSsrResponse(result)\n  if (ssrResponse.serverSsrCleanup !== 'stream') {\n    if (signal.aborted) {\n      disposeSsrResponseDetached(result, signal.reason)\n    }\n    return ssrResponse\n  }\n\n  const failed = (error: unknown) => {\n    router?.serverSsr?.cleanup()\n    console.error(error)\n  }\n  const abort = () => {\n    disposeSsrResponseDetached(ssrResponse, signal.reason, failed)\n  }\n  if (signal.aborted) {\n    abort()\n    return ssrResponse\n  }\n\n  signal.addEventListener('abort', abort, { once: true })\n  router?.serverSsr?.onCleanup(() => {\n    signal.removeEventListener('abort', abort)\n  })\n  return ssrResponse\n}\n\nexport async function replaceSsrResponse(\n  result: HandlerCallbackResult,\n  response: Response,\n  reason?: unknown,\n): Promise<SsrResponse> {\n  const ssrResponse = normalizeSsrResponse(result)\n  await disposeSsrResponse(ssrResponse, reason)\n  return { response, serverSsrCleanup: 'none' }\n}\n\nexport async function stripSsrResponseBody(\n  result: HandlerCallbackResult,\n  reason?: unknown,\n): Promise<SsrResponse> {\n  const ssrResponse = normalizeSsrResponse(result)\n  await disposeSsrResponse(ssrResponse, reason)\n  return {\n    response: new Response(null, ssrResponse.response),\n    serverSsrCleanup: 'none',\n  }\n}\n\nexport interface HandlerCallback<TRouter extends AnyRouter> {\n  (ctx: {\n    request: Request\n    router: TRouter\n    responseHeaders: Headers\n  }): HandlerCallbackResult | Promise<HandlerCallbackResult>\n}\n\nexport function defineHandlerCallback<TRouter extends AnyRouter>(\n  handler: HandlerCallback<TRouter>,\n): HandlerCallback<TRouter> {\n  return handler\n}\n"],"mappings":";AAeA,SAAgB,cAAc,OAAsC;CAClE,OACE,OAAO,UAAU,YACjB,UAAU,QACV,cAAc,SACd,sBAAsB;AAE1B;AAEA,SAAgB,qBACd,QACa;CACb,OAAO,cAAc,MAAM,IACvB,SACA;EAAE,UAAU;EAAQ,kBAAkB;CAAO;AACnD;AAEA,SAAgB,mBACd,UACA,QACe;CACf,IAAI,SAAS,qBAAqB,UAChC,OAAO,QAAQ,QAAQ;CAEzB,IAAI;EACF,OAAO,QAAQ,QAAQ,SAAS,QAAQ,MAAM,CAAC;CACjD,SAAS,OAAO;EACd,OAAO,QAAQ,OAAO,KAAK;CAC7B;AACF;AAEA,SAAgB,2BACd,QACA,QACA,UAAoC,QAAQ,OACtC;CACN,MAAM,cAAc,qBAAqB,MAAM;CAC/C,IAAI,YAAY,qBAAqB,UAAU;EAC7C,mBAAwB,aAAa,MAAM,EAAE,MAAM,OAAO;EAC1D;CACF;CAEA,IAAI,YAAY,SAAS,MACvB,IAAI;EACF,YAAiB,SAAS,KAAK,OAAO,MAAM,EAAE,MAAM,OAAO;CAC7D,SAAS,OAAO;EACd,QAAQ,KAAK;CACf;AAEJ;AAEA,SAAgB,wBACd,QACA,UACa;CACb,IAAI,CAAC,SAAS,MACZ,MAAM,IAAI,MAAM,uDAAuD;CAGzE,IAAI,WAAW;CACf,OAAO;EACL;EACA,kBAAkB;EAClB,MAAM,QAAQ,QAAkB;GAC9B,IAAI,UACF;GAEF,WAAW;GAIX,OAAO,WAAW,QAAQ;GAE1B,IAAI;IACF,MAAM,SAAS,KAAM,OAAO,MAAM;GACpC,QAAQ,CAER;EACF;CACF;AACF;AAEA,SAAgB,yBACd,QACA,QACA,QACa;CACb,MAAM,cAAc,qBAAqB,MAAM;CAC/C,IAAI,YAAY,qBAAqB,UAAU;EAC7C,IAAI,OAAO,SACT,2BAA2B,QAAQ,OAAO,MAAM;EAElD,OAAO;CACT;CAEA,MAAM,UAAU,UAAmB;EACjC,QAAQ,WAAW,QAAQ;EAC3B,QAAQ,MAAM,KAAK;CACrB;CACA,MAAM,cAAc;EAClB,2BAA2B,aAAa,OAAO,QAAQ,MAAM;CAC/D;CACA,IAAI,OAAO,SAAS;EAClB,MAAM;EACN,OAAO;CACT;CAEA,OAAO,iBAAiB,SAAS,OAAO,EAAE,MAAM,KAAK,CAAC;CACtD,QAAQ,WAAW,gBAAgB;EACjC,OAAO,oBAAoB,SAAS,KAAK;CAC3C,CAAC;CACD,OAAO;AACT;AAEA,eAAsB,mBACpB,QACA,UACA,QACsB;CAEtB,MAAM,mBADc,qBAAqB,MAChB,GAAa,MAAM;CAC5C,OAAO;EAAE;EAAU,kBAAkB;CAAO;AAC9C;AAEA,eAAsB,qBACpB,QACA,QACsB;CACtB,MAAM,cAAc,qBAAqB,MAAM;CAC/C,MAAM,mBAAmB,aAAa,MAAM;CAC5C,OAAO;EACL,UAAU,IAAI,SAAS,MAAM,YAAY,QAAQ;EACjD,kBAAkB;CACpB;AACF;AAUA,SAAgB,sBACd,SAC0B;CAC1B,OAAO;AACT"}

package/dist/esm/ssr/server.d.ts

@@ -1,6 +1,6 @@
-export { createRequestHandler } from './createRequestHandler.js';
+export { createRequestHandler, waitForRequest } from './createRequestHandler.js';
 export type { RequestHandler } from './createRequestHandler.js';
-export { createSsrStreamResponse, defineHandlerCallback, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody, } from './handlerCallback.js';
+export { bindSsrResponseToRequest, createSsrStreamResponse, defineHandlerCallback, disposeSsrResponse, disposeSsrResponseDetached, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody, } from './handlerCallback.js';
 export type { HandlerCallback, HandlerCallbackResult, SsrResponse, } from './handlerCallback.js';
 export { transformPipeableStreamWithRouter, transformStreamWithRouter, transformReadableStreamWithRouter, } from './transformStreamWithRouter.js';
 export type { TransformStreamWithRouterOptions } from './transformStreamWithRouter.js';

package/dist/esm/ssr/server.js

@@ -1,5 +1,5 @@
 import { attachRouterServerSsrUtils, getNormalizedURL, getOrigin } from "./ssr-server.js";
-import { createSsrStreamResponse, defineHandlerCallback, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody } from "./handlerCallback.js";
-import { createRequestHandler } from "./createRequestHandler.js";
+import { bindSsrResponseToRequest, createSsrStreamResponse, defineHandlerCallback, disposeSsrResponse, disposeSsrResponseDetached, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody } from "./handlerCallback.js";
+import { createRequestHandler, waitForRequest } from "./createRequestHandler.js";
 import { transformPipeableStreamWithRouter, transformReadableStreamWithRouter, transformStreamWithRouter } from "./transformStreamWithRouter.js";
-export { attachRouterServerSsrUtils, createRequestHandler, createSsrStreamResponse, defineHandlerCallback, getNormalizedURL, getOrigin, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody, transformPipeableStreamWithRouter, transformReadableStreamWithRouter, transformStreamWithRouter };
+export { attachRouterServerSsrUtils, bindSsrResponseToRequest, createRequestHandler, createSsrStreamResponse, defineHandlerCallback, disposeSsrResponse, disposeSsrResponseDetached, getNormalizedURL, getOrigin, isSsrResponse, normalizeSsrResponse, replaceSsrResponse, stripSsrResponseBody, transformPipeableStreamWithRouter, transformReadableStreamWithRouter, transformStreamWithRouter, waitForRequest };

package/dist/esm/ssr/ssr-client.d.ts

@@ -1,10 +1 @@
-import { GLOBAL_SEROVAL, GLOBAL_TSR } from './constants.js';
-import { TsrSsrGlobal } from './types.js';
-import { AnyRouter } from '../router.js';
-declare global {
-    interface Window {
-        [GLOBAL_TSR]?: TsrSsrGlobal;
-        [GLOBAL_SEROVAL]?: any;
-    }
-}
-export declare function hydrate(router: AnyRouter): Promise<any>;
+export { hydrate } from '../load-client.js';

package/dist/esm/ssr/ssr-match-id.js

@@ -1,9 +1,9 @@
 //#region src/ssr/ssr-match-id.ts
 function dehydrateSsrMatchId(id) {
-	return id.replaceAll("/", "\0");
+	return id.replaceAll("~", "~~").replaceAll("\0", "~0").replaceAll("�", "~r").replaceAll("/", "\0");
 }
 function hydrateSsrMatchId(id) {
-	return id.replaceAll("\0", "/").replaceAll("�", "/");
+	return id.replaceAll("\0", "/").replaceAll("�", "/").replace(/~([~0r])/g, (_, code) => code === "0" ? "\0" : code === "r" ? "�" : code);
 }
 //#endregion
 export { dehydrateSsrMatchId, hydrateSsrMatchId };

package/dist/esm/ssr/ssr-match-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-match-id.js","names":[],"sources":["../../../src/ssr/ssr-match-id.ts"],"sourcesContent":["export function dehydrateSsrMatchId(id: string): string {\n  return id.replaceAll('/', '\\0')\n}\n\nexport function hydrateSsrMatchId(id: string): string {\n  return id.replaceAll('\\0', '/').replaceAll('\\uFFFD', '/')\n}\n"],"mappings":";AAAA,SAAgB,oBAAoB,IAAoB;CACtD,OAAO,GAAG,WAAW,KAAK,IAAI;AAChC;AAEA,SAAgB,kBAAkB,IAAoB;CACpD,OAAO,GAAG,WAAW,MAAM,GAAG,EAAE,WAAW,KAAU,GAAG;AAC1D"}
+{"version":3,"file":"ssr-match-id.js","names":[],"sources":["../../../src/ssr/ssr-match-id.ts"],"sourcesContent":["export function dehydrateSsrMatchId(id: string): string {\n  return id\n    .replaceAll('~', '~~')\n    .replaceAll('\\0', '~0')\n    .replaceAll('\\uFFFD', '~r')\n    .replaceAll('/', '\\0')\n}\n\nexport function hydrateSsrMatchId(id: string): string {\n  return id\n    .replaceAll('\\0', '/')\n    .replaceAll('\\uFFFD', '/')\n    .replace(/~([~0r])/g, (_, code) =>\n      code === '0' ? '\\0' : code === 'r' ? '\\uFFFD' : code,\n    )\n}\n"],"mappings":";AAAA,SAAgB,oBAAoB,IAAoB;CACtD,OAAO,GACJ,WAAW,KAAK,IAAI,EACpB,WAAW,MAAM,IAAI,EACrB,WAAW,KAAU,IAAI,EACzB,WAAW,KAAK,IAAI;AACzB;AAEA,SAAgB,kBAAkB,IAAoB;CACpD,OAAO,GACJ,WAAW,MAAM,GAAG,EACpB,WAAW,KAAU,GAAG,EACxB,QAAQ,cAAc,GAAG,SACxB,SAAS,MAAM,OAAO,SAAS,MAAM,MAAW,IAClD;AACJ"}

package/dist/esm/ssr/ssr-server.js

@@ -2,11 +2,12 @@ import { decodePath } from "../utils.js";
 import { invariant } from "../invariant.js";
 import { createLRUCache } from "../lru-cache.js";
 import { rootRouteId } from "../root.js";
+import { dehydrateSsrMatchId } from "./ssr-match-id.js";
+import { _getRenderedMatches } from "../load-client.js";
 import { createInlineCssPlaceholderAsset, createInlineCssStyleAsset, getStylesheetHref } from "../manifest.js";
 import { GLOBAL_TSR, TSR_SCRIPT_BARRIER_ID } from "./constants.js";
 import { makeSsrSerovalPlugin } from "./serializer/transformer.js";
 import { defaultSerovalPlugins } from "./serializer/seroval-plugins.js";
-import { dehydrateSsrMatchId } from "./ssr-match-id.js";
 import tsrScript_default from "./tsrScript.js";
 import { crossSerializeStream, getCrossReferenceHeader } from "seroval";
 //#region src/ssr/ssr-server.ts
@@ -26,7 +27,7 @@ function dehydrateMatch(match) {
 		["error", "e"],
 		["ssr", "ssr"]
 	]) if (match[key] !== void 0) dehydratedMatch[shorthand] = match[key];
-	if (match.globalNotFound) dehydratedMatch.g = true;
+	if (match._notFound) dehydratedMatch.g = true;
 	return dehydratedMatch;
 }
 const INITIAL_SCRIPTS = [getCrossReferenceHeader(SCOPE_ID), tsrScript_default];
@@ -223,7 +224,7 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets }) {
 	router.ssr = { get manifest() {
 		if (!manifest) return manifest;
 		const requestAssets = getRequestAssets?.();
-		const matches = router.stores.matches.get();
+		const matches = _getRenderedMatches(router.stores.matches.get());
 		const hasAssets = hasRequestAssets(requestAssets);
 		if (!hasAssets && !manifest.inlineCss) return manifest;
 		let inlineCssAsset;
@@ -291,7 +292,7 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets }) {
 				if (process.env.NODE_ENV !== "production") throw new Error("Invariant failed: router is already dehydrated!");
 				invariant();
 			}
-			let matchesToDehydrate = router.stores.matches.get();
+			let matchesToDehydrate = _getRenderedMatches(router.stores.matches.get());
 			if (router.isShell()) matchesToDehydrate = matchesToDehydrate.slice(0, 1);
 			const matches = matchesToDehydrate.map(dehydrateMatch);
 			let manifestToDehydrate = void 0;
@@ -316,9 +317,8 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets }) {
 				manifest: manifestToDehydrate,
 				matches
 			};
-			const lastMatchId = matchesToDehydrate[matchesToDehydrate.length - 1]?.id;
-			if (lastMatchId) dehydratedRouter.lastMatchId = dehydrateSsrMatchId(lastMatchId);
 			const dehydratedData = await router.options.dehydrate?.();
+			if (cleanupStarted) return;
 			if (dehydratedData) dehydratedRouter.dehydratedData = dehydratedData;
 			_dehydrated = true;
 			const trackPlugins = { didRun: false };