@tanstack/react-router 0.0.1-beta.225 → 0.0.1-beta.227

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.225",
+  "version": "0.0.1-beta.227",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -42,7 +42,7 @@
     "@babel/runtime": "^7.16.7",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.225"
+    "@tanstack/history": "0.0.1-beta.227"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/Matches.tsx

@@ -14,7 +14,7 @@ import {
   RoutePaths,
 } from './routeInfo'
 import { RegisteredRouter } from './router'
-import { NoInfer, StrictOrFrom } from './utils'
+import { NoInfer, StrictOrFrom, pick } from './utils'
 
 export interface RouteMatch<
   TRouteTree extends AnyRoute = AnyRoute,
@@ -35,7 +35,6 @@ export interface RouteMatch<
   loaderData?: RouteById<TRouteTree, TRouteId>['types']['loaderData']
   __resolveLoadPromise?: () => void
   context: RouteById<TRouteTree, TRouteId>['types']['allContext']
-  routeSearch: RouteById<TRouteTree, TRouteId>['types']['searchSchema']
   search: FullSearchSchema<TRouteTree> &
     RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema']
   fetchedAt: number
@@ -85,7 +84,6 @@ export function Matches() {
   )
 }
 
-const defaultPending = () => null
 function SafeFragment(props: any) {
   return <>{props.children}</>
 }
@@ -98,17 +96,17 @@ export function Match({ matches }: { matches: RouteMatch[] }) {
   const locationKey = useRouterState().location.state?.key
 
   const PendingComponent = (route.options.pendingComponent ??
-    options.defaultPendingComponent ??
-    defaultPending) as any
+    options.defaultPendingComponent) as any
 
   const routeErrorComponent =
     route.options.errorComponent ??
     options.defaultErrorComponent ??
     ErrorComponent
 
-  const ResolvedSuspenseBoundary = route.options.wrapInSuspense
-    ? React.Suspense
-    : SafeFragment
+  const ResolvedSuspenseBoundary =
+    route.options.wrapInSuspense ?? PendingComponent
+      ? React.Suspense
+      : SafeFragment
 
   const errorComponent = routeErrorComponent
     ? React.useCallback(
@@ -125,6 +123,8 @@ export function Match({ matches }: { matches: RouteMatch[] }) {
       )
     : undefined
 
+  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment
+
   return (
     <matchesContext.Provider value={matches}>
       <ResolvedSuspenseBoundary
@@ -135,21 +135,15 @@ export function Match({ matches }: { matches: RouteMatch[] }) {
           useParams: route.useParams,
         })}
       >
-        {errorComponent ? (
-          <CatchBoundary
-            resetKey={locationKey}
-            errorComponent={errorComponent}
-            onCatch={() => {
-              warning(false, `Error in route match: ${match.id}`)
-            }}
-          >
-            <MatchInner match={match} />
-          </CatchBoundary>
-        ) : (
-          <SafeFragment>
-            <MatchInner match={match} />
-          </SafeFragment>
-        )}
+        <ResolvedCatchBoundary
+          resetKey={locationKey}
+          errorComponent={errorComponent}
+          onCatch={() => {
+            warning(false, `Error in route match: ${match.id}`)
+          }}
+        >
+          <MatchInner match={match} />
+        </ResolvedCatchBoundary>
       </ResolvedSuspenseBoundary>
     </matchesContext.Provider>
   )
@@ -158,6 +152,10 @@ function MatchInner({ match }: { match: RouteMatch }): any {
   const { options, routesById } = useRouter()
   const route = routesById[match.routeId]!
 
+  if (match.id.split('/').length === 4) {
+    console.log(match.id, pick(match, ['status', 'cause', 'isFetching']))
+  }
+
   if (match.status === 'error') {
     throw match.error
   }

package/src/RouterProvider.tsx

@@ -1,11 +1,4 @@
-import {
-  HistoryLocation,
-  HistoryState,
-  RouterHistory,
-  createBrowserHistory,
-} from '@tanstack/history'
 import * as React from 'react'
-import invariant from 'tiny-invariant'
 import warning from 'tiny-warning'
 import { Matches } from './Matches'
 import {
@@ -16,53 +9,18 @@ import {
   ToOptions,
 } from './link'
 import { ParsedLocation } from './location'
-import {
-  cleanPath,
-  interpolatePath,
-  joinPaths,
-  matchPathname,
-  parsePathname,
-  resolvePath,
-  trimPath,
-  trimPathRight,
-} from './path'
-import { isRedirect } from './redirects'
-import {
-  AnyPathParams,
-  AnyRoute,
-  AnySearchSchema,
-  LoaderFnContext,
-  Route,
-} from './route'
-import {
-  FullSearchSchema,
-  RouteById,
-  RoutePaths,
-  RoutesById,
-  RoutesByPath,
-} from './routeInfo'
+import { AnyRoute } from './route'
+import { RouteById, RoutePaths } from './routeInfo'
 import {
   BuildNextOptions,
-  DehydratedRouteMatch,
   RegisteredRouter,
   Router,
   RouterOptions,
   RouterState,
-  componentTypes,
 } from './router'
-import {
-  NoInfer,
-  PickAsRequired,
-  functionalUpdate,
-  last,
-  deepEqual,
-  pick,
-  replaceEqualDeep,
-  useStableCallback,
-  escapeJSON,
-} from './utils'
+import { NoInfer, PickAsRequired } from './utils'
 import { MatchRouteOptions } from './Matches'
-import { AnyRouteMatch, RouteMatch } from './Matches'
+import { RouteMatch } from './Matches'
 
 export interface CommitLocationOptions {
   replace?: boolean
@@ -102,43 +60,12 @@ export type MatchRouteFn<TRouteTree extends AnyRoute> = <
   opts?: MatchRouteOptions,
 ) => false | RouteById<TRouteTree, TResolved>['types']['allParams']
 
-export type LoadFn = (opts?: {
-  next?: ParsedLocation
-  throwOnError?: boolean
-  __dehydratedMatches?: DehydratedRouteMatch[]
-}) => Promise<void>
-
 export type BuildLocationFn<TRouteTree extends AnyRoute> = (
   opts: BuildNextOptions,
 ) => ParsedLocation
 
 export type InjectedHtmlEntry = string | (() => Promise<string> | string)
 
-// export type RouterContext<
-//   TRouteTree extends AnyRoute,
-//   // TDehydrated extends Record<string, any>,
-// > = {
-//   buildLink: BuildLinkFn<TRouteTree>
-//   state: RouterState<TRouteTree>
-//   navigate: NavigateFn<TRouteTree>
-//   matchRoute: MatchRouteFn<TRouteTree>
-//   routeTree: TRouteTree
-//   routesById: RoutesById<TRouteTree>
-//   options: RouterOptions<TRouteTree>
-//   history: RouterHistory
-//   load: LoadFn
-//   buildLocation: BuildLocationFn<TRouteTree>
-//   subscribe: Router<TRouteTree>['subscribe']
-//   resetNextScrollRef: React.MutableRefObject<boolean>
-//   injectedHtmlRef: React.MutableRefObject<InjectedHtmlEntry[]>
-//   injectHtml: (entry: InjectedHtmlEntry) => void
-//   dehydrateData: <T>(
-//     key: any,
-//     getData: T | (() => Promise<T> | T),
-//   ) => () => void
-//   hydrateData: <T>(key: any) => T | undefined
-// }
-
 export const routerContext = React.createContext<Router<any>>(null!)
 
 if (typeof document !== 'undefined') {
@@ -170,11 +97,15 @@ export function RouterProvider<
   router.updateOptions({
     ...router.options,
     ...rest,
+
     context: {
       ...router.options.context,
       ...rest?.context,
     },
-  } as PickAsRequired<RouterOptions<TRouteTree, TDehydrated>, 'stringifySearch' | 'parseSearch' | 'context'>)
+  } as PickAsRequired<
+    RouterOptions<TRouteTree, TDehydrated>,
+    'stringifySearch' | 'parseSearch' | 'context'
+  >)
 
   const [preState, setState] = React.useState(() => router.state)
   const [isTransitioning, startReactTransition] = React.useTransition()
@@ -222,7 +153,7 @@ export function RouterProvider<
     return () => {
       unsub()
     }
-  }, [history])
+  }, [router.history])
 
   React.useLayoutEffect(() => {
     if (!isTransitioning && state.resolvedLocation !== state.location) {

package/src/fileRoute.ts

@@ -14,7 +14,7 @@ import {
   TrimPathLeft,
   RouteConstraints,
 } from './route'
-import { Assign, AssignAll, Expand, IsAny } from './utils'
+import { Assign, Expand, IsAny } from './utils'
 
 export interface FileRoutesByPath {
   // '/': {
@@ -86,13 +86,14 @@ export class FileRoute<
 
   createRoute = <
     TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
-    TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
+    TFullSearchSchema extends
+      RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
       TParentRoute,
       TSearchSchema
     >,
-    TParams extends RouteConstraints['TParams'] = ParsePathParams<TPath> extends never
-      ? AnyPathParams
-      : Record<ParsePathParams<TPath>, RouteConstraints['TPath']>,
+    TParams extends RouteConstraints['TParams'] = Expand<
+      Record<ParsePathParams<TPath>, string>
+    >,
     TAllParams extends RouteConstraints['TAllParams'] = MergeFromFromParent<
       TParentRoute['types']['allParams'],
       TParams
@@ -112,7 +113,7 @@ export class FileRoute<
       RouteOptions<
         TParentRoute,
         string,
-        string,
+        TPath,
         TSearchSchema,
         TFullSearchSchema,
         TParams,

package/src/route.ts

@@ -76,13 +76,11 @@ export type RouteOptions<
   TAllContext,
   TLoaderData
 > &
-  NoInfer<
-    UpdatableRouteOptions<
-      TFullSearchSchema,
-      TAllParams,
-      TAllContext,
-      TLoaderData
-    >
+  UpdatableRouteOptions<
+    NoInfer<TFullSearchSchema>,
+    NoInfer<TAllParams>,
+    NoInfer<TAllContext>,
+    NoInfer<TLoaderData>
   >
 
 export type ParamsFallback<
@@ -139,7 +137,8 @@ export type BaseRouteOptions<
           TRouteContext
         >
       }) & {
-    loader?: RouteLoadFn<
+    key?: (opts: { search: TFullSearchSchema; location: ParsedLocation }) => any
+    loader?: RouteLoaderFn<
       TAllParams,
       TFullSearchSchema,
       NoInfer<TAllContext>,
@@ -267,7 +266,7 @@ export type ParentParams<TParentParams> = AnyPathParams extends TParentParams
       [Key in keyof TParentParams]?: DefinedPathParamWarning
     }
 
-export type RouteLoadFn<
+export type RouteLoaderFn<
   TAllParams = {},
   TFullSearchSchema extends Record<string, any> = {},
   TAllContext extends Record<string, any> = AnyContext,
@@ -389,7 +388,8 @@ export class Route<
     TPath
   >,
   TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
-  TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
+  TFullSearchSchema extends
+    RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
     TParentRoute,
     TSearchSchema
   >,
@@ -714,14 +714,14 @@ type RoutePrefix<
 > = string extends TPath
   ? RootRouteId
   : TPath extends string
-  ? TPrefix extends RootRouteId
-    ? TPath extends '/'
-      ? '/'
-      : `/${TrimPath<TPath>}`
-    : `${TPrefix}/${TPath}` extends '/'
-    ? '/'
-    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`
-  : never
+    ? TPrefix extends RootRouteId
+      ? TPath extends '/'
+        ? '/'
+        : `/${TrimPath<TPath>}`
+      : `${TPrefix}/${TPath}` extends '/'
+        ? '/'
+        : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`
+    : never
 
 export type TrimPath<T extends string> = '' extends T
   ? ''
@@ -731,13 +731,13 @@ export type TrimPathLeft<T extends string> =
   T extends `${RootRouteId}/${infer U}`
     ? TrimPathLeft<U>
     : T extends `/${infer U}`
-    ? TrimPathLeft<U>
-    : T
+      ? TrimPathLeft<U>
+      : T
 export type TrimPathRight<T extends string> = T extends '/'
   ? '/'
   : T extends `${infer U}/`
-  ? TrimPathRight<U>
-  : T
+    ? TrimPathRight<U>
+    : T
 
 export type RouteMask<TRouteTree extends AnyRoute> = {
   routeTree: TRouteTree
@@ -842,20 +842,20 @@ export type ComponentPropsFromRoute<TRoute> =
   TRoute extends (() => infer T extends AnyRoute)
     ? ComponentPropsFromRoute<T>
     : TRoute extends Route<
-        infer TParentRoute,
-        infer TPath,
-        infer TFullPath,
-        infer TCustomId,
-        infer TId,
-        infer TSearchSchema,
-        infer TFullSearchSchema,
-        infer TParams,
-        infer TAllParams,
-        infer TRouteContext,
-        infer TAllContext,
-        infer TRouterContext,
-        infer TLoaderData,
-        infer TChildren
-      >
-    ? RouteProps<TFullSearchSchema, TAllParams, TAllContext, TLoaderData>
-    : {}
+          infer TParentRoute,
+          infer TPath,
+          infer TFullPath,
+          infer TCustomId,
+          infer TId,
+          infer TSearchSchema,
+          infer TFullSearchSchema,
+          infer TParams,
+          infer TAllParams,
+          infer TRouteContext,
+          infer TAllContext,
+          infer TRouterContext,
+          infer TLoaderData,
+          infer TChildren
+        >
+      ? RouteProps<TFullSearchSchema, TAllParams, TAllContext, TLoaderData>
+      : {}