Refactor app and database modules

shepeliev · shepeliev · commit 21d22641b5e5 · 2022-06-12T19:58:21.000+03:00
diff --git a/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -4,33 +4,44 @@
 
 package dev.gitlive.firebase
 
+import dev.gitlive.firebase.externals.getApp
+import dev.gitlive.firebase.externals.getApps
+import dev.gitlive.firebase.externals.initializeApp
 import kotlin.js.json
+import dev.gitlive.firebase.externals.FirebaseApp as JsFirebaseApp
 
-actual val Firebase.app: FirebaseApp
-    get() = FirebaseApp(firebase.app())
+actual val Firebase.app: FirebaseApp get() = FirebaseApp(getApp())
 
-actual fun Firebase.app(name: String): FirebaseApp =
-    FirebaseApp(firebase.app(name))
+actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(getApp(name))
 
 actual fun Firebase.initialize(context: Any?): FirebaseApp? =
     throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
 
 actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
-    FirebaseApp(firebase.initializeApp(options.toJson(), name))
+    FirebaseApp(initializeApp(options.toJson(), name))
 
 actual fun Firebase.initialize(context: Any?, options: FirebaseOptions) =
-    FirebaseApp(firebase.initializeApp(options.toJson()))
+    FirebaseApp(initializeApp(options.toJson()))
 
-actual class FirebaseApp internal constructor(val js: firebase.App) {
+actual class FirebaseApp internal constructor(val js: JsFirebaseApp) {
     actual val name: String
         get() = js.name
     actual val options: FirebaseOptions
         get() = js.options.run {
-            FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId, messagingSenderId, authDomain)
+            FirebaseOptions(
+                js.options.appId,
+                js.options.apiKey,
+                js.options.databaseURL,
+                js.options.gaTrackingId,
+                js.options.storageBucket,
+                js.options.projectId,
+                js.options.messagingSenderId,
+                js.options.authDomain
+            )
         }
 }
 
-actual fun Firebase.apps(context: Any?) = firebase.apps.map { FirebaseApp(it) }
+actual fun Firebase.apps(context: Any?) = getApps().map { FirebaseApp(it) }
 
 private fun FirebaseOptions.toJson() = json(
     "apiKey" to apiKey,
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
@@ -13,27 +13,11 @@ import kotlin.js.Promise
 external object firebase {
 
     open class App {
-        val name: String
-        val options: Options
         fun functions(region: String? = definedExternally): functions.Functions
-        fun database(url: String? = definedExternally): database.Database
         fun firestore(): firestore.Firestore
     }
 
-    interface Options {
-        val applicationId: String
-        val apiKey: String
-        val databaseUrl: String?
-        val gaTrackingId: String?
-        val storageBucket: String?
-        val projectId: String?
-        val messagingSenderId: String?
-        val authDomain: String?
-    }
-
-    val apps : Array<App>
     fun app(name: String? = definedExternally): App
-    fun initializeApp(options: Any, name: String? = definedExternally) : App
 
     interface FirebaseError {
         var code: String
@@ -286,63 +270,6 @@ external object firebase {
 
     }
 
-    fun database(app: App? = definedExternally): database.Database
-
-    object database {
-        fun enableLogging(logger: Boolean?, persistent: Boolean? = definedExternally)
-
-        open class Database {
-            fun ref(path: String? = definedExternally): Reference
-            fun useEmulator(host: String, port: Int)
-        }
-        open class ThenableReference : Reference
-
-
-        open class Query {
-            fun on(eventType: String?, callback: SnapshotCallback, cancelCallbackOrContext: (error: Error) -> Unit? = definedExternally, context: Any? = definedExternally): SnapshotCallback
-            fun off(eventType: String?, callback: SnapshotCallback?, context: Any? = definedExternally)
-            fun once(eventType: String, callback: SnapshotCallback, failureCallbackOrContext: (error: Error) -> Unit? = definedExternally, context: Any? = definedExternally): SnapshotCallback
-            fun orderByChild(path: String): Query
-            fun orderByKey(): Query
-            fun orderByValue(): Query
-            fun startAt(value: Any, key: String? = definedExternally): Query
-            fun endAt(value: Any, key: String? = definedExternally): Query
-            fun equalTo(value: Any, key: String? = definedExternally): Query
-            fun limitToFirst(limit: Int): Query
-            fun limitToLast (limit: Int): Query
-        }
-
-        open class Reference: Query {
-            val key: String?
-            fun child(path: String): Reference
-            fun remove(): Promise<Unit>
-            fun onDisconnect(): OnDisconnect
-            fun update(value: Any?): Promise<Unit>
-            fun set(value: Any?): Promise<Unit>
-            fun push(): ThenableReference
-        }
-
-        open class DataSnapshot {
-            val key: String?
-            fun `val`(): Any
-            fun exists(): Boolean
-            fun forEach(action: (a: DataSnapshot) -> Boolean): Boolean
-            fun numChildren(): Int
-            fun child(path: String): DataSnapshot
-        }
-
-        open class OnDisconnect {
-            fun update(value: Any?): Promise<Unit>
-            fun remove(): Promise<Unit>
-            fun cancel(): Promise<Unit>
-            fun set(value: Any?): Promise<Unit>
-        }
-
-        object ServerValue {
-            val TIMESTAMP: Any
-        }
-    }
-
     fun firestore(): firestore.Firestore
 
     object firestore {
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/app.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/app.kt
@@ -0,0 +1,28 @@
+@file:JsModule("firebase/app")
+@file:JsNonModule
+
+package dev.gitlive.firebase.externals
+
+external fun initializeApp(options: Any, name: String = definedExternally): FirebaseApp
+
+external fun getApp(name: String = definedExternally): FirebaseApp
+
+external fun getApps(): List<FirebaseApp>
+
+external interface FirebaseApp {
+    val automaticDataCollectionEnabled: Boolean
+    val name: String
+    val options: FirebaseOptions
+}
+
+external interface FirebaseOptions {
+    val apiKey: String
+    val appId : String
+    val authDomain: String?
+    val databaseURL: String?
+    val measurementId: String?
+    val messagingSenderId: String?
+    val gaTrackingId: String?
+    val projectId: String?
+    val storageBucket: String?
+}
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/database.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/database.kt
@@ -0,0 +1,129 @@
+@file:JsModule("firebase/database")
+@file:JsNonModule
+
+package dev.gitlive.firebase.externals
+
+import dev.gitlive.firebase.*
+import kotlin.js.Promise
+
+external fun child(parent: DatabaseReference, path: String): DatabaseReference
+
+external fun connectDatabaseEmulator(
+    db: Database,
+    host: String,
+    port: Int,
+    options: Any? = definedExternally
+)
+
+external fun enableLogging(enabled: Boolean?, persistent: Boolean? = definedExternally)
+
+external fun endAt(value: Any?, key: String? = definedExternally): QueryConstraint
+
+external fun endBefore(value: Any?, key: String? = definedExternally): QueryConstraint
+
+external fun equalTo(value: Any?, key: String? = definedExternally): QueryConstraint
+
+external fun get(query: Query): Promise<DataSnapshot>
+
+external fun getDatabase(
+    app: FirebaseApp? = definedExternally,
+    url: String? = definedExternally
+): Database
+
+external fun increment(delta: Long): Any
+
+external fun limitToFirst(limit: Int): QueryConstraint
+
+external fun limitToLast(limit: Int): QueryConstraint
+
+external fun off(query: Query, eventType: String?, callback: Any?)
+
+external fun onChildAdded(
+    query: Query,
+    callback: ChangeSnapshotCallback,
+    cancelCallback: CancelCallback? = definedExternally,
+): Unsubscribe
+
+external fun onChildChanged(
+    query: Query,
+    callback: ChangeSnapshotCallback,
+    cancelCallback: CancelCallback? = definedExternally,
+): Unsubscribe
+
+external fun onChildMoved(
+    query: Query,
+    callback: ChangeSnapshotCallback,
+    cancelCallback: CancelCallback? = definedExternally,
+): Unsubscribe
+
+external fun onChildRemoved(
+    query: Query,
+    callback: ChangeSnapshotCallback,
+    cancelCallback: CancelCallback? = definedExternally,
+): Unsubscribe
+
+external fun onValue(
+    query: Query,
+    callback: ValueSnapshotCallback,
+    cancelCallback: CancelCallback? = definedExternally,
+): Unsubscribe
+
+external fun onDisconnect(ref: DatabaseReference): OnDisconnect
+
+external fun orderByChild(path: String): QueryConstraint
+
+external fun orderByKey(): QueryConstraint
+
+external fun orderByValue(): QueryConstraint
+
+external fun push(parent: DatabaseReference, value: Any? = definedExternally): ThenableReference
+
+external fun query(query: Query, vararg queryConstraints: QueryConstraint): Query
+
+external fun ref(db: Database, path: String? = definedExternally): DatabaseReference
+
+external fun remove(ref: DatabaseReference): Promise<Unit>
+
+external fun serverTimestamp(): Any
+
+external fun set(ref: DatabaseReference, value: Any?): Promise<Unit>
+
+external fun startAfter(value: Any?, key: String? = definedExternally): QueryConstraint
+
+external fun startAt(value: Any?, key: String? = definedExternally): QueryConstraint
+
+external fun update(ref: DatabaseReference, values: Any): Promise<Unit>
+
+external interface Database {
+    val app: FirebaseApp
+}
+
+external interface Query {
+    val ref: DatabaseReference
+}
+
+external interface QueryConstraint
+
+external interface DatabaseReference : Query {
+    val key: String?
+    val parent: DatabaseReference?
+    val root: DatabaseReference
+}
+
+external interface ThenableReference : DatabaseReference
+
+external interface DataSnapshot {
+    val key: String?
+    fun `val`(): Any
+    fun exists(): Boolean
+    fun forEach(action: (a: DataSnapshot) -> Boolean): Boolean
+    fun numChildren(): Int
+    fun child(path: String): DataSnapshot
+}
+
+external interface OnDisconnect {
+    fun cancel(): Promise<Unit>
+    fun remove(): Promise<Unit>
+    fun set(value: Any?): Promise<Unit>
+    fun update(value: Any): Promise<Unit>
+}
diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt
@@ -4,6 +4,7 @@
 
 package dev.gitlive.firebase
 
+import dev.gitlive.firebase.externals.DataSnapshot
 import kotlin.js.Promise
 
 @JsModule("firebase/compat/auth")
@@ -28,8 +29,10 @@ external object installations
 @JsName("default")
 external object remoteConfig
 
-typealias SnapshotCallback = (data: firebase.database.DataSnapshot, b: String?) -> Unit
+typealias ChangeSnapshotCallback = (data: DataSnapshot, previousChildName: String?) -> Unit
+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>
-
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt
