expose serialization runtime in targets

fix IOOBE by replacing READ_ALL with decodeSequentially

Author: nbransby

firebase-common/build.gradle.kts

@@ -47,6 +47,11 @@ kotlin {
                 jvmTarget = "1.8"
             }
         }
+        val test by compilations.getting {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
     }
 
     tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
@@ -60,24 +65,24 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
             }
         }
         val androidMain by getting {
             dependencies {
                 api("com.google.firebase:firebase-common:19.2.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
             }
         }
         val jsMain by getting {
             dependencies {
 //                implementation(npm("firebase", "6.2.3"))
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
             }
         }
         val jvmMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
             }
             kotlin.srcDir("src/androidMain/kotlin")
         }
@@ -89,7 +94,7 @@ kotlin {
         }
         val iosMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
+                api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
             }
         }
         configure(listOf(iosArm64, iosX64)) {

firebase-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-common",
-  "version": "0.1.0-beta14",
+  "version": "0.1.0-beta",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-common.js",
   "scripts": {

firebase-common/src/androidTest/kotlin/dev/teamhub/firebase/EncodersTest.kt

@@ -12,6 +12,11 @@ class EncodersTest {
     @Test
     fun `encode a map`() {
         val encoded = encode<TestData>(TestData::class.serializer(), TestData(mapOf("key" to "value")))
-        assertEquals(mapOf("key" to "value"), (encoded as Map<String, Any>)["map"])
+        assertEquals(mapOf("map" to mapOf("key" to "value")), encoded)
     }
-}
+
+    @Test
+    fun `decode a map`() {
+        val decoded = decode<TestData>(TestData::class.serializer(), mapOf("map" to mapOf("key" to "value")))
+        assertEquals(TestData(mapOf("key" to "value")), decoded)
+    }}

firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/decoders.kt

@@ -1,7 +1,6 @@
 package dev.teamhub.firebase
 
 import kotlinx.serialization.*
-import kotlinx.serialization.CompositeDecoder.Companion.READ_ALL
 import kotlinx.serialization.CompositeDecoder.Companion.READ_DONE
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.internal.UnitDescriptor
@@ -78,7 +77,9 @@ open class FirebaseCompositeDecoder constructor(
     override val context = EmptyModule
     override val updateMode = UpdateMode.OVERWRITE
 
-    override fun decodeElementIndex(desc: SerialDescriptor) = READ_ALL
+    override fun decodeSequentially() = true
+
+    override fun decodeElementIndex(desc: SerialDescriptor): Int = throw NotImplementedError()
 
     override fun decodeCollectionSize(desc: SerialDescriptor) = size
 

firebase-common/src/commonMain/kotlin/dev/teamhub/firebase/serializers.kt

@@ -25,18 +25,19 @@ class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {
         override fun getElementIndex(name: String) = keys.indexOf(name)
         override fun getElementName(index: Int) = keys[index]
         override fun getElementAnnotations(index: Int) = emptyList<Annotation>()
-        override fun getElementDescriptor(index: Int) = throw UnsupportedOperationException()
+        override fun getElementDescriptor(index: Int) = throw NotImplementedError()
         override fun isElementOptional(index: Int) = false
     }
 
+    @Suppress("UNCHECKED_CAST")
     @ImplicitReflectionSerializer
     override fun serialize(encoder: Encoder, obj: Map<String, Any?>) {
         map = obj
         keys = obj.keys.toList()
         val collectionEncoder = encoder.beginCollection(descriptor, obj.size)
         keys.forEachIndexed { index, key ->
             val value = map.getValue(key)
-            val serializer = value?.firebaseSerializer() ?: UnitSerializer().nullable as KSerializer<Any?>
+            val serializer = (value?.firebaseSerializer() ?: UnitSerializer().nullable) as KSerializer<Any?>
             collectionEncoder.encodeNullableSerializableElement(
                 serializer.descriptor, index, serializer, value
             )
@@ -65,16 +66,17 @@ class FirebaseListSerializer : KSerializer<Iterable<Any?>> {
         override fun getElementIndex(name: String) = throw NotImplementedError()
         override fun getElementName(index: Int) = throw NotImplementedError()
         override fun getElementAnnotations(index: Int) = emptyList<Annotation>()
-        override fun getElementDescriptor(index: Int) = throw UnsupportedOperationException()
+        override fun getElementDescriptor(index: Int) = throw NotImplementedError()
         override fun isElementOptional(index: Int) = false
     }
 
     @Suppress("UNCHECKED_CAST")
+    @ImplicitReflectionSerializer
     override fun serialize(encoder: Encoder, obj: Iterable<Any?>) {
         list = obj.toList()
         val collectionEncoder = encoder.beginCollection(descriptor, list.size)
         list.forEachIndexed { index, value ->
-            val serializer = value?.firebaseSerializer() ?: UnitSerializer().nullable as KSerializer<Any>
+            val serializer = (value?.firebaseSerializer() ?: UnitSerializer().nullable) as KSerializer<Any>
             collectionEncoder.encodeNullableSerializableElement(
                 serializer.descriptor, index, serializer, value
             )

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

@@ -8,7 +8,7 @@ import kotlin.js.Json
 
 @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE")
 actual fun FirebaseDecoder.structureDecoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(desc.kind as StructureKind) {
-    StructureKind.CLASS -> (value as Json).let { json ->
+    StructureKind.CLASS, StructureKind.OBJECT -> (value as Json).let { json ->
         FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) {
                 desc, index -> json[desc.getElementName(index)]
         }

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

@@ -10,7 +10,7 @@ actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeP
     StructureKind.LIST -> Array<Any?>(desc.elementsCount) { null }
         .also { value = it }
         .let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it[index] = value } }
-    StructureKind.MAP, StructureKind.CLASS -> json()
+    StructureKind.MAP, StructureKind.CLASS, StructureKind.OBJECT -> json()
         .also { value = it }
         .let { FirebaseCompositeEncoder(positiveInfinity) { _, index, value -> it[desc.getElementName(index)] = value } }
 }