bun-router 0.7.4-experimental.3 → 0.7.4-experimental.5

package/lib/fs/fsys.ts

@@ -32,5 +32,9 @@ function splitFilePath(p: string): string[] {
 	return p.split(path.sep);
 }
 
+function resolveModulePath(module: string) {
+	return path.join(process.cwd(), module);
+}
+
 
-export { readDir, ext, splitFilePath };
+export { readDir, ext, splitFilePath, resolveModulePath };

package/lib/logger/logger.ts

@@ -9,7 +9,7 @@ _                          _
 |___|___|_|_|  |_| |___|___|_| |___|_|  
                                                                                     
 `;
-const VERSION = '0.7.4-experimental';
+const VERSION = '0.7.4-experimental.5';
 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

@@ -2,7 +2,7 @@ import path from 'path';
 import { Database } from 'bun:sqlite';
 import { Route, BunRouter, RouterOptions, Options, HttpHandler } from './router.d';
 import { httpStatusCodes } from '../http/status';
-import { readDir } from '../fs/fsys';
+import { readDir, resolveModulePath } from '../fs/fsys';
 import { Logger, startMessage } from '../logger/logger';
 import { http } from '../http/http';
 import { RouteTree } from './tree';
@@ -36,12 +36,11 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 				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;
 
@@ -55,7 +54,7 @@ const Router: BunRouter = (port?: number | string, options?: RouterOptions<Optio
 					method: 'GET',
 					handler: async () => {
 						if (ext === '.tsx') {
-							const component = await loadComponent(purePath.split('.')[0]);
+							const component = await loadComponent(resolveModulePath(purePath.split('.')[0]));
 							return await http.render(component());
 						} else {
 							return await http.file(200, fp);

package/package.json

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

package/tsconfig.json

@@ -21,5 +21,5 @@
     "paths": {
       "examples/*": ["./examples/*"],
     }
-  }
+  },
 }