bun-router 0.7.4-experimental.2 → 0.7.4-experimental.4

package/examples/static.ts

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

package/lib/logger/logger.ts

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

package/lib/resolver/resolver.test.ts

@@ -0,0 +1,5 @@
+import { resolveModules } from './resolver';
+
+const modules = await resolveModules('../lib/resolver/testdir');
+
+console.log(modules.length);

package/lib/resolver/{resolveTSX.ts → resolver.ts}

@@ -13,16 +13,31 @@ async function createFileTree(root: string) {
 }
 
 async function resolveModules(root: string) {
+
+	if (!await doesExist(root)) {
+		throw new Error(`Directory ${root} does not exist`);
+	}
+
 	const tree = await createFileTree(root);
 	const files = tree.getFilesByExtension('.tsx');
 	const modules: ComponentType[] = [];
 
 	for (const file of files) {
-		const module = await import(file) as ComponentType;
+		const module = await import(file);
 		modules.push(module);
 	}
-
 	return modules;
 }
 
-export { resolveModules };
+async function doesExist(root: string): Promise<boolean> {
+	const file =  Bun.file(root);
+	return await file.exists();
+}
+
+async function isDir(root: string): Promise<boolean> {
+	const file =  Bun.file(root);
+	return await file.isDir();
+}
+
+
+export { resolveModules };

package/lib/resolver/testdir/foo.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export default function foo() {
+	return <div>foo</div>;
+}

package/lib/router/router.ts

@@ -31,21 +31,21 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 		// the root directory is traversed recursively
 		static: async (pattern: string, root: string) => {
 			await readDir(root, async (fp) => {
-				const pure = path.join('.', fp);
-				const ext = path.extname(pure);
+				const ext = path.extname(fp);
 
-				let base = path.basename(pure);
+				let base = path.basename(fp);
 
 				//FIXME: this can be improved
-				if (ext === '.html') base = base.replace(ext, '');
-				if (ext === '.tsx') base = base.replace(ext, '');
+				if (ext === '.html' || ext === '.tsx') base = base.replace(ext, '');
 
 				if (pattern[0] !== '/') pattern = '/' + pattern;
 
-				let patternPath = pattern + base;
+				let patternPath = pattern + '/' + base;
 
 				if (base === 'index') patternPath = pattern;
 
+				const purePath = path.join(root, patternPath);
+
 				const route: Route = {
 					children: new Map(),
 					dynamicPath: '',
@@ -54,10 +54,10 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 					method: 'GET',
 					handler: async () => {
 						if (ext === '.tsx') {
-							const component = await loadComponent(path.join(root, patternPath));
+							const component = await loadComponent(purePath.split('.')[0]);
 							return await http.render(component());
 						} else {
-							return await http.file(200, pure);
+							return await http.file(200, fp);
 						}
 					},
 				};

package/package.json

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

package/tsconfig.json

@@ -19,7 +19,7 @@
       "bun-types" // add Bun global
     ],
     "paths": {
-      "examples/*": ["./examples/*"]
+      "examples/*": ["./examples/*"],
     }
-  }
+  },
 }