bun-router 0.7.4-experimental.6 → 0.7.4-experimental.8

package/examples/ssr/index.ts

@@ -2,6 +2,6 @@ import { Router } from '../../';
 
 const router = Router();
 
-router.static('/', './examples/ssr/pages');
+router.static('/page', './examples/ssr/pages');
 
 router.serve();

package/examples/static.ts

@@ -2,5 +2,6 @@ import { Router } from '..';
 
 const r = Router(3001);
 
-r.static('/', './pages');
+r.static('/page', './pages');
+
 r.serve();

package/lib/logger/logger.ts

@@ -9,7 +9,7 @@ _                          _
 |___|___|_|_|  |_| |___|___|_| |___|_|  
                                                                                     
 `;
-const VERSION = '0.7.4-experimental.6';
+const VERSION = '0.7.4-experimental.8';
 const Logger = (): BunLogger => {
 	return {
 		info: async (statusCode: number, routePath: string, method: string, message?: string) => {

package/lib/router/router.ts

@@ -12,12 +12,24 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 	const { addRoute, findRoute } = RouteTree();
 	const logger = Logger();
 
-	async function loadComponent(name: string) {
-		const modulePath = path.join(process.cwd(), name);
-		const module = await import(modulePath);
+	async function loadComponent(root: string, name: string) {
+		const module = await import(path.join(process.cwd(), root, name));
 		return module.default;
 	}
 
+	function normalizePath(pattern: string, pathname: string) {
+		const extension = path.extname(pathname);
+		let base = path.basename(pathname);
+
+		if (extension === '.html' || extension === '.tsx') base = base.replace(extension, '');
+
+		let patternPath = [pattern, base].join('/');
+
+		if (base === 'index') patternPath = pattern;
+		
+		return { patternPath, extension, base }
+	}
+
 	return {
 		// add a route to the router tree 
 		add: (pattern, method, callback) => { addRoute(pattern, method, callback); },
@@ -33,29 +45,17 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 		static: async (pattern: string, root: string) => {
 			if (!exists(root)) console.log(`Cannot find directory ${root}`);
 			await readDir(root, async (fp) => {
-				const ext = path.extname(fp);
-
-				let base = path.basename(fp);
-
-				if (ext === '.html' || ext === '.tsx') base = base.replace(ext, '');
-
-				if (pattern[0] !== '/') pattern = '/' + pattern;
-
-				let patternPath = pattern + '/' + base;
-
-				if (base === 'index') patternPath = pattern;
-
-				const purePath = path.join(root, patternPath);
+				const { patternPath, extension, base } = normalizePath(pattern, fp);
 
 				const route: Route = {
 					children: new Map(),
 					dynamicPath: '',
 					isLast: true,
-					path: patternPath.slice(1),
+					path: patternPath.slice(1), // remove the leading '/'
 					method: 'GET',
 					handler: async () => {
-						if (ext === '.tsx') {
-							const component = await loadComponent(purePath.split('.')[0]);
+						if (extension === '.tsx') {
+							const component = await loadComponent(root, base);
 							return await http.render(component());
 						} else {
 							return await http.file(200, fp);
@@ -63,8 +63,6 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 					},
 				};
 
-				console.log(route.path);
-
 				addRoute(route.path, 'GET', route.handler);
 			});
 		},

package/package.json

@@ -14,7 +14,7 @@
   "peerDependencies": {
     "typescript": "^5.0.0"
   },
-  "version": "0.7.4-experimental.6",
+  "version": "0.7.4-experimental.8",
   "dependencies": {
     "@types/react": "^18.2.22",
     "eslint-plugin-react-hooks": "^4.6.0",