@tanstack/react-router 0.0.1-beta.245 → 0.0.1-beta.247

package/build/esm/index.js

@@ -415,9 +415,12 @@ function matchPathname(basepath, currentPathname, matchLocation) {
   }
   return pathParams ?? {};
 }
+function removeBasepath(basepath, pathname) {
+  return basepath != '/' ? pathname.substring(basepath.length) : pathname;
+}
 function matchByPath(basepath, from, matchLocation) {
   // Remove the base path from the pathname
-  from = basepath != '/' ? from.substring(basepath.length) : from;
+  from = removeBasepath(basepath, from);
   // Default to to $ (wildcard)
   const to = `${matchLocation.to ?? '$'}`;
   // Parse the from and to
@@ -477,7 +480,8 @@ function matchByPath(basepath, from, matchLocation) {
         }
       }
       if (!isLastBaseSegment && isLastRouteSegment) {
-        return !!matchLocation.fuzzy;
+        params['**'] = joinPaths(baseSegments.slice(i + 1).map(d => d.value));
+        return !!matchLocation.fuzzy && routeSegment?.value !== '/';
       }
     }
     return true;
@@ -517,7 +521,6 @@ class Route {
   constructor(options) {
     this.options = options || {};
     this.isRoot = !options?.getParentRoute;
-    Route.__onInit(this);
     this.$$typeof = Symbol.for('react.memo');
   }
   init = opts => {
@@ -561,10 +564,6 @@ class Route {
     Object.assign(this.options, options);
     return this;
   };
-  static __onInit = route => {
-    // This is a dummy static method that should get
-    // replaced by a framework specific implementation if necessary
-  };
   useMatch = opts => {
     return useMatch({
       ...opts,
@@ -613,6 +612,15 @@ function createRouteMask(opts) {
 
 //
 
+class NotFoundRoute extends Route {
+  constructor(options) {
+    super({
+      ...options,
+      id: '404'
+    });
+  }
+}
+
 const matchContext = /*#__PURE__*/React.createContext(undefined);
 function Matches() {
   const router = useRouter();
@@ -1310,11 +1318,15 @@ class Router {
   buildRouteTree = () => {
     this.routesById = {};
     this.routesByPath = {};
+    const notFoundRoute = this.options.notFoundRoute;
+    if (notFoundRoute) {
+      notFoundRoute.init({
+        originalIndex: 99999999999
+      });
+      this.routesById[notFoundRoute.id] = notFoundRoute;
+    }
     const recurseRoutes = childRoutes => {
       childRoutes.forEach((childRoute, i) => {
-        // if (typeof childRoute === 'function') {
-        //   childRoute = (childRoute as any)()
-        // }
         childRoute.init({
           originalIndex: i
         });
@@ -1334,8 +1346,12 @@ class Router {
       });
     };
     recurseRoutes([this.routeTree]);
-    this.flatRoutes = Object.values(this.routesByPath).map((d, i) => {
-      const trimmed = trimPath(d.fullPath);
+    const scoredRoutes = [];
+    Object.values(this.routesById).forEach((d, i) => {
+      if (d.isRoot || !d.path) {
+        return;
+      }
+      const trimmed = trimPathLeft(d.fullPath);
       const parsed = parsePathname(trimmed);
       while (parsed.length > 1 && parsed[0]?.value === '/') {
         parsed.shift();
@@ -1349,14 +1365,15 @@ class Router {
         }
         return 1;
       });
-      return {
+      scoredRoutes.push({
         child: d,
         trimmed,
         parsed,
         index: i,
         score
-      };
-    }).sort((a, b) => {
+      });
+    });
+    this.flatRoutes = scoredRoutes.sort((a, b) => {
       let isIndex = a.trimmed === '/' ? 1 : b.trimmed === '/' ? -1 : 0;
       if (isIndex !== 0) return isIndex;
       const length = Math.min(a.score.length, b.score.length);
@@ -1458,7 +1475,7 @@ class Router {
       const matchedParams = matchPathname(this.basepath, trimPathRight(pathname), {
         to: route.fullPath,
         caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive,
-        fuzzy: false
+        fuzzy: true
       });
       if (matchedParams) {
         routeParams = matchedParams;
@@ -1468,7 +1485,17 @@ class Router {
     });
     let routeCursor = foundRoute || this.routesById['__root__'];
     let matchedRoutes = [routeCursor];
-    // let includingLayouts = true
+
+    // Check to see if the route needs a 404 entry
+    if (
+    // If we found a route, and it's not an index route and we have left over path
+    (foundRoute ? foundRoute.path !== '/' && routeParams['**'] :
+    // Or if we didn't find a route and we have left over path
+    trimPathRight(pathname)) &&
+    // And we have a 404 route configured
+    this.options.notFoundRoute) {
+      matchedRoutes.push(this.options.notFoundRoute);
+    }
     while (routeCursor?.parentRoute) {
       routeCursor = routeCursor.parentRoute;
       if (routeCursor) matchedRoutes.unshift(routeCursor);
@@ -2092,12 +2119,12 @@ class Router {
     let matches = this.matchRoutes(next.pathname, next.search, {
       throwOnError: true
     });
-    await this.loadMatches({
+    matches = await this.loadMatches({
       matches,
       preload: true,
       checkLatest: () => undefined
     });
-    return [last(matches), matches];
+    return matches;
   };
   buildLink = dest => {
     // If this link simply reloads the current route,
@@ -2499,13 +2526,7 @@ function useBlocker(message, condition = true) {
   } = useRouter();
   React.useEffect(() => {
     if (!condition) return;
-    let unblock = history.block((retry, cancel) => {
-      if (window.confirm(message)) {
-        unblock();
-        retry();
-      }
-    });
-    return unblock;
+    return history.block(message);
   });
 }
 function Block({
@@ -2553,5 +2574,5 @@ function Navigate(props) {
   return null;
 }
 
-export { Await, Block, CatchBoundary, CatchBoundaryImpl, ErrorComponent, FileRoute, Link, Match, MatchRoute, Matches, Navigate, Outlet, PathParamError, RootRoute, Route, Router, RouterProvider, ScrollRestoration, SearchParamError, cleanPath, componentTypes, createRouteMask, decode, deepEqual, defaultParseSearch, defaultStringifySearch, defer, encode, escapeJSON, functionalUpdate, getInitialRouterState, getRouteMatch, interpolatePath, isDehydratedDeferred, isPlainObject, isRedirect, isServer, joinPaths, last, lazyFn, lazyRouteComponent, matchByPath, matchContext, matchPathname, parsePathname, parseSearchWith, pick, redirect, replaceEqualDeep, resolvePath, rootRouteId, rootRouteWithContext, routerContext, shallow, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, typedNavigate, useAwaited, useBlocker, useElementScrollRestoration, useLayoutEffect$1 as useLayoutEffect, useLinkProps, useLoaderData, useMatch, useMatchRoute, useMatches, useNavigate, useParams, useRouteContext, useRouter, useRouterState, useScrollRestoration, useSearch, useStableCallback };
+export { Await, Block, CatchBoundary, CatchBoundaryImpl, ErrorComponent, FileRoute, Link, Match, MatchRoute, Matches, Navigate, NotFoundRoute, Outlet, PathParamError, RootRoute, Route, Router, RouterProvider, ScrollRestoration, SearchParamError, cleanPath, componentTypes, createRouteMask, decode, deepEqual, defaultParseSearch, defaultStringifySearch, defer, encode, escapeJSON, functionalUpdate, getInitialRouterState, getRouteMatch, interpolatePath, isDehydratedDeferred, isPlainObject, isRedirect, isServer, joinPaths, last, lazyFn, lazyRouteComponent, matchByPath, matchContext, matchPathname, parsePathname, parseSearchWith, pick, redirect, removeBasepath, replaceEqualDeep, resolvePath, rootRouteId, rootRouteWithContext, routerContext, shallow, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, typedNavigate, useAwaited, useBlocker, useElementScrollRestoration, useLayoutEffect$1 as useLayoutEffect, useLinkProps, useLoaderData, useMatch, useMatchRoute, useMatches, useNavigate, useParams, useRouteContext, useRouter, useRouterState, useScrollRestoration, useSearch, useStableCallback };
 //# sourceMappingURL=index.js.map