Refactor installations

Author: shepeliev

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

@@ -2,32 +2,17 @@
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */
 
-@file:JsModule("firebase/compat/app")
-
 package dev.gitlive.firebase
 
-import kotlin.js.Json
+import dev.gitlive.firebase.externals.database.DataSnapshot
+import dev.gitlive.firebase.externals.functions.HttpsCallable
+import dev.gitlive.firebase.externals.functions.HttpsCallableResult
 import kotlin.js.Promise
 
-@JsName("default")
-external object firebase {
-
-    open class App {
-    }
-
-    interface FirebaseError {
-        var code: String
-        var message: String
-        var name: String
-    }
-
-    fun installations(app: App? = definedExternally): installations.Installations
+typealias ChangeSnapshotCallback = (data: DataSnapshot, previousChildName: String?) -> Unit
+typealias ValueSnapshotCallback = (data: DataSnapshot) -> Unit
+typealias CancelCallback = (error: Throwable) -> Unit
+typealias Unsubscribe = () -> Unit
 
-    object installations {
-        interface Installations {
-            fun delete(): Promise<Unit>
-            fun getId(): Promise<String>
-            fun getToken(forceRefresh: Boolean): Promise<String>
-        }
-    }
-}
+operator fun HttpsCallable.invoke() = asDynamic()() as Promise<HttpsCallableResult>
+operator fun HttpsCallable.invoke(data: Any?) = asDynamic()(data) as Promise<HttpsCallableResult>

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

@@ -0,0 +1,17 @@
+@file:JsModule("firebase/installations")
+@file:JsNonModule
+
+package dev.gitlive.firebase.externals.installations
+
+import dev.gitlive.firebase.externals.app.FirebaseApp
+import kotlin.js.Promise
+
+external fun delete(installations: Installations): Promise<Unit>
+
+external fun getId(installations: Installations): Promise<String>
+
+external fun getInstallations(app: FirebaseApp? = definedExternally): Installations
+
+external fun getToken(installations: Installations, forceRefresh: Boolean): Promise<String>
+
+external interface Installations

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

@@ -1,28 +1,23 @@
 package dev.gitlive.firebase.installations
 
 import dev.gitlive.firebase.*
+import dev.gitlive.firebase.externals.installations.*
 import kotlinx.coroutines.await
 
 actual val Firebase.installations
-    get() = rethrow {
-        dev.gitlive.firebase.installations
-        FirebaseInstallations(firebase.installations())
-    }
+    get() = rethrow { FirebaseInstallations(getInstallations()) }
 
 actual fun Firebase.installations(app: FirebaseApp) =
-    rethrow {
-        dev.gitlive.firebase.installations
-        FirebaseInstallations(firebase.installations(app.js))
-    }
+    rethrow { FirebaseInstallations(getInstallations(app.js)) }
 
-actual class FirebaseInstallations internal constructor(val js: firebase.installations.Installations) {
+actual class FirebaseInstallations internal constructor(val js: Installations) {
 
-    actual suspend fun delete() = rethrow { js.delete().await() }
+    actual suspend fun delete() = rethrow { delete(js).await() }
 
-    actual suspend fun getId(): String = rethrow { js.getId().await() }
+    actual suspend fun getId(): String = rethrow { getId(js).await() }
 
     actual suspend fun getToken(forceRefresh: Boolean): String =
-        rethrow { js.getToken(forceRefresh).await() }
+        rethrow { getToken(js, forceRefresh).await() }
 }
 
 actual open class FirebaseInstallationsException(code: String?, cause: Throwable): FirebaseException(code, cause)