@octanejs/tanstack-router 0.1.11 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/tanstack-router",
-  "version": "0.1.11",
+  "version": "0.1.15",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -58,16 +58,16 @@
     "isbot": "^5.1.22"
   },
   "peerDependencies": {
-    "octane": "0.1.12"
+    "octane": "0.1.16"
   },
   "devDependencies": {
-    "@tanstack/react-router": "1.170.16",
-    "@tsrx/react": "^0.2.44",
+    "@tanstack/react-router": "1.170.18",
+    "@tsrx/react": "^0.2.50",
     "esbuild": "^0.28.1",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "vitest": "^4.1.9",
-    "octane": "0.1.12"
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "vitest": "^4.1.10",
+    "octane": "0.1.16"
   },
   "scripts": {
     "test": "vitest run"

package/src/Asset.tsrx

@@ -4,7 +4,8 @@ import type { RouterManagedTag } from '@tanstack/router-core';
 import { useRouter } from './context.ts';
 import { useHydrated } from './ClientOnly.tsrx';
 
-export type AssetProps = RouterManagedTag & {
+export type AssetProps =
+	RouterManagedTag & {
 		assetKey: string;
 		target: 'head' | 'body';
 	};
@@ -70,11 +71,9 @@ function mountAsset(props: AssetProps) {
 
 export function Asset(props: AssetProps) @{
 	const router = useRouter();
-	const server = isServer ?? router.isServer;
 	const hydrated = useHydrated();
-	const renderElement = server || props.target === 'body' && !hydrated;
 
-	if (!server) {
+	if (!(isServer ?? router.isServer)) {
 		useLayoutEffect(() => mountAsset(props), [
 			props.assetKey,
 			props.attrs,
@@ -84,7 +83,7 @@ export function Asset(props: AssetProps) @{
 		]);
 	}
 
-	@if (renderElement) {
+	@if ((isServer ?? router.isServer) || props.target === 'body' && !hydrated) {
 		@switch (props.tag) {
 			@case 'title': {
 				<title {...props.attrs} data-tsr-managed-key={props.assetKey}>

package/src/Body.ts

@@ -18,9 +18,8 @@ const HydrationRangeOwner: ComponentBody<Pick<BodyProps, 'children'>> = (props)
 
 export const Body: ComponentBody<BodyProps> = (props) => {
 	const router = useRouter();
-	const server = isServer ?? router.isServer;
 	const { children, ...attrs } = props;
-	if (server) {
+	if (isServer ?? router.isServer) {
 		return createElement(
 			'body',
 			attrs,

package/src/CatchBoundary.tsrx

@@ -97,9 +97,7 @@ export function ErrorComponent(props: {
 					style="font-size:.7em;border:1px solid red;border-radius:.25rem;padding:.3rem;color:red;overflow:auto"
 				>
 					@if (props.error?.message) {
-						<code>
-							{props.error.message as string}
-						</code>
+						<code>{props.error.message as string}</code>
 					}
 				</pre>
 			</div>

package/src/Head.ts

@@ -10,9 +10,8 @@ export interface HeadProps {
 
 export const Head: ComponentBody<HeadProps> = (props) => {
 	const router = useRouter();
-	const server = isServer ?? router.isServer;
 	const { children, ...attrs } = props;
-	if (server) {
+	if (isServer ?? router.isServer) {
 		return createElement('head', attrs, children);
 	}
 	if (typeof document !== 'undefined') {

package/src/Html.ts

@@ -10,9 +10,8 @@ export interface HtmlProps {
 
 export const Html: ComponentBody<HtmlProps> = (props) => {
 	const router = useRouter();
-	const server = isServer ?? router.isServer;
 	const { children, ...attrs } = props;
-	if (server) {
+	if (isServer ?? router.isServer) {
 		return createElement('html', attrs, children);
 	}
 	return children;

package/src/Link.tsrx

@@ -16,9 +16,15 @@ import type { LinkComponentProps, OctaneAnchorProps, UseLinkPropsOptions } from
 // Keep the generic implementation signature visible to `.tsrx` consumers so
 // route-aware `to`/`params`/`search` inference and native anchor event types are
 // available before declaration emit.
-export function Link<TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends | string
-| undefined = undefined, TMaskFrom extends string = TFrom, TMaskTo extends string = ''>(props: LinkComponentProps<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) @{
-	const { _asChild: AsChild, children, ...rest } = props as typeof props & {
+export function Link<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TFrom extends string = string,
+	TTo extends string | undefined = undefined,
+	TMaskFrom extends string = TFrom,
+	TMaskTo extends string = '',
+>(props: LinkComponentProps<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) @{
+	const { _asChild: AsChild, children, ...rest } = props as
+		typeof props & {
 			_asChild?: any;
 		};
 	const linkProps = useLinkProps(

package/src/RouterProvider.tsrx

@@ -14,7 +14,8 @@ import { SafeFragment } from './SafeFragment.tsrx';
 // Upstream's `RouterProps` is `Omit<RouterOptions<…>, 'context'> & { router }` —
 // extra props reconfigure the instance via `router.update()`. The octane binding
 // keeps the router-typed member strict and the option passthrough permissive.
-export type RouterProps = {
+export type RouterProps =
+	{
 		router: AnyRouter;
 		context?: Record<string, any>;
 	} & Record<string, any>;

package/src/ScriptOnce.tsrx

@@ -4,13 +4,12 @@ import { useRouter } from './context.ts';
 
 export function ScriptOnce(props: { children: string }) @{
 	const router = useRouter();
-	const server = isServer ?? router.isServer;
 	const [hydrating, setHydrating] = useState(true);
 	useEffect(() => {
 		setHydrating(false);
 	}, []);
 
-	@if (server || hydrating) {
+	@if ((isServer ?? router.isServer) || hydrating) {
 		<script
 			nonce={router.options.ssr?.nonce}
 			dangerouslySetInnerHTML={{

package/src/context.ts

@@ -20,8 +20,7 @@ export function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
 }): TRouter;
 export function useRouter(...args: unknown[]): AnyRouter {
 	const opts = (args.length && typeof args[0] !== 'symbol' ? args[0] : undefined) as
-		| { router?: AnyRouter; warn?: boolean }
-		| undefined;
+		{ router?: AnyRouter; warn?: boolean } | undefined;
 	const ctx = useContext(routerContext);
 	const router = opts?.router ?? ctx;
 	if (!router && opts?.warn !== false) {

package/src/generator-plugin.js

@@ -18,6 +18,14 @@ import { compileToVolarMappings } from 'octane/compiler/volar';
  * @returns {string}
  */
 export function maskOctaneRouteSource(source, filename = 'route.tsrx') {
+	// Only .tsrx carries the native template dialect. Plain .ts/.tsx route
+	// files (robots.txt.ts-style server routes, shared route helpers) must
+	// pass through untouched — the TSRX parser is not a general TS parser and
+	// rejects valid TS it was never meant to see.
+	if (!filename.endsWith('.tsrx')) {
+		return source;
+	}
+
 	const { sourceAst } = compileToVolarMappings(source, filename);
 	const output = source.split('');
 

package/src/linkTypes.ts

@@ -58,8 +58,7 @@ export type LinkProps<
 
 export interface LinkPropsChildren {
 	children?:
-		| OctaneRenderable
-		| ((state: { isActive: boolean; isTransitioning: boolean }) => unknown);
+		OctaneRenderable | ((state: { isActive: boolean; isTransitioning: boolean }) => unknown);
 }
 
 export type CreateLinkProps = LinkProps<any, any, string, string, string, string>;

package/src/useBlocker.tsrx

@@ -180,7 +180,8 @@ export function useBlocker(
 
 // Upstream's PromptProps: the blocker options plus optional children (a render
 // prop receiving the resolver, or plain renderables).
-export type PromptProps = (UseBlockerOpts | LegacyBlockerOpts) & {
+export type PromptProps =
+	(UseBlockerOpts | LegacyBlockerOpts) & {
 		children?: OctaneNode | ((params: BlockerResolver) => OctaneNode);
 	};