@tanstack/router-core 1.171.5 → 1.171.7

package/dist/cjs/ssr/ssr-server.cjs

@@ -31,38 +31,42 @@ function dehydrateMatch(match) {
 }
 const INITIAL_SCRIPTS = [(0, seroval.getCrossReferenceHeader)(SCOPE_ID), require_tsrScript.default];
 var ScriptBuffer = class {
-	constructor(router) {
+	constructor(injectScript) {
 		this._scriptBarrierLifted = false;
 		this._cleanedUp = false;
-		this._pendingMicrotask = false;
-		this.router = router;
+		this._microtaskVersion = 0;
+		this._pendingMicrotaskVersion = 0;
+		this.injectScript = injectScript;
 		this._queue = INITIAL_SCRIPTS.slice();
 	}
 	enqueue(script) {
 		if (this._cleanedUp) return;
 		this._queue.push(script);
-		if (this._scriptBarrierLifted && !this._pendingMicrotask) {
-			this._pendingMicrotask = true;
-			queueMicrotask(() => {
-				this._pendingMicrotask = false;
-				this.injectBufferedScripts();
-			});
-		}
+		if (this._scriptBarrierLifted) this.scheduleInjectBufferedScripts();
 	}
 	liftBarrier() {
 		if (this._scriptBarrierLifted || this._cleanedUp) return;
 		this._scriptBarrierLifted = true;
-		if (this._queue.length > 0 && !this._pendingMicrotask) {
-			this._pendingMicrotask = true;
-			queueMicrotask(() => {
-				this._pendingMicrotask = false;
-				this.injectBufferedScripts();
-			});
-		}
+		if (this._queue.length > 0) this.scheduleInjectBufferedScripts();
+	}
+	scheduleInjectBufferedScripts() {
+		if (this._pendingMicrotaskVersion !== 0) return;
+		const pendingVersion = ++this._microtaskVersion;
+		this._pendingMicrotaskVersion = pendingVersion;
+		queueMicrotask(() => {
+			if (this._pendingMicrotaskVersion !== pendingVersion) return;
+			this._pendingMicrotaskVersion = 0;
+			this.injectBufferedScripts();
+		});
+	}
+	clearPendingMicrotask() {
+		if (this._pendingMicrotaskVersion === 0) return;
+		this._pendingMicrotaskVersion = 0;
+		this._microtaskVersion++;
 	}
 	/**
 	* Flushes any pending scripts synchronously.
-	* Call this before emitting onSerializationFinished to ensure all scripts are injected.
+	* Call this before signaling serialization finished to ensure all scripts are injected.
 	*
 	* IMPORTANT: Only injects if the barrier has been lifted. Before the barrier is lifted,
 	* scripts should remain in the queue so takeBufferedScripts() can retrieve them
@@ -70,33 +74,38 @@ var ScriptBuffer = class {
 	flush() {
 		if (!this._scriptBarrierLifted) return;
 		if (this._cleanedUp) return;
-		this._pendingMicrotask = false;
-		const scriptsToInject = this.takeAll();
-		if (scriptsToInject && this.router?.serverSsr) this.router.serverSsr.injectScript(scriptsToInject);
+		this.clearPendingMicrotask();
+		this.injectBufferedScripts();
 	}
 	takeAll() {
-		const bufferedScripts = this._queue;
-		this._queue = [];
+		return this.takeScripts(this._queue.length);
+	}
+	takeScripts(count) {
+		if (count <= 0) return void 0;
+		const bufferedScripts = this._queue.splice(0, count);
 		if (bufferedScripts.length === 0) return;
 		if (bufferedScripts.length === 1) return bufferedScripts[0] + ";document.currentScript.remove()";
 		return bufferedScripts.join(";") + ";document.currentScript.remove()";
 	}
+	hasPending() {
+		return this._queue.length > 0;
+	}
 	injectBufferedScripts() {
 		if (this._cleanedUp) return;
 		if (this._queue.length === 0) return;
 		const scriptsToInject = this.takeAll();
-		if (scriptsToInject && this.router?.serverSsr) this.router.serverSsr.injectScript(scriptsToInject);
+		if (scriptsToInject) this.injectScript?.(scriptsToInject);
 	}
 	cleanup() {
 		this._cleanedUp = true;
+		this.clearPendingMicrotask();
 		this._queue = [];
-		this.router = void 0;
+		this.injectScript = void 0;
 	}
 };
 const isProd = process.env.NODE_ENV === "production";
 const MANIFEST_CACHE_SIZE = 100;
 const manifestCaches = /* @__PURE__ */ new WeakMap();
-const inlineCssCaches = /* @__PURE__ */ new WeakMap();
 function getManifestCache(manifest) {
 	const cache = manifestCaches.get(manifest);
 	if (cache) return cache;
@@ -104,102 +113,178 @@ function getManifestCache(manifest) {
 	manifestCaches.set(manifest, newCache);
 	return newCache;
 }
-function getInlineCssCache(manifest) {
-	const cache = inlineCssCaches.get(manifest);
-	if (cache) return cache;
-	const newCache = require_lru_cache.createLRUCache(MANIFEST_CACHE_SIZE);
-	inlineCssCaches.set(manifest, newCache);
-	return newCache;
+function getInlineCssForPreparedRoutes(manifest, preparedRoutes) {
+	if (preparedRoutes.inlineCss !== void 0) return preparedRoutes.inlineCss;
+	const styles = manifest.inlineCss?.styles;
+	const hrefs = preparedRoutes.inlineCssHrefs;
+	if (!styles || !hrefs?.length) return void 0;
+	let css = "";
+	for (const href of hrefs) css += styles[href];
+	preparedRoutes.inlineCss = css;
+	return css;
 }
-function getInlineCssHrefsForMatches(manifest, matches) {
-	const styles = manifest?.inlineCss?.styles;
-	if (!styles) return [];
-	const seen = /* @__PURE__ */ new Set();
-	const hrefs = [];
-	for (const match of matches) {
-		const assets = manifest?.routes[match.routeId]?.assets ?? [];
-		for (const asset of assets) {
-			const href = require_manifest.getStylesheetHref(asset);
-			if (!href || seen.has(href) || styles[href] === void 0) continue;
-			seen.add(href);
-			hrefs.push(href);
-		}
-	}
-	return hrefs;
+function getInlineCssAssetForPreparedRoutes(manifest, preparedRoutes) {
+	const css = getInlineCssForPreparedRoutes(manifest, preparedRoutes);
+	return css === void 0 ? void 0 : require_manifest.createInlineCssStyleAsset(css);
 }
-function getInlineCssForHrefs(manifest, hrefs) {
-	const styles = manifest.inlineCss?.styles;
-	if (!styles || hrefs.length === 0) return void 0;
-	const cacheKey = hrefs.join("\0");
+function getMatchedRoutesCacheKey(matches) {
+	let cacheKey = "";
+	for (let i = 0; i < matches.length; i++) cacheKey += (i === 0 ? "" : "\0") + matches[i].routeId;
+	return cacheKey;
+}
+function getPreparedMatchedManifestRoutes(manifest, matches, cacheKey) {
 	if (isProd) {
-		const cached = getInlineCssCache(manifest).get(cacheKey);
-		if (cached !== void 0) return cached;
+		const cached = getManifestCache(manifest).get(cacheKey);
+		if (cached) return cached;
 	}
-	const css = hrefs.map((href) => styles[href]).join("");
-	if (isProd) getInlineCssCache(manifest).set(cacheKey, css);
-	return css;
+	const preparedRoutes = prepareMatchedManifestRoutes(manifest, matches);
+	if (isProd) getManifestCache(manifest).set(cacheKey, preparedRoutes);
+	return preparedRoutes;
 }
-function getInlineCssAssetForMatches(manifest, matches) {
-	if (!manifest?.inlineCss) return void 0;
-	const css = getInlineCssForHrefs(manifest, getInlineCssHrefsForMatches(manifest, matches));
-	return css === void 0 ? void 0 : require_manifest.createInlineCssStyleAsset(css);
+function prepareMatchedManifestRoutes(manifest, matches) {
+	const inlineStyles = manifest.inlineCss?.styles;
+	const routes = {};
+	if (!inlineStyles) {
+		for (const match of matches) {
+			const route = manifest.routes[match.routeId];
+			if (route) routes[match.routeId] = route;
+		}
+		return {
+			routes,
+			hasStrippedRoutes: false
+		};
+	}
+	const inlineCssHrefs = [];
+	const seenInlineCssHrefs = /* @__PURE__ */ new Set();
+	let hasStrippedRoutes = false;
+	for (const match of matches) {
+		const routeId = match.routeId;
+		const route = manifest.routes[routeId];
+		if (!route) continue;
+		const nextRoute = stripInlinedStylesheetAssetsFromRoute(inlineStyles, route, inlineCssHrefs, seenInlineCssHrefs);
+		if (nextRoute !== route) hasStrippedRoutes = true;
+		routes[routeId] = nextRoute;
+	}
+	return {
+		routes,
+		hasStrippedRoutes,
+		...inlineCssHrefs.length ? { inlineCssHrefs } : {}
+	};
 }
-function stripInlinedStylesheetAssets(manifest, routes, matches) {
-	if (!manifest.inlineCss) return routes;
-	const nextRoutes = {};
-	for (const [routeId, route] of Object.entries(routes)) {
-		const assets = route.assets?.filter((asset) => !require_manifest.isInlinableStylesheet(manifest, asset));
+function stripInlinedStylesheetAssetsFromRoute(inlineStyles, route, inlineCssHrefs, seenInlineCssHrefs) {
+	const css = route.css;
+	if (!css) return route;
+	if (css.length === 0) {
 		const nextRoute = { ...route };
-		if (assets) if (assets.length > 0) nextRoute.assets = assets;
-		else delete nextRoute.assets;
-		nextRoutes[routeId] = nextRoute;
+		delete nextRoute.css;
+		return nextRoute;
 	}
-	if (getInlineCssAssetForMatches(manifest, matches)) {
-		const rootRoute = nextRoutes["__root__"] ?? {};
-		nextRoutes[require_root.rootRouteId] = {
-			...rootRoute,
-			assets: [require_manifest.createInlineCssPlaceholderAsset(), ...rootRoute.assets ?? []]
-		};
+	let cssLinks;
+	for (let i = 0; i < css.length; i++) {
+		const link = css[i];
+		const href = require_manifest.getStylesheetHref(link);
+		if (inlineStyles[href] === void 0) {
+			if (cssLinks) cssLinks.push(link);
+			continue;
+		}
+		if (!seenInlineCssHrefs.has(href)) {
+			seenInlineCssHrefs.add(href);
+			inlineCssHrefs.push(href);
+		}
+		if (!cssLinks) cssLinks = css.slice(0, i);
 	}
-	return nextRoutes;
+	if (!cssLinks) return route;
+	if (cssLinks.length > 0) return {
+		...route,
+		css: cssLinks
+	};
+	const nextRoute = { ...route };
+	delete nextRoute.css;
+	return nextRoute;
 }
-function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includeUnmatchedRouteAssets = true }) {
+function hasRouteAssets(route) {
+	return !!route.scripts?.length || !!route.css?.length;
+}
+function hasRequestAssets(assets) {
+	return !!assets && (!!assets.preloads?.length || hasRouteAssets(assets));
+}
+function mergeRequestAssetsIntoRootRoute(rootRoute, requestAssets) {
+	const preloads = requestAssets?.preloads?.length ? [...requestAssets.preloads, ...rootRoute?.preloads ?? []] : rootRoute?.preloads;
+	const scripts = requestAssets?.scripts?.length ? [...requestAssets.scripts, ...rootRoute?.scripts ?? []] : rootRoute?.scripts;
+	const cssLinks = requestAssets?.css?.length ? [...requestAssets.css, ...rootRoute?.css ?? []] : rootRoute?.css;
+	return {
+		...rootRoute ?? {},
+		...preloads?.length ? { preloads } : {},
+		...scripts?.length ? { scripts } : {},
+		...cssLinks?.length ? { css: cssLinks } : {}
+	};
+}
+function attachRouterServerSsrUtils({ router, manifest, getRequestAssets }) {
 	router.ssr = { get manifest() {
 		if (!manifest) return manifest;
 		const requestAssets = getRequestAssets?.();
-		const inlineCssAsset = getInlineCssAssetForMatches(manifest, router.stores.matches.get());
-		if (!requestAssets?.length && !inlineCssAsset) return manifest;
+		const matches = router.stores.matches.get();
+		const hasAssets = hasRequestAssets(requestAssets);
+		if (!hasAssets && !manifest.inlineCss) return manifest;
+		let inlineCssAsset;
+		let routes = manifest.routes;
+		if (manifest.inlineCss) {
+			const preparedManifest = getPreparedMatchedManifestRoutes(manifest, matches, getMatchedRoutesCacheKey(matches));
+			inlineCssAsset = getInlineCssAssetForPreparedRoutes(manifest, preparedManifest);
+			if (preparedManifest.hasStrippedRoutes) routes = {
+				...manifest.routes,
+				...preparedManifest.routes
+			};
+		}
+		if (!hasAssets) return {
+			...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+			...inlineCssAsset ? { inlineStyle: inlineCssAsset } : {},
+			routes
+		};
+		const rootRoute = routes[require_root.rootRouteId];
 		return {
-			...manifest,
+			...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+			...inlineCssAsset ? { inlineStyle: inlineCssAsset } : {},
 			routes: {
-				...manifest.routes,
-				[require_root.rootRouteId]: {
-					...manifest.routes[require_root.rootRouteId],
-					assets: [
-						...requestAssets ?? [],
-						...inlineCssAsset ? [inlineCssAsset] : [],
-						...manifest.routes["__root__"]?.assets ?? []
-					]
-				}
+				...routes,
+				[require_root.rootRouteId]: mergeRequestAssetsIntoRootRoute(rootRoute, requestAssets)
 			}
 		};
 	} };
 	let _dehydrated = false;
 	let _serializationFinished = false;
+	let streamFastPathReserved = false;
 	const renderFinishedListeners = [];
+	const injectedHtmlListeners = [];
 	const serializationFinishedListeners = [];
-	const scriptBuffer = new ScriptBuffer(router);
+	const cleanupListeners = [];
+	let cleanupStarted = false;
 	let injectedHtmlBuffer = "";
-	router.serverSsr = {
+	const callListeners = (listeners, errorPrefix) => {
+		const snapshot = listeners.slice();
+		for (const l of snapshot) try {
+			l();
+		} catch (err) {
+			console.error(`${errorPrefix}:`, err);
+		}
+	};
+	const removeListener = (listeners, listener) => {
+		const index = listeners.indexOf(listener);
+		if (index >= 0) listeners.splice(index, 1);
+	};
+	const scriptBuffer = new ScriptBuffer((script) => {
+		serverSsr.injectScript(script);
+	});
+	const serverSsr = {
 		injectHtml: (html) => {
-			if (!html) return;
+			if (!html || cleanupStarted) return;
 			injectedHtmlBuffer += html;
-			router.emit({ type: "onInjectedHtml" });
+			callListeners(injectedHtmlListeners, "SSR injected HTML listener error");
 		},
 		injectScript: (script) => {
-			if (!script) return;
+			if (!script || cleanupStarted) return;
 			const html = `<script${router.options.ssr?.nonce ? ` nonce='${router.options.ssr.nonce}'` : ""}>${script}<\/script>`;
-			router.serverSsr.injectHtml(html);
+			serverSsr.injectHtml(html);
 		},
 		dehydrate: async (opts) => {
 			if (_dehydrated) {
@@ -211,27 +296,19 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			const matches = matchesToDehydrate.map(dehydrateMatch);
 			let manifestToDehydrate = void 0;
 			if (manifest) {
-				const currentRouteIdsList = matchesToDehydrate.map((m) => m.routeId);
-				const manifestCacheKey = `${currentRouteIdsList.join("\0")}\0includeUnmatchedRouteAssets=${includeUnmatchedRouteAssets}`;
-				let filteredRoutes;
-				if (isProd) filteredRoutes = getManifestCache(manifest).get(manifestCacheKey);
-				if (!filteredRoutes) {
-					const currentRouteIds = new Set(currentRouteIdsList);
-					const nextFilteredRoutes = {};
-					for (const routeId in manifest.routes) {
-						const routeManifest = manifest.routes[routeId];
-						if (currentRouteIds.has(routeId)) nextFilteredRoutes[routeId] = routeManifest;
-						else if (includeUnmatchedRouteAssets && routeManifest.assets && routeManifest.assets.length > 0) nextFilteredRoutes[routeId] = { assets: routeManifest.assets };
-					}
-					filteredRoutes = stripInlinedStylesheetAssets(manifest, nextFilteredRoutes, matchesToDehydrate);
-					if (isProd) getManifestCache(manifest).set(manifestCacheKey, filteredRoutes);
-				}
-				manifestToDehydrate = { routes: { ...filteredRoutes } };
-				if (opts?.requestAssets?.length) {
+				const cacheKey = getMatchedRoutesCacheKey(matchesToDehydrate);
+				const preparedManifest = getPreparedMatchedManifestRoutes(manifest, matchesToDehydrate, cacheKey);
+				manifestToDehydrate = {
+					...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+					...preparedManifest.inlineCssHrefs ? { inlineStyle: require_manifest.createInlineCssPlaceholderAsset() } : {},
+					routes: preparedManifest.routes
+				};
+				const requestAssets = opts?.requestAssets;
+				if (hasRequestAssets(requestAssets)) {
 					const existingRoot = manifestToDehydrate.routes[require_root.rootRouteId];
-					manifestToDehydrate.routes[require_root.rootRouteId] = {
-						...existingRoot,
-						assets: [...opts.requestAssets, ...existingRoot?.assets ?? []]
+					manifestToDehydrate.routes = {
+						...manifestToDehydrate.routes,
+						[require_root.rootRouteId]: mergeRequestAssetsIntoRootRoute(existingRoot, requestAssets)
 					};
 				}
 			}
@@ -247,18 +324,25 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			const trackPlugins = { didRun: false };
 			const serializationAdapters = router.options.serializationAdapters;
 			const plugins = serializationAdapters ? serializationAdapters.map((t) => /* @__PURE__ */ require_transformer.makeSsrSerovalPlugin(t, trackPlugins)).concat(require_seroval_plugins.defaultSerovalPlugins) : require_seroval_plugins.defaultSerovalPlugins;
+			let serializationCompleteSignaled = false;
 			const signalSerializationComplete = () => {
+				if (serializationCompleteSignaled || cleanupStarted) return;
+				serializationCompleteSignaled = true;
 				_serializationFinished = true;
-				try {
-					serializationFinishedListeners.forEach((l) => l());
-					router.emit({ type: "onSerializationFinished" });
+				const listeners = serializationFinishedListeners.slice();
+				serializationFinishedListeners.length = 0;
+				for (const l of listeners) try {
+					l();
 				} catch (err) {
 					console.error("Serialization listener error:", err);
-				} finally {
-					serializationFinishedListeners.length = 0;
-					renderFinishedListeners.length = 0;
 				}
 			};
+			const finishScriptSerialization = () => {
+				if (serializationCompleteSignaled || cleanupStarted) return;
+				scriptBuffer.enqueue(require_constants.GLOBAL_TSR + ".e()");
+				scriptBuffer.flush();
+				signalSerializationComplete();
+			};
 			(0, seroval.crossSerializeStream)(dehydratedRouter, {
 				refs: /* @__PURE__ */ new Map(),
 				plugins,
@@ -270,13 +354,11 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 				onError: (err) => {
 					console.error("Serialization error:", err);
 					if (err && err.stack) console.error(err.stack);
-					signalSerializationComplete();
+					finishScriptSerialization();
 				},
 				scopeId: SCOPE_ID,
 				onDone: () => {
-					scriptBuffer.enqueue(require_constants.GLOBAL_TSR + ".e()");
-					scriptBuffer.flush();
-					signalSerializationComplete();
+					finishScriptSerialization();
 				}
 			});
 		},
@@ -286,20 +368,54 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 		isSerializationFinished() {
 			return _serializationFinished;
 		},
-		onRenderFinished: (listener) => renderFinishedListeners.push(listener),
-		onSerializationFinished: (listener) => serializationFinishedListeners.push(listener),
+		reserveStreamFastPath() {
+			if (!cleanupStarted && _serializationFinished && !streamFastPathReserved && renderFinishedListeners.length === 0 && !injectedHtmlBuffer && !scriptBuffer.hasPending()) {
+				streamFastPathReserved = true;
+				return true;
+			}
+			return false;
+		},
+		onInjectedHtml: (listener) => {
+			if (cleanupStarted) return () => {};
+			injectedHtmlListeners.push(listener);
+			return () => removeListener(injectedHtmlListeners, listener);
+		},
+		onRenderFinished: (listener) => {
+			if (cleanupStarted || streamFastPathReserved) return;
+			renderFinishedListeners.push(listener);
+		},
+		onSerializationFinished: (listener) => {
+			if (cleanupStarted) return () => {};
+			if (_serializationFinished && !cleanupStarted) {
+				try {
+					listener();
+				} catch (err) {
+					console.error("Serialization listener error:", err);
+				}
+				return () => {};
+			}
+			serializationFinishedListeners.push(listener);
+			return () => removeListener(serializationFinishedListeners, listener);
+		},
+		onCleanup: (listener) => {
+			if (cleanupStarted) return;
+			cleanupListeners.push(listener);
+		},
 		setRenderFinished: () => {
-			try {
-				renderFinishedListeners.forEach((l) => l());
+			if (cleanupStarted) return;
+			scriptBuffer.liftBarrier();
+			const listeners = renderFinishedListeners.slice();
+			renderFinishedListeners.length = 0;
+			for (const l of listeners) try {
+				l();
 			} catch (err) {
 				console.error("Error in render finished listener:", err);
-			} finally {
-				renderFinishedListeners.length = 0;
 			}
-			scriptBuffer.liftBarrier();
+			if (_serializationFinished) scriptBuffer.flush();
 		},
 		takeBufferedScripts() {
 			const scripts = scriptBuffer.takeAll();
+			if (!scripts) return void 0;
 			return {
 				tag: "script",
 				attrs: {
@@ -320,14 +436,29 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			return buffered;
 		},
 		cleanup() {
-			if (!router.serverSsr) return;
+			if (cleanupStarted) return;
+			cleanupStarted = true;
+			const listeners = cleanupListeners.slice();
+			cleanupListeners.length = 0;
+			for (const l of listeners) try {
+				l();
+			} catch (err) {
+				console.error("Error in SSR cleanup listener:", err);
+			}
 			renderFinishedListeners.length = 0;
+			injectedHtmlListeners.length = 0;
 			serializationFinishedListeners.length = 0;
 			injectedHtmlBuffer = "";
 			scriptBuffer.cleanup();
 			router.serverSsr = void 0;
 		}
 	};
+	router.serverSsr = serverSsr;
+	for (const listener of router.serverSsrLifecycle?.onServerSsrAttach ?? []) try {
+		listener(serverSsr);
+	} catch (err) {
+		console.error("SSR attach listener error:", err);
+	}
 }
 /**
 * Get the origin for the request.