@tanstack/router-cli 1.121.0-alpha.22 → 1.121.0-alpha.27

package/dist/cjs/generate.cjs

@@ -3,7 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const routerGenerator = require("@tanstack/router-generator");
 async function generate(config, root) {
   try {
-    await routerGenerator.generator(config, root);
+    const generator = new routerGenerator.Generator({
+      config,
+      root
+    });
+    await generator.run();
     process.exit(0);
   } catch (err) {
     console.error(err);

package/dist/cjs/generate.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generate.cjs","sources":["../../src/generate.ts"],"sourcesContent":["import { generator } from '@tanstack/router-generator'\nimport type { Config } from '@tanstack/router-generator'\n\nexport async function generate(config: Config, root: string) {\n  try {\n    await generator(config, root)\n    process.exit(0)\n  } catch (err) {\n    console.error(err)\n    process.exit(1)\n  }\n}\n"],"names":["generator"],"mappings":";;;AAGsB,eAAA,SAAS,QAAgB,MAAc;AACvD,MAAA;AACI,UAAAA,gBAAA,UAAU,QAAQ,IAAI;AAC5B,YAAQ,KAAK,CAAC;AAAA,WACP,KAAK;AACZ,YAAQ,MAAM,GAAG;AACjB,YAAQ,KAAK,CAAC;AAAA,EAAA;AAElB;;"}
+{"version":3,"file":"generate.cjs","sources":["../../src/generate.ts"],"sourcesContent":["import { Generator } from '@tanstack/router-generator'\nimport type { Config } from '@tanstack/router-generator'\n\nexport async function generate(config: Config, root: string) {\n  try {\n    const generator = new Generator({\n      config,\n      root,\n    })\n    await generator.run()\n    process.exit(0)\n  } catch (err) {\n    console.error(err)\n    process.exit(1)\n  }\n}\n"],"names":["Generator"],"mappings":";;;AAGsB,eAAA,SAAS,QAAgB,MAAc;AACvD,MAAA;AACI,UAAA,YAAY,IAAIA,0BAAU;AAAA,MAC9B;AAAA,MACA;AAAA,IAAA,CACD;AACD,UAAM,UAAU,IAAI;AACpB,YAAQ,KAAK,CAAC;AAAA,WACP,KAAK;AACZ,YAAQ,MAAM,GAAG;AACjB,YAAQ,KAAK,CAAC;AAAA,EAAA;AAElB;;"}

package/dist/cjs/watch.cjs

@@ -10,29 +10,38 @@ function watch(root) {
   let watcher = new chokidar.FSWatcher({});
   const generatorWatcher = () => {
     const config = routerGenerator.getConfig();
+    const generator = new routerGenerator.Generator({ config, root });
     watcher.close();
     console.info(`TSR: Watching routes (${config.routesDirectory})...`);
     watcher = chokidar.watch(config.routesDirectory);
     watcher.on("ready", async () => {
       const handle = async () => {
         try {
-          await routerGenerator.generator(config, root);
+          await generator.run();
         } catch (err) {
           console.error(err);
           console.info();
         }
       };
       await handle();
-      let timeout;
-      const deduped = (_file) => {
-        if (timeout) {
-          clearTimeout(timeout);
+      watcher.on("all", (event, path) => {
+        let type;
+        switch (event) {
+          case "add":
+            type = "create";
+            break;
+          case "change":
+            type = "update";
+            break;
+          case "unlink":
+            type = "delete";
+            break;
         }
-        timeout = setTimeout(handle, 10);
-      };
-      watcher.on("change", deduped);
-      watcher.on("add", deduped);
-      watcher.on("unlink", deduped);
+        if (type) {
+          return generator.run({ path, type });
+        }
+        return generator.run();
+      });
     });
   };
   configWatcher.on("ready", generatorWatcher);

package/dist/cjs/watch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"watch.cjs","sources":["../../src/watch.ts"],"sourcesContent":["import chokidar from 'chokidar'\nimport {\n  generator,\n  getConfig,\n  resolveConfigPath,\n} from '@tanstack/router-generator'\n\nexport function watch(root: string) {\n  const configPath = resolveConfigPath({\n    configDirectory: root,\n  })\n  const configWatcher = chokidar.watch(configPath)\n\n  let watcher = new chokidar.FSWatcher({})\n\n  const generatorWatcher = () => {\n    const config = getConfig()\n\n    watcher.close()\n\n    console.info(`TSR: Watching routes (${config.routesDirectory})...`)\n    watcher = chokidar.watch(config.routesDirectory)\n\n    watcher.on('ready', async () => {\n      const handle = async () => {\n        try {\n          await generator(config, root)\n        } catch (err) {\n          console.error(err)\n          console.info()\n        }\n      }\n\n      await handle()\n\n      let timeout: ReturnType<typeof setTimeout> | undefined\n\n      const deduped = (_file: string) => {\n        if (timeout) {\n          clearTimeout(timeout)\n        }\n\n        timeout = setTimeout(handle, 10)\n      }\n\n      watcher.on('change', deduped)\n      watcher.on('add', deduped)\n      watcher.on('unlink', deduped)\n    })\n  }\n\n  configWatcher.on('ready', generatorWatcher)\n  configWatcher.on('change', generatorWatcher)\n}\n"],"names":["resolveConfigPath","getConfig","generator"],"mappings":";;;;AAOO,SAAS,MAAM,MAAc;AAClC,QAAM,aAAaA,gBAAAA,kBAAkB;AAAA,IACnC,iBAAiB;AAAA,EAAA,CAClB;AACK,QAAA,gBAAgB,SAAS,MAAM,UAAU;AAE/C,MAAI,UAAU,IAAI,SAAS,UAAU,CAAA,CAAE;AAEvC,QAAM,mBAAmB,MAAM;AAC7B,UAAM,SAASC,gBAAAA,UAAU;AAEzB,YAAQ,MAAM;AAEd,YAAQ,KAAK,yBAAyB,OAAO,eAAe,MAAM;AACxD,cAAA,SAAS,MAAM,OAAO,eAAe;AAEvC,YAAA,GAAG,SAAS,YAAY;AAC9B,YAAM,SAAS,YAAY;AACrB,YAAA;AACI,gBAAAC,gBAAA,UAAU,QAAQ,IAAI;AAAA,iBACrB,KAAK;AACZ,kBAAQ,MAAM,GAAG;AACjB,kBAAQ,KAAK;AAAA,QAAA;AAAA,MAEjB;AAEA,YAAM,OAAO;AAET,UAAA;AAEE,YAAA,UAAU,CAAC,UAAkB;AACjC,YAAI,SAAS;AACX,uBAAa,OAAO;AAAA,QAAA;AAGZ,kBAAA,WAAW,QAAQ,EAAE;AAAA,MACjC;AAEQ,cAAA,GAAG,UAAU,OAAO;AACpB,cAAA,GAAG,OAAO,OAAO;AACjB,cAAA,GAAG,UAAU,OAAO;AAAA,IAAA,CAC7B;AAAA,EACH;AAEc,gBAAA,GAAG,SAAS,gBAAgB;AAC5B,gBAAA,GAAG,UAAU,gBAAgB;AAC7C;;"}
+{"version":3,"file":"watch.cjs","sources":["../../src/watch.ts"],"sourcesContent":["import chokidar from 'chokidar'\nimport {\n  Generator,\n  getConfig,\n  resolveConfigPath,\n} from '@tanstack/router-generator'\nimport type { FileEventType } from '@tanstack/router-generator'\n\nexport function watch(root: string) {\n  const configPath = resolveConfigPath({\n    configDirectory: root,\n  })\n  const configWatcher = chokidar.watch(configPath)\n\n  let watcher = new chokidar.FSWatcher({})\n\n  const generatorWatcher = () => {\n    const config = getConfig()\n    const generator = new Generator({ config, root })\n\n    watcher.close()\n\n    console.info(`TSR: Watching routes (${config.routesDirectory})...`)\n    watcher = chokidar.watch(config.routesDirectory)\n\n    watcher.on('ready', async () => {\n      const handle = async () => {\n        try {\n          await generator.run()\n        } catch (err) {\n          console.error(err)\n          console.info()\n        }\n      }\n\n      await handle()\n\n      watcher.on('all', (event, path) => {\n        let type: FileEventType | undefined\n        switch (event) {\n          case 'add':\n            type = 'create'\n            break\n          case 'change':\n            type = 'update'\n            break\n          case 'unlink':\n            type = 'delete'\n            break\n        }\n        if (type) {\n          return generator.run({ path, type })\n        }\n        return generator.run()\n      })\n    })\n  }\n\n  configWatcher.on('ready', generatorWatcher)\n  configWatcher.on('change', generatorWatcher)\n}\n"],"names":["resolveConfigPath","getConfig","Generator"],"mappings":";;;;AAQO,SAAS,MAAM,MAAc;AAClC,QAAM,aAAaA,gBAAAA,kBAAkB;AAAA,IACnC,iBAAiB;AAAA,EAAA,CAClB;AACK,QAAA,gBAAgB,SAAS,MAAM,UAAU;AAE/C,MAAI,UAAU,IAAI,SAAS,UAAU,CAAA,CAAE;AAEvC,QAAM,mBAAmB,MAAM;AAC7B,UAAM,SAASC,gBAAAA,UAAU;AACzB,UAAM,YAAY,IAAIC,gBAAAA,UAAU,EAAE,QAAQ,MAAM;AAEhD,YAAQ,MAAM;AAEd,YAAQ,KAAK,yBAAyB,OAAO,eAAe,MAAM;AACxD,cAAA,SAAS,MAAM,OAAO,eAAe;AAEvC,YAAA,GAAG,SAAS,YAAY;AAC9B,YAAM,SAAS,YAAY;AACrB,YAAA;AACF,gBAAM,UAAU,IAAI;AAAA,iBACb,KAAK;AACZ,kBAAQ,MAAM,GAAG;AACjB,kBAAQ,KAAK;AAAA,QAAA;AAAA,MAEjB;AAEA,YAAM,OAAO;AAEb,cAAQ,GAAG,OAAO,CAAC,OAAO,SAAS;AAC7B,YAAA;AACJ,gBAAQ,OAAO;AAAA,UACb,KAAK;AACI,mBAAA;AACP;AAAA,UACF,KAAK;AACI,mBAAA;AACP;AAAA,UACF,KAAK;AACI,mBAAA;AACP;AAAA,QAAA;AAEJ,YAAI,MAAM;AACR,iBAAO,UAAU,IAAI,EAAE,MAAM,MAAM;AAAA,QAAA;AAErC,eAAO,UAAU,IAAI;AAAA,MAAA,CACtB;AAAA,IAAA,CACF;AAAA,EACH;AAEc,gBAAA,GAAG,SAAS,gBAAgB;AAC5B,gBAAA,GAAG,UAAU,gBAAgB;AAC7C;;"}

package/dist/esm/generate.js

@@ -1,7 +1,11 @@
-import { generator } from "@tanstack/router-generator";
+import { Generator } from "@tanstack/router-generator";
 async function generate(config, root) {
   try {
-    await generator(config, root);
+    const generator = new Generator({
+      config,
+      root
+    });
+    await generator.run();
     process.exit(0);
   } catch (err) {
     console.error(err);

package/dist/esm/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sources":["../../src/generate.ts"],"sourcesContent":["import { generator } from '@tanstack/router-generator'\nimport type { Config } from '@tanstack/router-generator'\n\nexport async function generate(config: Config, root: string) {\n  try {\n    await generator(config, root)\n    process.exit(0)\n  } catch (err) {\n    console.error(err)\n    process.exit(1)\n  }\n}\n"],"names":[],"mappings":";AAGsB,eAAA,SAAS,QAAgB,MAAc;AACvD,MAAA;AACI,UAAA,UAAU,QAAQ,IAAI;AAC5B,YAAQ,KAAK,CAAC;AAAA,WACP,KAAK;AACZ,YAAQ,MAAM,GAAG;AACjB,YAAQ,KAAK,CAAC;AAAA,EAAA;AAElB;"}
+{"version":3,"file":"generate.js","sources":["../../src/generate.ts"],"sourcesContent":["import { Generator } from '@tanstack/router-generator'\nimport type { Config } from '@tanstack/router-generator'\n\nexport async function generate(config: Config, root: string) {\n  try {\n    const generator = new Generator({\n      config,\n      root,\n    })\n    await generator.run()\n    process.exit(0)\n  } catch (err) {\n    console.error(err)\n    process.exit(1)\n  }\n}\n"],"names":[],"mappings":";AAGsB,eAAA,SAAS,QAAgB,MAAc;AACvD,MAAA;AACI,UAAA,YAAY,IAAI,UAAU;AAAA,MAC9B;AAAA,MACA;AAAA,IAAA,CACD;AACD,UAAM,UAAU,IAAI;AACpB,YAAQ,KAAK,CAAC;AAAA,WACP,KAAK;AACZ,YAAQ,MAAM,GAAG;AACjB,YAAQ,KAAK,CAAC;AAAA,EAAA;AAElB;"}

package/dist/esm/watch.js

@@ -1,5 +1,5 @@
 import chokidar from "chokidar";
-import { resolveConfigPath, getConfig, generator } from "@tanstack/router-generator";
+import { resolveConfigPath, getConfig, Generator } from "@tanstack/router-generator";
 function watch(root) {
   const configPath = resolveConfigPath({
     configDirectory: root
@@ -8,29 +8,38 @@ function watch(root) {
   let watcher = new chokidar.FSWatcher({});
   const generatorWatcher = () => {
     const config = getConfig();
+    const generator = new Generator({ config, root });
     watcher.close();
     console.info(`TSR: Watching routes (${config.routesDirectory})...`);
     watcher = chokidar.watch(config.routesDirectory);
     watcher.on("ready", async () => {
       const handle = async () => {
         try {
-          await generator(config, root);
+          await generator.run();
         } catch (err) {
           console.error(err);
           console.info();
         }
       };
       await handle();
-      let timeout;
-      const deduped = (_file) => {
-        if (timeout) {
-          clearTimeout(timeout);
+      watcher.on("all", (event, path) => {
+        let type;
+        switch (event) {
+          case "add":
+            type = "create";
+            break;
+          case "change":
+            type = "update";
+            break;
+          case "unlink":
+            type = "delete";
+            break;
         }
-        timeout = setTimeout(handle, 10);
-      };
-      watcher.on("change", deduped);
-      watcher.on("add", deduped);
-      watcher.on("unlink", deduped);
+        if (type) {
+          return generator.run({ path, type });
+        }
+        return generator.run();
+      });
     });
   };
   configWatcher.on("ready", generatorWatcher);

package/dist/esm/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sources":["../../src/watch.ts"],"sourcesContent":["import chokidar from 'chokidar'\nimport {\n  generator,\n  getConfig,\n  resolveConfigPath,\n} from '@tanstack/router-generator'\n\nexport function watch(root: string) {\n  const configPath = resolveConfigPath({\n    configDirectory: root,\n  })\n  const configWatcher = chokidar.watch(configPath)\n\n  let watcher = new chokidar.FSWatcher({})\n\n  const generatorWatcher = () => {\n    const config = getConfig()\n\n    watcher.close()\n\n    console.info(`TSR: Watching routes (${config.routesDirectory})...`)\n    watcher = chokidar.watch(config.routesDirectory)\n\n    watcher.on('ready', async () => {\n      const handle = async () => {\n        try {\n          await generator(config, root)\n        } catch (err) {\n          console.error(err)\n          console.info()\n        }\n      }\n\n      await handle()\n\n      let timeout: ReturnType<typeof setTimeout> | undefined\n\n      const deduped = (_file: string) => {\n        if (timeout) {\n          clearTimeout(timeout)\n        }\n\n        timeout = setTimeout(handle, 10)\n      }\n\n      watcher.on('change', deduped)\n      watcher.on('add', deduped)\n      watcher.on('unlink', deduped)\n    })\n  }\n\n  configWatcher.on('ready', generatorWatcher)\n  configWatcher.on('change', generatorWatcher)\n}\n"],"names":[],"mappings":";;AAOO,SAAS,MAAM,MAAc;AAClC,QAAM,aAAa,kBAAkB;AAAA,IACnC,iBAAiB;AAAA,EAAA,CAClB;AACK,QAAA,gBAAgB,SAAS,MAAM,UAAU;AAE/C,MAAI,UAAU,IAAI,SAAS,UAAU,CAAA,CAAE;AAEvC,QAAM,mBAAmB,MAAM;AAC7B,UAAM,SAAS,UAAU;AAEzB,YAAQ,MAAM;AAEd,YAAQ,KAAK,yBAAyB,OAAO,eAAe,MAAM;AACxD,cAAA,SAAS,MAAM,OAAO,eAAe;AAEvC,YAAA,GAAG,SAAS,YAAY;AAC9B,YAAM,SAAS,YAAY;AACrB,YAAA;AACI,gBAAA,UAAU,QAAQ,IAAI;AAAA,iBACrB,KAAK;AACZ,kBAAQ,MAAM,GAAG;AACjB,kBAAQ,KAAK;AAAA,QAAA;AAAA,MAEjB;AAEA,YAAM,OAAO;AAET,UAAA;AAEE,YAAA,UAAU,CAAC,UAAkB;AACjC,YAAI,SAAS;AACX,uBAAa,OAAO;AAAA,QAAA;AAGZ,kBAAA,WAAW,QAAQ,EAAE;AAAA,MACjC;AAEQ,cAAA,GAAG,UAAU,OAAO;AACpB,cAAA,GAAG,OAAO,OAAO;AACjB,cAAA,GAAG,UAAU,OAAO;AAAA,IAAA,CAC7B;AAAA,EACH;AAEc,gBAAA,GAAG,SAAS,gBAAgB;AAC5B,gBAAA,GAAG,UAAU,gBAAgB;AAC7C;"}
+{"version":3,"file":"watch.js","sources":["../../src/watch.ts"],"sourcesContent":["import chokidar from 'chokidar'\nimport {\n  Generator,\n  getConfig,\n  resolveConfigPath,\n} from '@tanstack/router-generator'\nimport type { FileEventType } from '@tanstack/router-generator'\n\nexport function watch(root: string) {\n  const configPath = resolveConfigPath({\n    configDirectory: root,\n  })\n  const configWatcher = chokidar.watch(configPath)\n\n  let watcher = new chokidar.FSWatcher({})\n\n  const generatorWatcher = () => {\n    const config = getConfig()\n    const generator = new Generator({ config, root })\n\n    watcher.close()\n\n    console.info(`TSR: Watching routes (${config.routesDirectory})...`)\n    watcher = chokidar.watch(config.routesDirectory)\n\n    watcher.on('ready', async () => {\n      const handle = async () => {\n        try {\n          await generator.run()\n        } catch (err) {\n          console.error(err)\n          console.info()\n        }\n      }\n\n      await handle()\n\n      watcher.on('all', (event, path) => {\n        let type: FileEventType | undefined\n        switch (event) {\n          case 'add':\n            type = 'create'\n            break\n          case 'change':\n            type = 'update'\n            break\n          case 'unlink':\n            type = 'delete'\n            break\n        }\n        if (type) {\n          return generator.run({ path, type })\n        }\n        return generator.run()\n      })\n    })\n  }\n\n  configWatcher.on('ready', generatorWatcher)\n  configWatcher.on('change', generatorWatcher)\n}\n"],"names":[],"mappings":";;AAQO,SAAS,MAAM,MAAc;AAClC,QAAM,aAAa,kBAAkB;AAAA,IACnC,iBAAiB;AAAA,EAAA,CAClB;AACK,QAAA,gBAAgB,SAAS,MAAM,UAAU;AAE/C,MAAI,UAAU,IAAI,SAAS,UAAU,CAAA,CAAE;AAEvC,QAAM,mBAAmB,MAAM;AAC7B,UAAM,SAAS,UAAU;AACzB,UAAM,YAAY,IAAI,UAAU,EAAE,QAAQ,MAAM;AAEhD,YAAQ,MAAM;AAEd,YAAQ,KAAK,yBAAyB,OAAO,eAAe,MAAM;AACxD,cAAA,SAAS,MAAM,OAAO,eAAe;AAEvC,YAAA,GAAG,SAAS,YAAY;AAC9B,YAAM,SAAS,YAAY;AACrB,YAAA;AACF,gBAAM,UAAU,IAAI;AAAA,iBACb,KAAK;AACZ,kBAAQ,MAAM,GAAG;AACjB,kBAAQ,KAAK;AAAA,QAAA;AAAA,MAEjB;AAEA,YAAM,OAAO;AAEb,cAAQ,GAAG,OAAO,CAAC,OAAO,SAAS;AAC7B,YAAA;AACJ,gBAAQ,OAAO;AAAA,UACb,KAAK;AACI,mBAAA;AACP;AAAA,UACF,KAAK;AACI,mBAAA;AACP;AAAA,UACF,KAAK;AACI,mBAAA;AACP;AAAA,QAAA;AAEJ,YAAI,MAAM;AACR,iBAAO,UAAU,IAAI,EAAE,MAAM,MAAM;AAAA,QAAA;AAErC,eAAO,UAAU,IAAI;AAAA,MAAA,CACtB;AAAA,IAAA,CACF;AAAA,EACH;AAEc,gBAAA,GAAG,SAAS,gBAAgB;AAC5B,gBAAA,GAAG,UAAU,gBAAgB;AAC7C;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-cli",
-  "version": "1.121.0-alpha.22",
+  "version": "1.121.0-alpha.27",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -55,7 +55,7 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "yargs": "^17.7.2",
-    "@tanstack/router-generator": "^1.121.0-alpha.22"
+    "@tanstack/router-generator": "^1.121.0-alpha.27"
   },
   "devDependencies": {
     "@types/yargs": "^17.0.33"

package/src/generate.ts

@@ -1,9 +1,13 @@
-import { generator } from '@tanstack/router-generator'
+import { Generator } from '@tanstack/router-generator'
 import type { Config } from '@tanstack/router-generator'
 
 export async function generate(config: Config, root: string) {
   try {
-    await generator(config, root)
+    const generator = new Generator({
+      config,
+      root,
+    })
+    await generator.run()
     process.exit(0)
   } catch (err) {
     console.error(err)

package/src/watch.ts

@@ -1,9 +1,10 @@
 import chokidar from 'chokidar'
 import {
-  generator,
+  Generator,
   getConfig,
   resolveConfigPath,
 } from '@tanstack/router-generator'
+import type { FileEventType } from '@tanstack/router-generator'
 
 export function watch(root: string) {
   const configPath = resolveConfigPath({
@@ -15,6 +16,7 @@ export function watch(root: string) {
 
   const generatorWatcher = () => {
     const config = getConfig()
+    const generator = new Generator({ config, root })
 
     watcher.close()
 
@@ -24,7 +26,7 @@ export function watch(root: string) {
     watcher.on('ready', async () => {
       const handle = async () => {
         try {
-          await generator(config, root)
+          await generator.run()
         } catch (err) {
           console.error(err)
           console.info()
@@ -33,19 +35,24 @@ export function watch(root: string) {
 
       await handle()
 
-      let timeout: ReturnType<typeof setTimeout> | undefined
-
-      const deduped = (_file: string) => {
-        if (timeout) {
-          clearTimeout(timeout)
+      watcher.on('all', (event, path) => {
+        let type: FileEventType | undefined
+        switch (event) {
+          case 'add':
+            type = 'create'
+            break
+          case 'change':
+            type = 'update'
+            break
+          case 'unlink':
+            type = 'delete'
+            break
         }
-
-        timeout = setTimeout(handle, 10)
-      }
-
-      watcher.on('change', deduped)
-      watcher.on('add', deduped)
-      watcher.on('unlink', deduped)
+        if (type) {
+          return generator.run({ path, type })
+        }
+        return generator.run()
+      })
     })
   }