Skip to content

Commit 56a17e2

Browse files
committed
Merge remote-tracking branch 'GitLiveApp/master' into feature/firestore-settings
2 parents d144ea2 + 2e736d4 commit 56a17e2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import dev.gitlive.firebase.externals.FirebaseApp
88
import kotlin.js.Json
99
import kotlin.js.Promise
1010

11+
external fun documentId(): FieldPath
12+
1113
external class FieldPath(vararg fieldNames: String) {
12-
companion object {
13-
val documentId: FieldPath
14-
}
1514
fun isEqual(other: FieldPath): Boolean
1615

1716
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import dev.gitlive.firebase.firestore.externals.clearIndexedDbPersistence
1515
import dev.gitlive.firebase.firestore.externals.connectFirestoreEmulator
1616
import dev.gitlive.firebase.firestore.externals.deleteDoc
1717
import dev.gitlive.firebase.firestore.externals.doc
18+
import dev.gitlive.firebase.firestore.externals.documentId as jsDocumentId
1819
import dev.gitlive.firebase.firestore.externals.enableIndexedDbPersistence
1920
import dev.gitlive.firebase.firestore.externals.getDoc
2021
import dev.gitlive.firebase.firestore.externals.getDocs
@@ -464,10 +465,10 @@ actual class SnapshotMetadata(val js: JsSnapshotMetadata) {
464465
actual class FieldPath private constructor(val js: JsFieldPath) {
465466

466467
actual companion object {
467-
actual val documentId = FieldPath(JsFieldPath.documentId)
468+
actual val documentId = FieldPath(jsDocumentId())
468469
}
469470
actual constructor(vararg fieldNames: String) : this(dev.gitlive.firebase.firestore.rethrow {
470-
js("Reflect").construct(JsFieldPath, fieldNames).unsafeCast<JsFieldPath>()
471+
JsFieldPath(*fieldNames)
471472
})
472473
actual val documentId: FieldPath get() = FieldPath.documentId
473474
actual val encoded: EncodedFieldPath = js

0 commit comments

Comments
 (0)