make snapshot first param

Author: nbransby

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

@@ -117,6 +117,7 @@ external object firebase {
             fun push(): ThenableReference
         }
         open class DataSnapshot {
+            val key: String?
             fun `val`(): Any
             fun exists(): Boolean
             fun forEach(action: (a: DataSnapshot) -> Boolean): Boolean

firebase-database/src/androidMain/kotlin/dev/teamhub/firebase/database/database.kt

@@ -86,22 +86,22 @@ actual open class Query internal constructor(
 
             val moved by lazy { types.contains(Type.MOVED) }
             override fun onChildMoved(snapshot: com.google.firebase.database.DataSnapshot, previousChildName: String?) {
-                if(moved) offer(ChildEvent(Type.MOVED, DataSnapshot(snapshot), previousChildName))
+                if(moved) offer(ChildEvent(DataSnapshot(snapshot), Type.MOVED, previousChildName))
             }
 
             val changed by lazy { types.contains(Type.CHANGED) }
             override fun onChildChanged(snapshot: com.google.firebase.database.DataSnapshot, previousChildName: String?) {
-                if(changed) offer(ChildEvent(Type.CHANGED, DataSnapshot(snapshot), previousChildName))
+                if(changed) offer(ChildEvent(DataSnapshot(snapshot), Type.CHANGED, previousChildName))
             }
 
             val added by lazy { types.contains(Type.ADDED) }
             override fun onChildAdded(snapshot: com.google.firebase.database.DataSnapshot, previousChildName: String?) {
-                if(added) offer(ChildEvent(Type.ADDED, DataSnapshot(snapshot), previousChildName))
+                if(added) offer(ChildEvent(DataSnapshot(snapshot), Type.ADDED, previousChildName))
             }
 
             val removed by lazy { types.contains(Type.REMOVED) }
             override fun onChildRemoved(snapshot: com.google.firebase.database.DataSnapshot) {
-                if(removed) offer(ChildEvent(Type.REMOVED, DataSnapshot(snapshot), null))
+                if(removed) offer(ChildEvent(DataSnapshot(snapshot), Type.REMOVED, null))
             }
 
             override fun onCancelled(error: com.google.firebase.database.DatabaseError) {
@@ -146,6 +146,8 @@ actual class DataSnapshot internal constructor(val android: com.google.firebase.
 
     actual val exists get() = android.exists()
 
+    actual val key get() = android.key
+
     actual inline fun <reified T> value() =
         decode<T>(value = android.value)
 

firebase-database/src/commonMain/kotlin/dev/teamhub/firebase/database/database.kt

@@ -26,7 +26,11 @@ expect class FirebaseDatabase {
     fun setLoggingEnabled(enabled: Boolean)
 }
 
-data class ChildEvent internal constructor(val type: Type, val snapshot: DataSnapshot, val previousChildName: String?) {
+data class ChildEvent internal constructor(
+    val snapshot: DataSnapshot,
+    val type: Type,
+    val previousChildName: String?
+) {
     enum class Type {
         ADDED,
         CHANGED,
@@ -54,6 +58,7 @@ expect class DatabaseReference : Query {
 
 expect class DataSnapshot {
     val exists: Boolean
+    val key: String?
     @ImplicitReflectionSerializer
     inline fun <reified T> value(): T
     inline fun <reified T> value(strategy: DeserializationStrategy<T>): T

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

@@ -49,8 +49,8 @@ actual open class Query internal constructor(open val js: firebase.database.Quer
                         { snapshot, previousChildName ->
                             offer(
                                 ChildEvent(
-                                    type,
                                     DataSnapshot(snapshot),
+                                    type,
                                     previousChildName
                                 )
                             )
@@ -91,6 +91,7 @@ actual class DataSnapshot internal constructor(val js: firebase.database.DataSna
         rethrow { decode(strategy, js.`val`()) }
 
     actual val exists get() = rethrow { js.exists() }
+    actual val key get() = rethrow { js.key }
     actual fun child(path: String) = DataSnapshot(js.child(path))
 
     actual val children: Iterable<DataSnapshot> = rethrow {