bun-router 0.3.7 → 0.3.9

package/examples/dynamic.ts

@@ -0,0 +1,28 @@
+import { router, html, Context } from '..';
+
+const handler = (ctx: Context) => {
+    const name = ctx.params.get('name');
+    if (typeof name === 'undefined' || name === '') return html('<h6 style="color: red">User Undefined</h6>');
+    return html(`<h4>Hello, ${name}!</h4>`);
+}
+
+const space = (ctx: Context) => {
+    const name = ctx.params.get('name');
+    if (typeof name === 'undefined' || name === '') return html(`<h6 style="color: red">Space [${name}] Not Found</h6>`);
+    return html(`<h4>Welcome to ${name}!`)
+}
+
+const handleSettings = (ctx: Context) => {
+    const name = ctx.params.get('name');
+    if (typeof name === 'undefined' || name === '') return html(`<h6 style="color: red">User Not Found</h6>`);
+    return html(`<h4>Settings for ${name}</h4>`)
+}
+
+const r = router();
+
+r.add('/u/:name', 'GET', handler);
+r.add('/s/:name', 'GET', space);
+r.add('/u/:name/settings', 'GET', handleSettings);
+
+
+r.serve();

package/index.ts

@@ -1,3 +1,5 @@
 export * from './lib/router/router';
+export * from './lib/router/router.d';
 export * from './lib/fs/fsys';
-export * from './lib/logger/logger';
+export * from './lib/logger/logger';
+export * from './lib/logger/logger.d';

package/lib/router/router.ts

@@ -99,7 +99,18 @@ const extract = (route: Route, ctx: Context) => {
 }
 
 const match = (route: Route, ctx: Context): boolean => {
-    return ctx.params.size !== 0 || route.pattern === (new URL(ctx.request.url)).pathname
+    const url = new URL(ctx.request.url);
+    const patternRegex = new RegExp('^' + route.pattern.replace(/:[^/]+/g, '([^/]+)') + '$');
+    const matches = url.pathname.match(patternRegex);
+
+    if (matches) {
+        const extractor = extract(route, ctx);
+        extractor?.params();
+
+        return true;
+    }
+
+    return false;
 }
 
 const router: Router = (port?: number | string, options?: Options) => {
@@ -155,10 +166,6 @@ const router: Router = (port?: number | string, options?: Options) => {
                             fs: new Map(),
                         };
 
-                        const extractor = extract(route, ctx);
-
-                        extractor?.params();
-
                         if (url.pathname === '/favicon.ico') return noContent();
 
                         if (match(route, ctx)) {

package/package.json

@@ -8,5 +8,5 @@
   "peerDependencies": {
     "typescript": "^5.0.0"
   },
-  "version": "0.3.7"
+  "version": "0.3.9"
 }

package/index.d.ts

@@ -1,2 +0,0 @@
-export * from './lib/logger/logger.d';
-export * from './lib/router/router.d';