Merge pull request #7 from appwrite/dev

Fix build

Author: lohanidamodar

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
     products: [
         .library(
             name: "Appwrite",
-            targets: ["Appwrite", "AppwriteModels"]
+            targets: ["Appwrite", "AppwriteModels", "JSONCodable"]
         ),
     ],
     dependencies: [
@@ -26,11 +26,18 @@ let package = Package(
             dependencies: [
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "NIOWebSocket", package: "swift-nio"),
-                "AppwriteModels"
+                "AppwriteModels",
+                "JSONCodable"
             ]
         ),
         .target(
-            name: "AppwriteModels"
+            name: "AppwriteModels",
+            dependencies: [
+                "JSONCodable"
+            ]
+        ),
+        .target(
+            name: "JSONCodable"
         ),
         .testTarget(
             name: "AppwriteTests",

README.md

@@ -33,7 +33,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "1.2.1"),
+        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "1.2.2"),
     ],
 ```
 

Sources/Appwrite/Client.swift

@@ -23,7 +23,7 @@ open class Client {
         "x-sdk-name": "Swift",
         "x-sdk-platform": "server",
         "x-sdk-language": "swift",
-        "x-sdk-version": "1.2.1",
+        "x-sdk-version": "1.2.2",
         "X-Appwrite-Response-Format": "1.0.0"
     ]
 

Sources/Appwrite/Services/Account.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Account service allows you to authenticate and manage a user account.
@@ -122,7 +123,7 @@ open class Account: Service {
     ) async throws -> AppwriteModels.Account<[String: AnyCodable]> {
         return try await updateEmail(
             email: email,
-            password: password
+            password: password,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -212,7 +213,7 @@ open class Account: Service {
         name: String
     ) async throws -> AppwriteModels.Account<[String: AnyCodable]> {
         return try await updateName(
-            name: name
+            name: name,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -276,7 +277,7 @@ open class Account: Service {
     ) async throws -> AppwriteModels.Account<[String: AnyCodable]> {
         return try await updatePassword(
             password: password,
-            oldPassword: oldPassword
+            oldPassword: oldPassword,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -344,7 +345,7 @@ open class Account: Service {
     ) async throws -> AppwriteModels.Account<[String: AnyCodable]> {
         return try await updatePhone(
             phone: phone,
-            password: password
+            password: password,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -408,7 +409,7 @@ open class Account: Service {
     /// @return array
     ///
     open func updatePrefs<T>(
-        prefs: T,
+        prefs: Any,
         nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/prefs"
@@ -449,7 +450,7 @@ open class Account: Service {
         prefs: Any
     ) async throws -> AppwriteModels.Account<[String: AnyCodable]> {
         return try await updatePrefs(
-            prefs: prefs
+            prefs: prefs,
             nestedType: [String: AnyCodable].self
         )
     }

Sources/Appwrite/Services/Avatars.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Avatars service aims to help you complete everyday tasks related to your app image, icons, and avatars.

Sources/Appwrite/Services/Databases.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Databases service allows you to create structured collections of documents, query and filter lists of documents
@@ -1033,7 +1034,7 @@ open class Databases: Service {
         return try await listDocuments(
             databaseId: databaseId,
             collectionId: collectionId,
-            queries: queries
+            queries: queries,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -1058,7 +1059,7 @@ open class Databases: Service {
         databaseId: String,
         collectionId: String,
         documentId: String,
-        data: T,
+        data: Any,
         permissions: [String]? = nil,
         nestedType: T.Type
     ) async throws -> AppwriteModels.Document<T> {
@@ -1117,7 +1118,7 @@ open class Databases: Service {
             collectionId: collectionId,
             documentId: documentId,
             data: data,
-            permissions: permissions
+            permissions: permissions,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -1184,7 +1185,7 @@ open class Databases: Service {
         return try await getDocument(
             databaseId: databaseId,
             collectionId: collectionId,
-            documentId: documentId
+            documentId: documentId,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -1207,7 +1208,7 @@ open class Databases: Service {
         databaseId: String,
         collectionId: String,
         documentId: String,
-        data: T? = nil,
+        data: Any? = nil,
         permissions: [String]? = nil,
         nestedType: T.Type
     ) async throws -> AppwriteModels.Document<T> {
@@ -1264,7 +1265,7 @@ open class Databases: Service {
             collectionId: collectionId,
             documentId: documentId,
             data: data,
-            permissions: permissions
+            permissions: permissions,
             nestedType: [String: AnyCodable].self
         )
     }

Sources/Appwrite/Services/Functions.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Functions Service allows you view, create and manage your Cloud Functions.

Sources/Appwrite/Services/Graphql.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The GraphQL API allows you to query and mutate your Appwrite server using GraphQL.
@@ -16,7 +17,7 @@ open class Graphql: Service {
     /// @return array
     ///
     open func query(
-        query: T
+        query: Any
     ) async throws -> Any {
         let path: String = "/graphql"
 
@@ -52,7 +53,7 @@ open class Graphql: Service {
     /// @return array
     ///
     open func mutation(
-        query: T
+        query: Any
     ) async throws -> Any {
         let path: String = "/graphql/mutation"
 

Sources/Appwrite/Services/Health.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Health service allows you to both validate and monitor your Appwrite server's health.

Sources/Appwrite/Services/Locale.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Locale service allows you to customize your app based on your users' location.