wip inferred parameters

Author: saviorand

lightbug.🔥

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

lightbug_api/app.mojo

@@ -2,14 +2,9 @@ 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)
-
+struct App[*Ts: APIRoute, router: Router]:
     fn func(mut self, req: HTTPRequest) raises -> HTTPResponse:
-        for route in self.router.routes:
+        for route in router.routes:
             if route.path == req.uri.path and route.method == req.method:
                 return route.handler(req)
         return NotFound(req.uri.path)

lightbug_api/routing.mojo

@@ -1,22 +1,24 @@
 from lightbug_http import HTTPRequest, HTTPResponse, NotFound
 
+alias allowed_methods = ["GET", "POST", "PUT", "DELETE", "PATCH"]
 
-@register_passable("trivial")
-struct APIRoute:
-    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
+@register_passable("trivial")
+struct APIRoute[path: StringLiteral, method: StringLiteral, handler: fn (HTTPRequest) -> HTTPResponse]:
+    fn __init__(out self):
+        constrained[method in allowed_methods, "Invalid method"]()
 
 
 @register_passable("trivial")
-struct Router[*Ts: APIRoute]:
-    var routes: VariadicList[APIRoute]
+struct Router[
+    path: StringLiteral, 
+    method: StringLiteral, 
+    handler: fn (HTTPRequest) -> HTTPResponse,
+    //,
+    *Routes: APIRoute[path, method, handler]
+]:
+    var routes: VariadicList[APIRoute[path, method, handler]]
 
     @always_inline
-    fn __init__(inout self, routes: VariadicList[APIRoute]):
-        self.routes = routes
+    fn __init__(inout self, *routes: APIRoute[path, method, handler]):
+        self.routes = VariadicList(routes)