Refactor functions

Author: shepeliev

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

@@ -13,33 +13,14 @@ import kotlin.js.Promise
 external object firebase {
 
     open class App {
-        fun functions(region: String? = definedExternally): functions.Functions
     }
 
-    fun app(name: String? = definedExternally): App
-
     interface FirebaseError {
         var code: String
         var message: String
         var name: String
     }
 
-    fun functions(app: App? = definedExternally): functions.Functions
-
-    object functions {
-        class Functions {
-            fun httpsCallable(name: String, options: Json?): HttpsCallable
-            fun useFunctionsEmulator(origin: String)
-            fun useEmulator(host: String, port: Int)
-        }
-        interface HttpsCallableResult {
-            val data: Any?
-        }
-        interface HttpsCallable {
-        }
-
-    }
-
     fun installations(app: App? = definedExternally): installations.Installations
 
     object installations {

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

@@ -0,0 +1,24 @@
+@file:JsModule("firebase/functions")
+@file:JsNonModule
+
+package dev.gitlive.firebase.externals.functions
+
+import dev.gitlive.firebase.externals.app.FirebaseApp
+import kotlin.js.Json
+
+external fun connectFunctionsEmulator(functions: Functions, host: String, port: Int)
+
+external fun getFunctions(
+    app: FirebaseApp? = definedExternally,
+    regionOrCustomDomain: String? = definedExternally
+): Functions
+
+external fun httpsCallable(functions: Functions, name: String, options: Json?): HttpsCallable
+
+external interface Functions
+
+external interface HttpsCallableResult {
+    val data: Any?
+}
+
+external interface HttpsCallable

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

@@ -5,6 +5,8 @@
 package dev.gitlive.firebase
 
 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
 
 @JsModule("firebase/compat/functions")
@@ -18,5 +20,5 @@ typealias ValueSnapshotCallback = (data: DataSnapshot) -> Unit
 typealias CancelCallback = (error: Throwable) -> Unit
 typealias Unsubscribe = () -> Unit
 
-operator fun firebase.functions.HttpsCallable.invoke() = asDynamic()() as Promise<firebase.functions.HttpsCallableResult>
-operator fun firebase.functions.HttpsCallable.invoke(data: Any?) = asDynamic()(data) as Promise<firebase.functions.HttpsCallableResult>
+operator fun HttpsCallable.invoke() = asDynamic()() as Promise<HttpsCallableResult>
+operator fun HttpsCallable.invoke(data: Any?) = asDynamic()(data) as Promise<HttpsCallableResult>

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

@@ -14,7 +14,7 @@ expect class FirebaseFunctions {
     fun httpsCallable(name: String, timeout: Long? = null): HttpsCallableReference
     fun useEmulator(host: String, port: Int)
 
-    @Deprecated("Use useEmulator(java.lang.String,int) to connect to the emulator.")
+    @Deprecated("Use useEmulator(java.lang.String,int) to connect to the emulator.", level = DeprecationLevel.ERROR)
     fun useFunctionsEmulator(origin: String)
 }
 
@@ -42,4 +42,3 @@ expect fun Firebase.functions(app: FirebaseApp): FirebaseFunctions
 expect fun Firebase.functions(app: FirebaseApp, region: String): FirebaseFunctions
 
 expect class FirebaseFunctionsException: FirebaseException
-

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

@@ -5,34 +5,40 @@
 package dev.gitlive.firebase.functions
 
 import dev.gitlive.firebase.*
+import dev.gitlive.firebase.externals.functions.*
 import kotlinx.coroutines.await
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
+import org.w3c.dom.url.URL
 import kotlin.js.json
+import dev.gitlive.firebase.externals.functions.HttpsCallableResult as JsHttpsCallableResult
 
 actual val Firebase.functions: FirebaseFunctions
-    get() = rethrow { dev.gitlive.firebase.functions; FirebaseFunctions(firebase.functions()) }
+    get() = rethrow { FirebaseFunctions(getFunctions()) }
 
 actual fun Firebase.functions(region: String) =
-    rethrow { dev.gitlive.firebase.functions; FirebaseFunctions(firebase.app().functions(region)) }
+    rethrow { FirebaseFunctions(getFunctions(regionOrCustomDomain = region)) }
 
 actual fun Firebase.functions(app: FirebaseApp) =
-    rethrow { dev.gitlive.firebase.functions; FirebaseFunctions(firebase.functions(app.js)) }
+    rethrow { FirebaseFunctions(getFunctions(app.js)) }
 
 actual fun Firebase.functions(app: FirebaseApp, region: String) =
-    rethrow { dev.gitlive.firebase.functions; FirebaseFunctions(app.js.functions(region)) }
+    rethrow { FirebaseFunctions(getFunctions(app.js, region)) }
 
-actual class FirebaseFunctions internal constructor(val js: firebase.functions.Functions) {
+actual class FirebaseFunctions internal constructor(val js: Functions) {
     actual fun httpsCallable(name: String, timeout: Long?) =
-        rethrow { HttpsCallableReference(js.httpsCallable(name, timeout?.let { json("timeout" to timeout.toDouble()) })) }
+        rethrow { HttpsCallableReference(httpsCallable(js, name, timeout?.let { json("timeout" to timeout.toDouble()) })) }
 
-    actual fun useFunctionsEmulator(origin: String) = js.useFunctionsEmulator(origin)
+    actual fun useFunctionsEmulator(origin: String) {
+        val url = URL(origin)
+        useEmulator(url.host, url.port.toInt())
+    }
 
-    actual fun useEmulator(host: String, port: Int) = js.useEmulator(host, port)
+    actual fun useEmulator(host: String, port: Int) = connectFunctionsEmulator(js, host, port)
 }
 
 @Suppress("UNCHECKED_CAST")
-actual class HttpsCallableReference internal constructor(val js: firebase.functions.HttpsCallable) {
+actual class HttpsCallableReference internal constructor(val js: HttpsCallable) {
 
     actual suspend operator fun invoke() =
         rethrow { HttpsCallableResult(js().await()) }
@@ -44,7 +50,7 @@ actual class HttpsCallableReference internal constructor(val js: firebase.functi
         rethrow { HttpsCallableResult(js(encode(strategy, data, encodeDefaults)).await()) }
 }
 
-actual class HttpsCallableResult constructor(val js: firebase.functions.HttpsCallableResult) {
+actual class HttpsCallableResult constructor(val js: JsHttpsCallableResult) {
 
     actual inline fun <reified T> data() =
         rethrow { decode<T>(value = js.data) }