@tanstack/router-core 1.171.15 → 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,6 +580,14 @@ export declare function getLocationChangeInfo(location: ParsedLocation, resolved
     hrefChanged: boolean;
     hashChanged: boolean;
 };
+/**
+ * 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__: {
@@ -593,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.
  *
@@ -611,10 +641,11 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
         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/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;

package/dist/cjs/ssr/handlerCallback.cjs

@@ -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,8 +86,11 @@ function defineHandlerCallback(handler) {
 	return handler;
 }
 //#endregion
+exports.bindSsrResponseToRequest = bindSsrResponseToRequest;
 exports.createSsrStreamResponse = createSsrStreamResponse;
 exports.defineHandlerCallback = defineHandlerCallback;
+exports.disposeSsrResponse = disposeSsrResponse;
+exports.disposeSsrResponseDetached = disposeSsrResponseDetached;
 exports.isSsrResponse = isSsrResponse;
 exports.normalizeSsrResponse = normalizeSsrResponse;
 exports.replaceSsrResponse = replaceSsrResponse;

package/dist/cjs/ssr/handlerCallback.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"handlerCallback.cjs","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.cjs","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/cjs/ssr/handlerCallback.d.cts

@@ -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/cjs/ssr/server.cjs

@@ -4,9 +4,12 @@ const require_handlerCallback = require("./handlerCallback.cjs");
 const require_createRequestHandler = require("./createRequestHandler.cjs");
 const require_transformStreamWithRouter = require("./transformStreamWithRouter.cjs");
 exports.attachRouterServerSsrUtils = require_ssr_server.attachRouterServerSsrUtils;
+exports.bindSsrResponseToRequest = require_handlerCallback.bindSsrResponseToRequest;
 exports.createRequestHandler = require_createRequestHandler.createRequestHandler;
 exports.createSsrStreamResponse = require_handlerCallback.createSsrStreamResponse;
 exports.defineHandlerCallback = require_handlerCallback.defineHandlerCallback;
+exports.disposeSsrResponse = require_handlerCallback.disposeSsrResponse;
+exports.disposeSsrResponseDetached = require_handlerCallback.disposeSsrResponseDetached;
 exports.getNormalizedURL = require_ssr_server.getNormalizedURL;
 exports.getOrigin = require_ssr_server.getOrigin;
 exports.isSsrResponse = require_handlerCallback.isSsrResponse;
@@ -16,3 +19,4 @@ exports.stripSsrResponseBody = require_handlerCallback.stripSsrResponseBody;
 exports.transformPipeableStreamWithRouter = require_transformStreamWithRouter.transformPipeableStreamWithRouter;
 exports.transformReadableStreamWithRouter = require_transformStreamWithRouter.transformReadableStreamWithRouter;
 exports.transformStreamWithRouter = require_transformStreamWithRouter.transformStreamWithRouter;
+exports.waitForRequest = require_createRequestHandler.waitForRequest;

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

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

package/dist/cjs/ssr/ssr-client.d.cts

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

package/dist/cjs/ssr/ssr-match-id.cjs

@@ -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
 exports.dehydrateSsrMatchId = dehydrateSsrMatchId;

package/dist/cjs/ssr/ssr-match-id.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-match-id.cjs","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.cjs","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"}