Merge pull request #63 from futuredapp/feature/url-query-as-KeyValuePairs

Use KeyValuePairs instead of Dictionary for url query

Author: mkj-is

Sources/FTAPIKit/Endpoint.swift

@@ -17,15 +17,15 @@ public protocol Endpoint {
 
     var headers: [String: String] { get }
 
-    var query: [String: String] { get }
+    var query: KeyValuePairs<String, String> { get }
 
     /// HTTP method/verb describing the action.
     var method: HTTPMethod { get }
 }
 
 public extension Endpoint {
     var headers: [String: String] { [:] }
-    var query: [String: String] { [:] }
+    var query: KeyValuePairs<String, String> { [:] }
     var method: HTTPMethod { .get }
 }
 
@@ -42,7 +42,7 @@ public protocol MultipartEndpoint: Endpoint {
 }
 
 public protocol URLEncodedEndpoint: Endpoint {
-    var body: [String: String] { get }
+    var body: KeyValuePairs<String, String> { get }
 }
 
 /// Endpoint protocol extending `Endpoint` having decodable associated type, which is used

Sources/FTAPIKit/URLRequestBuilder.swift

@@ -51,7 +51,7 @@ struct URLRequestBuilder<S: URLServer> {
         }
     }
 
-    private func queryItems(parameters: [String: String]) -> [URLQueryItem] {
+    private func queryItems(parameters: KeyValuePairs<String, String>) -> [URLQueryItem] {
         parameters.compactMap { key, value in
             guard let encodedKey = key.addingPercentEncoding(withAllowedCharacters: .urlQueryNameValueAllowed),
                 let encodedValue = value.addingPercentEncoding(withAllowedCharacters: .urlQueryNameValueAllowed) else {

Tests/FTAPIKitTests/Mockups/Endpoints.swift

@@ -78,7 +78,7 @@ struct TestMultipartEndpoint: MultipartEndpoint {
 struct TestURLEncodedEndpoint: URLEncodedEndpoint {
     let path = "post"
     let method: HTTPMethod = .post
-    let body: [String: String] = [
+    let body: KeyValuePairs<String, String> = [
         "param1": "value1",
         "param2": "value2"
     ]