parametrize the router

Author: saviorand

lightbug.🔥

@@ -1,5 +1,6 @@
-from lightbug_api import App
 from lightbug_http import HTTPRequest, HTTPResponse, OK
+from lightbug_api.app import App
+from lightbug_api.routing import APIRoute
 
 @always_inline
 fn printer(req: HTTPRequest) -> HTTPResponse:
@@ -8,12 +9,12 @@ fn printer(req: HTTPRequest) -> HTTPResponse:
 
 @always_inline
 fn hello(req: HTTPRequest) -> HTTPResponse:
-        return OK("Hello 🔥!")
+        return OK("Hello, 🔥!", "text/plain; charset=utf-8")
 
 fn main() raises:
-    var app = App()
-
-    app.get("/", hello)
-    app.post("/", printer)
+    var app = App(
+        APIRoute("/printer", "POST", printer), 
+        APIRoute("/hello", "GET", hello)
+    )
 
     app.start_server()

lightbug_api/__init__.mojo

@@ -1,27 +0,0 @@
-from lightbug_http import HTTPRequest, HTTPResponse, SysServer, NotFound
-from lightbug_api.routing import Router
-
-
-@value
-struct App:
-    var router: Router
-
-    fn __init__(inout self):
-        self.router = Router()
-
-    fn func(self, req: HTTPRequest) raises -> HTTPResponse:
-        for route_ptr in self.router.routes:
-            var route = route_ptr[]
-            if route.path == req.uri.path and route.method == req.method:
-                return route.handler(req)
-        return NotFound(req.uri.path)
-
-    fn get(inout self, path: String, handler: fn (HTTPRequest) -> HTTPResponse):
-        self.router.add_route(path, "GET", handler)
-
-    fn post(inout self, path: String, handler: fn (HTTPRequest) -> HTTPResponse):
-        self.router.add_route(path, "POST", handler)
-
-    fn start_server(inout self, address: StringLiteral = "0.0.0.0:8080") raises:
-        var server = SysServer()
-        server.listen_and_serve(address, self)

lightbug_api/app.mojo

@@ -0,0 +1,19 @@
+from lightbug_http import HTTPRequest, HTTPResponse, Server, NotFound
+from lightbug_api.routing import Router, APIRoute
+
+@register_passable("trivial")
+struct App[*Ts: APIRoute]:
+    var router: Router[*Ts]
+
+    fn __init__(out self, *routes: APIRoute):
+        self.router = Router[*Ts](routes)
+
+    fn func(mut self, req: HTTPRequest) raises -> HTTPResponse:
+        for route in self.router.routes:
+            if route.path == req.uri.path and route.method == req.method:
+                return route.handler(req)
+        return NotFound(req.uri.path)
+
+    fn start_server(inout self, address: StringLiteral = "0.0.0.0:8080") raises:
+        var server = Server()
+        server.listen_and_serve(address, self)

lightbug_api/routing.mojo

@@ -1,19 +1,22 @@
 from lightbug_http import HTTPRequest, HTTPResponse, NotFound
 
 
-@value
+@register_passable("trivial")
 struct APIRoute:
-    var path: String
-    var method: String
+    var path: StringLiteral
+    var method: StringLiteral
     var handler: fn (HTTPRequest) -> HTTPResponse
 
+    fn __init__(out self, path: StringLiteral, method: StringLiteral, handler: fn (HTTPRequest) -> HTTPResponse):
+        self.path = path
+        self.method = method
+        self.handler = handler
 
-@value
-struct Router:
-    var routes: List[APIRoute]
 
-    fn __init__(inout self):
-        self.routes = List[APIRoute]()
+@register_passable("trivial")
+struct Router[*Ts: APIRoute]:
+    var routes: VariadicList[APIRoute]
 
-    fn add_route(inout self, path: String, method: String, handler: fn (HTTPRequest) -> HTTPResponse):
-        self.routes.append(APIRoute(path, method, handler))
+    @always_inline
+    fn __init__(inout self, routes: VariadicList[APIRoute]):
+        self.routes = routes