routes coding

Papyrus/Sources/Coders.swift

@@ -0,0 +1,12 @@
+enum Coders {
+
+    // MARK: HTTP Body
+
+    static var defaultHTTPBodyEncoder: HTTPBodyEncoder = .json()
+    static var defaultHTTPBodyDecoder: HTTPBodyDecoder = .json()
+
+    // MARK: Query
+
+    static var defaultQueryEncoder = URLEncodedFormEncoder()
+    static var defaultQueryDecoder = URLEncodedFormDecoder()
+}

Papyrus/Sources/Extensions/String+Multipart.swift

@@ -0,0 +1,9 @@
+extension String {
+    static func randomMultipartBoundary() -> String {
+        let first = UInt32.random(in: UInt32.min...UInt32.max)
+        let second = UInt32.random(in: UInt32.min...UInt32.max)
+        return String(format: "papyrus.boundary.%08x%08x", first, second)
+    }
+
+    static let crlf = "\r\n"
+}

Papyrus/Sources/URLSession+Papyrus.swift → Papyrus/Sources/Extensions/URLSession+Papyrus.swift

@@ -38,13 +38,6 @@ extension URLSession: HTTPService {
         }
 #endif
     }
-
-    public func request(_ req: Request, completionHandler: @escaping (Response) -> Void) {
-        let urlRequest = req.urlRequest
-        dataTask(with: urlRequest) {
-            completionHandler(_Response(request: urlRequest, response: $1, error: $2, body: $0))
-        }.resume()
-    }
 }
 
 // MARK: `Response` Conformance

Papyrus/Sources/HTTPBodyDecoder.swift

@@ -0,0 +1,53 @@
+import Foundation
+
+public protocol HTTPBodyDecoder: KeyMappable {
+    func decode<D: Decodable>(_ type: D.Type, from: Data) throws -> D
+}
+
+// MARK: application/json
+
+extension HTTPBodyDecoder where Self == JSONDecoder {
+    public static func json(_ decoder: JSONDecoder = JSONDecoder()) -> Self {
+        decoder
+    }
+}
+
+extension JSONDecoder: HTTPBodyDecoder {
+    public func with(keyMapping: KeyMapping) -> Self {
+        let new = JSONDecoder()
+        new.userInfo = userInfo
+        new.dataDecodingStrategy = dataDecodingStrategy
+        new.dateDecodingStrategy = dateDecodingStrategy
+        new.nonConformingFloatDecodingStrategy = nonConformingFloatDecodingStrategy
+#if os(Linux)
+#else
+        if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+            new.assumesTopLevelDictionary = assumesTopLevelDictionary
+            new.allowsJSON5 = allowsJSON5
+        }
+#endif
+        new.keyDecodingStrategy = keyMapping.jsonDecodingStrategy
+        return new as! Self
+    }
+}
+
+// MARK: application/x-www-form-urlencoded
+
+extension HTTPBodyDecoder where Self == URLEncodedFormDecoder {
+    public static func urlForm(_ decoder: URLEncodedFormDecoder = URLEncodedFormDecoder()) -> Self {
+        decoder
+    }
+}
+
+extension URLEncodedFormDecoder: HTTPBodyDecoder {
+    public func decode<D: Decodable>(_ type: D.Type, from data: Data) throws -> D {
+        let string = String(decoding: data, as: UTF8.self)
+        return try decode(type, from: string)
+    }
+
+    public func with(keyMapping: KeyMapping) -> Self {
+        var copy = self
+        copy.keyMapping = keyMapping
+        return copy
+    }
+}

Papyrus/Sources/RequestEncoder.swift → Papyrus/Sources/HTTPBodyEncoder.swift

@@ -1,19 +1,19 @@
 import Foundation
 
-public protocol RequestEncoder: KeyMappable {
+public protocol HTTPBodyEncoder: KeyMappable {
     var contentType: String { get }
     func encode<E: Encodable>(_ value: E) throws -> Data
 }
 
 // MARK: application/json
 
-extension RequestEncoder where Self == JSONEncoder {
-    public static func json(_ encoder: JSONEncoder) -> Self {
+extension HTTPBodyEncoder where Self == JSONEncoder {
+    public static func json(_ encoder: JSONEncoder = JSONEncoder()) -> Self {
         encoder
     }
 }
 
-extension JSONEncoder: RequestEncoder {
+extension JSONEncoder: HTTPBodyEncoder {
     public var contentType: String { "application/json" }
 
     public func with(keyMapping: KeyMapping) -> Self {
@@ -30,13 +30,13 @@ extension JSONEncoder: RequestEncoder {
 
 // MARK: application/x-www-form-urlencoded
 
-extension RequestEncoder where Self == URLEncodedFormEncoder {
-    public static func urlForm(_ encoder: URLEncodedFormEncoder) -> Self {
+extension HTTPBodyEncoder where Self == URLEncodedFormEncoder {
+    public static func urlForm(_ encoder: URLEncodedFormEncoder = URLEncodedFormEncoder()) -> Self {
         encoder
     }
 }
 
-extension URLEncodedFormEncoder: RequestEncoder {
+extension URLEncodedFormEncoder: HTTPBodyEncoder {
     public var contentType: String { "application/x-www-form-urlencoded" }
 
     public func encode<E: Encodable>(_ value: E) throws -> Data {
@@ -57,8 +57,8 @@ extension URLEncodedFormEncoder: RequestEncoder {
 
 // MARK: multipart/form-data
 
-extension RequestEncoder where Self == MultipartEncoder {
-    public static func multipart(_ encoder: MultipartEncoder) -> Self {
+extension HTTPBodyEncoder where Self == MultipartEncoder {
+    public static func multipart(_ encoder: MultipartEncoder = MultipartEncoder()) -> Self {
         encoder
     }
 }

Papyrus/Sources/HTTPService.swift

@@ -7,7 +7,4 @@ public protocol HTTPService {
 
     /// Concurrency based API
     func request(_ req: Request) async -> Response
-
-    /// Callback based API
-    func request(_ req: Request, completionHandler: @escaping (Response) -> Void)
 }

Papyrus/Sources/KeyMappable.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+public protocol KeyMappable {
+    func with(keyMapping: KeyMapping) -> Self
+}
+
+extension KeyMappable {
+    func with(keyMapping: KeyMapping?) -> Self {
+        guard let keyMapping else { return self }
+        return with(keyMapping: keyMapping)
+    }
+}

Papyrus/Sources/KeyMapping.swift

@@ -1,9 +1,5 @@
 import Foundation
 
-public protocol KeyMappable {
-    func with(keyMapping: KeyMapping) -> Self
-}
-
 /// Represents the mapping between your type's property names and
 /// their corresponding request field key.
 public enum KeyMapping {

Papyrus/Sources/Macros.swift

@@ -18,22 +18,22 @@ public macro Mock() = #externalMacro(module: "PapyrusPlugin", type: "MockMacro")
 public macro Headers(_ headers: [String: String]) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro JSON(encoder: JSONEncoder = JSONEncoder(), decoder: JSONDecoder = JSONDecoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro KeyMapping(_ mapping: KeyMapping) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro URLForm(_ encoder: URLEncodedFormEncoder = URLEncodedFormEncoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro Authorization(_ value: RequestBuilder.AuthorizationHeader) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro Multipart(_ encoder: MultipartEncoder = MultipartEncoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro JSON(encoder: JSONEncoder = JSONEncoder(), decoder: JSONDecoder = JSONDecoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro Converter(encoder: RequestEncoder, decoder: ResponseDecoder) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro URLForm(_ encoder: URLEncodedFormEncoder = URLEncodedFormEncoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro KeyMapping(_ mapping: KeyMapping) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro Multipart(_ encoder: MultipartEncoder = MultipartEncoder()) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 @attached(peer)
-public macro Authorization(_ value: RequestBuilder.AuthorizationHeader) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
+public macro Coder(encoder: HTTPBodyEncoder, decoder: HTTPBodyDecoder) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")
 
 // MARK: Function attributes
 

Papyrus/Sources/Multipart/MultipartDecoder.swift

@@ -0,0 +1,18 @@
+import Foundation
+
+public struct MultipartDecoder: HTTPBodyDecoder {
+    public let boundary: String
+
+    public init(boundary: String? = nil) {
+        self.boundary = boundary ?? .randomMultipartBoundary()
+    }
+
+    public func with(keyMapping: KeyMapping) -> MultipartDecoder {
+        // KeyMapping isn't relevant since each part has already encoded data.
+        self
+    }
+
+    public func decode<D>(_ type: D.Type, from: Data) throws -> D where D : Decodable {
+        fatalError("multipart decoding isn't supported, yet")
+    }
+}

Papyrus/Sources/Multipart/MultipartEncoder.swift

@@ -1,12 +1,12 @@
 import Foundation
 
-public struct MultipartEncoder: RequestEncoder {
+public struct MultipartEncoder: HTTPBodyEncoder {
     public var contentType: String { "multipart/form-data; boundary=\(boundary)" }
     public let boundary: String
     private let crlf = "\r\n"
 
     public init(boundary: String? = nil) {
-        self.boundary = boundary ?? MultipartEncoder.randomBoundary()
+        self.boundary = boundary ?? .randomMultipartBoundary()
     }
 
     public func with(keyMapping: KeyMapping) -> MultipartEncoder {
@@ -47,11 +47,4 @@ public struct MultipartEncoder: RequestEncoder {
         let string = headers.map { "\($0): \($1)\(crlf)" }.sorted().joined() + crlf
         return Data(string.utf8)
     }
-
-    private static func randomBoundary() -> String {
-        let first = UInt32.random(in: UInt32.min...UInt32.max)
-        let second = UInt32.random(in: UInt32.min...UInt32.max)
-
-        return String(format: "papyrus.boundary.%08x%08x", first, second)
-    }
 }