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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.31",
+  "version": "0.0.1-beta.34",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/path.ts

@@ -1,3 +1,4 @@
+import invariant from 'tiny-invariant'
 import { AnyPathParams } from './routeConfig'
 import { MatchLocation } from './router'
 import { last } from './utils'
@@ -145,10 +146,11 @@ export function interpolatePath(
 }
 
 export function matchPathname(
+  basepath: string,
   currentPathname: string,
   matchLocation: Pick<MatchLocation, 'to' | 'fuzzy' | 'caseSensitive'>,
 ): AnyPathParams | undefined {
-  const pathParams = matchByPath(currentPathname, matchLocation)
+  const pathParams = matchByPath(basepath, currentPathname, matchLocation)
   // const searchMatched = matchBySearch(currentLocation.search, matchLocation)
 
   if (matchLocation.to && !pathParams) {
@@ -159,11 +161,17 @@ export function matchPathname(
 }
 
 export function matchByPath(
+  basepath: string,
   from: string,
   matchLocation: Pick<MatchLocation, 'to' | 'caseSensitive' | 'fuzzy'>,
 ): Record<string, string> | undefined {
+  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 ?? '*'}`)
+  const to = `${matchLocation.to ?? '*'}`
+  const routeSegments = parsePathname(to)
 
   const params: Record<string, string> = {}
 

package/src/router.ts

@@ -22,6 +22,7 @@ import {
   joinPaths,
   matchPathname,
   resolvePath,
+  trimPath,
 } from './path'
 import { AnyRoute, createRoute, Route } from './route'
 import {
@@ -246,8 +247,9 @@ export interface MatchLocation {
 }
 
 export interface MatchRouteOptions {
-  pending: boolean
+  pending?: boolean
   caseSensitive?: boolean
+  fuzzy?: boolean
 }
 
 type LinkCurrentTargetElement = {
@@ -551,9 +553,9 @@ export function createRouter<
 
       // 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()
@@ -599,7 +601,7 @@ export function createRouter<
 
       const { basepath, routeConfig } = router.options
 
-      router.basepath = cleanPath(`/${basepath ?? ''}`)
+      router.basepath = `/${trimPath(basepath ?? '') ?? ''}`
 
       if (routeConfig) {
         router.routesById = {} as any
@@ -848,7 +850,7 @@ export function createRouter<
               route.routePath !== '/' || route.childRoutes?.length
             )
 
-            const matchParams = matchPathname(pathname, {
+            const matchParams = matchPathname(router.basepath, pathname, {
               to: route.fullPath,
               fuzzy,
               caseSensitive:
@@ -924,15 +926,16 @@ export function createRouter<
       const matchPromises = resolvedMatches.map(async (match) => {
         // Validate the match (loads search params etc)
         match.__.validate()
-        match.load(loaderOpts)
 
         const search = match.search as { __data?: any }
 
-        if (search.__data && search.__data.matchId !== match.matchId) {
+        if (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
         }
@@ -1029,13 +1032,17 @@ export function createRouter<
         if (!router.state.pending?.location) {
           return false
         }
-        return !!matchPathname(router.state.pending.location.pathname, {
-          ...opts,
-          to: next.pathname,
-        })
+        return !!matchPathname(
+          router.basepath,
+          router.state.pending.location.pathname,
+          {
+            ...opts,
+            to: next.pathname,
+          },
+        )
       }
 
-      return !!matchPathname(router.state.location.pathname, {
+      return !!matchPathname(router.basepath, router.state.location.pathname, {
         ...opts,
         to: next.pathname,
       })