support route parameters

Author: swhitty

Macros/Tests/HTTPHandlerMacroTests.swift

@@ -46,6 +46,9 @@ struct HTTPHandlerMacroTests {
         #expect(
             try await handler.handleRequest(.make(path: "/accepted")).statusCode == .accepted
         )
+        #expect(
+            try await handler.handleRequest(.make(path: "/account/fish")).bodyText == "fish"
+        )
         #expect(
             try await handler.handleRequest(.make(path: "/teapot")).statusCode == .teapot
         )
@@ -80,6 +83,12 @@ private struct MacroHandler {
         HTTPResponse(statusCode: .accepted)
     }
 
+    @HTTPRoute("/account/:id")
+    func accountID(_ req: HTTPRequest) async -> HTTPResponse {
+        let id = req.routeParameters["id"] ?? ""
+        return HTTPResponse(statusCode: .ok, body: id.data(using: .utf8)!)
+    }
+
     @HTTPRoute("/teapot", statusCode: .teapot)
     func getTeapot() throws { }
 

Package.swift

@@ -15,7 +15,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swhitty/FlyingFox.git", from: "0.22.0"),
+        .package(url: "https://github.com/swhitty/FlyingFox.git", branch: "main"),
         .package(url: "https://github.com/swiftlang/swift-syntax", "510.0.0"..<"602.0.0")
     ],
     targets: [

Plugins/Sources/HTTPHandlerMacro.swift

@@ -43,7 +43,7 @@ public enum HTTPHandlerMacro: MemberMacro {
     ) throws -> [DeclSyntax] {
         let memberList = declaration.memberBlock.members
 
-        let routes = memberList.compactMap { member -> RouteDecl? in
+        var routes = memberList.compactMap { member -> RouteDecl? in
             guard let funcDecl = FunctionDecl.make(from: member),
                   let routeAtt = funcDecl.attribute(name: "HTTPRoute") ?? funcDecl.attribute(name: "JSONRoute") else {
                 return nil
@@ -67,6 +67,10 @@ public enum HTTPHandlerMacro: MemberMacro {
             context.diagnoseWarning(for: node, "No HTTPRoute found")
         }
 
+        for i in routes.indices {
+            routes[i].idx = i
+        }
+
         let routeDecl: DeclSyntax = """
         func handleRequest(_ request: HTTPRequest) async throws -> HTTPResponse {
             \(raw: routes.map(\.routeSyntax).joined(separator: "\n"))
@@ -103,6 +107,7 @@ private extension HTTPHandlerMacro {
         var isJSON: Bool
         var encoder: String
         var decoder: String
+        var idx: Int = 0
 
         var routeSyntax: String {
             if isJSON {
@@ -112,16 +117,29 @@ private extension HTTPHandlerMacro {
             }
         }
 
+        var responseVar: String {
+            "response\(idx)"
+        }
+
         var httpRouteSyntax: String {
             if funcDecl.returnType.isVoid {
                 """
-                if await HTTPRoute("\(route)") ~= request { \(funcCallSyntax)
-                return HTTPResponse(statusCode: \(statusCode), headers: \(headers))
+                let \(responseVar) = try await RoutedHTTPHandler.handleMatchedRequest(request, to: HTTPRoute("\(route)")) { _ in
+                    \(funcCallSyntax)
+                    return HTTPResponse(statusCode: \(statusCode), headers: \(headers))
+                }
+                if let \(responseVar) {
+                    return \(responseVar)
                 }
                 """
             } else {
                 """
-                if await HTTPRoute("\(route)") ~= request { return \(funcCallSyntax) }
+                let \(responseVar) = try await RoutedHTTPHandler.handleMatchedRequest(request, to: HTTPRoute("\(route)")) { _ in
+                    return \(funcCallSyntax)
+                }
+                if let \(responseVar) {
+                    return \(responseVar)
+                }
                 """
             }
         }