Add AnyCodable (#23)

* Add AnyCodable and refactor httpBody

* Add rpc overload without parameter

Author: Guilherme Souza

Package.resolved

@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "AnyCodable",
+        "repositoryURL": "https://github.com/Flight-School/AnyCodable",
+        "state": {
+          "branch": null,
+          "revision": "b1a7a8a6186f2fcb28f7bda67cfc545de48b3c80",
+          "version": "0.6.2"
+        }
+      },
       {
         "package": "SnapshotTesting",
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",

Package.swift

@@ -18,14 +18,15 @@ let package = Package(
     .package(
       name: "SnapshotTesting",
       url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.8.1"
-    )
+    ),
+    .package(name: "AnyCodable", url: "https://github.com/Flight-School/AnyCodable", from: "0.6.2"),
   ],
   targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
     // Targets can depend on other targets in this package, and on products in packages this package depends on.
     .target(
       name: "PostgREST",
-      dependencies: []
+      dependencies: ["AnyCodable"]
     ),
     .target(
       name: "example",

Sources/PostgREST/PostgrestBuilder.swift

@@ -1,3 +1,4 @@
+import AnyCodable
 import Foundation
 
 public class PostgrestBuilder {
@@ -6,11 +7,11 @@ public class PostgrestBuilder {
   var headers: [String: String]
   var schema: String?
   var method: String?
-  var body: Any?
+  var body: AnyEncodable?
 
   init(
     url: String, queryParams: [(name: String, value: String)], headers: [String: String],
-    schema: String?, method: String?, body: Any?
+    schema: String?, method: String?, body: AnyEncodable?
   ) {
     self.url = url
     self.queryParams = queryParams
@@ -152,11 +153,7 @@ public class PostgrestBuilder {
     request.httpMethod = method
     request.allHTTPHeaderFields = headers
     if let body = body {
-      if let httpBody = body as? Data {
-        request.httpBody = httpBody
-      } else {
-        request.httpBody = try JSONSerialization.data(withJSONObject: body, options: [])
-      }
+      request.httpBody = try JSONEncoder().encode(body)
     }
     return request
   }

Sources/PostgREST/PostgrestClient.swift

@@ -44,10 +44,21 @@ public class PostgrestClient {
   ///   - fn: Procedure name to call.
   ///   - parameters: Parameters to pass to the procedure.
   /// - Returns: `PostgrestTransformBuilder`
-  public func rpc(fn: String, parameters: [String: Any]?) -> PostgrestTransformBuilder {
+  public func rpc<U: Encodable>(fn: String, parameters: U?) -> PostgrestTransformBuilder {
     return PostgrestRpcBuilder(
       url: "\(config.url)/rpc/\(fn)", queryParams: [], headers: config.headers,
       schema: config.schema, method: nil, body: nil
     ).rpc(parameters: parameters)
   }
+
+  /// Call a stored procedure, aka a "Remote Procedure Call"
+  /// - Parameters:
+  ///   - fn: Procedure name to call.
+  /// - Returns: `PostgrestTransformBuilder`
+  public func rpc(fn: String) -> PostgrestTransformBuilder {
+    return PostgrestRpcBuilder(
+      url: "\(config.url)/rpc/\(fn)", queryParams: [], headers: config.headers,
+      schema: config.schema, method: nil, body: nil
+    ).rpc()
+  }
 }

Sources/PostgREST/PostgrestQueryBuilder.swift

@@ -1,3 +1,5 @@
+import AnyCodable
+
 public class PostgrestQueryBuilder: PostgrestBuilder {
   public func select(columns: String = "*") -> PostgrestFilterBuilder {
     method = "GET"
@@ -18,8 +20,8 @@ public class PostgrestQueryBuilder: PostgrestBuilder {
     )
   }
 
-  public func insert(
-    values: Any, upsert: Bool = false, onConflict: String? = nil,
+  public func insert<U: Encodable>(
+    values: U, upsert: Bool = false, onConflict: String? = nil,
     returning: PostgrestReturningOptions = .representation
   ) -> PostgrestBuilder {
     method = "POST"
@@ -30,29 +32,31 @@ public class PostgrestQueryBuilder: PostgrestBuilder {
       appendSearchParams(name: "on_conflict", value: onConflict)
     }
 
-    body = values
+    body = AnyEncodable(values)
     return self
   }
 
-  public func upsert(
-    values: Any, onConflict: String? = nil, returning: PostgrestReturningOptions = .representation
+  public func upsert<U: Encodable>(
+    values: U, onConflict: String? = nil, returning: PostgrestReturningOptions = .representation
   ) -> PostgrestBuilder {
     method = "POST"
     headers["Prefer"] = "return=\(returning.rawValue),resolution=merge-duplicates"
     if let onConflict = onConflict {
       appendSearchParams(name: "on_conflict", value: onConflict)
     }
 
-    body = values
+    body = AnyEncodable(values)
     return self
   }
 
-  public func update(values: Any, returning: PostgrestReturningOptions = .representation)
+  public func update<U: Encodable>(
+    values: U, returning: PostgrestReturningOptions = .representation
+  )
     -> PostgrestFilterBuilder
   {
     method = "PATCH"
     headers["Prefer"] = "return=\(returning.rawValue)"
-    body = values
+    body = AnyEncodable(values)
     return PostgrestFilterBuilder(
       url: url, queryParams: queryParams, headers: headers, schema: schema, method: method,
       body: body

Sources/PostgREST/PostgrestRpcBuilder.swift

@@ -1,7 +1,20 @@
+import AnyCodable
+
 public class PostgrestRpcBuilder: PostgrestBuilder {
-  public func rpc(parameters: [String: Any]?) -> PostgrestTransformBuilder {
+  public func rpc<U: Encodable>(parameters: U?) -> PostgrestTransformBuilder {
+    method = "POST"
+    body = AnyEncodable(parameters)
+    return PostgrestTransformBuilder(
+      url: url,
+      queryParams: queryParams,
+      headers: headers,
+      schema: schema,
+      method: method,
+      body: body)
+  }
+
+  public func rpc() -> PostgrestTransformBuilder {
     method = "POST"
-    body = parameters
     return PostgrestTransformBuilder(
       url: url,
       queryParams: queryParams,

Tests/LinuxMain.swift

@@ -32,6 +32,10 @@ final class BuildURLRequestTests: XCTestCase {
         try client.rpc(fn: "test_fcn", parameters: ["KEY": "VALUE"])
           .buildURLRequest(head: false, count: nil)
       },
+      TestCase(name: "call rpc without parameter") { client in
+        try client.rpc(fn: "test_fcn")
+          .buildURLRequest(head: false, count: nil)
+      },
     ]
 
     for testCase in testCases {

Tests/PostgRESTTests/BuildURLRequestTests.swift

@@ -0,0 +1,4 @@
+curl \
+	--request POST \
+	--header "Content-Type: application/json" \
+	"https://example.supabase.co/rpc/test_fcn"