Fixing some JS issues

Author: Daeda88

firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/encoders.kt

@@ -46,10 +46,16 @@ inline fun <reified T> encode(value: T, buildSettings: EncodeSettings.Builder.()
     encode(value, EncodeSettings.BuilderImpl().apply(buildSettings).buildEncodeSettings())
 
 inline fun <T : Any> encodeAsObject(strategy: SerializationStrategy<T>, value: T, buildSettings: EncodeSettings.Builder.() -> Unit = {}): EncodedObject {
+    if (value is Map<*, *> && value.keys.any { it !is String }) {
+        throw IllegalArgumentException("$value is a Map containing non-String keys. Must be of the form Map<String, Any?>")
+    }
     val encoded = encode(strategy, value, buildSettings) ?: throw IllegalArgumentException("$value was encoded as null. Must be of the form Map<String, Any?>")
     return encoded.asNativeMap()?.asEncodedObject() ?: throw IllegalArgumentException("$value was encoded as ${encoded::class}. Must be of the form Map<String, Any?>")
 }
 inline fun <reified T : Any> encodeAsObject(value: T, buildSettings: EncodeSettings.Builder.() -> Unit = {}): EncodedObject {
+    if (value is Map<*, *> && value.keys.any { it !is String }) {
+        throw IllegalArgumentException("$value is a Map containing non-String keys. Must be of the form Map<String, Any?>")
+    }
     val encoded = encode(value, buildSettings) ?: throw IllegalArgumentException("$value was encoded as null. Must be of the form Map<String, Any?>")
     return encoded.asNativeMap()?.asEncodedObject() ?: throw IllegalArgumentException("$value was encoded as ${encoded::class}. Must be of the form Map<String, Any?>")
 }

firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

@@ -422,7 +422,7 @@ class EncodersTest {
         val testDataClass = TestData(mapOf("key" to "value"), mapOf(1 to 1), true, null, ValueClass(42))
         val encodedObject = encodeAsObject(TestData.serializer(), testDataClass) { encodeDefaults = false }
 
-        assertEquals(mapOf("map" to nativeMapOf("key" to "value"), "otherMap" to nativeMapOf(1 to 1), "bool" to true, "valueClass" to 42), encodedObject.raw)
+        nativeAssertEquals(mapOf("map" to nativeMapOf("key" to "value"), "otherMap" to nativeMapOf(1 to 1), "bool" to true, "valueClass" to 42), encodedObject.raw)
 
         val testMap = mapOf("one" to 1, "two" to null, "three" to false)
         assertEquals(testMap, encodeAsObject(testMap).raw)

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/_encoders.kt

@@ -10,25 +10,42 @@ import kotlinx.serialization.descriptors.StructureKind
 import kotlin.js.Json
 import kotlin.js.json
 
-actual data class EncodedObject(private val keyValues: List<Pair<String, Any?>>) : Json by json(*keyValues.toTypedArray()) {
+actual data class EncodedObject(private val keyValues: List<Pair<String, Any?>>) {
     actual companion object {
         actual val emptyEncodedObject: EncodedObject = EncodedObject(emptyList())
     }
 
     actual val raw get() = keyValues.toMap()
+    val json get() = json(*keyValues.toTypedArray())
 }
 
-
 @PublishedApi
 internal actual fun List<Pair<String, Any?>>.asEncodedObject() = EncodedObject(this)
 
 @PublishedApi
-internal actual fun Any.asNativeMap(): Map<*, *>? = (this as? Json)?.let { json ->
+internal actual fun Any.asNativeMap(): Map<*, *>? {
+    val json = when (this) {
+        is Number -> null
+        is Boolean -> null
+        is String -> null
+        is Map<*, *> -> {
+            if (keys.all { it is String }) {
+                this as Json
+            } else {
+                null
+            }
+        }
+        is Collection<*> -> null
+        is Array<*> -> null
+        else -> {
+            this as Json
+        }
+    } ?: return null
     val mutableMap = mutableMapOf<String, Any?>()
     for (key in js("Object").keys(json)) {
         mutableMap[key] = json[key]
     }
-    mutableMap.toMap()
+    return mutableMap.toMap()
 }
 
 actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor): FirebaseCompositeEncoder = when(descriptor.kind) {

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

@@ -183,7 +183,7 @@ internal actual class NativeDatabaseReference internal constructor(
     }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        rethrow { update(js, encodedUpdate).awaitWhileOnline(database) }
+        rethrow { update(js, encodedUpdate.json).awaitWhileOnline(database) }
 
 
     actual suspend fun <T> runTransaction(strategy: KSerializer<T>, buildSettings: EncodeDecodeSettingsBuilder.() -> Unit, transactionUpdate: (currentData: T) -> T): DataSnapshot {
@@ -235,7 +235,7 @@ internal actual class NativeOnDisconnect internal constructor(
         rethrow { js.set(encodedValue).awaitWhileOnline(database) }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        rethrow { js.update(encodedUpdate).awaitWhileOnline(database) }
+        rethrow { js.update(encodedUpdate.json).awaitWhileOnline(database) }
 
 }
 

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

@@ -131,9 +131,9 @@ internal actual class NativeWriteBatchWrapper actual internal constructor(actual
         documentRef: DocumentReference,
         encodedData: EncodedObject,
         setOptions: SetOptions
-    ): NativeWriteBatchWrapper = rethrow { js.set(documentRef.js, encodedData, setOptions.js) }.let { this }
+    ): NativeWriteBatchWrapper = rethrow { js.set(documentRef.js, encodedData.json, setOptions.js) }.let { this }
 
-    actual fun updateEncoded(documentRef: DocumentReference, encodedData: EncodedObject): NativeWriteBatchWrapper = rethrow { js.update(documentRef.js, encodedData) }
+    actual fun updateEncoded(documentRef: DocumentReference, encodedData: EncodedObject): NativeWriteBatchWrapper = rethrow { js.update(documentRef.js, encodedData.json) }
         .let { this }
 
     actual fun updateEncodedFieldsAndValues(
@@ -177,11 +177,11 @@ internal actual class NativeTransactionWrapper actual internal constructor(actua
         encodedData: EncodedObject,
         setOptions: SetOptions
     ): NativeTransactionWrapper = rethrow {
-        js.set(documentRef.js, encodedData, setOptions.js)
+        js.set(documentRef.js, encodedData.json, setOptions.js)
     }
         .let { this }
 
-    actual fun updateEncoded(documentRef: DocumentReference, encodedData: EncodedObject): NativeTransactionWrapper = rethrow { js.update(documentRef.js, encodedData) }
+    actual fun updateEncoded(documentRef: DocumentReference, encodedData: EncodedObject): NativeTransactionWrapper = rethrow { js.update(documentRef.js, encodedData.json) }
         .let { this }
 
     actual fun updateEncodedFieldsAndValues(
@@ -245,10 +245,10 @@ internal actual class NativeDocumentReference actual constructor(actual val nati
     }
 
     actual suspend fun setEncoded(encodedData: EncodedObject, setOptions: SetOptions) = rethrow {
-        setDoc(js, encodedData, setOptions.js).await()
+        setDoc(js, encodedData.json, setOptions.js).await()
     }
 
-    actual suspend fun updateEncoded(encodedData: EncodedObject) = rethrow { jsUpdate(js, encodedData).await() }
+    actual suspend fun updateEncoded(encodedData: EncodedObject) = rethrow { jsUpdate(js, encodedData.json).await() }
 
     actual suspend fun updateEncodedFieldsAndValues(encodedFieldsAndValues: List<Pair<String, Any?>>) {
         rethrow {
@@ -398,7 +398,7 @@ internal actual class NativeCollectionReferenceWrapper actual internal construct
     actual fun document(documentPath: String) = rethrow { NativeDocumentReference(doc(js, documentPath)) }
 
     actual suspend fun addEncoded(data: EncodedObject) = rethrow {
-        NativeDocumentReference(addDoc(js, data).await())
+        NativeDocumentReference(addDoc(js, data.json).await())
     }
 }