Update methods to use encodeAsMap.

Author: corrado4eyes

firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -107,15 +107,13 @@ actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
         merge: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(strategy, data, encodeDefaults) as Map<String, Any>?
-        val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() }
-            ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap()
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = serializedItem?.let { item ->
-            serializedFieldAndValues?.let { fieldsAndValues ->
-                item + fieldsAndValues
-            }
-        } as Any? ?: return this
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
 
         if (merge) {
             android.set(documentRef.android, result, SetOptions.merge())
@@ -148,14 +146,13 @@ actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
         encodeDefaults: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(data, encodeDefaults) as Map<String, Any>
-
-        val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() }
-            ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap()
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = (serializedFieldAndValues?.let {
-            serializedItem.plus(it)
-        } ?: serializedItem)
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
 
         return android.update(documentRef.android, result).let { this }
     }

firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -98,14 +98,15 @@ actual class WriteBatch(val ios: FIRWriteBatch) {
         merge: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(strategy, data, encodeDefaults) as Map<String, Any>?
-        val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() }
-            ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap()
-        val result = (serializedFieldAndValues?.let {
-            serializedItem?.plus(it)
-        } ?: serializedItem) as Map<Any?, *>
-
-        ios.setData(result, documentRef.ios, merge)
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
+
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
+
+        ios.setData(result as Map<Any?, *>, documentRef.ios, merge)
         return this
     }
 
@@ -128,13 +129,14 @@ actual class WriteBatch(val ios: FIRWriteBatch) {
         encodeDefaults: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(strategy, data, encodeDefaults) as Map<Any?, *>
-        val serializedFieldAndValues = fieldsAndValues.associate { (field, value) -> field to encode(value, encodeDefaults) }
-
-        val result = serializedFieldAndValues?.let {
-            serializedItem.plus(it)
-        } ?: serializedItem
-        return ios.updateData(result, documentRef.ios).let { this }
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
+
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
+        return ios.updateData(result as Map<Any?, *>, documentRef.ios).let { this }
     }
 
     actual inline fun update(documentRef: DocumentReference, vararg fieldsAndValues: Pair<FieldPath, Any?>) =

firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

@@ -94,15 +94,13 @@ actual class WriteBatch(val js: firebase.firestore.WriteBatch) {
         merge: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(strategy, data, encodeDefaults) as Map<String, Any>?
-        val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() }
-            ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap()
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = serializedItem?.let { item ->
-            serializedFieldAndValues?.let { fieldsAndValues ->
-                item + fieldsAndValues
-            }
-        } as Any? ?: return this
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
 
         if (merge) {
             js.set(documentRef.js, result, json("merge" to merge))
@@ -133,14 +131,13 @@ actual class WriteBatch(val js: firebase.firestore.WriteBatch) {
         encodeDefaults: Boolean,
         vararg fieldsAndValues: Pair<String, Any?>
     ): WriteBatch {
-        val serializedItem = encode(data, encodeDefaults) as Map<String, Any>
-
-        val serializedFieldAndValues = fieldsAndValues.takeUnless { fieldsAndValues.isEmpty() }
-            ?.map { (field, value) -> field to encode(value, encodeDefaults) }?.toMap()
+        val serializedItem = encodeAsMap(strategy, data, encodeDefaults)
+        val serializedFieldAndValues = encodeAsMap(fieldsAndValues = fieldsAndValues)
 
-        val result = (serializedFieldAndValues?.let {
-            serializedItem.plus(it)
-        } ?: serializedItem)
+        val result = if (serializedFieldAndValues != null)
+            serializedItem + serializedFieldAndValues
+        else
+            serializedItem
 
         return js.update(documentRef.js, result).let { this }
     }