@tanstack/router-plugin 1.121.0-alpha.2 → 1.121.0-alpha.26

package/dist/esm/rspack.d.ts

@@ -25,9 +25,9 @@ declare const TanStackRouterGeneratorRspack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -43,6 +43,7 @@ declare const TanStackRouterGeneratorRspack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').RspackPluginInstance;
 /**
  * @example
@@ -70,9 +71,9 @@ declare const TanStackRouterCodeSplitterRspack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -88,6 +89,7 @@ declare const TanStackRouterCodeSplitterRspack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').RspackPluginInstance;
 /**
  * @example
@@ -115,9 +117,9 @@ declare const TanStackRouterRspack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -133,6 +135,7 @@ declare const TanStackRouterRspack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').RspackPluginInstance;
 declare const tanstackRouter: (options?: Partial<{
     target: "react" | "solid";
@@ -147,9 +150,9 @@ declare const tanstackRouter: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -165,6 +168,7 @@ declare const tanstackRouter: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').RspackPluginInstance;
 export default TanStackRouterRspack;
 export { configSchema, TanStackRouterRspack, TanStackRouterGeneratorRspack, TanStackRouterCodeSplitterRspack, tanstackRouter, };

package/dist/esm/vite.d.ts

@@ -1,14 +1,47 @@
 import { configSchema, Config } from './core/config.js';
+declare const tanstackRouterAutoImport: (options?: Partial<{
+    target: "react" | "solid";
+    routeFileIgnorePrefix: string;
+    routesDirectory: string;
+    quoteStyle: "single" | "double";
+    semicolons: boolean;
+    disableLogging: boolean;
+    routeTreeFileHeader: string[];
+    indexToken: string;
+    routeToken: string;
+    generatedRouteTree: string;
+    disableTypes: boolean;
+    addExtensions: boolean;
+    enableRouteTreeFormatting: boolean;
+    routeTreeFileFooter: string[];
+    tmpDir: string;
+    enableRouteGeneration?: boolean | undefined;
+    codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
+    virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
+    routeFilePrefix?: string | undefined;
+    routeFileIgnorePattern?: string | undefined;
+    pathParamsAllowedCharacters?: (";" | ":" | "@" | "&" | "=" | "+" | "$" | ",")[] | undefined;
+    verboseFileRoutes?: boolean | undefined;
+    autoCodeSplitting?: boolean | undefined;
+    customScaffolding?: {
+        routeTemplate?: string | undefined;
+        lazyRouteTemplate?: string | undefined;
+    } | undefined;
+    experimental?: {
+        enableCodeSplitting?: boolean | undefined;
+    } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
+}> | undefined) => import('vite').Plugin<any> | import('vite').Plugin<any>[];
 /**
  * @example
  * ```ts
  * export default defineConfig({
- *   plugins: [TanStackRouterGeneratorVite()],
+ *   plugins: [tanstackRouterGenerator()],
  *   // ...
  * })
  * ```
  */
-declare const TanStackRouterGeneratorVite: (options?: Partial<{
+declare const tanstackRouterGenerator: (options?: Partial<{
     target: "react" | "solid";
     routeFileIgnorePrefix: string;
     routesDirectory: string;
@@ -21,9 +54,9 @@ declare const TanStackRouterGeneratorVite: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -39,17 +72,18 @@ declare const TanStackRouterGeneratorVite: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('vite').Plugin<any> | import('vite').Plugin<any>[];
 /**
  * @example
  * ```ts
  * export default defineConfig({
- *   plugins: [TanStackRouterCodeSplitterVite()],
+ *   plugins: [tanStackRouterCodeSplitter()],
  *   // ...
  * })
  * ```
  */
-declare const TanStackRouterCodeSplitterVite: (options?: Partial<{
+declare const tanStackRouterCodeSplitter: (options?: Partial<{
     target: "react" | "solid";
     routeFileIgnorePrefix: string;
     routesDirectory: string;
@@ -62,9 +96,9 @@ declare const TanStackRouterCodeSplitterVite: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -80,17 +114,18 @@ declare const TanStackRouterCodeSplitterVite: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('vite').Plugin<any> | import('vite').Plugin<any>[];
 /**
  * @example
  * ```ts
  * export default defineConfig({
- *   plugins: [TanStackRouterVite()],
+ *   plugins: [tanstackRouter()],
  *   // ...
  * })
  * ```
  */
-declare const TanStackRouterVite: (options?: Partial<{
+declare const tanstackRouter: (options?: Partial<{
     target: "react" | "solid";
     routeFileIgnorePrefix: string;
     routesDirectory: string;
@@ -103,9 +138,9 @@ declare const TanStackRouterVite: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -121,8 +156,12 @@ declare const TanStackRouterVite: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('vite').Plugin<any> | import('vite').Plugin<any>[];
-declare const tanstackRouter: (options?: Partial<{
+/**
+ * @deprecated Use `tanstackRouter` instead.
+ */
+declare const TanStackRouterVite: (options?: Partial<{
     target: "react" | "solid";
     routeFileIgnorePrefix: string;
     routesDirectory: string;
@@ -135,9 +174,9 @@ declare const tanstackRouter: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -153,7 +192,8 @@ declare const tanstackRouter: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('vite').Plugin<any> | import('vite').Plugin<any>[];
-export default TanStackRouterVite;
-export { configSchema, TanStackRouterGeneratorVite, TanStackRouterCodeSplitterVite, TanStackRouterVite, tanstackRouter, };
+export default tanstackRouter;
+export { configSchema, tanstackRouterAutoImport, tanStackRouterCodeSplitter, tanstackRouterGenerator, TanStackRouterVite, tanstackRouter, };
 export type { Config };

package/dist/esm/vite.js

@@ -3,20 +3,23 @@ import { configSchema } from "./core/config.js";
 import { unpluginRouterCodeSplitterFactory } from "./core/router-code-splitter-plugin.js";
 import { unpluginRouterGeneratorFactory } from "./core/router-generator-plugin.js";
 import { unpluginRouterComposedFactory } from "./core/router-composed-plugin.js";
-const TanStackRouterGeneratorVite = createVitePlugin(
-  unpluginRouterGeneratorFactory
+import { unpluginRouteAutoImportFactory } from "./core/route-autoimport-plugin.js";
+const tanstackRouterAutoImport = createVitePlugin(
+  unpluginRouteAutoImportFactory
 );
-const TanStackRouterCodeSplitterVite = createVitePlugin(
+const tanstackRouterGenerator = createVitePlugin(unpluginRouterGeneratorFactory);
+const tanStackRouterCodeSplitter = createVitePlugin(
   unpluginRouterCodeSplitterFactory
 );
-const TanStackRouterVite = createVitePlugin(unpluginRouterComposedFactory);
-const tanstackRouter = TanStackRouterVite;
+const tanstackRouter = createVitePlugin(unpluginRouterComposedFactory);
+const TanStackRouterVite = tanstackRouter;
 export {
-  TanStackRouterCodeSplitterVite,
-  TanStackRouterGeneratorVite,
   TanStackRouterVite,
   configSchema,
-  TanStackRouterVite as default,
-  tanstackRouter
+  tanstackRouter as default,
+  tanStackRouterCodeSplitter,
+  tanstackRouter,
+  tanstackRouterAutoImport,
+  tanstackRouterGenerator
 };
 //# sourceMappingURL=vite.js.map

package/dist/esm/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","sources":["../../src/vite.ts"],"sourcesContent":["import { createVitePlugin } from 'unplugin'\n\nimport { configSchema } from './core/config'\nimport { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'\nimport { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'\nimport { unpluginRouterComposedFactory } from './core/router-composed-plugin'\n\nimport type { Config } from './core/config'\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [TanStackRouterGeneratorVite()],\n *   // ...\n * })\n * ```\n */\nconst TanStackRouterGeneratorVite = createVitePlugin(\n  unpluginRouterGeneratorFactory,\n)\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [TanStackRouterCodeSplitterVite()],\n *   // ...\n * })\n * ```\n */\nconst TanStackRouterCodeSplitterVite = createVitePlugin(\n  unpluginRouterCodeSplitterFactory,\n)\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [TanStackRouterVite()],\n *   // ...\n * })\n * ```\n */\nconst TanStackRouterVite = createVitePlugin(unpluginRouterComposedFactory)\nconst tanstackRouter = TanStackRouterVite\n\nexport default TanStackRouterVite\nexport {\n  configSchema,\n  TanStackRouterGeneratorVite,\n  TanStackRouterCodeSplitterVite,\n  TanStackRouterVite,\n  tanstackRouter,\n}\n\nexport type { Config }\n"],"names":[],"mappings":";;;;;AAkBA,MAAM,8BAA8B;AAAA,EAClC;AACF;AAWA,MAAM,iCAAiC;AAAA,EACrC;AACF;AAWM,MAAA,qBAAqB,iBAAiB,6BAA6B;AACzE,MAAM,iBAAiB;"}
+{"version":3,"file":"vite.js","sources":["../../src/vite.ts"],"sourcesContent":["import { createVitePlugin } from 'unplugin'\n\nimport { configSchema } from './core/config'\nimport { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'\nimport { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'\nimport { unpluginRouterComposedFactory } from './core/router-composed-plugin'\nimport { unpluginRouteAutoImportFactory } from './core/route-autoimport-plugin'\nimport type { Config } from './core/config'\n\nconst tanstackRouterAutoImport = createVitePlugin(\n  unpluginRouteAutoImportFactory,\n)\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [tanstackRouterGenerator()],\n *   // ...\n * })\n * ```\n */\nconst tanstackRouterGenerator = createVitePlugin(unpluginRouterGeneratorFactory)\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [tanStackRouterCodeSplitter()],\n *   // ...\n * })\n * ```\n */\nconst tanStackRouterCodeSplitter = createVitePlugin(\n  unpluginRouterCodeSplitterFactory,\n)\n\n/**\n * @example\n * ```ts\n * export default defineConfig({\n *   plugins: [tanstackRouter()],\n *   // ...\n * })\n * ```\n */\nconst tanstackRouter = createVitePlugin(unpluginRouterComposedFactory)\n\n/**\n * @deprecated Use `tanstackRouter` instead.\n */\nconst TanStackRouterVite = tanstackRouter\n\nexport default tanstackRouter\nexport {\n  configSchema,\n  tanstackRouterAutoImport,\n  tanStackRouterCodeSplitter,\n  tanstackRouterGenerator,\n  TanStackRouterVite,\n  tanstackRouter,\n}\n\nexport type { Config }\n"],"names":[],"mappings":";;;;;;AASA,MAAM,2BAA2B;AAAA,EAC/B;AACF;AAWM,MAAA,0BAA0B,iBAAiB,8BAA8B;AAW/E,MAAM,6BAA6B;AAAA,EACjC;AACF;AAWM,MAAA,iBAAiB,iBAAiB,6BAA6B;AAKrE,MAAM,qBAAqB;"}

package/dist/esm/webpack.d.ts

@@ -21,9 +21,9 @@ declare const TanStackRouterGeneratorWebpack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -39,6 +39,7 @@ declare const TanStackRouterGeneratorWebpack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').WebpackPluginInstance;
 /**
  * @example
@@ -62,9 +63,9 @@ declare const TanStackRouterCodeSplitterWebpack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -80,6 +81,7 @@ declare const TanStackRouterCodeSplitterWebpack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').WebpackPluginInstance;
 /**
  * @example
@@ -103,9 +105,9 @@ declare const TanStackRouterWebpack: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -121,6 +123,7 @@ declare const TanStackRouterWebpack: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').WebpackPluginInstance;
 declare const tanstackRouter: (options?: Partial<{
     target: "react" | "solid";
@@ -135,9 +138,9 @@ declare const tanstackRouter: (options?: Partial<{
     generatedRouteTree: string;
     disableTypes: boolean;
     addExtensions: boolean;
-    disableManifestGeneration: boolean;
     enableRouteTreeFormatting: boolean;
     routeTreeFileFooter: string[];
+    tmpDir: string;
     enableRouteGeneration?: boolean | undefined;
     codeSplittingOptions?: import('./core/config.js').CodeSplittingOptions | undefined;
     virtualRouteConfig?: string | import('@tanstack/virtual-file-routes').VirtualRootRoute | undefined;
@@ -153,6 +156,7 @@ declare const tanstackRouter: (options?: Partial<{
     experimental?: {
         enableCodeSplitting?: boolean | undefined;
     } | undefined;
+    plugins?: import('@tanstack/router-generator').GeneratorPlugin[] | undefined;
 }> | undefined) => import('unplugin').WebpackPluginInstance;
 export default TanStackRouterWebpack;
 export { configSchema, TanStackRouterWebpack, TanStackRouterGeneratorWebpack, TanStackRouterCodeSplitterWebpack, tanstackRouter, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-plugin",
-  "version": "1.121.0-alpha.2",
+  "version": "1.121.0-alpha.26",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -93,24 +93,26 @@
     "@babel/template": "^7.26.8",
     "@babel/traverse": "^7.26.8",
     "@babel/types": "^7.26.8",
-    "@types/babel__core": "^7.20.5",
-    "@types/babel__template": "^7.4.4",
-    "@types/babel__traverse": "^7.20.6",
     "babel-dead-code-elimination": "^1.0.10",
     "chokidar": "^3.6.0",
     "unplugin": "^2.1.2",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "^1.121.0-alpha.1",
-    "@tanstack/router-generator": "^1.121.0-alpha.1",
-    "@tanstack/router-utils": "^1.121.0-alpha.2",
+    "@tanstack/router-generator": "^1.121.0-alpha.26",
+    "@tanstack/router-utils": "^1.121.0-alpha.26",
+    "@tanstack/router-core": "^1.121.0-alpha.22",
     "@tanstack/virtual-file-routes": "^1.121.0-alpha.1"
   },
+  "devDependencies": {
+    "@types/babel__core": "^7.20.5",
+    "@types/babel__template": "^7.4.4",
+    "@types/babel__traverse": "^7.20.6"
+  },
   "peerDependencies": {
     "@rsbuild/core": ">=1.0.2",
     "vite": ">=5.0.0 || >=6.0.0",
     "vite-plugin-solid": "^2.11.2",
     "webpack": ">=5.92.0",
-    "@tanstack/react-router": "^1.121.0-alpha.1"
+    "@tanstack/react-router": "^1.121.0-alpha.22"
   },
   "peerDependenciesMeta": {
     "@rsbuild/core": {

package/src/core/config.ts

@@ -78,3 +78,5 @@ export const getConfig = (inlineConfig: Partial<Config>, root: string) => {
 }
 
 export type Config = z.infer<typeof configSchema>
+export type ConfigInput = z.input<typeof configSchema>
+export type ConfigOutput = z.output<typeof configSchema>

package/src/core/route-hmr-statement.ts

@@ -4,7 +4,7 @@ export const routeHmrStatement = template.statement(
   `
 if (import.meta.hot) {
   import.meta.hot.accept((newModule) => {
-    if (newModule.Route && typeof newModule.Route.clone === 'function') {
+    if (newModule && newModule.Route && typeof newModule.Route.clone === 'function') {
       newModule.Route.clone(Route)
     }
    })

package/src/core/router-generator-plugin.ts

@@ -1,45 +1,44 @@
-import { isAbsolute, join, normalize, resolve } from 'node:path'
-import { generator, resolveConfigPath } from '@tanstack/router-generator'
+import { isAbsolute, join, normalize } from 'node:path'
+import { Generator, resolveConfigPath } from '@tanstack/router-generator'
 
 import { getConfig } from './config'
 import type { FSWatcher } from 'chokidar'
 import type { UnpluginFactory } from 'unplugin'
 import type { Config } from './config'
 
-let lock = false
-const checkLock = () => lock
-const setLock = (bool: boolean) => {
-  lock = bool
-}
-
 const PLUGIN_NAME = 'unplugin:router-generator'
 
 export const unpluginRouterGeneratorFactory: UnpluginFactory<
   Partial<Config> | undefined
 > = (options = {}) => {
-  let ROOT: string = process.cwd()
+  const ROOT: string = process.cwd()
   let userConfig = options as Config
+  let generator: Generator
 
+  const routeGenerationDisabled = () =>
+    userConfig.enableRouteGeneration === false
   const getRoutesDirectoryPath = () => {
     return isAbsolute(userConfig.routesDirectory)
       ? userConfig.routesDirectory
       : join(ROOT, userConfig.routesDirectory)
   }
 
+  const initConfigAndGenerator = () => {
+    userConfig = getConfig(options, ROOT)
+    generator = new Generator({
+      config: userConfig,
+      root: ROOT,
+    })
+  }
+
   const generate = async () => {
-    if (checkLock()) {
+    if (routeGenerationDisabled()) {
       return
     }
-
-    setLock(true)
-
     try {
-      await generator(userConfig, process.cwd())
-    } catch (err) {
-      console.error(err)
-      console.info()
-    } finally {
-      setLock(false)
+      await generator.run()
+    } catch (e) {
+      console.error(e)
     }
   }
 
@@ -50,45 +49,30 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
     const filePath = normalize(file)
 
     if (filePath === resolveConfigPath({ configDirectory: ROOT })) {
-      userConfig = getConfig(options, ROOT)
-      return
-    }
-
-    if (
-      event === 'update' &&
-      filePath === resolve(userConfig.generatedRouteTree)
-    ) {
-      // skip generating routes if the generated route tree is updated
+      initConfigAndGenerator()
       return
     }
-
-    const routesDirectoryPath = getRoutesDirectoryPath()
-    if (filePath.startsWith(routesDirectoryPath)) {
-      await generate()
-    }
-  }
-
-  const run: (cb: () => Promise<void> | void) => Promise<void> = async (cb) => {
-    if (userConfig.enableRouteGeneration ?? true) {
-      await cb()
+    try {
+      await generator.run({ path: filePath, type: event })
+    } catch (e) {
+      console.error(e)
     }
   }
 
   return {
     name: 'router-generator-plugin',
+    enforce: 'pre',
     async watchChange(id, { event }) {
-      await run(async () => {
+      if (!routeGenerationDisabled()) {
         await handleFile(id, event)
-      })
+      }
+    },
+    async buildStart() {
+      await generate()
     },
     vite: {
-      configResolved(config) {
-        ROOT = config.root
-        userConfig = getConfig(options, ROOT)
-
-        // if (config.command === 'serve') {
-        //   await run(generate)
-        // }
+      configResolved() {
+        initConfigAndGenerator()
       },
       async buildStart() {
         if (this.environment.config.consumer === 'server') {
@@ -96,18 +80,16 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
           // for the client environment
           return
         }
-        await run(generate)
+        await generate()
       },
       sharedDuringBuild: true,
     },
     rspack(compiler) {
-      userConfig = getConfig(options, ROOT)
+      initConfigAndGenerator()
 
       let handle: FSWatcher | null = null
 
-      compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, async () => {
-        await run(generate)
-      })
+      compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, generate)
 
       compiler.hooks.watchRun.tapPromise(PLUGIN_NAME, async () => {
         if (handle) {
@@ -119,11 +101,9 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
         const chokidar = await import('chokidar')
         handle = chokidar
           .watch(routesDirectoryPath, { ignoreInitial: true })
-          .on('add', async () => {
-            await run(generate)
-          })
+          .on('add', generate)
 
-        await run(generate)
+        await generate()
       })
 
       compiler.hooks.watchClose.tap(PLUGIN_NAME, async () => {
@@ -137,9 +117,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
 
       let handle: FSWatcher | null = null
 
-      compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, async () => {
-        await run(generate)
-      })
+      compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, generate)
 
       compiler.hooks.watchRun.tapPromise(PLUGIN_NAME, async () => {
         if (handle) {
@@ -151,11 +129,9 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
         const chokidar = await import('chokidar')
         handle = chokidar
           .watch(routesDirectoryPath, { ignoreInitial: true })
-          .on('add', async () => {
-            await run(generate)
-          })
+          .on('add', generate)
 
-        await run(generate)
+        await generate()
       })
 
       compiler.hooks.watchClose.tap(PLUGIN_NAME, async () => {

package/src/index.ts

@@ -1,4 +1,4 @@
-export { configSchema } from './core/config'
+export { configSchema, getConfig } from './core/config'
 export { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
 export { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
-export type { Config } from './core/config'
+export type { Config, ConfigInput, ConfigOutput } from './core/config'