@tanstack/router-generator 1.120.7 → 1.121.0-alpha.11

package/src/config.ts

@@ -3,23 +3,16 @@ import { existsSync, readFileSync } from 'node:fs'
 import { z } from 'zod'
 import { virtualRootRouteSchema } from './filesystem/virtual/config'
 
-export const configSchema = z.object({
+export const baseConfigSchema = z.object({
   target: z.enum(['react', 'solid']).optional().default('react'),
   virtualRouteConfig: virtualRootRouteSchema.or(z.string()).optional(),
   routeFilePrefix: z.string().optional(),
   routeFileIgnorePrefix: z.string().optional().default('-'),
   routeFileIgnorePattern: z.string().optional(),
   routesDirectory: z.string().optional().default('./src/routes'),
-  generatedRouteTree: z.string().optional().default('./src/routeTree.gen.ts'),
   quoteStyle: z.enum(['single', 'double']).optional().default('single'),
   semicolons: z.boolean().optional().default(false),
-  disableTypes: z.boolean().optional().default(false),
-  addExtensions: z.boolean().optional().default(false),
   disableLogging: z.boolean().optional().default(false),
-  disableManifestGeneration: z.boolean().optional().default(false),
-  enableRouteTreeFormatting: z.boolean().optional().default(true),
-  __enableAPIRoutesGeneration: z.boolean().optional(), // Internal flag to be turned on for TanStack Start
-  apiBase: z.string().optional().default('/api'),
   routeTreeFileHeader: z
     .array(z.string())
     .optional()
@@ -28,18 +21,28 @@ export const configSchema = z.object({
       '// @ts-nocheck',
       '// noinspection JSUnusedGlobalSymbols',
     ]),
-  routeTreeFileFooter: z.array(z.string()).optional().default([]),
-  autoCodeSplitting: z.boolean().optional(),
   indexToken: z.string().optional().default('index'),
   routeToken: z.string().optional().default('route'),
   pathParamsAllowedCharacters: z
     .array(z.enum([';', ':', '@', '&', '=', '+', '$', ',']))
     .optional(),
+})
+
+export type BaseConfig = z.infer<typeof baseConfigSchema>
+
+export const configSchema = baseConfigSchema.extend({
+  generatedRouteTree: z.string().optional().default('./src/routeTree.gen.ts'),
+  disableTypes: z.boolean().optional().default(false),
+  verboseFileRoutes: z.boolean().optional(),
+  addExtensions: z.boolean().optional().default(false),
+  disableManifestGeneration: z.boolean().optional().default(false),
+  enableRouteTreeFormatting: z.boolean().optional().default(true),
+  routeTreeFileFooter: z.array(z.string()).optional().default([]),
+  autoCodeSplitting: z.boolean().optional(),
   customScaffolding: z
     .object({
       routeTemplate: z.string().optional(),
       lazyRouteTemplate: z.string().optional(),
-      apiTemplate: z.string().optional(),
     })
     .optional(),
   experimental: z

package/src/filesystem/physical/getRouteNodes.ts

@@ -4,8 +4,6 @@ import {
   determineInitialRoutePath,
   logging,
   removeExt,
-  removeLeadingSlash,
-  removeTrailingSlash,
   replaceBackslash,
   routePathToVariable,
 } from '../../utils'
@@ -22,7 +20,16 @@ import type { Config } from '../../config'
 const disallowedRouteGroupConfiguration = /\(([^)]+)\).(ts|js|tsx|jsx)/
 
 export async function getRouteNodes(
-  config: Config,
+  config: Pick<
+    Config,
+    | 'routesDirectory'
+    | 'routeFilePrefix'
+    | 'routeFileIgnorePrefix'
+    | 'routeFileIgnorePattern'
+    | 'disableLogging'
+    | 'routeToken'
+    | 'indexToken'
+  >,
   root: string,
 ): Promise<GetRouteNodesResult> {
   const { routeFilePrefix, routeFileIgnorePrefix, routeFileIgnorePattern } =
@@ -196,7 +203,7 @@ export async function getRouteNodes(
  */
 export function getRouteMeta(
   routePath: string,
-  config: Config,
+  config: Pick<Config, 'routeToken' | 'indexToken'>,
 ): {
   // `__root` is can be more easily determined by filtering down to routePath === /${rootPathId}
   // `pathless` is needs to determined after `lazy` has been cleaned up from the routePath
@@ -215,15 +222,7 @@ export function getRouteMeta(
 } {
   let fsRouteType: FsRouteType = 'static'
 
-  if (
-    removeLeadingSlash(routePath).startsWith(
-      `${removeTrailingSlash(removeLeadingSlash(config.apiBase))}/`,
-    ) &&
-    config.__enableAPIRoutesGeneration
-  ) {
-    // api routes, i.e. `/api/foo.ts`
-    fsRouteType = 'api'
-  } else if (routePath.endsWith(`/${config.routeToken}`)) {
+  if (routePath.endsWith(`/${config.routeToken}`)) {
     // layout routes, i.e `/foo/route.tsx` or `/foo/_layout/route.tsx`
     fsRouteType = 'layout'
   } else if (routePath.endsWith('/lazy')) {
@@ -257,7 +256,7 @@ export function getRouteMeta(
 function isValidPathlessLayoutRoute(
   normalizedRoutePath: string,
   routeType: FsRouteType,
-  config: Config,
+  config: Pick<Config, 'routeToken' | 'indexToken'>,
 ): boolean {
   if (routeType === 'lazy') {
     return false

package/src/filesystem/virtual/getRouteNodes.ts

@@ -37,7 +37,15 @@ function flattenTree(node: RouteNode): Array<RouteNode> {
 }
 
 export async function getRouteNodes(
-  tsrConfig: Config,
+  tsrConfig: Pick<
+    Config,
+    | 'routesDirectory'
+    | 'virtualRouteConfig'
+    | 'routeFileIgnorePrefix'
+    | 'disableLogging'
+    | 'indexToken'
+    | 'routeToken'
+  >,
   root: string,
 ): Promise<GetRouteNodesResult> {
   const fullDir = resolve(tsrConfig.routesDirectory)
@@ -90,7 +98,7 @@ export async function getRouteNodes(
  *
  */
 async function getVirtualRouteConfigFromFileExport(
-  tsrConfig: Config,
+  tsrConfig: Pick<Config, 'virtualRouteConfig'>,
   root: string,
 ): Promise<VirtualRootRoute> {
   if (
@@ -115,7 +123,14 @@ async function getVirtualRouteConfigFromFileExport(
 }
 
 export async function getRouteNodesRecursive(
-  tsrConfig: Config,
+  tsrConfig: Pick<
+    Config,
+    | 'routesDirectory'
+    | 'routeFileIgnorePrefix'
+    | 'disableLogging'
+    | 'indexToken'
+    | 'routeToken'
+  >,
   root: string,
   fullDir: string,
   nodes?: Array<VirtualRouteNode>,