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

package/build/esm/index.js

@@ -203,8 +203,8 @@ function interpolatePath(path, params, leaveWildcard) {
     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) {
@@ -212,10 +212,15 @@ function matchPathname(currentPathname, matchLocation) {
   }
   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++) {
@@ -826,7 +831,7 @@ function createRouter(userOptions) {
       });
     },
     mount: () => {
-      const next = router.__.buildLocation({
+      router.__.buildLocation({
         to: '.',
         search: true,
         hash: true
@@ -834,9 +839,10 @@ function createRouter(userOptions) {
 
       // 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();
       }
@@ -864,6 +870,7 @@ function createRouter(userOptions) {
       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) {
@@ -877,7 +884,7 @@ function createRouter(userOptions) {
         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);
@@ -1075,7 +1082,7 @@ function createRouter(userOptions) {
               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
@@ -1126,14 +1133,15 @@ function createRouter(userOptions) {
     },
     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;
         }
@@ -1212,11 +1220,11 @@ function createRouter(userOptions) {
         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
       }));
     },