@octanejs/tanstack-router 0.2.8 → 0.2.10

package/src/scriptComponent.tsrx

@@ -0,0 +1,27 @@
+import { createElement, useId } from 'octane';
+import type { RouterManagedTag } from '@tanstack/router-core';
+import { getAssetKeys } from './assetKeys.ts';
+
+// router-core's initial hydration scripts remove themselves before adoption.
+// Host descriptors leave no per-item template frames behind when they do, and
+// create live script elements that execute on later client navigation. This
+// shared owner intentionally remains outside Strong mode for both entries.
+export function createScripts(useScripts: () => Array<RouterManagedTag>) {
+	function Scripts() @{
+		const owner = useId();
+		const scripts = useScripts();
+		const keys = getAssetKeys('body', owner, scripts);
+		<>
+			{scripts.map((script, index) => {
+				const { assetKey, managedKey } = keys[index]!;
+				return createElement('script', {
+					...script.attrs,
+					key: assetKey,
+					'data-tsr-managed-key': managedKey,
+					dangerouslySetInnerHTML: { __html: script.children ?? '' },
+				});
+			})}
+		</>
+	}
+	return Scripts;
+}

package/src/scriptContentBinding.ts

@@ -0,0 +1,43 @@
+'use strong';
+
+import { composeSsrBodyScripts, deepEqual, getSsrBodyScriptParts } from '@tanstack/router-core';
+import { isServer } from '@tanstack/router-core/isServer';
+import type { useRouter as UseRouter } from './context';
+import { splitSlot, subSlot } from './internal';
+import { useStore } from './useStore';
+import type { AnyRouteMatch, RouterManagedTag } from '@tanstack/router-core';
+
+// router-core 1.171.34 composes body scripts through `getSsrBodyScriptParts` +
+// `composeSsrBodyScripts`, and the initial hydration `<Scripts>` take moved from
+// the removed `serverSsr.takeBufferedScripts()` (a single buffered tag) to
+// `serverSsr.takeInitialHydrationScriptTags()` (hydration tags plus the streaming
+// boundary), which `composeSsrBodyScripts` interleaves.
+const routeScriptAttrs = { suppressHydrationWarning: true };
+
+export function createUseScripts(useRouter: typeof UseRouter) {
+	function useScripts(...args: Array<unknown>): Array<RouterManagedTag> {
+		const [, slot] = splitSlot(args);
+		const router = useRouter();
+		const nonce = router.options.ssr?.nonce;
+		const getScripts = (matches: Array<AnyRouteMatch>) =>
+			composeSsrBodyScripts(
+				getSsrBodyScriptParts(matches, router.ssr?.manifest, nonce, routeScriptAttrs),
+			);
+
+		if (isServer ?? router.isServer) {
+			return composeSsrBodyScripts(
+				getSsrBodyScriptParts(
+					router.stores.matches.get(),
+					router.ssr?.manifest,
+					nonce,
+					routeScriptAttrs,
+				),
+				router.serverSsr?.takeInitialHydrationScriptTags(),
+			);
+		}
+
+		return useStore(router.stores.matches, getScripts, deepEqual, subSlot(slot, 'body:scripts'));
+	}
+
+	return useScripts;
+}

package/src/scriptContentUtils.ts

@@ -1,37 +1,4 @@
-import { composeSsrBodyScripts, deepEqual, getSsrBodyScriptParts } from '@tanstack/router-core';
-import { isServer } from '@tanstack/router-core/isServer';
 import { useRouter } from './context';
-import { splitSlot, subSlot } from './internal';
-import { useStore } from './useStore';
-import type { AnyRouteMatch, RouterManagedTag } from '@tanstack/router-core';
+import { createUseScripts } from './scriptContentBinding';
 
-// router-core 1.171.34 composes body scripts through `getSsrBodyScriptParts` +
-// `composeSsrBodyScripts`, and the initial hydration `<Scripts>` take moved from
-// the removed `serverSsr.takeBufferedScripts()` (a single buffered tag) to
-// `serverSsr.takeInitialHydrationScriptTags()` (hydration tags plus the streaming
-// boundary), which `composeSsrBodyScripts` interleaves.
-const routeScriptAttrs = { suppressHydrationWarning: true };
-
-export function useScripts(...args: Array<unknown>): Array<RouterManagedTag> {
-	const [, slot] = splitSlot(args);
-	const router = useRouter();
-	const nonce = router.options.ssr?.nonce;
-	const getScripts = (matches: Array<AnyRouteMatch>) =>
-		composeSsrBodyScripts(
-			getSsrBodyScriptParts(matches, router.ssr?.manifest, nonce, routeScriptAttrs),
-		);
-
-	if (isServer ?? router.isServer) {
-		return composeSsrBodyScripts(
-			getSsrBodyScriptParts(
-				router.stores.matches.get(),
-				router.ssr?.manifest,
-				nonce,
-				routeScriptAttrs,
-			),
-			router.serverSsr?.takeInitialHydrationScriptTags(),
-		);
-	}
-
-	return useStore(router.stores.matches, getScripts, deepEqual, subSlot(slot, 'body:scripts'));
-}
+export const useScripts = createUseScripts(useRouter);

package/src/useStore.ts

@@ -1,3 +1,5 @@
+'use strong';
+
 // The keystone adapter. Everything reactive in the router funnels through
 // `@tanstack/react-store`'s `useStore(atom, selector)`, which is
 // `useSyncExternalStoreWithSelector(atom.subscribe→unsubscribe, atom.get, …,