Merge pull request #259 from litclimbing/add-parent-field

Added "parent" field to document and collection references

Author: nbransby

build.gradle.kts

@@ -196,7 +196,7 @@ subprojects {
         dependencies {
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.0"))
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")

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

@@ -384,6 +384,7 @@ external object firebase {
 
         open class CollectionReference : Query {
             val path: String
+            val parent: DocumentReference?
             fun doc(path: String = definedExternally): DocumentReference
             fun add(data: Any): Promise<DocumentReference>
         }
@@ -420,6 +421,7 @@ external object firebase {
         open class DocumentReference {
             val id: String
             val path: String
+            val parent: CollectionReference
 
             fun collection(path: String): CollectionReference
             fun get(options: Any? = definedExternally): Promise<DocumentSnapshot>

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

@@ -227,6 +227,9 @@ actual class DocumentReference(val android: com.google.firebase.firestore.Docume
     actual val path: String
         get() = android.path
 
+    actual val parent: CollectionReference
+        get() = CollectionReference(android.parent)
+
     actual fun collection(collectionPath: String) = CollectionReference(android.collection(collectionPath))
 
     actual suspend inline fun <reified T> set(data: T, encodeDefaults: Boolean, merge: Boolean) = when(merge) {
@@ -369,6 +372,9 @@ actual class CollectionReference(override val android: com.google.firebase.fires
     actual val document: DocumentReference
         get() = DocumentReference(android.document())
 
+    actual val parent: DocumentReference?
+        get() = android.parent?.let{DocumentReference(it)}
+
     actual fun document(documentPath: String) = DocumentReference(android.document(documentPath))
 
     actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =

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

@@ -109,6 +109,7 @@ expect class DocumentReference {
     val id: String
     val path: String
     val snapshots: Flow<DocumentSnapshot>
+    val parent: CollectionReference
 
     fun collection(collectionPath: String): CollectionReference
     suspend fun get(): DocumentSnapshot
@@ -133,6 +134,7 @@ expect class DocumentReference {
 expect class CollectionReference : Query {
     val path: String
     val document: DocumentReference
+    val parent: DocumentReference?
 
     fun document(documentPath: String): DocumentReference
     suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean = true): DocumentReference

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

@@ -174,6 +174,9 @@ actual class DocumentReference(val ios: FIRDocumentReference) {
     actual val path: String
         get() = ios.path
 
+    actual val parent: CollectionReference
+        get() = CollectionReference(ios.parent)
+
     actual fun collection(collectionPath: String) = CollectionReference(ios.collectionWithPath(collectionPath))
 
     actual suspend inline fun <reified T> set(data: T, encodeDefaults: Boolean, merge: Boolean) =
@@ -283,6 +286,8 @@ actual class CollectionReference(override val ios: FIRCollectionReference) : Que
 
     actual val document get() = DocumentReference(ios.documentWithAutoID())
 
+    actual val parent get() = ios.parent?.let{DocumentReference(it)}
+
     actual fun document(documentPath: String) = DocumentReference(ios.documentWithPath(documentPath))
 
     actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =

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

@@ -214,6 +214,9 @@ actual class DocumentReference(val js: firebase.firestore.DocumentReference) {
     actual val path: String
         get() = rethrow { js.path }
 
+    actual val parent: CollectionReference
+        get() = rethrow { CollectionReference(js.parent) }
+
     actual fun collection(collectionPath: String) = rethrow { CollectionReference(js.collection(collectionPath)) }
 
     actual suspend inline fun <reified T> set(data: T, encodeDefaults: Boolean, merge: Boolean) =
@@ -351,6 +354,8 @@ actual class CollectionReference(override val js: firebase.firestore.CollectionR
 
     actual val document get() = rethrow { DocumentReference(js.doc()) }
 
+    actual val parent get() = rethrow { js.parent?.let{DocumentReference(it)} }
+
     actual fun document(documentPath: String) = rethrow { DocumentReference(js.doc(documentPath)) }
 
     actual suspend inline fun <reified T> add(data: T, encodeDefaults: Boolean) =