add nested routes; add nested routes with parameters

Author: mia-z

__tests__/route-match.test.ts

@@ -0,0 +1,7 @@
+import { describe, it, expect } from "bun:test";
+
+describe("Route matching tests", () => {
+    it("will match a single, non-nested route", async () => {
+        //this needs to be testable
+    });
+});

__tests__/scan-paths.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from "bun:test";
+import { RoutePath } from "buxt";
 import { join } from "path";
 import { cwd } from "process";
 import ScanPaths from "src/utils/ScanPaths";
@@ -8,11 +9,11 @@ const root = join(cwd(), "__tests__", "routes");
 describe("Route mapper tests", () => {
     it("will recursively fetch the paths of files inside the 'routes' folder", async () => {
         const paths: Array<RoutePath> = [ 
-            { AbsolutePath: "messages.ts", FullPath: root + "/messages.ts", EffectiveRoute: "messages", },
-            { AbsolutePath: "messages/[id].ts", FullPath: root + "/messages/[id].ts", EffectiveRoute: "messages/[id]" },
-            { AbsolutePath: "messages/new_message.ts", FullPath: root + "/messages/new_message.ts", EffectiveRoute: "messages/new_message"  },
-            { AbsolutePath: "user/[user]/[likes].ts", FullPath: root + "/user/[user]/[likes].ts", EffectiveRoute: "user/[user]/[likes]"  },
-            { AbsolutePath: "user/[user].ts", FullPath: root + "/user/[user].ts", EffectiveRoute: "user/[user]"  }
+            { AbsolutePath: "messages.ts", FullPath: root + "/messages.ts" },
+            { AbsolutePath: "messages/[id].ts", FullPath: root + "/messages/[id].ts" },
+            { AbsolutePath: "messages/new_message.ts", FullPath: root + "/messages/new_message.ts" },
+            { AbsolutePath: "user/[user]/[likes].ts", FullPath: root + "/user/[user]/[likes].ts" },
+            { AbsolutePath: "user/[user].ts", FullPath: root + "/user/[user].ts" }
         ];
 
         const routePaths = await ScanPaths(root, "");

index.ts

@@ -1,11 +1,11 @@
 "use strict";
 
 import { BuxtServer } from "./src/BuxtServer";
-import { BuxtRequest, BuxtResponse } from "buxt";
+import type { BuxtRequest, BuxtResponse, Route, RoutePath } from "./index.d";
 
 const factoryFunction = BuxtServer.createServer;
 
 export { factoryFunction as CreateServer };
 
-export type { BuxtResponse, BuxtRequest };
+export type { BuxtResponse, BuxtRequest, Route, RoutePath };
 export default BuxtServer.createServer;

src/BuxtServer.ts

@@ -32,6 +32,47 @@ export class BuxtServer {
         }));
     }
 
+    private matchRoute(routeToMatch: string): Route {
+        let currentDepth = 0;
+        const routeToMatchSections = routeToMatch.split("/");
+        for (let route of this.routes) {
+            const mappedRoute = route.route.split("/");
+            for (let section of mappedRoute) {
+                if (section === routeToMatchSections[currentDepth]) {
+                    if (mappedRoute.length > currentDepth + 1 && 
+                        routeToMatchSections.length > currentDepth + 1) {
+                        currentDepth++;
+                        continue;
+                    } else if (mappedRoute.length > routeToMatchSections.length ||
+                        mappedRoute.length > routeToMatchSections.length) {
+                        break;
+                    } else {
+                        return route;
+                    }
+                }
+                if (currentDepth > 0) {
+                    if (section.match(/(?<=\[)(.*?)(?=\])/g)) {
+                        if (mappedRoute.length > currentDepth + 1 && 
+                            routeToMatchSections.length > currentDepth + 1) {
+                            currentDepth++;
+                            continue;
+                        } else if (mappedRoute.length > routeToMatchSections.length ||
+                            mappedRoute.length > routeToMatchSections.length) {
+                            break;
+                        } else {
+                            return route;
+                        }
+                    }
+                }
+            }
+            currentDepth = 0;
+        }
+    }
+
+    private async handleRequest(): Promise<void> {
+
+    }
+
     async listen(): Promise<void> {
         console.info("Serving the following endpoints");
         this.routes.forEach(async (route, index) => {
@@ -42,12 +83,9 @@ export class BuxtServer {
             fetch: async (req) => {
                 const bReq = await BuxtRequest.buildRequest(req);
                 const bRes = new BuxtResponse();
-                for (let route of this.routes) {
-                    if (route.route === bReq.matchPath) {
-                        await route.delegate(bReq, bRes);
-                        return bRes.getResponse();
-                    }
-                }
+                const r = this.matchRoute(bReq.matchPath);
+
+                console.log(r);
 
                 return new Response("Not Found", { status: 404 });
             }

tsconfig.json

@@ -9,7 +9,7 @@
             "bun-types"
         ],
         "paths": {
-            "buxt": ["index.d.ts"]
+            "buxt": ["index.ts"]
         }
     }
 }