moved EncodedData to internal

Author: Daeda88

firebase-common-internal/src/androidMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -0,0 +1,7 @@
+@file:JvmName("AndroidEncodedObject")
+package dev.gitlive.firebase.internal
+
+val EncodedObject.android: Map<String, Any?> get() = raw
+
+@PublishedApi
+internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

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

@@ -4,21 +4,11 @@
 
 package dev.gitlive.firebase.internal
 
-import dev.gitlive.firebase.EncodedObject
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.StructureKind
 import kotlin.collections.set
 
-@PublishedApi
-internal data class EncodedObjectImpl internal constructor(override val raw: Map<String, Any?>) : EncodedObject, Map<String, Any?> by raw
-
-@PublishedApi
-internal actual fun Map<String, Any?>.asEncodedObject(): EncodedObject = EncodedObjectImpl(this)
-
-@PublishedApi
-internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>
-
 actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor): FirebaseCompositeEncoder = when(descriptor.kind) {
     StructureKind.LIST -> mutableListOf<Any?>()
         .also { value = it }

firebase-common-internal/src/commonMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -0,0 +1,27 @@
+package dev.gitlive.firebase.internal
+
+import kotlin.jvm.JvmInline
+
+/**
+ * Platform specific object for storing encoded data that can be used for methods that explicitly require an object.
+ * This is essentially a [Map] of [String] and [Any]? (as represented by [raw]) but since [encode] gives a platform specific value, this method wraps that.
+ */
+sealed interface EncodedObject {
+    val raw: Map<String, Any?>
+}
+
+@JvmInline
+@PublishedApi
+internal value class EncodedObjectImpl(override val raw: Map<String, Any?>) : EncodedObject
+
+@PublishedApi
+internal expect fun Any.asNativeMap(): Map<*, *>?
+
+@PublishedApi
+internal fun Map<*, *>.asEncodedObject(): EncodedObject = map { (key, value) ->
+    if (key is String) {
+        key to value
+    } else {
+        throw IllegalArgumentException("Expected a String key but received $key")
+    }
+}.toMap().let(::EncodedObjectImpl)

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

@@ -5,7 +5,6 @@
 package dev.gitlive.firebase.internal
 
 import dev.gitlive.firebase.EncodeSettings
-import dev.gitlive.firebase.EncodedObject
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -74,21 +73,6 @@ internal inline fun <reified T> encode(value: T, encodeSettings: EncodeSettings)
     }.value
 }
 
-@PublishedApi
-expect internal fun Any.asNativeMap(): Map<*, *>?
-
-@PublishedApi
-internal fun Map<*, *>.asEncodedObject(): EncodedObject = map { (key, value) ->
-    if (key is String) {
-        key to value
-    } else {
-        throw IllegalArgumentException("Expected a String key but received $key")
-    }
-}.toMap().asEncodedObject()
-
-@PublishedApi
-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
  * where using annotation is not possible

firebase-common-internal/src/iosMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -0,0 +1,6 @@
+package dev.gitlive.firebase.internal
+
+val EncodedObject.ios: Map<Any?, *> get() = raw.mapKeys { (key, _) -> key }
+
+@PublishedApi
+internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

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

@@ -4,23 +4,11 @@
 
 package dev.gitlive.firebase.internal
 
-import dev.gitlive.firebase.EncodedObject
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.StructureKind
 import kotlin.collections.set
 
-@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 Map<String, Any?>.asEncodedObject(): EncodedObject = InternalEncodedObject(this)
-
-@PublishedApi
-internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>
-
 actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor): FirebaseCompositeEncoder = when(descriptor.kind) {
     StructureKind.LIST -> encodeAsList()
     StructureKind.MAP -> mutableListOf<Any?>()

firebase-common-internal/src/jsMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -0,0 +1,32 @@
+package dev.gitlive.firebase.internal
+
+import kotlin.js.Json
+import kotlin.js.json
+
+val EncodedObject.js: Json get() = json(*raw.entries.map { (key, value) -> key to value }.toTypedArray())
+
+@PublishedApi
+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]
+    }
+    return mutableMap.toMap()
+}

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

@@ -4,48 +4,11 @@
 
 package dev.gitlive.firebase.internal
 
-import dev.gitlive.firebase.EncodedObject
 import kotlinx.serialization.descriptors.PolymorphicKind
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.StructureKind
-import kotlin.js.Json
 import kotlin.js.json
 
-@PublishedApi
-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<*, *>? {
-    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]
-    }
-    return mutableMap.toMap()
-}
-
 actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor): FirebaseCompositeEncoder = when(descriptor.kind) {
     StructureKind.LIST -> encodeAsList(descriptor)
     StructureKind.MAP -> {

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

@@ -13,11 +13,12 @@ import com.google.firebase.database.Transaction
 import com.google.firebase.database.ValueEventListener
 import dev.gitlive.firebase.DecodeSettings
 import dev.gitlive.firebase.EncodeDecodeSettingsBuilder
-import dev.gitlive.firebase.EncodedObject
+import dev.gitlive.firebase.internal.EncodedObject
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.database.ChildEvent.Type
 import dev.gitlive.firebase.database.FirebaseDatabase.Companion.FirebaseDatabase
+import dev.gitlive.firebase.internal.android
 import dev.gitlive.firebase.internal.decode
 import dev.gitlive.firebase.internal.reencodeTransformation
 import kotlinx.coroutines.CompletableDeferred
@@ -207,7 +208,7 @@ internal actual class NativeDatabaseReference internal constructor(
         .run { Unit }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        android.updateChildren(encodedUpdate)
+        android.updateChildren(encodedUpdate.android)
             .run { if(persistenceEnabled) await() else awaitWhileOnline(database) }
             .run { Unit }
 
@@ -297,7 +298,7 @@ internal actual class NativeOnDisconnect internal constructor(
         .run { Unit }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        android.updateChildren(encodedUpdate)
+        android.updateChildren(encodedUpdate.android)
             .run { if(persistenceEnabled) await() else awaitWhileOnline(database) }
             .run { Unit }
 }

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

@@ -7,7 +7,7 @@ package dev.gitlive.firebase.database
 import dev.gitlive.firebase.DecodeSettings
 import dev.gitlive.firebase.EncodeDecodeSettingsBuilder
 import dev.gitlive.firebase.EncodeSettings
-import dev.gitlive.firebase.EncodedObject
+import dev.gitlive.firebase.internal.EncodedObject
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.database.ChildEvent.Type.ADDED

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

@@ -16,15 +16,16 @@ import cocoapods.FirebaseDatabase.FIRDatabaseReference
 import cocoapods.FirebaseDatabase.FIRTransactionResult
 import dev.gitlive.firebase.DecodeSettings
 import dev.gitlive.firebase.EncodeDecodeSettingsBuilder
-import dev.gitlive.firebase.EncodedObject
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.database.ChildEvent.Type
 import dev.gitlive.firebase.database.ChildEvent.Type.ADDED
 import dev.gitlive.firebase.database.ChildEvent.Type.CHANGED
 import dev.gitlive.firebase.database.ChildEvent.Type.MOVED
 import dev.gitlive.firebase.database.ChildEvent.Type.REMOVED
+import dev.gitlive.firebase.internal.EncodedObject
 import dev.gitlive.firebase.internal.decode
+import dev.gitlive.firebase.internal.ios
 import dev.gitlive.firebase.internal.reencodeTransformation
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.FlowPreview
@@ -170,7 +171,7 @@ internal actual class NativeDatabaseReference internal constructor(
     }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) {
-        ios.await(persistenceEnabled) { updateChildValues(encodedUpdate, it) }
+        ios.await(persistenceEnabled) { updateChildValues(encodedUpdate.ios, it) }
     }
 
     actual suspend fun removeValue() {
@@ -241,7 +242,7 @@ internal actual class NativeOnDisconnect internal constructor(
     }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) {
-        ios.await(persistenceEnabled) { onDisconnectUpdateChildValues(encodedUpdate, it) }
+        ios.await(persistenceEnabled) { onDisconnectUpdateChildValues(encodedUpdate.ios, it) }
     }
 }
 

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

@@ -6,7 +6,6 @@ package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.DecodeSettings
 import dev.gitlive.firebase.EncodeDecodeSettingsBuilder
-import dev.gitlive.firebase.EncodedObject
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.database.externals.CancelCallback
@@ -28,7 +27,9 @@ import dev.gitlive.firebase.database.externals.ref
 import dev.gitlive.firebase.database.externals.remove
 import dev.gitlive.firebase.database.externals.set
 import dev.gitlive.firebase.database.externals.update
+import dev.gitlive.firebase.internal.EncodedObject
 import dev.gitlive.firebase.internal.decode
+import dev.gitlive.firebase.internal.js
 import dev.gitlive.firebase.internal.reencodeTransformation
 import kotlinx.coroutines.asDeferred
 import kotlinx.coroutines.channels.awaitClose
@@ -183,7 +184,7 @@ internal actual class NativeDatabaseReference internal constructor(
     }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        rethrow { update(js, encodedUpdate.json).awaitWhileOnline(database) }
+        rethrow { update(js, encodedUpdate.js).awaitWhileOnline(database) }
 
 
     actual suspend fun <T> runTransaction(strategy: KSerializer<T>, buildSettings: EncodeDecodeSettingsBuilder.() -> Unit, transactionUpdate: (currentData: T) -> T): DataSnapshot {
@@ -235,7 +236,7 @@ internal actual class NativeOnDisconnect internal constructor(
         rethrow { js.set(encodedValue).awaitWhileOnline(database) }
 
     actual suspend fun updateEncodedChildren(encodedUpdate: EncodedObject) =
-        rethrow { js.update(encodedUpdate.json).awaitWhileOnline(database) }
+        rethrow { js.update(encodedUpdate.js).awaitWhileOnline(database) }
 
 }