Merge pull request #29 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

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

Sources/Appwrite/Client.swift

@@ -23,7 +23,7 @@ open class Client {
         "x-sdk-name": "Apple",
         "x-sdk-platform": "client",
         "x-sdk-language": "apple",
-        "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.
@@ -130,7 +131,7 @@ open class Account: Service {
             userId: userId,
             email: email,
             password: password,
-            name: name
+            name: name,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -204,7 +205,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
         )
     }
@@ -329,7 +330,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
         )
     }
@@ -393,7 +394,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
         )
     }
@@ -461,7 +462,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
         )
     }
@@ -525,7 +526,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"
@@ -566,7 +567,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
@@ -69,7 +70,7 @@ open class Databases: Service {
         return try await listDocuments(
             databaseId: databaseId,
             collectionId: collectionId,
-            queries: queries
+            queries: queries,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -94,7 +95,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> {
@@ -153,7 +154,7 @@ open class Databases: Service {
             collectionId: collectionId,
             documentId: documentId,
             data: data,
-            permissions: permissions
+            permissions: permissions,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -220,7 +221,7 @@ open class Databases: Service {
         return try await getDocument(
             databaseId: databaseId,
             collectionId: collectionId,
-            documentId: documentId
+            documentId: documentId,
             nestedType: [String: AnyCodable].self
         )
     }
@@ -243,7 +244,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> {
@@ -300,7 +301,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/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.

Sources/Appwrite/Services/Storage.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Storage service allows you to manage your project files.

Sources/Appwrite/Services/Teams.swift

@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import AppwriteModels
 
 /// The Teams service allows you to group users of your project and to enable them to share read and write access to your project resources

Sources/AppwriteModels/Account.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Account
 public class Account<T : Codable> {

Sources/AppwriteModels/Continent.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Continent
 public class Continent {

Sources/AppwriteModels/ContinentList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Continents List
 public class ContinentList {

Sources/AppwriteModels/Country.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Country
 public class Country {

Sources/AppwriteModels/CountryList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Countries List
 public class CountryList {

Sources/AppwriteModels/Currency.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Currency
 public class Currency {

Sources/AppwriteModels/CurrencyList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Currencies List
 public class CurrencyList {

Sources/AppwriteModels/Document.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Document
 public class Document<T : Codable> {

Sources/AppwriteModels/DocumentList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Documents List
 public class DocumentList<T : Codable> {

Sources/AppwriteModels/Execution.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Execution
 public class Execution {

Sources/AppwriteModels/ExecutionList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Executions List
 public class ExecutionList {

Sources/AppwriteModels/File.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// File
 public class File {

Sources/AppwriteModels/FileList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Files List
 public class FileList {

Sources/AppwriteModels/Jwt.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// JWT
 public class Jwt {

Sources/AppwriteModels/Language.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Language
 public class Language {

Sources/AppwriteModels/LanguageList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Languages List
 public class LanguageList {

Sources/AppwriteModels/Locale.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Locale
 public class Locale {

Sources/AppwriteModels/Log.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Log
 public class Log {

Sources/AppwriteModels/LogList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Logs List
 public class LogList {

Sources/AppwriteModels/Membership.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Membership
 public class Membership {

Sources/AppwriteModels/MembershipList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Memberships List
 public class MembershipList {

Sources/AppwriteModels/Phone.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Phone
 public class Phone {

Sources/AppwriteModels/PhoneList.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Phones List
 public class PhoneList {

Sources/AppwriteModels/Preferences.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Preferences
 public class Preferences<T : Codable> {

Sources/AppwriteModels/Session.swift

@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// Session
 public class Session {