@tanstack/router-core 0.0.1-beta.165 → 0.0.1-beta.166

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.165",
+  "version": "0.0.1-beta.166",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -43,7 +43,7 @@
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/react-store": "0.0.1-beta.165"
+    "@tanstack/react-store": "0.0.1-beta.166"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/route.ts

@@ -126,6 +126,30 @@ export type RouteProps<
   }) => TSelected
 }
 
+export type PendingRouteProps<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TContext extends AnyContext = AnyContext,
+> = Omit<
+  RouteProps<any, TFullSearchSchema, TAllParams, TRouteContext, TContext>,
+  'useLoader'
+>
+
+export type ErrorRouteProps<
+  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,
+  TAllParams extends AnyPathParams = AnyPathParams,
+  TRouteContext extends AnyContext = AnyContext,
+  TContext extends AnyContext = AnyContext,
+> = PendingRouteProps<
+  TFullSearchSchema,
+  TAllParams,
+  TRouteContext,
+  TContext
+> & {
+  error: unknown
+}
+
 export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
@@ -284,19 +308,11 @@ export type UpdatableRouteOptions<
   >
   // The content to be rendered when the route encounters an error
   errorComponent?: RegisteredRouteErrorComponent<
-    { error: unknown } & Partial<
-      RouteProps<
-        TLoader,
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TContext
-      >
-    >
+    ErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>
   > //
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
   pendingComponent?: RegisteredRouteComponent<
-    RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext>
+    PendingRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TContext>
   >
   // Filter functions that can manipulate search params *before* they are passed to links and navigate
   // calls that match this route.

package/src/router.ts

@@ -29,6 +29,7 @@ import {
   RouteProps,
   RegisteredRouteComponent,
   RegisteredRouteErrorComponent,
+  ErrorRouteProps,
 } from './route'
 import {
   RoutesById,
@@ -159,7 +160,7 @@ export interface RouterOptions<
     RouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>
   >
   defaultErrorComponent?: RegisteredRouteErrorComponent<
-    RouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>
+    ErrorRouteProps<AnySearchSchema, AnyPathParams, AnyContext, AnyContext>
   >
   defaultPendingComponent?: RegisteredRouteComponent<
     RouteProps<unknown, AnySearchSchema, AnyPathParams, AnyContext, AnyContext>