fix(router-generator): refactor isNonPath condition and determineNodePath

Signed-off-by: leesb971204 <[email protected]>

Author: leesb971204

packages/router-generator/src/generator.ts

@@ -402,13 +402,12 @@ export async function generator(config: Config, root: string) {
     } else {
       routeTree.push(node)
     }
-
-    if (node.children && node.children.length > 0) {
-      node.isNonPath = updateIsNonPath(node)
-    }
-
-    if (node.parent) {
-      node.parent.isNonPath = updateIsNonPath(node.parent)
+    if (
+      node._fsRouteType === 'layout' &&
+      node.isVirtual &&
+      node.isVirtualParentRoute
+    ) {
+      node.isNonPath = node.children?.every((d) => d.isNonPath)
     }
 
     routeNodes.push(node)
@@ -845,9 +844,7 @@ function removeGroups(s: string) {
 function determineNodePath(node: RouteNode) {
   return (node.path = node.parent
     ? node.routePath?.replace(
-        node.parent._fsRouteType === 'pathless_layout'
-          ? (node.parent.path ?? '')
-          : (node.parent.routePath ?? ''),
+        node.parent.isNonPath ? '' : (node.parent.routePath ?? ''),
         '',
       ) || '/'
     : node.routePath)
@@ -1108,18 +1105,3 @@ export function startAPIRouteSegmentsFromTSRFilePath(
 
   return segments
 }
-
-/**
- * Only true if all children are pathless_layout or
- * if children are of different types but all their children are pathless_layout
- * @param node
- * @returns
- */
-export const updateIsNonPath = (node: RouteNode) => {
-  if (node._fsRouteType === 'pathless_layout') return true
-  return node.children?.every(
-    (child) =>
-      child._fsRouteType === 'pathless_layout' ||
-      (child.children?.length && child.isNonPath),
-  )
-}