@tanstack/router-generator 1.51.6 → 1.54.0

package/src/generator.ts

@@ -2,168 +2,25 @@ import path from 'node:path'
 import * as fs from 'node:fs'
 import * as fsp from 'node:fs/promises'
 import * as prettier from 'prettier'
-import { cleanPath, logging, trimPathLeft } from './utils'
+import {
+  determineInitialRoutePath,
+  logging,
+  removeExt,
+  removeTrailingSlash,
+  removeUnderscores,
+  replaceBackslash,
+  routePathToVariable,
+  trimPathLeft,
+} from './utils'
+import { getRouteNodes as physicalGetRouteNodes } from './filesystem/physical/getRouteNodes'
+import { getRouteNodes as virtualGetRouteNodes } from './filesystem/virtual/getRouteNodes'
+import { rootPathId } from './filesystem/physical/rootPathId'
+import type { GetRouteNodesResult, RouteNode } from './types'
 import type { Config } from './config'
 
 let latestTask = 0
-export const rootPathId = '__root'
 const routeGroupPatternRegex = /\(.+\)/g
 const possiblyNestedRouteGroupPatternRegex = /\([^/]+\)\/?/g
-const disallowedRouteGroupConfiguration = /\(([^)]+)\).(ts|js|tsx|jsx)/
-
-export type RouteNode = {
-  filePath: string
-  fullPath: string
-  variableName: string
-  routePath?: string
-  cleanedPath?: string
-  path?: string
-  isNonPath?: boolean
-  isNonLayout?: boolean
-  isLayout?: boolean
-  isVirtualParentRequired?: boolean
-  isVirtualParentRoute?: boolean
-  isRoute?: boolean
-  isAPIRoute?: boolean
-  isLoader?: boolean
-  isComponent?: boolean
-  isErrorComponent?: boolean
-  isPendingComponent?: boolean
-  isVirtual?: boolean
-  isLazy?: boolean
-  isRoot?: boolean
-  children?: Array<RouteNode>
-  parent?: RouteNode
-}
-
-async function getRouteNodes(config: Config) {
-  const { routeFilePrefix, routeFileIgnorePrefix, routeFileIgnorePattern } =
-    config
-  const logger = logging({ disabled: config.disableLogging })
-  const routeFileIgnoreRegExp = new RegExp(routeFileIgnorePattern ?? '', 'g')
-
-  const routeNodes: Array<RouteNode> = []
-
-  async function recurse(dir: string) {
-    const fullDir = path.resolve(config.routesDirectory, dir)
-    let dirList = await fsp.readdir(fullDir, { withFileTypes: true })
-
-    dirList = dirList.filter((d) => {
-      if (
-        d.name.startsWith('.') ||
-        (routeFileIgnorePrefix && d.name.startsWith(routeFileIgnorePrefix))
-      ) {
-        return false
-      }
-
-      if (routeFilePrefix) {
-        return d.name.startsWith(routeFilePrefix)
-      }
-
-      if (routeFileIgnorePattern) {
-        return !d.name.match(routeFileIgnoreRegExp)
-      }
-
-      return true
-    })
-
-    await Promise.all(
-      dirList.map(async (dirent) => {
-        const fullPath = path.join(fullDir, dirent.name)
-        const relativePath = path.join(dir, dirent.name)
-
-        if (dirent.isDirectory()) {
-          await recurse(relativePath)
-        } else if (fullPath.match(/\.(tsx|ts|jsx|js)$/)) {
-          const filePath = replaceBackslash(path.join(dir, dirent.name))
-          const filePathNoExt = removeExt(filePath)
-          let routePath = determineInitialRoutePath(filePathNoExt)
-
-          if (routeFilePrefix) {
-            routePath = routePath.replaceAll(routeFilePrefix, '')
-          }
-
-          if (disallowedRouteGroupConfiguration.test(dirent.name)) {
-            const errorMessage = `A route configuration for a route group was found at \`${filePath}\`. This is not supported. Did you mean to use a layout/pathless route instead?`
-            logger.error(`ERROR: ${errorMessage}`)
-            throw new Error(errorMessage)
-          }
-
-          const variableName = routePathToVariable(routePath)
-
-          // Remove the index from the route path and
-          // if the route path is empty, use `/'
-
-          const isLazy = routePath.endsWith('/lazy')
-
-          if (isLazy) {
-            routePath = routePath.replace(/\/lazy$/, '')
-          }
-
-          const isRoute = routePath.endsWith('/route')
-          const isComponent = routePath.endsWith('/component')
-          const isErrorComponent = routePath.endsWith('/errorComponent')
-          const isPendingComponent = routePath.endsWith('/pendingComponent')
-          const isLoader = routePath.endsWith('/loader')
-          const isAPIRoute = routePath.startsWith(
-            `${removeTrailingSlash(config.apiBase)}/`,
-          )
-
-          const segments = routePath.split('/')
-          const isLayout =
-            segments[segments.length - 1]?.startsWith('_') || false
-
-          ;(
-            [
-              [isComponent, 'component'],
-              [isErrorComponent, 'errorComponent'],
-              [isPendingComponent, 'pendingComponent'],
-              [isLoader, 'loader'],
-            ] as const
-          ).forEach(([isType, type]) => {
-            if (isType) {
-              logger.warn(
-                `WARNING: The \`.${type}.tsx\` suffix used for the ${filePath} file is deprecated. Use the new \`.lazy.tsx\` suffix instead.`,
-              )
-            }
-          })
-
-          routePath = routePath.replace(
-            /\/(component|errorComponent|pendingComponent|loader|route|lazy)$/,
-            '',
-          )
-
-          if (routePath === 'index') {
-            routePath = '/'
-          }
-
-          routePath = routePath.replace(/\/index$/, '/') || '/'
-
-          routeNodes.push({
-            filePath,
-            fullPath,
-            routePath,
-            variableName,
-            isRoute,
-            isComponent,
-            isErrorComponent,
-            isPendingComponent,
-            isLoader,
-            isLazy,
-            isLayout,
-            isAPIRoute,
-          })
-        }
-      }),
-    )
-
-    return routeNodes
-  }
-
-  await recurse('./')
-
-  return routeNodes
-}
 
 let isFirst = false
 let skipMessage = false
@@ -209,23 +66,31 @@ export async function generator(config: Config) {
     parser: 'typescript',
   }
 
-  const routePathIdPrefix = config.routeFilePrefix ?? ''
-  const beforeRouteNodes = await getRouteNodes(config)
-  const rootRouteNode = beforeRouteNodes.find(
-    (d) => d.routePath === `/${rootPathId}`,
-  )
+  let getRouteNodesResult: GetRouteNodesResult
 
+  if (config.virtualRouteConfig) {
+    getRouteNodesResult = await virtualGetRouteNodes(config)
+  } else {
+    getRouteNodesResult = await physicalGetRouteNodes(config)
+  }
+
+  const { rootRouteNode, routeNodes: beforeRouteNodes } = getRouteNodesResult
+  if (rootRouteNode === undefined) {
+    throw new Error(`rootRouteNode must not be undefined`)
+  }
   const preRouteNodes = multiSortBy(beforeRouteNodes, [
     (d) => (d.routePath === '/' ? -1 : 1),
     (d) => d.routePath?.split('/').length,
-    (d) => (d.filePath.match(/[./]index[.]/) ? 1 : -1),
+    (d) =>
+      d.filePath.match(new RegExp(`[./]${config.indexToken}[.]`)) ? 1 : -1,
     (d) =>
       d.filePath.match(
         /[./](component|errorComponent|pendingComponent|loader|lazy)[.]/,
       )
         ? 1
         : -1,
-    (d) => (d.filePath.match(/[./]route[.]/) ? -1 : 1),
+    (d) =>
+      d.filePath.match(new RegExp(`[./]${config.routeToken}[.]`)) ? -1 : 1,
     (d) => (d.routePath?.endsWith('/') ? -1 : 1),
     (d) => d.routePath,
   ]).filter((d) => ![`/${rootPathId}`].includes(d.routePath || ''))
@@ -298,13 +163,11 @@ export const Route = createRootRoute({
     const trimmedPath = trimPathLeft(node.path ?? '')
 
     const split = trimmedPath.split('/')
-    const first = split[0] ?? trimmedPath
     const lastRouteSegment = split[split.length - 1] ?? trimmedPath
 
     node.isNonPath =
       lastRouteSegment.startsWith('_') ||
       routeGroupPatternRegex.test(lastRouteSegment)
-    node.isNonLayout = first.endsWith('_')
 
     node.cleanedPath = removeGroups(
       removeUnderscores(removeLayoutSegments(node.path)) ?? '',
@@ -542,7 +405,7 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
   const sortedRouteNodes = multiSortBy(routeNodes, [
     (d) => (d.routePath?.includes(`/${rootPathId}`) ? -1 : 1),
     (d) => d.routePath?.split('/').length,
-    (d) => (d.routePath?.endsWith("index'") ? -1 : 1),
+    (d) => (d.routePath?.endsWith(config.indexToken) ? -1 : 1),
     (d) => d,
   ])
 
@@ -562,11 +425,18 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
     .map((d) => d[0])
 
   const virtualRouteNodes = sortedRouteNodes.filter((d) => d.isVirtual)
-  const rootPathIdExtension =
-    config.addExtensions && rootRouteNode
-      ? path.extname(rootRouteNode.filePath)
-      : ''
 
+  function getImportPath(node: RouteNode) {
+    return replaceBackslash(
+      removeExt(
+        path.relative(
+          path.dirname(config.generatedRouteTree),
+          path.resolve(config.routesDirectory, node.filePath),
+        ),
+        config.addExtensions,
+      ),
+    )
+  }
   const routeImports = [
     ...config.routeTreeFileHeader,
     '// This file is auto-generated by TanStack Router',
@@ -575,29 +445,13 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
       : '',
     '// Import Routes',
     [
-      `import { Route as rootRoute } from './${replaceBackslash(
-        path.relative(
-          path.dirname(config.generatedRouteTree),
-          path.resolve(
-            config.routesDirectory,
-            `${routePathIdPrefix}${rootPathId}${rootPathIdExtension}`,
-          ),
-        ),
-      )}'`,
+      `import { Route as rootRoute } from './${getImportPath(rootRouteNode)}'`,
       ...sortedRouteNodes
         .filter((d) => !d.isVirtual)
         .map((node) => {
           return `import { Route as ${
             node.variableName
-          }Import } from './${replaceBackslash(
-            removeExt(
-              path.relative(
-                path.dirname(config.generatedRouteTree),
-                path.resolve(config.routesDirectory, node.filePath),
-              ),
-              config.addExtensions,
-            ),
-          )}'`
+          }Import } from './${getImportPath(node)}'`
         }),
     ].join('\n'),
     virtualRouteNodes.length ? '// Create Virtual Routes' : '',
@@ -695,7 +549,7 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
     ${routeNodes
       .map((routeNode) => {
         const [filePathId, routeId] = getFilePathIdAndRouteIdFromPath(
-          routeNode.routePath!,
+          routeNode.routePath,
         )
 
         return `'${filePathId}': {
@@ -726,14 +580,14 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
   const createRouteManifest = () => {
     const routesManifest = {
       __root__: {
-        filePath: rootRouteNode?.filePath,
+        filePath: rootRouteNode.filePath,
         children: routeTree.map(
-          (d) => getFilePathIdAndRouteIdFromPath(d.routePath!)[1],
+          (d) => getFilePathIdAndRouteIdFromPath(d.routePath)[1],
         ),
       },
       ...Object.fromEntries(
         routeNodes.map((d) => {
-          const [_, routeId] = getFilePathIdAndRouteIdFromPath(d.routePath!)
+          const [_, routeId] = getFilePathIdAndRouteIdFromPath(d.routePath)
 
           return [
             routeId,
@@ -744,7 +598,7 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
                 : undefined,
               children: d.children?.map(
                 (childRoute) =>
-                  getFilePathIdAndRouteIdFromPath(childRoute.routePath!)[1],
+                  getFilePathIdAndRouteIdFromPath(childRoute.routePath)[1],
               ),
             },
           ]
@@ -811,24 +665,6 @@ export const Route = createAPIFileRoute('${escapedRoutePath}')({
   )
 }
 
-function routePathToVariable(routePath: string): string {
-  return (
-    removeUnderscores(routePath)
-      ?.replace(/\/\$\//g, '/splat/')
-      .replace(/\$$/g, 'splat')
-      .replace(/\$/g, '')
-      .split(/[/-]/g)
-      .map((d, i) => (i > 0 ? capitalize(d) : d))
-      .join('')
-      .replace(/([^a-zA-Z0-9]|[.])/gm, '')
-      .replace(/^(\d)/g, 'R$1') ?? ''
-  )
-}
-
-export function removeExt(d: string, keepExtension: boolean = false) {
-  return keepExtension ? d : d.substring(0, d.lastIndexOf('.')) || d
-}
-
 function spaces(d: number): string {
   return Array.from({ length: d })
     .map(() => ' ')
@@ -865,35 +701,14 @@ export function multiSortBy<T>(
     .map(([d]) => d)
 }
 
-function capitalize(s: string) {
-  if (typeof s !== 'string') return ''
-  return s.charAt(0).toUpperCase() + s.slice(1)
-}
-
-function removeUnderscores(s?: string) {
-  return s?.replaceAll(/(^_|_$)/gi, '').replaceAll(/(\/_|_\/)/gi, '/')
-}
-
 function removeTrailingUnderscores(s?: string) {
   return s?.replaceAll(/(_$)/gi, '').replaceAll(/(_\/)/gi, '/')
 }
 
-function replaceBackslash(s: string) {
-  return s.replaceAll(/\\/gi, '/')
-}
-
 function removeGroups(s: string) {
   return s.replace(possiblyNestedRouteGroupPatternRegex, '')
 }
 
-function removeTrailingSlash(s: string) {
-  return s.replace(/\/$/, '')
-}
-
-function determineInitialRoutePath(routePath: string) {
-  return cleanPath(`/${routePath.split('.').join('/')}`) || ''
-}
-
 /**
  * The `node.path` is used as the `id` in the route definition.
  * This function checks if the given node has a parent and if so, it determines the correct path for the given node.
@@ -902,7 +717,7 @@ function determineInitialRoutePath(routePath: string) {
  */
 function determineNodePath(node: RouteNode) {
   return (node.path = node.parent
-    ? node.routePath?.replace(node.parent.routePath!, '') || '/'
+    ? node.routePath?.replace(node.parent.routePath ?? '', '') || '/'
     : node.routePath)
 }
 
@@ -986,7 +801,7 @@ export const inferPath = (routeNode: RouteNode): string => {
     : (routeNode.cleanedPath?.replace(/\/$/, '') ?? '')
 }
 
-function getFilePathIdAndRouteIdFromPath(pathname: string) {
+function getFilePathIdAndRouteIdFromPath(pathname?: string) {
   const filePathId = removeTrailingUnderscores(pathname)
   const id = removeGroups(filePathId ?? '')
 
@@ -1044,13 +859,14 @@ export type StartAPIRoutePathSegment = {
  */
 export function startAPIRouteSegmentsFromTSRFilePath(
   src: string,
+  config: Config,
 ): Array<StartAPIRoutePathSegment> {
   const routePath = determineInitialRoutePath(src)
 
   const parts = routePath
     .replaceAll('.', '/')
     .split('/')
-    .filter((p) => !!p && p !== 'index')
+    .filter((p) => !!p && p !== config.indexToken)
   const segments: Array<StartAPIRoutePathSegment> = parts.map((part) => {
     if (part.startsWith('$')) {
       if (part === '$') {

package/src/types.ts

@@ -0,0 +1,28 @@
+export type RouteNode = {
+  filePath: string
+  fullPath: string
+  variableName: string
+  routePath?: string
+  cleanedPath?: string
+  path?: string
+  isNonPath?: boolean
+  isLayout?: boolean
+  isVirtualParentRequired?: boolean
+  isVirtualParentRoute?: boolean
+  isRoute?: boolean
+  isAPIRoute?: boolean
+  isLoader?: boolean
+  isComponent?: boolean
+  isErrorComponent?: boolean
+  isPendingComponent?: boolean
+  isVirtual?: boolean
+  isLazy?: boolean
+  isRoot?: boolean
+  children?: Array<RouteNode>
+  parent?: RouteNode
+}
+
+export interface GetRouteNodesResult {
+  rootRouteNode?: RouteNode
+  routeNodes: Array<RouteNode>
+}

package/src/utils.ts

@@ -26,3 +26,46 @@ export function logging(config: { disabled: boolean }) {
     },
   }
 }
+
+export function removeLeadingSlash(path: string): string {
+  return path.replace(/^\//, '')
+}
+
+export function removeTrailingSlash(s: string) {
+  return s.replace(/\/$/, '')
+}
+
+export function determineInitialRoutePath(routePath: string) {
+  return cleanPath(`/${routePath.split('.').join('/')}`) || ''
+}
+
+export function replaceBackslash(s: string) {
+  return s.replaceAll(/\\/gi, '/')
+}
+
+export function routePathToVariable(routePath: string): string {
+  return (
+    removeUnderscores(routePath)
+      ?.replace(/\/\$\//g, '/splat/')
+      .replace(/\$$/g, 'splat')
+      .replace(/\$/g, '')
+      .split(/[/-]/g)
+      .map((d, i) => (i > 0 ? capitalize(d) : d))
+      .join('')
+      .replace(/([^a-zA-Z0-9]|[.])/gm, '')
+      .replace(/^(\d)/g, 'R$1') ?? ''
+  )
+}
+
+export function removeUnderscores(s?: string) {
+  return s?.replaceAll(/(^_|_$)/gi, '').replaceAll(/(\/_|_\/)/gi, '/')
+}
+
+export function capitalize(s: string) {
+  if (typeof s !== 'string') return ''
+  return s.charAt(0).toUpperCase() + s.slice(1)
+}
+
+export function removeExt(d: string, keepExtension: boolean = false) {
+  return keepExtension ? d : d.substring(0, d.lastIndexOf('.')) || d
+}