@tanstack/react-router 0.0.1-beta.57 → 0.0.1-beta.58

package/build/stats-react.json

@@ -7,31 +7,31 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "740d-103",
+            "uid": "c2ff-99",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
             "name": "node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
-            "uid": "740d-105"
+            "uid": "c2ff-101"
           },
           {
             "name": "packages",
             "children": [
               {
                 "name": "store/build/esm/index.js",
-                "uid": "740d-107"
+                "uid": "c2ff-103"
               },
               {
                 "name": "router/build/esm/index.js",
-                "uid": "740d-109"
+                "uid": "c2ff-105"
               },
               {
                 "name": "react-store/build/esm/index.js",
-                "uid": "740d-111"
+                "uid": "c2ff-107"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "740d-113"
+                "uid": "c2ff-109"
               }
             ]
           }
@@ -41,155 +41,155 @@
     "isRoot": true
   },
   "nodeParts": {
-    "740d-103": {
+    "c2ff-99": {
       "renderedLength": 429,
       "gzipLength": 238,
       "brotliLength": 0,
-      "mainUid": "740d-102"
+      "mainUid": "c2ff-98"
     },
-    "740d-105": {
+    "c2ff-101": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "740d-104"
+      "mainUid": "c2ff-100"
     },
-    "740d-107": {
+    "c2ff-103": {
       "renderedLength": 1290,
       "gzipLength": 496,
       "brotliLength": 0,
-      "mainUid": "740d-106"
+      "mainUid": "c2ff-102"
     },
-    "740d-109": {
-      "renderedLength": 43501,
-      "gzipLength": 10525,
+    "c2ff-105": {
+      "renderedLength": 44621,
+      "gzipLength": 10817,
       "brotliLength": 0,
-      "mainUid": "740d-108"
+      "mainUid": "c2ff-104"
     },
-    "740d-111": {
+    "c2ff-107": {
       "renderedLength": 1571,
       "gzipLength": 594,
       "brotliLength": 0,
-      "mainUid": "740d-110"
+      "mainUid": "c2ff-106"
     },
-    "740d-113": {
-      "renderedLength": 11728,
+    "c2ff-109": {
+      "renderedLength": 11729,
       "gzipLength": 3116,
       "brotliLength": 0,
-      "mainUid": "740d-112"
+      "mainUid": "c2ff-108"
     }
   },
   "nodeMetas": {
-    "740d-102": {
+    "c2ff-98": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "740d-103"
+        "index.production.js": "c2ff-99"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "740d-112"
+          "uid": "c2ff-108"
         }
       ]
     },
-    "740d-104": {
+    "c2ff-100": {
       "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "740d-105"
+        "index.production.js": "c2ff-101"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "740d-108"
+          "uid": "c2ff-104"
         }
       ]
     },
-    "740d-106": {
+    "c2ff-102": {
       "id": "/packages/store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "740d-107"
+        "index.production.js": "c2ff-103"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "740d-108"
+          "uid": "c2ff-104"
         }
       ]
     },
-    "740d-108": {
+    "c2ff-104": {
       "id": "/packages/router/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "740d-109"
+        "index.production.js": "c2ff-105"
       },
       "imported": [
         {
-          "uid": "740d-104"
+          "uid": "c2ff-100"
         },
         {
-          "uid": "740d-106"
+          "uid": "c2ff-102"
         }
       ],
       "importedBy": [
         {
-          "uid": "740d-112"
+          "uid": "c2ff-108"
         }
       ]
     },
-    "740d-110": {
+    "c2ff-106": {
       "id": "/packages/react-store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "740d-111"
+        "index.production.js": "c2ff-107"
       },
       "imported": [
         {
-          "uid": "740d-115"
+          "uid": "c2ff-111"
         }
       ],
       "importedBy": [
         {
-          "uid": "740d-112"
+          "uid": "c2ff-108"
         }
       ]
     },
-    "740d-112": {
+    "c2ff-108": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "740d-113"
+        "index.production.js": "c2ff-109"
       },
       "imported": [
         {
-          "uid": "740d-102"
+          "uid": "c2ff-98"
         },
         {
-          "uid": "740d-114"
+          "uid": "c2ff-110"
         },
         {
-          "uid": "740d-108"
+          "uid": "c2ff-104"
         },
         {
-          "uid": "740d-110"
+          "uid": "c2ff-106"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "740d-114": {
+    "c2ff-110": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "740d-112"
+          "uid": "c2ff-108"
         }
       ],
       "isExternal": true
     },
-    "740d-115": {
+    "c2ff-111": {
       "id": "use-sync-external-store/shim/with-selector",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "740d-110"
+          "uid": "c2ff-106"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -9,7 +9,7 @@
  * @license MIT
  */
 import * as React from 'react';
-import { RegisteredAllRouteInfo, LinkOptions, ToOptions, MatchRouteOptions, RouteInfoByPath, ResolveRelativePath, NoInfer, ValidFromPath, RegisteredRouter, AnyRouteConfig, RouteConfig, AnyAllRouteInfo, AllRouteInfo, Router, RouterOptions, DefaultAllRouteInfo, RouterStore, RouteMatch, Route, Expand } from '@tanstack/router';
+import { RegisteredRoutesInfo, LinkOptions, ToOptions, MatchRouteOptions, RouteByPath, ResolveRelativePath, NoInfer, ValidFromPath, RegisteredRouter, AnyRoute, Route, AnyRoutesInfo, RoutesInfo, Router, RouterOptions, DefaultRoutesInfo, RouterStore, RouteMatch, Expand } from '@tanstack/router';
 export * from '@tanstack/router';
 export { useStore } from '@tanstack/react-store';
 
@@ -21,16 +21,16 @@ type RouteComponent<TProps = {}> = SyncRouteComponent<TProps> & {
 declare function lazy(importer: () => Promise<{
     default: SyncRouteComponent;
 }>): RouteComponent;
-type LinkPropsOptions<TFrom extends RegisteredAllRouteInfo['routePaths'] = '/', TTo extends string = '.'> = LinkOptions<RegisteredAllRouteInfo, TFrom, TTo> & {
+type LinkPropsOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = '.'> = LinkOptions<RegisteredRoutesInfo, TFrom, TTo> & {
     activeProps?: React.AnchorHTMLAttributes<HTMLAnchorElement> | (() => React.AnchorHTMLAttributes<HTMLAnchorElement>);
     inactiveProps?: React.AnchorHTMLAttributes<HTMLAnchorElement> | (() => React.AnchorHTMLAttributes<HTMLAnchorElement>);
 };
-type MakeUseMatchRouteOptions<TFrom extends RegisteredAllRouteInfo['routePaths'] = '/', TTo extends string = '.'> = ToOptions<RegisteredAllRouteInfo, TFrom, TTo> & MatchRouteOptions;
-type MakeMatchRouteOptions<TFrom extends RegisteredAllRouteInfo['routePaths'] = '/', TTo extends string = '.'> = ToOptions<RegisteredAllRouteInfo, TFrom, TTo> & MatchRouteOptions & {
-    children?: ReactNode | ((params: RouteInfoByPath<RegisteredAllRouteInfo, ResolveRelativePath<TFrom, NoInfer<TTo>>>['allParams']) => ReactNode);
+type MakeUseMatchRouteOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = '.'> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> & MatchRouteOptions;
+type MakeMatchRouteOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = '.'> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> & MatchRouteOptions & {
+    children?: ReactNode | ((params: RouteByPath<RegisteredRoutesInfo, ResolveRelativePath<TFrom, NoInfer<TTo>>>['__types']['allParams']) => ReactNode);
 };
-type MakeLinkPropsOptions<TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/', TTo extends string = '.'> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement>;
-type MakeLinkOptions<TFrom extends RegisteredAllRouteInfo['routePaths'] = '/', TTo extends string = '.'> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement> & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
+type MakeLinkPropsOptions<TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/', TTo extends string = '.'> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement>;
+type MakeLinkOptions<TFrom extends RegisteredRoutesInfo['routePaths'] = '/', TTo extends string = '.'> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement> & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
     children?: ReactNode | ((state: {
         isActive: boolean;
     }) => ReactNode);
@@ -45,7 +45,7 @@ declare module '@tanstack/router' {
             };
         }>;
     }
-    interface RouterOptions<TRouteConfig, TRouterContext> {
+    interface RouterOptions<TRouteTree, TRouterContext> {
     }
 }
 type PromptProps = {
@@ -53,9 +53,9 @@ type PromptProps = {
     when?: boolean | any;
     children?: ReactNode;
 };
-declare function useLinkProps<TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/', TTo extends string = '.'>(options: MakeLinkPropsOptions<TFrom, TTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
-interface LinkFn<TDefaultFrom extends RegisteredAllRouteInfo['routePaths'] = '/', TDefaultTo extends string = '.'> {
-    <TFrom extends RegisteredAllRouteInfo['routePaths'] = TDefaultFrom, TTo extends string = TDefaultTo>(props: MakeLinkOptions<TFrom, TTo> & React.RefAttributes<HTMLAnchorElement>): ReactNode;
+declare function useLinkProps<TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/', TTo extends string = '.'>(options: MakeLinkPropsOptions<TFrom, TTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
+interface LinkFn<TDefaultFrom extends RegisteredRoutesInfo['routePaths'] = '/', TDefaultTo extends string = '.'> {
+    <TFrom extends RegisteredRoutesInfo['routePaths'] = TDefaultFrom, TTo extends string = TDefaultTo>(props: MakeLinkOptions<TFrom, TTo> & React.RefAttributes<HTMLAnchorElement>): ReactNode;
 }
 declare const Link: LinkFn;
 type MatchesContextValue = RouteMatch[];
@@ -67,37 +67,37 @@ type MatchesProviderProps = {
     value: MatchesContextValue;
     children: ReactNode;
 };
-declare class ReactRouter<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>, TRouterContext = unknown> extends Router<TRouteConfig, TAllRouteInfo, TRouterContext> {
+declare class ReactRouter<TRouteConfig extends AnyRoute = Route, TRoutesInfo extends AnyRoutesInfo = RoutesInfo<TRouteConfig>, TRouterContext = unknown> extends Router<TRouteConfig, TRoutesInfo, TRouterContext> {
     constructor(opts: RouterOptions<TRouteConfig, TRouterContext>);
 }
-type RouterProps<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TRouterContext = unknown> = RouterOptions<TRouteConfig, TRouterContext> & {
-    router: Router<TRouteConfig, TAllRouteInfo, TRouterContext>;
+type RouterProps<TRouteConfig extends AnyRoute = Route, TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo, TRouterContext = unknown> = RouterOptions<TRouteConfig, TRouterContext> & {
+    router: Router<TRouteConfig, TRoutesInfo, TRouterContext>;
 };
-declare function RouterProvider<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo, TRouterContext = unknown>({ router, ...rest }: RouterProps<TRouteConfig, TAllRouteInfo, TRouterContext>): JSX.Element;
+declare function RouterProvider<TRouteConfig extends AnyRoute = Route, TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo, TRouterContext = unknown>({ router, ...rest }: RouterProps<TRouteConfig, TRoutesInfo, TRouterContext>): JSX.Element;
 declare function useRouter(): RegisteredRouter;
 declare function useRouterStore<T = RouterStore>(selector?: (state: Router['store']) => T, shallow?: boolean): T;
 declare function useMatches(): RouteMatch[];
-declare function useMatch<TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'], TStrict extends boolean = true, TRouteMatch = RouteMatch<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TFrom]>>(opts?: {
+declare function useMatch<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TRouteMatch = RouteMatch<RegisteredRoutesInfo, RegisteredRoutesInfo['routesById'][TFrom]>>(opts?: {
     from: TFrom;
     strict?: TStrict;
     track?: (match: TRouteMatch) => any;
     shallow?: boolean;
 }): TStrict extends true ? TRouteMatch : TRouteMatch | undefined;
-declare function useRoute<TId extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/'>(routeId: TId): Route<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TId]>;
-declare function useSearch<TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'], TStrict extends boolean = true, TSearch = RegisteredAllRouteInfo['routeInfoById'][TFrom]['fullSearchSchema'], TSelected = TSearch>(opts?: {
+declare function useRoute<TId extends keyof RegisteredRoutesInfo['routesById'] = '/'>(routeId: TId): RegisteredRoutesInfo['routesById'][TId];
+declare function useSearch<TFrom extends keyof RegisteredRoutesInfo['routesById'], TStrict extends boolean = true, TSearch = RegisteredRoutesInfo['routesById'][TFrom]['__types']['fullSearchSchema'], TSelected = TSearch>(opts?: {
     from: TFrom;
     strict?: TStrict;
     track?: (search: TSearch) => TSelected;
 }): TStrict extends true ? TSelected : TSelected | undefined;
-declare function useParams<TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/', TDefaultSelected = Expand<RegisteredAllRouteInfo['allParams'] & RegisteredAllRouteInfo['routeInfoById'][TFrom]['allParams']>, TSelected = TDefaultSelected>(opts?: {
+declare function useParams<TFrom extends keyof RegisteredRoutesInfo['routesById'] = '/', TDefaultSelected = Expand<RegisteredRoutesInfo['allParams'] & RegisteredRoutesInfo['routesById'][TFrom]['__types']['allParams']>, TSelected = TDefaultSelected>(opts?: {
     from: TFrom;
     track?: (search: TDefaultSelected) => TSelected;
 }): TSelected;
-declare function useNavigate<TDefaultFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/'>(defaultOpts?: {
+declare function useNavigate<TDefaultFrom extends keyof RegisteredRoutesInfo['routesById'] = '/'>(defaultOpts?: {
     from?: TDefaultFrom;
 }): <TFrom extends string = TDefaultFrom, TTo extends string = ".">(opts?: MakeLinkOptions<TFrom, TTo> | undefined) => Promise<void>;
-declare function useMatchRoute(): <TFrom extends ValidFromPath<AnyAllRouteInfo> = "/", TTo extends string = ".">(opts: MakeUseMatchRouteOptions<TFrom, TTo>) => false;
-declare function MatchRoute<TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/', TTo extends string = '.'>(props: MakeMatchRouteOptions<TFrom, TTo>): any;
+declare function useMatchRoute(): <TFrom extends ValidFromPath<AnyRoutesInfo> = "/", TTo extends string = ".">(opts: MakeUseMatchRouteOptions<TFrom, TTo>) => any;
+declare function MatchRoute<TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/', TTo extends string = '.'>(props: MakeMatchRouteOptions<TFrom, TTo>): any;
 declare function Outlet(): JSX.Element | null;
 declare function DefaultErrorBoundary({ error }: {
     error: any;

package/build/umd/index.development.js

@@ -565,62 +565,110 @@
     return out;
   }
 
+  const rootRouteId = '__root__';
   class Route {
-    constructor(routeConfig, options, originalIndex, parent, router) {
-      Object.assign(this, {
-        ...routeConfig,
-        originalIndex,
-        options,
-        getRouter: () => router,
-        childRoutes: undefined,
-        getParentRoute: () => parent
-      });
-      router.options.createRoute?.({
-        router,
-        route: this
-      });
-    }
-  }
+    // Set up in this.init()
 
-  const rootRouteId = '__root__';
-  const createRouteConfig = (options = {}, children = [], isRoot = true, parentId, parentPath) => {
-    if (isRoot) {
-      options.path = rootRouteId;
-    }
+    // customId!: TCustomId
 
-    // Strip the root from parentIds
-    if (parentId === rootRouteId) {
-      parentId = '';
-    }
-    let path = isRoot ? rootRouteId : options.path;
+    // Optional
 
-    // If the path is anything other than an index path, trim it up
-    if (path && path !== '/') {
-      path = trimPath(path);
-    }
-    const routeId = path || options.id;
-    let id = joinPaths([parentId, routeId]);
-    if (path === rootRouteId) {
-      path = '/';
-    }
-    if (id !== rootRouteId) {
-      id = joinPaths(['/', id]);
+    constructor(options) {
+      this.options = options || {};
+      this.isRoot = !options?.getParentRoute;
     }
-    const fullPath = id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]));
-    return {
-      id: id,
-      routeId: routeId,
-      path: path,
-      fullPath: fullPath,
-      options: options,
-      children,
-      addChildren: children => createRouteConfig(options, children, false, parentId, parentPath),
-      createRoute: childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath),
-      generate: () => {
-        invariant(false, `routeConfig.generate() is used by TanStack Router's file-based routing code generation and should not actually be called during runtime. `);
+    init = () => {
+      const allOptions = this.options;
+      const isRoot = !allOptions?.path && !allOptions?.id;
+      const parent = this.options?.getParentRoute?.();
+      if (isRoot) {
+        this.path = rootRouteId;
+      } else {
+        invariant(parent, `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`);
+      }
+      let path = isRoot ? rootRouteId : allOptions.path;
+
+      // If the path is anything other than an index path, trim it up
+      if (path && path !== '/') {
+        path = trimPath(path);
+      }
+      const customId = allOptions?.id || path;
+
+      // Strip the parentId prefix from the first level of children
+      let id = isRoot ? rootRouteId : joinPaths([parent.id === rootRouteId ? '' : parent.id, customId]);
+      if (path === rootRouteId) {
+        path = '/';
       }
+      if (id !== rootRouteId) {
+        id = joinPaths(['/', id]);
+      }
+      const fullPath = id === rootRouteId ? '/' : trimPathRight(joinPaths([parent.fullPath, path]));
+      this.id = id;
+      // this.customId = customId as TCustomId
+      this.fullPath = fullPath;
     };
-  };
+    addChildren = children => {
+      this.children = children;
+      return this;
+    };
+
+    // generate: () => {
+    //   invariant(
+    //     false,
+    //     `routeConfig.generate() is used by TanStack Router's file-based routing code generation and should not actually be called during runtime. `,
+    //   )
+    // },
+  }
+
+  class RootRoute extends Route {
+    constructor(options) {
+      super(options);
+    }
+  }
+
+  // const rootRoute = new RootRoute({
+  //   validateSearch: () => null as unknown as { root?: boolean },
+  // })
+
+  // const aRoute = new Route({
+  //   getParentRoute: () => rootRoute,
+  //   path: 'a',
+  //   validateSearch: () => null as unknown as { a?: string },
+  // })
+
+  // const bRoute = new Route({
+  //   getParentRoute: () => aRoute,
+  //   path: 'b',
+  // })
+
+  // const rootIsRoot = rootRoute.isRoot
+  // //    ^?
+  // const aIsRoot = aRoute.isRoot
+  // //    ^?
+
+  // const rId = rootRoute.id
+  // //    ^?
+  // const aId = aRoute.id
+  // //    ^?
+  // const bId = bRoute.id
+  // //    ^?
+
+  // const rPath = rootRoute.fullPath
+  // //    ^?
+  // const aPath = aRoute.fullPath
+  // //    ^?
+  // const bPath = bRoute.fullPath
+  // //    ^?
+
+  // const rSearch = rootRoute.__types.fullSearchSchema
+  // //    ^?
+  // const aSearch = aRoute.__types.fullSearchSchema
+  // //    ^?
+  // const bSearch = bRoute.__types.fullSearchSchema
+  // //    ^?
+
+  // const config = rootRoute.addChildren([aRoute.addChildren([bRoute])])
+  // //    ^?
 
   //
 
@@ -909,12 +957,12 @@
       }
       const {
         basepath,
-        routeConfig
+        routeTree
       } = this.options;
       this.basepath = `/${trimPath(basepath ?? '') ?? ''}`;
-      if (routeConfig) {
+      if (routeTree) {
         this.routesById = {};
-        this.routeTree = this.#buildRouteTree(routeConfig);
+        this.routeTree = this.#buildRouteTree(routeTree);
       }
       return this;
     };
@@ -1057,17 +1105,18 @@
         return matches;
       }
       const existingMatches = [...this.store.state.currentMatches, ...(this.store.state.pendingMatches ?? [])];
-      const recurse = async routes => {
+      const findInRouteTree = async routes => {
         const parentMatch = last(matches);
         let params = parentMatch?.params ?? {};
         const filteredRoutes = this.options.filterRoutes?.(routes) ?? routes;
-        let foundRoutes = [];
+        let matchingRoutes = [];
         const findMatchInRoutes = (parentRoutes, routes) => {
           routes.some(route => {
-            if (!route.path && route.childRoutes?.length) {
-              return findMatchInRoutes([...foundRoutes, route], route.childRoutes);
+            const children = route.children;
+            if (!route.path && children?.length) {
+              return findMatchInRoutes([...matchingRoutes, route], children);
             }
-            const fuzzy = !!(route.path !== '/' || route.childRoutes?.length);
+            const fuzzy = route.path === '/' ? false : !!children?.length;
             const matchParams = matchPathname(this.basepath, pathname, {
               to: route.fullPath,
               fuzzy,
@@ -1088,17 +1137,17 @@
               };
             }
             if (!!matchParams) {
-              foundRoutes = [...parentRoutes, route];
+              matchingRoutes = [...parentRoutes, route];
             }
-            return !!foundRoutes.length;
+            return !!matchingRoutes.length;
           });
-          return !!foundRoutes.length;
+          return !!matchingRoutes.length;
         };
         findMatchInRoutes([], filteredRoutes);
-        if (!foundRoutes.length) {
+        if (!matchingRoutes.length) {
           return;
         }
-        foundRoutes.forEach(foundRoute => {
+        matchingRoutes.forEach(foundRoute => {
           const interpolatedPath = interpolatePath(foundRoute.path, params);
           const matchId = interpolatePath(foundRoute.id, params, true);
           const match = existingMatches.find(d => d.id === matchId) ||
@@ -1110,12 +1159,13 @@
           });
           matches.push(match);
         });
-        const foundRoute = last(foundRoutes);
-        if (foundRoute.childRoutes?.length) {
-          recurse(foundRoute.childRoutes);
+        const foundRoute = last(matchingRoutes);
+        const foundChildren = foundRoute.children;
+        if (foundChildren?.length) {
+          findInRouteTree(foundChildren);
         }
       };
-      recurse([this.routeTree]);
+      findInRouteTree([this.routeTree]);
       linkMatches(matches);
       return matches;
     };
@@ -1362,11 +1412,12 @@
         };
       });
     };
-    #buildRouteTree = rootRouteConfig => {
-      const recurseRoutes = (routeConfigs, parent) => {
-        return routeConfigs.map((routeConfig, i) => {
-          const routeOptions = routeConfig.options;
-          const route = new Route(routeConfig, routeOptions, i, parent, this);
+    #buildRouteTree = routeTree => {
+      const recurseRoutes = routes => {
+        routes.forEach((route, i) => {
+          route.init();
+          route.originalIndex = i;
+          route.router = this;
           const existingRoute = this.routesById[route.id];
           if (existingRoute) {
             {
@@ -1375,13 +1426,12 @@
             throw new Error();
           }
           this.routesById[route.id] = route;
-          const children = routeConfig.children;
-          route.childRoutes = children.length ? recurseRoutes(children, route) : undefined;
-          return route;
+          const children = route.children;
+          if (children?.length) recurseRoutes(children);
         });
       };
-      const routes = recurseRoutes([rootRouteConfig]);
-      return routes[0];
+      recurseRoutes([routeTree]);
+      return routeTree;
     };
     #parseLocation = previousLocation => {
       let {
@@ -1842,6 +1892,11 @@
       match: match
     }))));
   }
+
+  // This is the messiest thing ever... I'm either seriously tired (likely) or
+  // there has to be a better way to reset error boundaries when the
+  // router's location key changes.
+
   class CatchBoundary extends React__namespace.Component {
     state = {
       error: false,
@@ -1862,10 +1917,6 @@
       }));
     }
   }
-
-  // This is the messiest thing ever... I'm either seriously tired (likely) or
-  // there has to be a better way to reset error boundaries when the
-  // router's location key changes.
   function CatchBoundaryInner(props) {
     const [activeErrorState, setActiveErrorState] = React__namespace.useState(props.errorState);
     const router = useRouter();
@@ -1949,6 +2000,7 @@
   exports.MatchRoute = MatchRoute;
   exports.Outlet = Outlet;
   exports.ReactRouter = ReactRouter;
+  exports.RootRoute = RootRoute;
   exports.Route = Route;
   exports.RouteMatch = RouteMatch;
   exports.Router = Router;
@@ -1957,7 +2009,6 @@
   exports.createBrowserHistory = createBrowserHistory;
   exports.createHashHistory = createHashHistory;
   exports.createMemoryHistory = createMemoryHistory;
-  exports.createRouteConfig = createRouteConfig;
   exports.decode = decode;
   exports.defaultFetchServerDataFn = defaultFetchServerDataFn;
   exports.defaultParseSearch = defaultParseSearch;