Resolve conflicts

Author: shepeliev

firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/ServerValue.kt

@@ -1,18 +1,17 @@
 package dev.gitlive.firebase.database
 
-import dev.gitlive.firebase.firebase
+import dev.gitlive.firebase.database.externals.serverTimestamp
 import kotlinx.serialization.Serializable
-
-private typealias NativeServerValue = firebase.database.ServerValue
+import dev.gitlive.firebase.database.externals.increment as jsIncrement
 
 /** Represents a Firebase ServerValue. */
 @Serializable(with = ServerValueSerializer::class)
 actual class ServerValue internal actual constructor(
     internal actual val nativeValue: Any
 ){
     actual companion object {
-        actual val TIMESTAMP: ServerValue get() = ServerValue(NativeServerValue.TIMESTAMP)
-        actual fun increment(delta: Double): ServerValue = ServerValue(NativeServerValue.increment(delta))
+        actual val TIMESTAMP: ServerValue get() = ServerValue(serverTimestamp())
+        actual fun increment(delta: Double): ServerValue = ServerValue(jsIncrement(delta))
     }
 
     override fun equals(other: Any?): Boolean =

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

@@ -31,7 +31,7 @@ external fun getDatabase(
     url: String? = definedExternally
 ): Database
 
-external fun increment(delta: Long): Any
+external fun increment(delta: Double): Any
 
 external fun limitToFirst(limit: Int): QueryConstraint
 

firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/Timestamp.kt

@@ -1,14 +1,13 @@
 package dev.gitlive.firebase.firestore
 
-import dev.gitlive.firebase.*
 import kotlinx.serialization.Serializable
 
 /** A base class that could be used to combine [Timestamp] and [Timestamp.ServerTimestamp] in the same field. */
 @Serializable(with = BaseTimestampSerializer::class)
 actual sealed class BaseTimestamp
 
 /** A class representing a platform specific Firebase Timestamp. */
-actual typealias NativeTimestamp = firebase.firestore.Timestamp
+actual typealias NativeTimestamp = dev.gitlive.firebase.firestore.externals.Timestamp
 
 /** A class representing a Firebase Timestamp. */
 @Serializable(with = TimestampSerializer::class)
@@ -33,4 +32,3 @@ actual class Timestamp internal actual constructor(
     @Serializable(with = ServerTimestampSerializer::class)
     actual object ServerTimestamp: BaseTimestamp()
 }
-

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

@@ -179,7 +179,9 @@ external interface DocumentSnapshot {
     fun get(fieldPath: FieldPath, options: Any? = definedExternally): Any?
 }
 
-external interface FieldValue
+external class FieldValue {
+    fun isEqual(other: FieldValue): Boolean
+}
 
 external interface Query
 
@@ -252,3 +254,15 @@ external interface WriteBatch {
         vararg moreFieldsAndValues: Any?
     ): WriteBatch
 }
+
+external class Timestamp(seconds: Double, nanoseconds: Double) {
+    companion object {
+        fun now(): Timestamp
+    }
+
+    val seconds: Double
+    val nanoseconds: Double
+    fun toMillis(): Double
+
+    fun isEqual(other: Timestamp): Boolean
+}

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

@@ -4,8 +4,11 @@
 
 package dev.gitlive.firebase.firestore
 
-import dev.gitlive.firebase.*
+import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
+import dev.gitlive.firebase.FirebaseException
+import dev.gitlive.firebase.decode
+import dev.gitlive.firebase.encode
 import dev.gitlive.firebase.firestore.externals.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.await
@@ -52,7 +55,7 @@ private fun <R> performUpdate(
 /** Helper method to perform an update operation. */
 private fun <R> performUpdate(
     fieldsAndValues: Array<out Pair<FieldPath, Any?>>,
-    update: (firebase.firestore.FieldPath, Any?, Array<Any?>) -> R
+    update: (dev.gitlive.firebase.firestore.externals.FieldPath, Any?, Array<Any?>) -> R
 ) = performUpdate(fieldsAndValues, { it.js }, { encode(it, true) }, update)
 
 actual class FirebaseFirestore(jsFirestore: Firestore) {
@@ -246,13 +249,13 @@ actual class DocumentReference(val js: JsDocumentReference) {
 
     actual suspend fun update(vararg fieldsAndValues: Pair<String, Any?>) = rethrow {
         performUpdate(fieldsAndValues) { field, value, moreFieldsAndValues ->
-            js.update(field, value, *moreFieldsAndValues)
+            jsUpdate(js, field, value, *moreFieldsAndValues)
         }?.await()
     }.run { Unit }
 
     actual suspend fun update(vararg fieldsAndValues: Pair<FieldPath, Any?>) = rethrow {
         performUpdate(fieldsAndValues) { field, value, moreFieldsAndValues ->
-            js.update(field, value, *moreFieldsAndValues)
+            jsUpdate(js, field, value, *moreFieldsAndValues)
         }?.await()
     }.run { Unit }
 
@@ -444,7 +447,7 @@ actual class FieldPath private constructor(val js: JsFieldPath) {
 }
 
 /** Represents a platform specific Firebase FieldValue. */
-private typealias NativeFieldValue = firebase.firestore.FieldValue
+private typealias NativeFieldValue = dev.gitlive.firebase.firestore.externals.FieldValue
 
 /** Represents a Firebase FieldValue. */
 @Serializable(with = FieldValueSerializer::class)