@tanstack/router-plugin 1.121.0-alpha.5 → 1.121.0

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 () => {