@octanejs/tanstack-router 0.1.9 → 0.1.11

package/src/hooks.ts

@@ -14,6 +14,33 @@ import { replaceEqualDeep } from '@tanstack/router-core';
 import { useRouter, matchContext } from './context';
 import { useStore } from './useStore';
 import { splitSlot, subSlot } from './internal';
+import type {
+	AnyRouter,
+	FromPathOption,
+	RegisteredRouter,
+	ThrowConstraint,
+	ThrowOrOptional,
+	UseLoaderDataResult,
+	UseLoaderDepsResult,
+	UseNavigateResult,
+	UseParamsResult,
+	UseRouteContextOptions,
+	UseRouteContextResult,
+	UseSearchResult,
+} from '@tanstack/router-core';
+import type {
+	UseLoaderDataOptions,
+	UseLoaderDepsOptions,
+	UseLocationBaseOptions,
+	UseLocationResult,
+	UseMatchOptions,
+	UseMatchResult,
+	UseMatchesBaseOptions,
+	UseMatchesResult,
+	UseParamsOptions,
+	UseSearchOptions,
+} from './routeHookTypes';
+import type { StructuralSharingOption } from './structuralSharing';
 
 // Sentinel store + selection for "no match at this id" (upstream's dummyStore).
 const dummyStore = {
@@ -37,6 +64,24 @@ function useStructuralSharing(opts: any, router: any, slot: symbol | undefined)
 	};
 }
 
+export function useMatch<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TStrict extends boolean = true,
+	TThrow extends boolean = true,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts: UseMatchOptions<
+		TRouter,
+		TFrom,
+		TStrict,
+		ThrowConstraint<TStrict, TThrow>,
+		TSelected,
+		TStructuralSharing
+	>,
+): ThrowOrOptional<UseMatchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>;
+export function useMatch(opts: any, slot: symbol | undefined): any;
 export function useMatch(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -67,6 +112,24 @@ export function useMatch(...args: any[]): any {
 	return undefined;
 }
 
+export function useParams<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TStrict extends boolean = true,
+	TThrow extends boolean = true,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts: UseParamsOptions<
+		TRouter,
+		TFrom,
+		TStrict,
+		ThrowConstraint<TStrict, TThrow>,
+		TSelected,
+		TStructuralSharing
+	>,
+): ThrowOrOptional<UseParamsResult<TRouter, TFrom, TStrict, TSelected>, TThrow>;
+export function useParams(opts: any, slot: symbol | undefined): any;
 export function useParams(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -85,6 +148,24 @@ export function useParams(...args: any[]): any {
 	);
 }
 
+export function useSearch<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TStrict extends boolean = true,
+	TThrow extends boolean = true,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts: UseSearchOptions<
+		TRouter,
+		TFrom,
+		TStrict,
+		ThrowConstraint<TStrict, TThrow>,
+		TSelected,
+		TStructuralSharing
+	>,
+): ThrowOrOptional<UseSearchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>;
+export function useSearch(opts: any, slot: symbol | undefined): any;
 export function useSearch(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -100,6 +181,16 @@ export function useSearch(...args: any[]): any {
 	);
 }
 
+export function useLoaderData<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TStrict extends boolean = true,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts: UseLoaderDataOptions<TRouter, TFrom, TStrict, TSelected, TStructuralSharing>,
+): UseLoaderDataResult<TRouter, TFrom, TStrict, TSelected>;
+export function useLoaderData(opts: any, slot: symbol | undefined): any;
 export function useLoaderData(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -114,6 +205,15 @@ export function useLoaderData(...args: any[]): any {
 	);
 }
 
+export function useLoaderDeps<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts: UseLoaderDepsOptions<TRouter, TFrom, TSelected, TStructuralSharing>,
+): UseLoaderDepsResult<TRouter, TFrom, TSelected>;
+export function useLoaderDeps(opts: any, slot: symbol | undefined): any;
 export function useLoaderDeps(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -127,6 +227,15 @@ export function useLoaderDeps(...args: any[]): any {
 	);
 }
 
+export function useRouteContext<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string | undefined = undefined,
+	TStrict extends boolean = true,
+	TSelected = unknown,
+>(
+	opts: UseRouteContextOptions<TRouter, TFrom, TStrict, TSelected>,
+): UseRouteContextResult<TRouter, TFrom, TStrict, TSelected>;
+export function useRouteContext(opts: any, slot: symbol | undefined): any;
 export function useRouteContext(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -139,6 +248,15 @@ export function useRouteContext(...args: any[]): any {
 	);
 }
 
+export function useLocation<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts?: UseLocationBaseOptions<TRouter, TSelected, TStructuralSharing> &
+		StructuralSharingOption<TRouter, TSelected, TStructuralSharing>,
+): UseLocationResult<TRouter, TSelected>;
+export function useLocation(opts: any, slot: symbol | undefined): any;
 export function useLocation(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -151,6 +269,15 @@ export function useLocation(...args: any[]): any {
 	);
 }
 
+export function useMatches<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts?: UseMatchesBaseOptions<TRouter, TSelected, TStructuralSharing> &
+		StructuralSharingOption<TRouter, TSelected, TStructuralSharing>,
+): UseMatchesResult<TRouter, TSelected>;
+export function useMatches(opts: any, slot: symbol | undefined): any;
 export function useMatches(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -163,6 +290,15 @@ export function useMatches(...args: any[]): any {
 	);
 }
 
+export function useParentMatches<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts?: UseMatchesBaseOptions<TRouter, TSelected, TStructuralSharing> &
+		StructuralSharingOption<TRouter, TSelected, TStructuralSharing>,
+): UseMatchesResult<TRouter, TSelected>;
+export function useParentMatches(opts: any, slot: symbol | undefined): any;
 export function useParentMatches(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -182,6 +318,15 @@ export function useParentMatches(...args: any[]): any {
 	);
 }
 
+export function useChildMatches<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TSelected = unknown,
+	TStructuralSharing extends boolean = boolean,
+>(
+	opts?: UseMatchesBaseOptions<TRouter, TSelected, TStructuralSharing> &
+		StructuralSharingOption<TRouter, TSelected, TStructuralSharing>,
+): UseMatchesResult<TRouter, TSelected>;
+export function useChildMatches(opts: any, slot: symbol | undefined): any;
 export function useChildMatches(...args: any[]): any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -200,6 +345,11 @@ export function useChildMatches(...args: any[]): any {
 
 // Returns a STABLE navigate function (upstream useCallback([from, router])) that
 // forwards to `router.navigate`, defaulting `from` to the hook's option.
+export function useNavigate<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TDefaultFrom extends string = string,
+>(options?: { from?: FromPathOption<TRouter, TDefaultFrom> }): UseNavigateResult<TDefaultFrom>;
+export function useNavigate(options: any, slot: symbol | undefined): (to: any) => any;
 export function useNavigate(...args: any[]): (to: any) => any {
 	const [user, slot] = splitSlot(args);
 	const opts = user[0] ?? {};
@@ -213,6 +363,7 @@ export function useNavigate(...args: any[]): (to: any) => any {
 
 // True when the current history entry isn't the first (there is somewhere to go
 // back to) — per upstream useCanGoBack (location.state.__TSR_index !== 0).
+export function useCanGoBack(): boolean;
 export function useCanGoBack(...args: any[]): boolean {
 	const [, slot] = splitSlot(args);
 	const router = useRouter();

package/src/index.ts

@@ -19,9 +19,11 @@
 // createLink/useLinkProps, navigation blocking (useBlocker/Block), the full
 // read-hook set (useMatch and friends, nearest-match resolution via
 // matchContext), Route/getRouteApi hook accessors, Await/useAwaited, lazy
-// routes, and search validation/middleware from core. Deferred: file-based
-// routing + codegen (`createFileRoute`, @tanstack/router-plugin), SSR entries
-// (RouterServer/RouterClient, HeadContent/Scripts), and devtools.
+// routes, search validation/middleware from core, generated file routes,
+// document/head assets, and Start-compatible SSR/hydration. Devtools remain
+// separate.
+import './frameworkTypes';
+
 export * from '@tanstack/router-core';
 export {
 	createHistory,
@@ -48,15 +50,39 @@ export {
 	createRoute,
 	createRootRoute,
 	createRootRouteWithContext,
+	rootRouteWithContext,
 	createRouteMask,
 	getRouteApi,
 	Route,
 	RootRoute,
 	RouteApi,
+	NotFoundRoute,
+} from './route';
+export {
+	FileRoute,
+	createFileRoute,
+	FileRouteLoader,
+	LazyRoute,
+	createLazyRoute,
+	createLazyFileRoute,
+} from './fileRoute';
+// Framework-facing component types (react-router parity, on octane renderables).
+// route.ts also narrows router-core's *Extensions interfaces to these via module
+// augmentation — mirroring upstream's route.tsx/router.tsx `declare module`.
+export type {
+	DefaultRouteTypes,
+	SyncRouteComponent,
+	AsyncRouteComponent,
+	RouteComponent,
+	RouteTypes,
+	ErrorRouteComponent,
+	NotFoundRouteComponent,
+	AnyRootRoute,
 } from './route';
 export { routerContext, getRouterContext, matchContext, useRouter } from './context';
 export { useStore } from './useStore';
 export { useRouterState } from './useRouterState';
+export type { UseRouterStateOptions, UseRouterStateResult } from './useRouterState';
 export {
 	useMatch,
 	useLocation,
@@ -71,14 +97,59 @@ export {
 	useNavigate,
 	useCanGoBack,
 } from './hooks';
+export type {
+	UseLoaderDataBaseOptions,
+	UseLoaderDataOptions,
+	UseLoaderDataRoute,
+	UseLoaderDepsBaseOptions,
+	UseLoaderDepsOptions,
+	UseLoaderDepsRoute,
+	UseLocationBaseOptions,
+	UseLocationResult,
+	UseMatchBaseOptions,
+	UseMatchOptions,
+	UseMatchResult,
+	UseMatchRoute,
+	UseMatchesBaseOptions,
+	UseMatchesResult,
+	UseParamsBaseOptions,
+	UseParamsOptions,
+	UseParamsRoute,
+	UseRouteContextRoute,
+	UseSearchBaseOptions,
+	UseSearchOptions,
+	UseSearchRoute,
+} from './routeHookTypes';
 export { useAwaited } from './useAwaited';
+export type { AwaitOptions } from './useAwaited';
 export { useLinkProps, createLink, linkOptions } from './link';
+export type { LinkOptionsFn, LinkOptionsFnOptions } from './link';
+export type {
+	ActiveLinkOptionProps,
+	ActiveLinkOptions,
+	CreateLinkProps,
+	LinkComponent,
+	LinkComponentProps,
+	LinkComponentRoute,
+	LinkProps,
+	LinkPropsChildren,
+	OctaneAnchorProps,
+	OctaneRenderable,
+	UseLinkPropsOptions,
+} from './linkTypes';
 export { useBlocker, Block } from './useBlocker.tsrx';
+export type {
+	BlockerResolver,
+	ShouldBlockFn,
+	ShouldBlockFnArgs,
+	UseBlockerOpts,
+} from './useBlocker.tsrx';
 export { useMatchRoute, MatchRoute } from './MatchRoute.tsrx';
 export { useElementScrollRestoration } from './useElementScrollRestoration';
 export { lazyRouteComponent } from './lazyRouteComponent';
 
 export { RouterProvider, RouterContextProvider } from './RouterProvider.tsrx';
+export type { RouterProps } from './RouterProvider.tsrx';
 export { Outlet } from './Outlet.tsrx';
 export { Link } from './Link.tsrx';
 export { Navigate } from './Navigate.tsrx';
@@ -89,3 +160,24 @@ export { Match } from './Match.tsrx';
 export { CatchBoundary, ErrorComponent } from './CatchBoundary.tsrx';
 export { CatchNotFound, DefaultGlobalNotFound } from './not-found.tsrx';
 export { ClientOnly, useHydrated } from './ClientOnly.tsrx';
+export { HeadContent } from './HeadContent.tsrx';
+export type { HeadContentProps } from './HeadContent.tsrx';
+export { Scripts } from './Scripts.tsrx';
+export { ScriptOnce } from './ScriptOnce.tsrx';
+export { Asset } from './Asset.tsrx';
+export type { AssetProps } from './Asset.tsrx';
+export { useTags } from './headContentUtils';
+export { Html } from './Html';
+export type { HtmlProps } from './Html';
+export { Head } from './Head';
+export type { HeadProps } from './Head';
+export { Body } from './Body';
+export type { BodyProps } from './Body';
+export type { OctaneElementAttributes, OctaneScriptAttributes } from './frameworkTypes';
+export type {
+	InferStructuralSharing,
+	ValidateLinkOptions,
+	ValidateLinkOptionsArray,
+	ValidateUseParamsOptions,
+	ValidateUseSearchOptions,
+} from './typePrimitives';

package/src/lazyRouteComponent.ts

@@ -6,6 +6,7 @@
 //   createRoute({ path: 'item/$id', component: lazyRouteComponent(() => import('./Item')) })
 import { use, createElement } from 'octane';
 import { isModuleNotFoundError } from '@tanstack/router-core';
+import { toExternalHydrationThenable } from './externalHydration';
 
 export function lazyRouteComponent(
 	importer: () => Promise<any>,
@@ -48,7 +49,7 @@ export function lazyRouteComponent(
 			throw new Promise(() => {});
 		}
 		if (error) throw error;
-		if (!comp) use(load());
+		if (!comp) use(toExternalHydrationThenable(load()));
 		return createElement(comp, props);
 	};
 	Lazy.preload = load;

package/src/link.ts

@@ -9,6 +9,7 @@
 // with replace/resetScroll/hashScrollIntoView/viewTransition/startTransition/
 // ignoreBlocker forwarded), and data-status/data-transitioning reflection.
 import { useRef, useState, useEffect, useCallback, flushSync, createElement } from 'octane';
+import type { ComponentBody } from 'octane';
 import {
 	deepEqual,
 	exactPathTest,
@@ -22,6 +23,9 @@ import { useRouter } from './context';
 import { useStore } from './useStore';
 import { splitSlot, subSlot } from './internal';
 import { Link } from './Link.tsrx';
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core';
+import type { LinkComponent, OctaneAnchorProps, UseLinkPropsOptions } from './linkTypes';
+import type { ValidateLinkOptions, ValidateLinkOptionsArray } from './typePrimitives';
 
 const STATIC_EMPTY_OBJECT = {};
 const STATIC_ACTIVE_OBJECT = { class: 'active' };
@@ -82,6 +86,13 @@ function mergeStyles(base: any, active: any, inactive: any): any {
 	return Object.assign({}, ...parts);
 }
 
+export function useLinkProps<
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string = string,
+	const TTo extends string | undefined = undefined,
+	const TMaskFrom extends string = TFrom,
+	const TMaskTo extends string = '',
+>(options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): OctaneAnchorProps;
 export function useLinkProps(...args: any[]): Record<string, any> {
 	const [user, slot] = splitSlot(args);
 	const options = (user[0] ?? {}) as Record<string, any>;
@@ -371,13 +382,23 @@ export function useLinkProps(...args: any[]): Record<string, any> {
 
 // Wrap a design-system component so it navigates like <Link> — the component
 // receives the fully-built link props (href, handlers, data-status, …).
+export function createLink<const TComp extends ComponentBody<any>>(
+	Comp: TComp,
+): LinkComponent<TComp>;
 export function createLink(Comp: any): any {
 	return function CreatedLink(props: any) {
 		return createElement(Link as any, { ...props, _asChild: Comp });
 	};
 }
 
-// Identity helper for pre-validating navigation options (type-level upstream).
-export function linkOptions(options: any): any {
-	return options;
-}
+export type LinkOptionsFnOptions<TOptions, TComp, TRouter extends AnyRouter = RegisteredRouter> =
+	TOptions extends ReadonlyArray<any>
+		? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>
+		: ValidateLinkOptions<TRouter, TOptions, string, TComp>;
+
+export type LinkOptionsFn<TComp> = <const TOptions, TRouter extends AnyRouter = RegisteredRouter>(
+	options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,
+) => TOptions;
+
+// Identity helper for pre-validating and reusing navigation options.
+export const linkOptions: LinkOptionsFn<'a'> = (options) => options as any;

package/src/linkTypes.ts

@@ -0,0 +1,96 @@
+import type { ComponentBody, ElementDescriptor } from 'octane';
+import type { Octane } from 'octane/jsx-runtime';
+import type { AnyRouter, LinkOptions, RegisteredRouter, RoutePaths } from '@tanstack/router-core';
+export type OctaneAnchorProps = Octane.JSX.IntrinsicElements['a'];
+
+export type OctaneRenderable =
+	| ElementDescriptor<unknown>
+	| string
+	| number
+	| bigint
+	| boolean
+	| null
+	| undefined
+	| ReadonlyArray<OctaneRenderable>;
+
+type OctaneComponentProps<TComp> = TComp extends keyof Octane.JSX.IntrinsicElements
+	? Octane.JSX.IntrinsicElements[TComp]
+	: TComp extends ComponentBody<infer TProps, infer _TExtra>
+		? TProps
+		: never;
+
+export type UseLinkPropsOptions<
+	TRouter extends AnyRouter = RegisteredRouter,
+	TFrom extends RoutePaths<TRouter['routeTree']> | string = string,
+	TTo extends string | undefined = '.',
+	TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,
+	TMaskTo extends string = '.',
+> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & OctaneAnchorProps;
+
+export type ActiveLinkOptions<
+	TComp = 'a',
+	TRouter extends AnyRouter = RegisteredRouter,
+	TFrom extends string = string,
+	TTo extends string | undefined = '.',
+	TMaskFrom extends string = TFrom,
+	TMaskTo extends string = '.',
+> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & ActiveLinkOptionProps<TComp>;
+
+type ActiveLinkProps<TComp> = Partial<
+	OctaneComponentProps<TComp> & {
+		[key: `data-${string}`]: unknown;
+	}
+>;
+
+export interface ActiveLinkOptionProps<TComp = 'a'> {
+	activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>);
+	inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>);
+}
+
+export type LinkProps<
+	TComp = 'a',
+	TRouter extends AnyRouter = RegisteredRouter,
+	TFrom extends string = string,
+	TTo extends string | undefined = '.',
+	TMaskFrom extends string = TFrom,
+	TMaskTo extends string = '.',
+> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & LinkPropsChildren;
+
+export interface LinkPropsChildren {
+	children?:
+		| OctaneRenderable
+		| ((state: { isActive: boolean; isTransitioning: boolean }) => unknown);
+}
+
+export type CreateLinkProps = LinkProps<any, any, string, string, string, string>;
+
+export type LinkComponentProps<
+	TComp = 'a',
+	TRouter extends AnyRouter = RegisteredRouter,
+	TFrom extends string = string,
+	TTo extends string | undefined = '.',
+	TMaskFrom extends string = TFrom,
+	TMaskTo extends string = '.',
+> = Omit<OctaneComponentProps<TComp>, keyof CreateLinkProps> &
+	LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>;
+
+export type LinkComponent<in out TComp, in out TDefaultFrom extends string = string> = <
+	TRouter extends AnyRouter = RegisteredRouter,
+	const TFrom extends string = TDefaultFrom,
+	const TTo extends string | undefined = undefined,
+	const TMaskFrom extends string = TFrom,
+	const TMaskTo extends string = '',
+>(
+	props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,
+) => void;
+
+export interface LinkComponentRoute<in out TDefaultFrom extends string = string> {
+	defaultFrom: TDefaultFrom;
+	<
+		TRouter extends AnyRouter = RegisteredRouter,
+		const TTo extends string | undefined = undefined,
+		const TMaskTo extends string = '',
+	>(
+		props: LinkComponentProps<'a', TRouter, this['defaultFrom'], TTo, this['defaultFrom'], TMaskTo>,
+	): void;
+}

package/src/not-found.tsrx

@@ -4,33 +4,46 @@
 // up; the reset key is `not-found-${pathname}-${status}` so navigating away (or a
 // new load settling) clears the not-found UI.
 import { isNotFound } from '@tanstack/router-core';
+import type { ErrorComponentProps, NotFoundError } from '@tanstack/router-core';
+import type { OctaneNode } from 'octane';
+import type { ErrorInfo } from './route.ts';
 import { useRouter } from './context.ts';
 import { useStore } from './useStore.ts';
 import { CatchBoundary } from './CatchBoundary.tsrx';
 
-function NotFoundFallback(props) {
+function NotFoundFallback(props: {
+	error: unknown;
+	render?: (error: NotFoundError) => OctaneNode;
+}) {
 	if (isNotFound(props.error)) {
 		return props.render ? props.render(props.error) : null;
 	}
 	throw props.error;
 }
 
-export function CatchNotFound(props) @{
+export function CatchNotFound(props: {
+	fallback?: (error: NotFoundError) => OctaneNode;
+	onCatch?: (error: Error, errorInfo: ErrorInfo) => void;
+	children: OctaneNode;
+}) @{
 	const router = useRouter();
-	const pathname = useStore(router.stores.location, (l) => l.pathname);
-	const status = useStore(router.stores.status, (s) => s);
+	const pathname = useStore(router.stores.location, (l: any) => l.pathname as string);
+	const status = useStore(router.stores.status, (s: any) => s as string);
 	const resetKey = `not-found-${pathname}-${status}`;
 
 	<CatchBoundary
 		getResetKey={() => resetKey}
-		onCatch={(error, errorInfo) => {
+		onCatch={(error: Error, errorInfo: ErrorInfo) => {
 			if (isNotFound(error)) {
 				if (props.onCatch) props.onCatch(error, errorInfo);
 			} else {
 				throw error;
 			}
 		}}
-		errorComponent={(p) => NotFoundFallback({ error: p.error, render: props.fallback })}
+		errorComponent={(p: ErrorComponentProps) => NotFoundFallback({
+			error: p.error,
+			render: props.fallback,
+		})}
 	>{props.children}</CatchBoundary>
 }
 

package/src/not-found.tsrx.d.ts

@@ -1,7 +1,10 @@
 // Type declaration for the .tsrx components (resolved by relative path).
+import type { NotFoundError } from '@tanstack/router-core';
+import type { ErrorInfo } from './route';
+
 export declare const CatchNotFound: (props: {
-	fallback?: (error: any) => unknown;
-	onCatch?: (error: any, errorInfo: { componentStack: string }) => void;
+	fallback?: (error: NotFoundError) => unknown;
+	onCatch?: (error: Error, errorInfo: ErrorInfo) => void;
 	children?: unknown;
 }) => unknown;
 export declare const DefaultGlobalNotFound: () => unknown;

package/src/octane-compiler.d.ts

@@ -0,0 +1,12 @@
+declare module 'octane/compiler/volar' {
+	export interface VolarCompileResult {
+		code: string;
+		mappings: Array<unknown>;
+		cssMappings: Array<unknown>;
+		scriptMappings: Array<unknown>;
+		sourceAst: unknown;
+		errors: Array<unknown>;
+	}
+
+	export function compileToVolarMappings(source: string, filename?: string): VolarCompileResult;
+}