ts-file-router 4.1.0 → 5.0.0

package/dist/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAKrE,eAAO,MAAM,cAAc,GAAI,qDAK5B,qBAAqB,SAqJvB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAgBrE,eAAO,MAAM,cAAc,GAAI,qDAK5B,qBAAqB,SA2IvB,CAAC"}

package/dist/generator.js

@@ -1,6 +1,11 @@
 import { serialize } from './serialize.js';
 import fs from 'fs/promises';
 import path from 'path';
+const getIgnoredOutputFile = (file, output) => file.includes(output);
+const getIgnoredFiles = (file, output) => file.includes('index') ||
+    file.startsWith('_') ||
+    getIgnoredOutputFile(file, output);
+const cleanPaths = (path) => path.replaceAll(/\\/gi, '/').replaceAll(/.(tsx|ts|jsx|js)/gi, '');
 export const generateRoutes = ({ baseFolder, outputFile, routeFileName = 'page.tsx', options = { exitCodeOnResolution: true }, }) => {
     // Get the pages dir to resolve routes
     const basePath = path.resolve(process.cwd(), baseFolder);
@@ -14,22 +19,16 @@ export const generateRoutes = ({ baseFolder, outputFile, routeFileName = 'page.t
         }
         for (const file of directory) {
             // ignore index files, underscore marked, or route file generated
-            if (file.includes('index') ||
-                file.startsWith('_') ||
-                file.includes(outputFile)) {
+            if (getIgnoredFiles(file, outputFile)) {
                 continue;
             }
             const fullPath = path.join(dir, file);
             // Get directory info to control file or folder
             const dirInfo = await fs.stat(fullPath);
             // Path to browser sync if necessary
-            const relativePath = '/' + path.relative(basePath, dir).replaceAll(/\\/g, '/');
+            const relativePath = '/' + path.relative(basePath, dir);
             // Normalize import path to esm pattern
-            const importPath = './' +
-                path
-                    .relative(basePath, fullPath)
-                    .replaceAll(/\\/gi, '/')
-                    .replaceAll(/.(tsx|ts|jsx|js)/gi, '');
+            const importPath = './' + path.relative(basePath, fullPath);
             // Remove extension from file to naming the route
             const key = path.basename(file, path.extname(file));
             if (dirInfo.isDirectory()) {
@@ -42,8 +41,8 @@ export const generateRoutes = ({ baseFolder, outputFile, routeFileName = 'page.t
             // Mount the route object with path like "/folder" and import
             // import will be like "(./baseFolder/file or ./baseFolder/folders).extension"
             routes[key] = {
-                path: relativePath,
-                import: importPath,
+                path: cleanPaths(relativePath),
+                import: cleanPaths(importPath),
             };
         }
         return routes;
@@ -71,26 +70,24 @@ export const generateRoutes = ({ baseFolder, outputFile, routeFileName = 'page.t
     };
     const watcher = async ({ debounce = 500 }) => {
         const { watch } = await import('chokidar');
-        const output = path.resolve(baseFolder, outputFile);
         let timeoutId;
         const watcher = watch(baseFolder, {
             ignoreInitial: false,
             persistent: true,
         });
-        console.log(`👀 Watching folder: ${baseFolder} for changes...`);
+        console.log(`👀 Watching folder: "${baseFolder}" for changes...`);
         const runFromWatcher = () => {
             if (timeoutId) {
                 clearTimeout(timeoutId);
             }
             timeoutId = setTimeout(() => {
-                console.log(`👀 Files changed, regenerating routes...`);
                 createRoutes();
             }, debounce);
         };
         watcher.on('all', (ev, file) => {
-            const resolvedPath = path.resolve(file);
+            const ignoredOuput = getIgnoredOutputFile(file, outputFile);
             // If output file as deleted regenerate it
-            if (resolvedPath === output && ev === 'unlink') {
+            if (ignoredOuput && ev === 'unlink') {
                 console.log(`🚨 ${outputFile} was deleted, regenerating...`);
                 runFromWatcher();
                 return;
@@ -101,8 +98,10 @@ export const generateRoutes = ({ baseFolder, outputFile, routeFileName = 'page.t
                 'unlink',
                 'unlinkDir',
             ];
-            // If added, or change (renamed) or deleted update de routes
-            if (watchOnEvents.includes(ev) && resolvedPath !== output) {
+            const ignoredGeneralFiles = getIgnoredFiles(file, outputFile);
+            // If added, or change (renamed) or deleted, update routes
+            if (watchOnEvents.includes(ev) && !ignoredGeneralFiles) {
+                console.log(`🔎 Watching files from path: "${file}" for changes...`);
                 runFromWatcher();
             }
         });

package/dist/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../src/serialize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA+C9C,eAAO,MAAM,SAAS,GAAU,QAAQ,WAAW,EAAE,YAAY,MAAM,kBActE,CAAC"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../src/serialize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,YAAY,CAAC;AAmD1D,eAAO,MAAM,SAAS,GAAU,QAAQ,WAAW,EAAE,YAAY,MAAM,kBActE,CAAC"}

package/dist/serialize.js

@@ -1,15 +1,18 @@
 import { Biome, Distribution } from '@biomejs/js-api';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+const isRouteLeaf = (value) => {
+    return (typeof value === 'object' &&
+        value !== null &&
+        'path' in value &&
+        'import' in value);
+};
 const stringifyRoutes = (obj) => {
     const entries = Object.entries(obj).map(([key, value]) => {
-        if (typeof value === 'object' &&
-            value !== null &&
-            'path' in value &&
-            'import' in value) {
+        if (isRouteLeaf(value)) {
             return `'${key}': { 
           path: '${value.path}', 
-          import: () => import('${value.import}')
+          import: import('${value.import}')
         }`;
         }
         return `'${key}': ${stringifyRoutes(value)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-file-router",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "router based on project files using typescript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,8 @@
   "scripts": {
     "start": "tsx ./src/generator.ts",
     "prebuild": "rimraf dist",
-    "build": "tsc"
+    "build": "tsc",
+    "publish:package": "npm run build && npm publish"
   },
   "author": "MatheusF10",
   "license": "ISC",