@tanstack/router-core 0.0.1-beta.23 → 0.0.1-beta.25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.23",
+  "version": "0.0.1-beta.25",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/frameworks.ts

@@ -4,6 +4,7 @@ export interface FrameworkGenerics {
   // pre-defined as constraints:
   //
   // Component: any
+  // ErrorComponent: any
 }
 
 export type GetFrameworkGeneric<U> = U extends keyof FrameworkGenerics

package/src/link.ts

@@ -142,8 +142,9 @@ type SearchParamOptions<
   TTo,
   TFromSchema = RouteInfoByPath<TAllRouteInfo, TFrom>['fullSearchSchema'],
   TToSchema = RouteInfoByPath<TAllRouteInfo, TTo>['fullSearchSchema'],
-> = StartsWith<TFrom, TTo> extends true // If the next route search extend or cover the from route, params will be optional
-  ? {
+> = StartsWith<TFrom, TTo> extends true
+  ? // If the next route search extend or cover the from route, params will be optional
+    {
       search?: SearchReducer<TFromSchema, TToSchema>
     }
   : // Optional search params? Allow it

package/src/route.ts

@@ -29,6 +29,7 @@ export interface Route<
   TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,
   TRouteInfo extends AnyRouteInfo = RouteInfo,
 > {
+  routeInfo: TRouteInfo
   routeId: TRouteInfo['id']
   routeRouteId: TRouteInfo['routeId']
   routePath: TRouteInfo['path']
@@ -56,7 +57,10 @@ export interface Route<
     opts?: MatchRouteOptions,
   ) => RouteInfoByPath<TAllRouteInfo, TResolved>['allParams']
   navigate: <TTo extends string = '.'>(
-    options: Omit<LinkOptions<TAllRouteInfo, TRouteInfo['id'], TTo>, 'from'>,
+    options: Omit<
+      LinkOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>,
+      'from'
+    >,
   ) => Promise<void>
   action: unknown extends TRouteInfo['actionResponse']
     ?
@@ -185,6 +189,7 @@ export function createRoute<
     })()
 
   let route: Route<TAllRouteInfo, TRouteInfo> = {
+    routeInfo: undefined!,
     routeId: id,
     routeRouteId: routeId,
     routePath,

package/src/routeConfig.ts

@@ -114,7 +114,7 @@ export type RouteOptions<
   // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`
   component?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>
   // The content to be rendered when the route encounters an error
-  errorComponent?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>
+  errorComponent?: GetFrameworkGeneric<'ErrorComponent'> // , NoInfer<TParentLoaderData>>
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
   pendingComponent?: GetFrameworkGeneric<'Component'> //, NoInfer<TParentLoaderData>>
   // An asynchronous function responsible for preparing or fetching data for the route before it is rendered

package/src/routeMatch.ts

@@ -30,9 +30,9 @@ export interface RouteMatch<
   isFetching: boolean
   invalidAt: number
   __: {
-    component?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>
-    errorComponent?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>
-    pendingComponent?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>
+    component?: GetFrameworkGeneric<'Component'>
+    errorComponent?: GetFrameworkGeneric<'ErrorComponent'>
+    pendingComponent?: GetFrameworkGeneric<'Component'>
     loadPromise?: Promise<void>
     componentsPromise?: Promise<void>
     dataPromise?: Promise<TRouteInfo['routeLoaderData']>

package/src/router.ts

@@ -91,7 +91,7 @@ export interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
   defaultPreloadGcMaxAge?: number
   defaultPreloadDelay?: number
   defaultComponent?: GetFrameworkGeneric<'Component'>
-  defaultErrorComponent?: GetFrameworkGeneric<'Component'>
+  defaultErrorComponent?: GetFrameworkGeneric<'ErrorComponent'>
   defaultPendingComponent?: GetFrameworkGeneric<'Component'>
   defaultLoaderMaxAge?: number
   defaultLoaderGcMaxAge?: number