@tanstack/react-router 1.26.21 → 1.27.0

package/src/path.ts

@@ -54,7 +54,18 @@ export function trimPath(path: string) {
 // /a/b/c + d = /a/b/c/d
 // /a/b/c + d/ = /a/b/c/d
 // /a/b/c + d/e = /a/b/c/d/e
-export function resolvePath(basepath: string, base: string, to: string) {
+interface ResolvePathOptions {
+  basepath: string
+  base: string
+  to: string
+  trailingSlash?: 'always' | 'never' | 'preserve'
+}
+export function resolvePath({
+  basepath,
+  base,
+  to,
+  trailingSlash = 'never',
+}: ResolvePathOptions) {
   base = base.replace(new RegExp(`^${basepath}`), '/')
   to = to.replace(new RegExp(`^${basepath}`), '/')
 
@@ -85,9 +96,18 @@ export function resolvePath(basepath: string, base: string, to: string) {
     }
   })
 
-  const joined = joinPaths([basepath, ...baseSegments.map((d) => d.value)])
+  if (baseSegments.length > 1) {
+    if (last(baseSegments)?.value === '/') {
+      if (trailingSlash === 'never') {
+        baseSegments.pop()
+      }
+    } else if (trailingSlash === 'always') {
+      baseSegments.push({ type: 'pathname', value: '/' })
+    }
+  }
 
-  return cleanPath(trimPathRight(joined))
+  const joined = joinPaths([basepath, ...baseSegments.map((d) => d.value)])
+  return cleanPath(joined)
 }
 
 export function parsePathname(pathname?: string): Array<Segment> {

package/src/router.ts

@@ -150,6 +150,7 @@ export interface RouterOptions<
   defaultNotFoundComponent?: NotFoundRouteComponent
   transformer?: RouterTransformer
   errorSerializer?: RouterErrorSerializer<TSerializedError>
+  trailingSlash?: 'always' | 'never' | 'preserve'
 }
 
 export interface RouterTransformer {
@@ -591,7 +592,13 @@ export class Router<
   }
 
   resolvePathWithBase = (from: string, path: string) => {
-    return resolvePath(this.basepath, from, cleanPath(path))
+    const resolvedPath = resolvePath({
+      basepath: this.basepath,
+      base: from,
+      to: cleanPath(path),
+      trailingSlash: this.options.trailingSlash,
+    })
+    return resolvedPath
   }
 
   get looseRoutesById() {