fix: enhance model property handling for array types

Author: ChiragAgg5k

README.md

@@ -2,7 +2,7 @@
 
 ![Swift Package Manager](https://img.shields.io/github/v/release/appwrite/sdk-for-swift.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-swift.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-1.7.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-1.7.4-blue.svg?style=flat-square)
 [![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)

Sources/Appwrite/Client.swift

@@ -257,7 +257,7 @@ open class Client {
 
        return output.addingPercentEncoding(
            withAllowedCharacters: .urlHostAllowed
-       ) ?? ""
+       )?.replacingOccurrences(of: "+", with: "%2B") ?? "" // since urlHostAllowed doesn't include +
    }
 
     ///

Sources/Appwrite/Services/Databases.swift

@@ -1656,6 +1656,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Create new Documents. Before using this route, you should create a new
     /// collection resource using either a [server
     /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
@@ -1699,6 +1703,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Create new Documents. Before using this route, you should create a new
     /// collection resource using either a [server
     /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
@@ -1724,6 +1732,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Create or update Documents. Before using this route, you should create a
     /// new collection resource using either a [server
     /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
@@ -1768,6 +1780,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Create or update Documents. Before using this route, you should create a
     /// new collection resource using either a [server
     /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
@@ -1866,6 +1882,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Bulk delete documents using queries, if no queries are passed then all
     /// documents are deleted.
     ///
@@ -1907,6 +1927,10 @@ open class Databases: Service {
     }
 
     ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
     /// Bulk delete documents using queries, if no queries are passed then all
     /// documents are deleted.
     ///
@@ -1997,6 +2021,94 @@ open class Databases: Service {
         )
     }
 
+    ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
+    /// Create or update a Document. Before using this route, you should create a
+    /// new collection resource using either a [server
+    /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
+    /// API or directly from your database console.
+    ///
+    /// @param String databaseId
+    /// @param String collectionId
+    /// @param String documentId
+    /// @param Any data
+    /// @param [String] permissions
+    /// @throws Exception
+    /// @return array
+    ///
+    open func upsertDocument<T>(
+        databaseId: String,
+        collectionId: String,
+        documentId: String,
+        data: Any,
+        permissions: [String]? = nil,
+        nestedType: T.Type
+    ) async throws -> AppwriteModels.Document<T> {
+        let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/documents/{documentId}"
+            .replacingOccurrences(of: "{databaseId}", with: databaseId)
+            .replacingOccurrences(of: "{collectionId}", with: collectionId)
+            .replacingOccurrences(of: "{documentId}", with: documentId)
+
+        let apiParams: [String: Any?] = [
+            "data": data,
+            "permissions": permissions
+        ]
+
+        let apiHeaders: [String: String] = [
+            "content-type": "application/json"
+        ]
+
+        let converter: (Any) -> AppwriteModels.Document<T> = { response in
+            return AppwriteModels.Document.from(map: response as! [String: Any])
+        }
+
+        return try await client.call(
+            method: "PUT",
+            path: apiPath,
+            headers: apiHeaders,
+            params: apiParams,
+            converter: converter
+        )
+    }
+
+    ///
+    /// **WARNING: Experimental Feature** - This endpoint is experimental and not
+    /// yet officially supported. It may be subject to breaking changes or removal
+    /// in future versions.
+    /// 
+    /// Create or update a Document. Before using this route, you should create a
+    /// new collection resource using either a [server
+    /// integration](https://appwrite.io/docs/server/databases#databasesCreateCollection)
+    /// API or directly from your database console.
+    ///
+    /// @param String databaseId
+    /// @param String collectionId
+    /// @param String documentId
+    /// @param Any data
+    /// @param [String] permissions
+    /// @throws Exception
+    /// @return array
+    ///
+    open func upsertDocument(
+        databaseId: String,
+        collectionId: String,
+        documentId: String,
+        data: Any,
+        permissions: [String]? = nil
+    ) async throws -> AppwriteModels.Document<[String: AnyCodable]> {
+        return try await upsertDocument(
+            databaseId: databaseId,
+            collectionId: collectionId,
+            documentId: documentId,
+            data: data,
+            permissions: permissions,
+            nestedType: [String: AnyCodable].self
+        )
+    }
+
     ///
     /// Update a document by its unique ID. Using the patch method you can pass
     /// only specific fields that will get updated.

Sources/Appwrite/Services/Tokens.swift

@@ -48,7 +48,7 @@ open class Tokens: Service {
 
     ///
     /// Create a new token. A token is linked to a file. Token can be passed as a
-    /// header or request get parameter.
+    /// request URL search parameter.
     ///
     /// @param String bucketId
     /// @param String fileId

Sources/AppwriteModels/AlgoArgon2.swift

@@ -65,10 +65,10 @@ open class AlgoArgon2: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoArgon2 {
         return AlgoArgon2(
-            type: map["type"] as! String,
-            memoryCost: map["memoryCost"] as! Int,
-            timeCost: map["timeCost"] as! Int,
-            threads: map["threads"] as! Int
+            type: map["type"] as? String ?? "",
+            memoryCost: map["memoryCost"] as? Int ?? 0,
+            timeCost: map["timeCost"] as? Int ?? 0,
+            threads: map["threads"] as? Int ?? 0
         )
     }
 }

Sources/AppwriteModels/AlgoBcrypt.swift

@@ -38,7 +38,7 @@ open class AlgoBcrypt: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoBcrypt {
         return AlgoBcrypt(
-            type: map["type"] as! String
+            type: map["type"] as? String ?? ""
         )
     }
 }

Sources/AppwriteModels/AlgoMd5.swift

@@ -38,7 +38,7 @@ open class AlgoMd5: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoMd5 {
         return AlgoMd5(
-            type: map["type"] as! String
+            type: map["type"] as? String ?? ""
         )
     }
 }

Sources/AppwriteModels/AlgoPhpass.swift

@@ -38,7 +38,7 @@ open class AlgoPhpass: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoPhpass {
         return AlgoPhpass(
-            type: map["type"] as! String
+            type: map["type"] as? String ?? ""
         )
     }
 }

Sources/AppwriteModels/AlgoScrypt.swift

@@ -74,11 +74,11 @@ open class AlgoScrypt: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoScrypt {
         return AlgoScrypt(
-            type: map["type"] as! String,
-            costCpu: map["costCpu"] as! Int,
-            costMemory: map["costMemory"] as! Int,
-            costParallel: map["costParallel"] as! Int,
-            length: map["length"] as! Int
+            type: map["type"] as? String ?? "",
+            costCpu: map["costCpu"] as? Int ?? 0,
+            costMemory: map["costMemory"] as? Int ?? 0,
+            costParallel: map["costParallel"] as? Int ?? 0,
+            length: map["length"] as? Int ?? 0
         )
     }
 }

Sources/AppwriteModels/AlgoScryptModified.swift

@@ -65,10 +65,10 @@ open class AlgoScryptModified: Codable {
 
     public static func from(map: [String: Any] ) -> AlgoScryptModified {
         return AlgoScryptModified(
-            type: map["type"] as! String,
-            salt: map["salt"] as! String,
-            saltSeparator: map["saltSeparator"] as! String,
-            signerKey: map["signerKey"] as! String
+            type: map["type"] as? String ?? "",
+            salt: map["salt"] as? String ?? "",
+            saltSeparator: map["saltSeparator"] as? String ?? "",
+            signerKey: map["signerKey"] as? String ?? ""
         )
     }
 }