Merge branch 'GitLiveApp:master' into brad/ios_constructors

Author: walkingbrad

firebase-common/src/androidMain/kotlin/dev/gitlive/firebase/_decoders.kt

@@ -11,7 +11,14 @@ import kotlinx.serialization.descriptors.StructureKind
 
 actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
         StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Map<*, *>).let { map ->
-            FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
+            FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index ->
+                val elementName = desc.getElementName(index)
+                if (desc.kind is PolymorphicKind && elementName == "value") {
+                    map
+                } else {
+                    map[desc.getElementName(index)]
+                }
+            }
         }
         StructureKind.LIST -> (value as List<*>).let {
             FirebaseCompositeDecoder(it.size) { _, index -> it[index] }

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

@@ -25,6 +25,9 @@ sealed class TestSealed {
     data class ChildClass(val map: Map<String, String>, val bool: Boolean = false): TestSealed()
 }
 
+@Serializable
+data class TestSealedList(val list: List<TestSealed>)
+
 class EncodersTest {
     @Test
     fun encodeMap() {
@@ -74,4 +77,62 @@ class EncodersTest {
         val decoded = decode(TestSealed.serializer(), nativeMapOf("type" to "child", "map" to nativeMapOf("key" to "value"), "bool" to true))
         assertEquals(TestSealed.ChildClass(mapOf("key" to "value"), true), decoded)
     }
+
+    @Test
+    fun encodeSealedClassList() {
+        val toEncode = TestSealedList(
+            list = listOf(
+                TestSealed.ChildClass(
+                    map = mapOf("key" to "value"),
+                    bool = false
+                )
+            )
+        )
+        val encoded = encode<TestSealedList>(
+            TestSealedList.serializer(),
+            toEncode,
+            shouldEncodeElementDefault = true
+        )
+        val expected = nativeMapOf(
+            "list" to nativeListOf(
+                nativeMapOf(
+                    "type" to "child",
+                    "map" to nativeMapOf(
+                        "key" to "value"
+                    ),
+                    "bool" to false
+                )
+            )
+        )
+        nativeAssertEquals(expected, encoded)
+    }
+
+    @Test
+    fun decodeSealedClassList() {
+        val toDecode = nativeMapOf(
+            "list" to nativeListOf(
+                nativeMapOf(
+                    "type" to "child",
+                    "map" to nativeMapOf(
+                        "key" to "value"
+                    ),
+                    "bool" to false
+                )
+            )
+        )
+        val decoded = decode(
+            TestSealedList.serializer(),
+            toDecode
+        )
+        val expected = TestSealedList(
+            list = listOf(
+                TestSealed.ChildClass(
+                    map = mapOf("key" to "value"),
+                    bool = false
+                )
+            )
+        )
+
+        assertEquals(expected, decoded)
+    }
 }

firebase-common/src/iosMain/kotlin/dev/gitlive/firebase/_decoders.kt

@@ -11,7 +11,14 @@ import kotlinx.serialization.descriptors.StructureKind
 
 actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
     StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Map<*, *>).let { map ->
-        FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
+        FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index ->
+            val elementName = desc.getElementName(index)
+            if (desc.kind is PolymorphicKind && elementName == "value") {
+                map
+            } else {
+                map[desc.getElementName(index)]
+            }
+        }
     }
     StructureKind.LIST -> (value as List<*>).let {
         FirebaseCompositeDecoder(it.size) { _, index -> it[index] }

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

@@ -13,8 +13,13 @@ import kotlin.js.Json
 @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE")
 actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
     StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Json).let { json ->
-        FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) {
-                desc, index -> json[desc.getElementName(index)]
+        FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) { desc, index ->
+            val elementName = desc.getElementName(index)
+            if (desc.kind is PolymorphicKind && elementName == "value") {
+                json
+            } else {
+                json[desc.getElementName(index)]
+            }
         }
     }
     StructureKind.LIST -> (value as Array<*>).let {