@tanstack/react-router 0.0.1-beta.193 → 0.0.1-beta.195

package/package.json

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

package/src/react.tsx

@@ -22,7 +22,6 @@ import {
   ResolveId,
   AnySearchSchema,
   ParsePathParams,
-  MergeFromFromParent,
   RouteContext,
   AnyContext,
   UseLoaderResult,
@@ -39,8 +38,13 @@ import {
   AnyPathParams,
   Expand,
   ResolveAllParams,
+  DeepMergeAll,
+  IsAny,
 } from '@tanstack/router-core'
 
+const useLayoutEffect =
+  typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect
+
 declare module '@tanstack/router-core' {
   interface RouterOptions<
     TRouteTree extends AnyRoute,
@@ -56,44 +60,30 @@ declare module '@tanstack/router-core' {
     TLoader = unknown,
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     RouteComponent: RouteComponent<
-      RouteProps<
-        TLoader,
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TAllContext
-      >
+      RouteProps<TLoader, TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
   interface RegisterErrorRouteComponent<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     ErrorRouteComponent: RouteComponent<
-      ErrorRouteProps<TFullSearchSchema, TAllParams, TRouteContext, TAllContext>
+      ErrorRouteProps<TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
   interface RegisterPendingRouteComponent<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     PendingRouteComponent: RouteComponent<
-      PendingRouteProps<
-        TFullSearchSchema,
-        TAllParams,
-        TRouteContext,
-        TAllContext
-      >
+      PendingRouteProps<TFullSearchSchema, TAllParams, TAllContext>
     >
   }
 
@@ -124,12 +114,15 @@ declare module '@tanstack/router-core' {
       TParentRoute,
       TParams
     >,
-    TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],
-    TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'],
     TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
-    TAllContext extends RouteConstraints['TAllContext'] = MergeFromFromParent<
-      TParentRoute['types']['context'],
-      TRouteContext
+    TAllContext extends RouteConstraints['TAllContext'] = Expand<
+      DeepMergeAll<
+        [
+          IsAny<TParentRoute['types']['context'], {}>,
+          TLoaderContext,
+          TRouteContext,
+        ]
+      >
     >,
     TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
     TChildren extends RouteConstraints['TChildren'] = unknown,
@@ -141,12 +134,9 @@ declare module '@tanstack/router-core' {
     useLoader: <TSelected = TLoader>(opts?: {
       select?: (search: TLoader) => TSelected
     }) => UseLoaderResult<TSelected>
-    useContext: <TSelected = TAllContext>(opts?: {
+    useRouteContext: <TSelected = TAllContext>(opts?: {
       select?: (search: TAllContext) => TSelected
     }) => TSelected
-    useRouteContext: <TSelected = TRouteContext>(opts?: {
-      select?: (search: TRouteContext) => TSelected
-    }) => TSelected
     useSearch: <TSelected = TFullSearchSchema>(opts?: {
       select?: (search: TFullSearchSchema) => TSelected
     }) => TSelected
@@ -159,28 +149,19 @@ declare module '@tanstack/router-core' {
     TLoader = unknown,
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
-    RouteProps: RouteProps<
-      TLoader,
-      TFullSearchSchema,
-      TAllParams,
-      TRouteContext,
-      TAllContext
-    >
+    RouteProps: RouteProps<TLoader, TFullSearchSchema, TAllParams, TAllContext>
   }
 
   interface RegisterPendingRouteProps<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     PendingRouteProps: PendingRouteProps<
       TFullSearchSchema,
       TAllParams,
-      TRouteContext,
       TAllContext
     >
   }
@@ -188,7 +169,6 @@ declare module '@tanstack/router-core' {
   interface RegisterErrorRouteProps<
     TFullSearchSchema extends Record<string, any> = AnySearchSchema,
     TAllParams extends AnyPathParams = AnyPathParams,
-    TRouteContext extends Record<string, any> = AnyContext,
     TAllContext extends Record<string, any> = AnyContext,
   > {
     ErrorRouteProps: ErrorRouteProps
@@ -199,7 +179,6 @@ export type RouteProps<
   TLoader = unknown,
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = {
   useLoader: <TSelected = TLoader>(opts?: {
@@ -208,12 +187,9 @@ export type RouteProps<
   useMatch: <TSelected = TAllContext>(opts?: {
     select?: (search: TAllContext) => TSelected
   }) => TSelected
-  useContext: <TSelected = TAllContext>(opts?: {
+  useRouteContext: <TSelected = TAllContext>(opts?: {
     select?: (search: TAllContext) => TSelected
   }) => TSelected
-  useRouteContext: <TSelected = TRouteContext>(opts?: {
-    select?: (search: TRouteContext) => TSelected
-  }) => TSelected
   useSearch: <TSelected = TFullSearchSchema>(opts?: {
     select?: (search: TFullSearchSchema) => TSelected
   }) => TSelected
@@ -225,35 +201,21 @@ export type RouteProps<
 export type ErrorRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = {
   error: unknown
   info: { componentStack: string }
 } & Omit<
-  RouteProps<
-    unknown,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >,
+  RouteProps<unknown, TFullSearchSchema, TAllParams, TAllContext>,
   'useLoader'
 >
 
 export type PendingRouteProps<
   TFullSearchSchema extends Record<string, any> = AnySearchSchema,
   TAllParams extends AnyPathParams = AnyPathParams,
-  TRouteContext extends Record<string, any> = AnyContext,
   TAllContext extends Record<string, any> = AnyContext,
 > = Omit<
-  RouteProps<
-    unknown,
-    TFullSearchSchema,
-    TAllParams,
-    TRouteContext,
-    TAllContext
-  >,
+  RouteProps<unknown, TFullSearchSchema, TAllParams, TAllContext>,
   'useLoader'
 >
 
@@ -265,19 +227,11 @@ Route.__onInit = (route) => {
     useLoader: (opts = {}) => {
       return useLoader({ ...opts, from: route.id }) as any
     },
-    useContext: (opts: any = {}) => {
-      return useMatch({
-        ...opts,
-        from: route.id,
-        select: (d: any) => (opts?.select ? opts.select(d.context) : d.context),
-      } as any)
-    },
     useRouteContext: (opts: any = {}) => {
       return useMatch({
         ...opts,
         from: route.id,
-        select: (d: any) =>
-          opts?.select ? opts.select(d.routeContext) : d.routeContext,
+        select: (d: any) => (opts?.select ? opts.select(d.context) : d.context),
       } as any)
     },
     useSearch: (opts = {}) => {
@@ -369,8 +323,7 @@ export type MakeUseMatchRouteOptions<
   TTo extends string = '',
   TMaskFrom extends RoutePaths<TRouteTree> = '/',
   TMaskTo extends string = '',
-> = ToOptions<RegisteredRouter['routeTree'], TFrom, TTo, TMaskFrom, TMaskTo> &
-  MatchRouteOptions
+> = ToOptions<AnyRoute, TFrom, TTo, TMaskFrom, TMaskTo> & MatchRouteOptions
 
 export type MakeMatchRouteOptions<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
@@ -587,7 +540,7 @@ export function Navigate<
 >(props: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): null {
   const router = useRouter()
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     router.navigate(props as any)
   }, [])
 
@@ -659,7 +612,6 @@ function Matches() {
       return React.createElement(ErrorComponent, {
         ...props,
         useMatch: route.useMatch,
-        useContext: route.useContext,
         useRouteContext: route.useRouteContext,
         useSearch: route.useSearch,
         useParams: route.useParams,
@@ -999,7 +951,6 @@ function Match({ matchIds }: { matchIds: string[] }) {
       return React.createElement(routeErrorComponent, {
         ...props,
         useMatch: route.useMatch,
-        useContext: route.useContext,
         useRouteContext: route.useRouteContext,
         useSearch: route.useSearch,
         useParams: route.useParams,
@@ -1013,7 +964,6 @@ function Match({ matchIds }: { matchIds: string[] }) {
       <ResolvedSuspenseBoundary
         fallback={React.createElement(PendingComponent, {
           useMatch: route.useMatch,
-          useContext: route.useContext,
           useRouteContext: route.useRouteContext,
           useSearch: route.useSearch,
           useParams: route.useParams,
@@ -1059,7 +1009,6 @@ function MatchInner({
     return React.createElement(PendingComponent, {
       useLoader: route.useLoader,
       useMatch: route.useMatch,
-      useContext: route.useContext,
       useRouteContext: route.useRouteContext,
       useSearch: route.useSearch,
       useParams: route.useParams,
@@ -1073,7 +1022,6 @@ function MatchInner({
       return React.createElement(comp, {
         useLoader: route.useLoader,
         useMatch: route.useMatch,
-        useContext: route.useContext as any,
         useRouteContext: route.useRouteContext as any,
         useSearch: route.useSearch,
         useParams: route.useParams as any,