EncodedObject as interface

Author: Daeda88

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

@@ -10,10 +10,15 @@ import kotlinx.serialization.descriptors.StructureKind
 import java.lang.IllegalArgumentException
 import kotlin.collections.set
 
-actual data class EncodedObject internal constructor(actual val raw: Map<String, Any?>) : Map<String, Any?> by raw
+actual interface EncodedObject : Map<String, Any?> {
+    actual val raw: Map<String, Any?>
+}
+
+@PublishedApi
+internal data class EncodedObjectImpl internal constructor(override val raw: Map<String, Any?>) : EncodedObject, Map<String, Any?> by raw
 
 @PublishedApi
-internal actual fun List<Pair<String, Any?>>.asEncodedObject() = EncodedObject(toMap())
+internal actual fun Map<String, Any?>.asEncodedObject(): EncodedObject = EncodedObjectImpl(this)
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

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

@@ -17,7 +17,7 @@ import kotlinx.serialization.modules.SerializersModule
  *
  * Created using [encodeAsObject]. It is not recommended to encode to this manually.
  */
-expect class EncodedObject {
+expect interface EncodedObject {
     val raw: Map<String, Any?>
 }
 
@@ -91,10 +91,10 @@ internal fun Map<*, *>.asEncodedObject(): EncodedObject = map { (key, value) ->
     } else {
         throw IllegalArgumentException("Expected a String key but received $key")
     }
-}.asEncodedObject()
+}.toMap().asEncodedObject()
 
 @PublishedApi
-internal expect fun List<Pair<String, Any?>>.asEncodedObject(): EncodedObject
+internal expect fun Map<String, Any?>.asEncodedObject(): EncodedObject
 
 /**
  * An extension which which serializer to use for value. Handy in updating fields by name or path

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

@@ -9,10 +9,17 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.StructureKind
 import kotlin.collections.set
 
-actual data class EncodedObject internal constructor(actual val raw: Map<String, Any?>) : Map<Any?, Any?> by raw.mapKeys({ (key, _) -> key as? Any })
+actual interface EncodedObject : Map<Any?, Any?> {
+    actual val raw: Map<String, Any?>
+}
+
+@PublishedApi
+internal data class InternalEncodedObject internal constructor(
+    override val raw: Map<String, Any?>
+) : EncodedObject, Map<Any?, Any?> by raw.mapKeys({ (key, _) -> key })
 
 @PublishedApi
-internal actual fun List<Pair<String, Any?>>.asEncodedObject() = EncodedObject(toMap())
+internal actual fun Map<String, Any?>.asEncodedObject(): EncodedObject = InternalEncodedObject(this)
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

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

@@ -10,13 +10,18 @@ import kotlinx.serialization.descriptors.StructureKind
 import kotlin.js.Json
 import kotlin.js.json
 
-actual class EncodedObject internal constructor(private val keyValues: List<Pair<String, Any?>>) {
-    actual val raw get() = keyValues.toMap()
-    val json get() = json(*keyValues.toTypedArray())
+actual interface EncodedObject {
+    actual val raw: Map<String, Any?>
+    val json: Json
 }
 
 @PublishedApi
-internal actual fun List<Pair<String, Any?>>.asEncodedObject() = EncodedObject(this)
+internal class InternalEncodedObject internal constructor(override val raw: Map<String, Any?>) : EncodedObject {
+    override val json: Json get() = json(*raw.entries.map { (key, value) -> key to value }.toTypedArray())
+}
+
+@PublishedApi
+internal actual fun Map<String, Any?>.asEncodedObject(): EncodedObject = InternalEncodedObject(this)
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? {