@tanstack/router-core 0.0.1-beta.31 → 0.0.1-beta.34

package/build/types/index.d.ts

@@ -193,8 +193,9 @@ interface MatchLocation {
     fromCurrent?: boolean;
 }
 interface MatchRouteOptions {
-    pending: boolean;
+    pending?: boolean;
     caseSensitive?: boolean;
+    fuzzy?: boolean;
 }
 interface DehydratedRouterState extends Pick<RouterState, 'status' | 'location' | 'lastUpdated' | 'location'> {
     matches: DehydratedRouteMatch[];
@@ -618,8 +619,8 @@ declare function trimPath(path: string): string;
 declare function resolvePath(basepath: string, base: string, to: string): string;
 declare function parsePathname(pathname?: string): Segment[];
 declare function interpolatePath(path: string | undefined, params: any, leaveWildcard?: boolean): string;
-declare function matchPathname(currentPathname: string, matchLocation: Pick<MatchLocation, 'to' | 'fuzzy' | 'caseSensitive'>): AnyPathParams | undefined;
-declare function matchByPath(from: string, matchLocation: Pick<MatchLocation, 'to' | 'caseSensitive' | 'fuzzy'>): Record<string, string> | undefined;
+declare function matchPathname(basepath: string, currentPathname: string, matchLocation: Pick<MatchLocation, 'to' | 'fuzzy' | 'caseSensitive'>): AnyPathParams | undefined;
+declare function matchByPath(basepath: string, from: string, matchLocation: Pick<MatchLocation, 'to' | 'caseSensitive' | 'fuzzy'>): Record<string, string> | undefined;
 
 declare function encode(obj: any, pfx?: string): string;
 declare function decode(str: any): {};

package/build/umd/index.development.js

@@ -1020,8 +1020,8 @@
       return segment.value;
     }));
   }
-  function matchPathname(currentPathname, matchLocation) {
-    const pathParams = matchByPath(currentPathname, matchLocation);
+  function matchPathname(basepath, currentPathname, matchLocation) {
+    const pathParams = matchByPath(basepath, currentPathname, matchLocation);
     // const searchMatched = matchBySearch(currentLocation.search, matchLocation)
 
     if (matchLocation.to && !pathParams) {
@@ -1029,10 +1029,15 @@
     }
     return pathParams != null ? pathParams : {};
   }
-  function matchByPath(from, matchLocation) {
+  function matchByPath(basepath, from, matchLocation) {
     var _matchLocation$to;
+    if (basepath && !from.startsWith(basepath)) {
+      return undefined;
+    }
+    from = from.startsWith(basepath) ? from.substring(basepath.length) : from;
     const baseSegments = parsePathname(from);
-    const routeSegments = parsePathname("" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*'));
+    const to = "" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*');
+    const routeSegments = parsePathname(to);
     const params = {};
     let isMatch = (() => {
       for (let i = 0; i < Math.max(baseSegments.length, routeSegments.length); i++) {
@@ -1643,7 +1648,7 @@
         });
       },
       mount: () => {
-        const next = router.__.buildLocation({
+        router.__.buildLocation({
           to: '.',
           search: true,
           hash: true
@@ -1651,9 +1656,10 @@
 
         // If the current location isn't updated, trigger a navigation
         // to the current location. Otherwise, load the current location.
-        if (next.href !== router.__location.href) {
-          router.__.commitLocation(next, true);
-        }
+        // if (next.href !== router.__location.href) {
+        //   router.__.commitLocation(next, true)
+        // }
+
         if (!router.state.matches.length) {
           router.load();
         }
@@ -1681,6 +1687,7 @@
         router.load();
       },
       update: opts => {
+        var _trimPath;
         const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
         if (!router.__location || newHistory) {
           if (opts != null && opts.history) {
@@ -1694,7 +1701,7 @@
           basepath,
           routeConfig
         } = router.options;
-        router.basepath = cleanPath("/" + (basepath != null ? basepath : ''));
+        router.basepath = "/" + ((_trimPath = trimPath(basepath != null ? basepath : '')) != null ? _trimPath : '');
         if (routeConfig) {
           router.routesById = {};
           router.routeTree = router.__.buildRouteTree(routeConfig);
@@ -1892,7 +1899,7 @@
                 return findMatchInRoutes([...foundRoutes, route], route.childRoutes);
               }
               const fuzzy = !!(route.routePath !== '/' || (_route$childRoutes2 = route.childRoutes) != null && _route$childRoutes2.length);
-              const matchParams = matchPathname(pathname, {
+              const matchParams = matchPathname(router.basepath, pathname, {
                 to: route.fullPath,
                 fuzzy,
                 caseSensitive: (_route$options$caseSe = route.options.caseSensitive) != null ? _route$options$caseSe : router.options.caseSensitive
@@ -1943,14 +1950,15 @@
       },
       loadMatches: async (resolvedMatches, loaderOpts) => {
         const matchPromises = resolvedMatches.map(async match => {
+          var _search$__data;
           // Validate the match (loads search params etc)
           match.__.validate();
-          match.load(loaderOpts);
           const search = match.search;
-          if (search.__data && search.__data.matchId !== match.matchId) {
+          if ((_search$__data = search.__data) != null && _search$__data.matchId && search.__data.matchId !== match.matchId) {
             return;
           }
-          if (match.__.loadPromise) {
+          match.load(loaderOpts);
+          if (match.status !== 'success' && match.__.loadPromise) {
             // Wait for the first sign of activity from the match
             await match.__.loadPromise;
           }
@@ -2029,11 +2037,11 @@
           if (!((_router$state$pending7 = router.state.pending) != null && _router$state$pending7.location)) {
             return false;
           }
-          return !!matchPathname(router.state.pending.location.pathname, _extends({}, opts, {
+          return !!matchPathname(router.basepath, router.state.pending.location.pathname, _extends({}, opts, {
             to: next.pathname
           }));
         }
-        return !!matchPathname(router.state.location.pathname, _extends({}, opts, {
+        return !!matchPathname(router.basepath, router.state.location.pathname, _extends({}, opts, {
           to: next.pathname
         }));
       },