wip

Sources/ApplicativeRouter/Combinators.swift

@@ -10,7 +10,7 @@ public func lit(_ str: String) -> Router<Void> {
       uncons(route.path)
         .flatMap { p, ps in
           p == str
-            ? (.init(method: route.method, path: ps, query: route.query, body: route.body), ())
+            ? (.init(method: route.method, path: ps, query: route.query, body: route.body, headers: route.headers), ())
             : nil
       }
   },
@@ -25,7 +25,7 @@ public func pathParam<A>(_ f: PartialIso<String, A>) -> Router<A> {
   return Router<A>(
     parse: { route in
       guard let (p, ps) = uncons(route.path), let v = f.apply(p) else { return nil }
-      return (RequestData(method: route.method, path: ps, query: route.query, body: route.body), v)
+      return (RequestData(method: route.method, path: ps, query: route.query, body: route.body, headers: route.headers), v)
   },
     print: { a in
       .init(method: nil, path: [f.unapply(a) ?? ""], query: [], body: nil)
@@ -59,12 +59,10 @@ public func queryParam<A>(_ key: String, _ f: PartialIso<String?, A>) -> Router<
   })
 }
 
-public func header<A>(_ key: String, _ f: PartialIso<String?, A>) -> Router<A> {
+public func header<A>(_ key: String, _ f: PartialIso<String, A>) -> Router<A> {
   .init(
     parse: { (request: RequestData) in
-      request.headers
-        .first(where: { k, _ in k == key })
-        .map(\.value)
+      request.headers[key]
         .flatMap(f.apply)
         .map { (request, $0) }
     },
@@ -74,7 +72,7 @@ public func header<A>(_ key: String, _ f: PartialIso<String?, A>) -> Router<A> {
         path: [],
         query: [],
         body: nil,
-        headers: f.unapply(value).map { [(key, $0)] } ?? []
+        headers: f.unapply(value).map { [key: $0] } ?? [:]
       )
     },
     template: { _ in fatalError() }

Sources/ApplicativeRouter/RequestData.swift

@@ -6,7 +6,7 @@ struct RequestData: Monoid {
   var path: [String] = []
   var query: [(key: String, value: String?)] = []
   var body: Data? = nil
-  var headers: [(key: String, value: String?)] = []
+  var headers: [String: String] = [:]
 
   static var empty = RequestData()
 
@@ -17,7 +17,7 @@ struct RequestData: Monoid {
       query: lhs.query + rhs.query,
       // todo: is coalescing enough or should we be appending?
       body: lhs.body ?? rhs.body,
-      headers: lhs.headers + rhs.headers
+      headers: lhs.headers.merging(rhs.headers, uniquingKeysWith: { $1 })
     )
   }
 }

Sources/ApplicativeRouter/SyntaxRouter.swift

@@ -167,15 +167,27 @@ private func requestData(from request: URLRequest) -> RequestData {
   let method = request.httpMethod.flatMap(Method.init(string:)) ?? .get
 
   guard let url = request.url else {
-    return .init(method: method, path: [], query: [], body: request.httpBody)
+    return .init(
+      method: method,
+      path: [],
+      query: [],
+      body: request.httpBody,
+      headers: request.allHTTPHeaderFields ?? [:]
+    )
   }
 
   let query = parse(query: url.query ?? "")
 
   let path = url.path.components(separatedBy: "/")
     |> mapOptional { $0.isEmpty ? nil : $0 }
 
-  return .init(method: method, path: path, query: query, body: request.httpBody)
+  return .init(
+    method: method,
+    path: path,
+    query: query,
+    body: request.httpBody,
+    headers: request.allHTTPHeaderFields ?? [:]
+  )
 }
 
 private func request(from data: RequestData) -> URLRequest? {

Tests/ApplicativeRouterTests/SyntaxRouterTests.swift

@@ -206,4 +206,15 @@ class SyntaxRouterTests: XCTestCase {
       router.absoluteString(for: .redirect("http://localhost:8080/home?redirect=http://localhost:8080/home"))
     )
   }
+
+  func testHeader() {
+    let router: Router<Int> = get %> "home" %> header("version", .int) <% end
+
+    var request = URLRequest(url: URL(string: "home")!)
+    request.allHTTPHeaderFields = ["version": "10"]
+    XCTAssertEqual(
+      router.match(request: request),
+      10
+    )
+  }
 }