Fixes after merging upstream master branch

Author: shepeliev

firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -4,6 +4,7 @@
 
 package dev.gitlive.firebase
 
+import dev.gitlive.firebase.externals.app.deleteApp
 import dev.gitlive.firebase.externals.app.getApp
 import dev.gitlive.firebase.externals.app.getApps
 import dev.gitlive.firebase.externals.app.initializeApp
@@ -33,7 +34,9 @@ actual class FirebaseApp internal constructor(val js: JsFirebaseApp) {
             FirebaseOptions(appId, apiKey, databaseURL, gaTrackingId, storageBucket, projectId, messagingSenderId, authDomain)
         }
 
-    actual fun delete() = js.delete()
+    actual fun delete() {
+        deleteApp(js)
+    }
 }
 
 actual fun Firebase.apps(context: Any?) = getApps().map { FirebaseApp(it) }

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/app/app.kt

@@ -3,12 +3,16 @@
 
 package dev.gitlive.firebase.externals.app
 
+import kotlin.js.Promise
+
 external fun initializeApp(options: Any, name: String = definedExternally): FirebaseApp
 
 external fun getApp(name: String = definedExternally): FirebaseApp
 
 external fun getApps(): Array<FirebaseApp>
 
+external fun deleteApp(app: FirebaseApp): Promise<Unit>
+
 external interface FirebaseApp {
     val automaticDataCollectionEnabled: Boolean
     val name: String

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/database/database.kt

@@ -99,6 +99,12 @@ external fun startAt(value: Any?, key: String? = definedExternally): QueryConstr
 
 external fun update(ref: DatabaseReference, values: Any): Promise<Unit>
 
+external fun <T> runTransaction(
+    ref: DatabaseReference,
+    transactionUpdate: (currentData: T) -> T,
+    options: Any? = definedExternally
+): Promise<TransactionResult>
+
 external interface Database {
     val app: FirebaseApp
 }
@@ -132,3 +138,8 @@ external interface OnDisconnect {
     fun set(value: Any?): Promise<Unit>
     fun update(value: Any): Promise<Unit>
 }
+
+external interface TransactionResult {
+    val committed: Boolean
+    val snapshot: DataSnapshot
+}

firebase-database/build.gradle.kts

@@ -21,6 +21,7 @@ android {
     defaultConfig {
         minSdk = property("minSdkVersion") as Int
         targetSdk = property("targetSdkVersion") as Int
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
         getByName("main") {
@@ -143,4 +144,3 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign(publishing.publications)
 }
-

firebase-database/src/androidAndroidTest/kotlin/dev/gitlive/firebase/database/database.kt

@@ -6,8 +6,9 @@
 package dev.gitlive.firebase.database
 
 import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.test.TestResult
 
 actual val emulatorHost: String = "10.0.2.2"
 
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
-actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
+actual fun runTest(test: suspend () -> Unit): TestResult = kotlinx.coroutines.test.runTest { test() }

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

@@ -264,4 +264,3 @@ actual class OnDisconnect internal constructor(
 }
 
 actual typealias DatabaseException = com.google.firebase.database.DatabaseException
-

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

@@ -99,4 +99,3 @@ expect class OnDisconnect {
     suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean = true)
     suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean = true)
 }
-

firebase-database/src/commonTest/kotlin/dev.gitlive.firebase.database/database.kt

@@ -2,21 +2,19 @@ package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.*
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.TestResult
 import kotlinx.serialization.*
 import kotlin.test.*
 
 expect val emulatorHost: String
 expect val context: Any
-expect fun runTest(test: suspend () -> Unit)
+expect fun runTest(test: suspend () -> Unit): TestResult
 
 class FirebaseDatabaseTest {
 
     @Serializable
     data class FirebaseDatabaseChildTest(val prop1: String? = null, val time: Double = 0.0)
 
-    @Serializable
-    data class DatabaseTest(val title: String, val likes: Int = 0)
-
     @BeforeTest
     fun initializeFirebase() {
         Firebase
@@ -138,4 +136,4 @@ class FirebaseDatabaseTest {
         }
     }
 
-}
+}

firebase-database/src/commonTest/kotlin/dev/gitlive/firebase/database/database.kt

@@ -151,21 +151,15 @@ actual class DatabaseReference internal constructor(override val js: JsDatabaseR
     actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) =
         rethrow { set(js, encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 
-    actual suspend fun <T> runTransaction(strategy: KSerializer<T>, transactionUpdate: (currentData: T) -> T): DataSnapshot {
-        val deferred = CompletableDeferred<DataSnapshot>()
-        js.transaction(
-            transactionUpdate,
-            { error, _, snapshot ->
-                if (error != null) {
-                    deferred.completeExceptionally(error)
-                } else {
-                    deferred.complete(DataSnapshot(snapshot!!))
-                }
-            },
-            applyLocally = false
-        )
-        return deferred.await()
-    }
+    actual suspend fun <T> runTransaction(strategy: KSerializer<T>, transactionUpdate: (currentData: T) -> T): DataSnapshot =
+        rethrow {
+            val result = dev.gitlive.firebase.externals.database.runTransaction(
+                js,
+                transactionUpdate,
+            ).awaitWhileOnline()
+
+            DataSnapshot(result.snapshot)
+        }
 }
 
 actual class DataSnapshot internal constructor(val js: JsDataSnapshot) {