From ce9f313220a453dee3e1b388a06afaea15953900 Mon Sep 17 00:00:00 2001
From: Flummi <git@srv.fail>
Date: Mon, 17 Mar 2025 06:46:53 +0100
Subject: [PATCH] refactor router to improve route registration and handler
 management

---
 dist/router.js | 20 ++++++++++++--------
 src/router.ts  | 33 +++++++++++++++++----------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/dist/router.js b/dist/router.js
index d02ff58..60e4dcf 100644
--- a/dist/router.js
+++ b/dist/router.js
@@ -101,20 +101,24 @@ export default class Router {
         this.registerRoute(path, "patch", cb);
         return this;
     }
-    registerRoute(path, method, handlers) {
-        if (!this.routes.has(path)) {
-            this.routes.set(path, {});
-        }
-        this.routes.get(path)[method] = handlers.flat();
+    registerRoute(path, method, handler) {
+        var _a;
+        const route = (_a = this.routes.get(path)) !== null && _a !== void 0 ? _a : {
+            [method]: handler
+        };
+        this.routes.set(path, route);
         console.log("route set:", method.toUpperCase(), path);
         this.sortRoutes();
         return this;
     }
     getRoute(path, method) {
-        method = method.toLowerCase();
-        return [...this.routes.entries()].find(r => {
+        return [...this.routes.entries()]
+            .find(r => {
             var _a, _b;
-            return (typeof r[0] === "string" ? r[0] === path : (_b = (_a = r[0]).exec) === null || _b === void 0 ? void 0 : _b.call(_a, path)) && r[1][method];
+            return typeof r[0] === "string"
+                ? r[0] === path
+                : ((_b = (_a = r[0]).exec) === null || _b === void 0 ? void 0 : _b.call(_a, path))
+                    && r[1][method.toLowerCase()];
         });
     }
     sortRoutes() {
diff --git a/src/router.ts b/src/router.ts
index 5abbe16..08028fa 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -5,7 +5,7 @@ import Tpl from "./template.js";
 import { Request, Response, Handler } from "./types.js";
 
 export default class Router {
-  private routes: Map<RegExp | string, { [key: string]: Handler | Handler[] }>;
+  private routes: Map<RegExp | string, { [key: string]: Handler[] }>;
   private tpl?: Tpl;
   private mimes: Map<string, string>;
 
@@ -42,7 +42,7 @@ export default class Router {
    */
   group(basePath: string | RegExp, callback: (methods: any) => void): this {
     const self = this;
-  
+
     const methods = {
       get(path: string | RegExp, ...handlers: Handler[]) {
         const fullPath = self.combinePaths(basePath, path);
@@ -67,10 +67,10 @@ export default class Router {
     };
   
     callback(methods);
-  
+
     return this;
   }
-  
+
   /**
    * Combines a base path and a sub path into a single path.
    * @param basePath - The base path or RegExp.
@@ -86,7 +86,7 @@ export default class Router {
       return new RegExp(`${basePath.replace(/\/$/, "")}${subPath.source}`);
     if(basePath instanceof RegExp && subPath instanceof RegExp)
       return new RegExp(`${basePath.source}${subPath.source}`);
-  
+
     throw new TypeError("Invalid path types. Both basePath and subPath must be either string or RegExp.");
   }
 
@@ -179,14 +179,13 @@ export default class Router {
   private registerRoute(
     path: string | RegExp,
     method: string,
-    handlers: Handler[]
+    handler: Handler[]
   ): this {
-    if(!this.routes.has(path)) {
-      this.routes.set(path, {});
-    }
-  
-    this.routes.get(path)![method] = handlers.flat();
-  
+    const route: { [key: string]: Handler[] } = this.routes.get(path) ?? {
+      [ method ]: handler
+    };
+    this.routes.set(path, route);
+
     console.log("route set:", method.toUpperCase(), path);
     this.sortRoutes();
     return this;
@@ -199,10 +198,12 @@ export default class Router {
    * @returns The matching route or undefined.
    */
   getRoute(path: string, method: string): any {
-    method = method.toLowerCase();
-    return [...this.routes.entries()].find(r => {
-      return (typeof r[0] === "string" ? r[0] === path : r[0].exec?.(path)) && r[1][method];
-    });
+    return [...this.routes.entries()]
+      .find(r => typeof r[0] === "string"
+        ? r[0] === path
+        : r[0].exec?.(path)
+       && r[1][method.toLowerCase()]
+    );
   }
 
   /**