bertui 0.1.3 → 0.1.4

package/index.js

@@ -31,5 +31,5 @@ export default {
     buildProduction,
     compileProject,
     program,
-    version: "0.1.3"
+    version: "0.1.4"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bertui",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Lightning-fast React dev server powered by Bun and Elysia",
   "type": "module",
   "main": "./index.js",

package/src/router/router.js

@@ -1,7 +1,7 @@
 // src/router/router.js
 import { join, relative, parse } from 'path';
 import { readdirSync, statSync, existsSync } from 'fs';
-import logger from '../logger/logger.js';
+import logger from 'ernest-logger'; // Assuming Ernest Logger is used
 
 /**
  * Scans the pages directory and generates route definitions
@@ -27,28 +27,45 @@ export function generateRoutes(root) {
         scanDirectory(fullPath, join(basePath, entry));
       } else if (stat.isFile() && /\.(jsx?|tsx?)$/.test(entry)) {
         const parsed = parse(entry);
-        const fileName = parsed.name;
+        let fileName = parsed.name;
         
-        // Skip non-page files
-        if (fileName.startsWith('_') || fileName.startsWith('.')) {
+        // Skip non-page files (e.g., those starting with a dot)
+        if (fileName.startsWith('.') || fileName.startsWith('~')) {
           continue;
         }
         
+        // --- ROUTE PATH GENERATION ---
+        
+        // Handle dynamic routes: _filename -> :filename
+        let isDynamic = false;
+        if (fileName.startsWith('_')) {
+          fileName = fileName.slice(1); // Remove the underscore
+          isDynamic = true;
+        }
+
         // Generate route path
         let routePath = join(basePath, fileName === 'index' ? '' : fileName);
-        routePath = '/' + routePath.replace(/\\/g, '/');
+        routePath = '/' + routePath.replace(/\\/g, '/'); // Use forward slashes
         
-        // Handle dynamic routes [id] -> :id
-        routePath = routePath.replace(/\[([^\]]+)\]/g, ':$1');
+        // Apply dynamic parameter if detected
+        if (isDynamic) {
+            // Replace the last part of the route path with the dynamic parameter (e.g., /blog/slug -> /blog/:slug)
+            routePath = routePath.replace(new RegExp(`/${fileName}$`), `/:${fileName}`);
+        }
         
-        // Get relative path from pages dir
+        // Handle the root path, ensuring it's just '/'
+        if (routePath === '//') {
+            routePath = '/';
+        }
+
+        // Get relative path from pages dir (used for imports in generated code)
         const relativePath = relative(pagesDir, fullPath);
         
         routes.push({
           path: routePath,
           file: relativePath,
           component: fullPath,
-          isDynamic: routePath.includes(':')
+          isDynamic: isDynamic || routePath.includes(':') 
         });
       }
     }
@@ -56,8 +73,10 @@ export function generateRoutes(root) {
   
   scanDirectory(pagesDir);
   
-  // Sort routes: static routes first, then dynamic, then catch-all
+  // Sort routes: Root path first, then static, then dynamic
   routes.sort((a, b) => {
+    if (a.path === '/') return -1; 
+    if (b.path === '/') return 1;
     if (a.isDynamic && !b.isDynamic) return 1;
     if (!a.isDynamic && b.isDynamic) return -1;
     return a.path.localeCompare(b.path);
@@ -102,14 +121,14 @@ export function Router() {
   const matchedRoute = routes.find(route => {
     if (route.path === currentPath) return true;
     
-    // Handle dynamic routes
+    // Handle dynamic routes (simple static matching for now)
     const routeParts = route.path.split('/');
     const pathParts = currentPath.split('/');
     
     if (routeParts.length !== pathParts.length) return false;
     
     return routeParts.every((part, i) => {
-      if (part.startsWith(':')) return true;
+      if (part.startsWith(':')) return true; // Match any value for dynamic part
       return part === pathParts[i];
     });
   });
@@ -182,9 +201,9 @@ export function logRoutes(routes) {
   if (routes.length === 0) {
     logger.warn('No routes found in src/pages/');
     logger.info('Create files in src/pages/ to define routes:');
-    logger.info('  src/pages/index.jsx     → /');
-    logger.info('  src/pages/about.jsx     → /about');
-    logger.info('  src/pages/user/[id].jsx → /user/:id');
+    logger.info('  src/pages/index.jsx     → /');
+    logger.info('  src/pages/about.jsx     → /about');
+    logger.info('  src/pages/user/_id.jsx  → /user/:id'); // Updated tip
     return;
   }