@@ -17,6 +17,7 @@ import {
1717 buildRouteTreeConfig ,
1818 checkFileExists ,
1919 checkRouteFullPathUniqueness ,
20+ countRoutePathSegments ,
2021 createRouteNodesByFullPath ,
2122 createRouteNodesById ,
2223 createRouteNodesByTo ,
@@ -33,9 +34,8 @@ import {
3334 removeExt ,
3435 removeGroups ,
3536 removeLastSegmentFromPath ,
36- removeLayoutSegmentsWithEscape ,
37+ removeLayoutSegmentsAndUnderscoresWithEscape ,
3738 removeTrailingSlash ,
38- removeUnderscoresWithEscape ,
3939 replaceBackslash ,
4040 trimPathLeft ,
4141} from './utils'
@@ -51,6 +51,7 @@ import type {
5151 HandleNodeAccumulator ,
5252 ImportDeclaration ,
5353 RouteNode ,
54+ RoutePathSegmentMetadata ,
5455} from './types'
5556import type { Config } from './config'
5657import type { Logger } from './logger'
@@ -70,6 +71,30 @@ interface fs {
7071 chown : ( filePath : string , uid : number , gid : number ) => Promise < void >
7172}
7273
74+ function getRoutePathSegmentMetadataForPath (
75+ node : RouteNode ,
76+ routePath : string ,
77+ parentRoutePath ?: string ,
78+ ) : Array < RoutePathSegmentMetadata | undefined > | undefined {
79+ if ( ! node . _routePathSegmentMetadata ) return undefined
80+
81+ const segments = routePath . split ( '/' )
82+ const result = new Array < RoutePathSegmentMetadata | undefined > (
83+ segments . length ,
84+ )
85+ const parentSegmentCount = countRoutePathSegments ( parentRoutePath )
86+ let segmentCount = 0
87+
88+ for ( let i = 0 ; i < segments . length ; i ++ ) {
89+ if ( ! segments [ i ] ) continue
90+ const sourceIndex = parentSegmentCount + segmentCount + 1
91+ result [ i ] = node . _routePathSegmentMetadata [ sourceIndex ]
92+ segmentCount ++
93+ }
94+
95+ return result . some ( Boolean ) ? result : undefined
96+ }
97+
7398const DefaultFileSystem : fs = {
7499 stat : async ( filePath ) => {
75100 const res = await fsp . stat ( filePath , { bigint : true } )
@@ -1430,29 +1455,39 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved
14301455 node . path = determineNodePath ( node )
14311456
14321457 const trimmedPath = trimPathLeft ( node . path ?? '' )
1433- const trimmedOriginalPath = trimPathLeft (
1434- node . originalRoutePath ?. replace (
1435- node . parent ?. originalRoutePath ?? '' ,
1436- '' ,
1437- ) ?? '' ,
1458+ const originalPath =
1459+ node . originalRoutePath && node . parent ?. originalRoutePath
1460+ ? node . originalRoutePath . replace ( node . parent . originalRoutePath , '' ) ||
1461+ '/'
1462+ : node . originalRoutePath
1463+ const routePathSegmentMetadata = getRoutePathSegmentMetadataForPath (
1464+ node ,
1465+ node . path ?? '/' ,
1466+ node . parent ?. routePath ,
14381467 )
1468+ const trimmedOriginalPath = trimPathLeft ( originalPath ?? '' )
14391469
14401470 const split = trimmedPath . split ( '/' )
1471+ const pathSplit = ( node . path ?? '' ) . split ( '/' )
14411472 const originalSplit = trimmedOriginalPath . split ( '/' )
14421473 const lastRouteSegment = split [ split . length - 1 ] ?? trimmedPath
14431474 const lastOriginalSegment =
14441475 originalSplit [ originalSplit . length - 1 ] ?? trimmedOriginalPath
1476+ const lastRouteSegmentMetadata =
1477+ routePathSegmentMetadata ?. [ pathSplit . length - 1 ]
14451478
14461479 // A segment is non-path if it starts with underscore AND the underscore is not escaped
14471480 node . isNonPath =
1448- isSegmentPathless ( lastRouteSegment , lastOriginalSegment ) ||
1481+ ( ! lastRouteSegmentMetadata ?. literalLeadingUnderscore &&
1482+ isSegmentPathless ( lastRouteSegment , lastOriginalSegment ) ) ||
14491483 split . every ( ( part ) => this . routeGroupPatternRegex . test ( part ) )
14501484
1451- // Use escape-aware functions to compute cleanedPath
1485+ // Use a single pass so layout removal does not desync escaped underscore checks.
14521486 node . cleanedPath = removeGroups (
1453- removeUnderscoresWithEscape (
1454- removeLayoutSegmentsWithEscape ( node . path , node . originalRoutePath ) ,
1455- node . originalRoutePath ,
1487+ removeLayoutSegmentsAndUnderscoresWithEscape (
1488+ node . path ,
1489+ originalPath ,
1490+ routePathSegmentMetadata ,
14561491 ) ,
14571492 )
14581493
@@ -1530,13 +1565,17 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved
15301565 candidate . originalRoutePath ?? '' ,
15311566 '' ,
15321567 ) || '/'
1568+ const routePathSegmentMetadataRelativeToParent =
1569+ getRoutePathSegmentMetadataForPath (
1570+ node ,
1571+ pathRelativeToParent ,
1572+ candidate . routePath ,
1573+ )
15331574 node . cleanedPath = removeGroups (
1534- removeUnderscoresWithEscape (
1535- removeLayoutSegmentsWithEscape (
1536- pathRelativeToParent ,
1537- originalPathRelativeToParent ,
1538- ) ,
1575+ removeLayoutSegmentsAndUnderscoresWithEscape (
1576+ pathRelativeToParent ,
15391577 originalPathRelativeToParent ,
1578+ routePathSegmentMetadataRelativeToParent ,
15401579 ) ,
15411580 )
15421581 break
0 commit comments