add startAfter, startAt, endBefore, endAt for snapshot and fieldValues

Author: michaelprichardson

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

@@ -381,6 +381,13 @@ external object firebase {
             fun orderBy(field: String, direction: Any): Query
             fun orderBy(field: FieldPath, direction: Any): Query
             fun startAfter(document: DocumentSnapshot): Query
+            fun startAfter(vararg fieldValues: Any): Query
+            fun startAt(document: DocumentSnapshot): Query
+            fun startAt(vararg fieldValues: Any): Query
+            fun endBefore(document: DocumentSnapshot): Query
+            fun endBefore(vararg fieldValues: Any): Query
+            fun endAt(document: DocumentSnapshot): Query
+            fun endAt(vararg fieldValues: Any): Query
         }
 
         open class CollectionReference : Query {

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

@@ -369,6 +369,14 @@ actual open class Query(open val android: com.google.firebase.firestore.Query) {
     internal actual fun _orderBy(field: FieldPath, direction: Direction) = Query(android.orderBy(field.android, direction))
 
     internal actual fun _startAfter(document: DocumentSnapshot) = Query(android.startAfter(document.android))
+    internal actual fun _startAfter(vararg fieldValues: Any) = Query(android.startAfter(*fieldValues))
+    internal actual fun _startAt(document: DocumentSnapshot) = Query(android.startAt(document.android))
+    internal actual fun _startAt(vararg fieldValues: Any) = Query(android.startAt(*fieldValues))
+
+    internal actual fun _endBefore(document: DocumentSnapshot) = Query(android.endBefore(document.android))
+    internal actual fun _endBefore(vararg fieldValues: Any) = Query(android.endBefore(*fieldValues))
+    internal actual fun _endAt(document: DocumentSnapshot) = Query(android.endAt(document.android))
+    internal actual fun _endAt(vararg fieldValues: Any) = Query(android.endAt(*fieldValues))
 }
 
 actual typealias Direction = com.google.firebase.firestore.Query.Direction

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

@@ -70,6 +70,14 @@ expect open class Query {
     internal fun _orderBy(field: FieldPath, direction: Direction): Query
 
     internal fun _startAfter(document: DocumentSnapshot): Query
+    internal fun _startAfter(vararg fieldValues: Any): Query
+    internal fun _startAt(document: DocumentSnapshot): Query
+    internal fun _startAt(vararg fieldValues: Any): Query
+
+    internal fun _endBefore(document: DocumentSnapshot): Query
+    internal fun _endBefore(vararg fieldValues: Any): Query
+    internal fun _endAt(document: DocumentSnapshot): Query
+    internal fun _endAt(vararg fieldValues: Any): Query
 }
 
 fun Query.where(field: String, equalTo: Any?) = _where(field, equalTo)
@@ -85,6 +93,14 @@ fun Query.orderBy(field: String, direction: Direction = Direction.ASCENDING) = _
 fun Query.orderBy(field: FieldPath, direction: Direction = Direction.ASCENDING) = _orderBy(field, direction)
 
 fun Query.startAfter(document: DocumentSnapshot) = _startAfter(document)
+fun Query.startAfter(vararg fieldValues: Any) = _startAfter(fieldValues)
+fun Query.startAt(document: DocumentSnapshot) = _startAfter(document)
+fun Query.startAt(vararg fieldValues: Any) = _startAfter(fieldValues)
+
+fun Query.endBefore(document: DocumentSnapshot) = _startAfter(document)
+fun Query.endBefore(vararg fieldValues: Any) = _startAfter(fieldValues)
+fun Query.endAt(document: DocumentSnapshot) = _startAfter(document)
+fun Query.endAt(vararg fieldValues: Any) = _startAfter(fieldValues)
 
 expect class WriteBatch {
     inline fun <reified T> set(documentRef: DocumentReference, data: T, encodeDefaults: Boolean = true, merge: Boolean = false): WriteBatch

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

@@ -284,6 +284,14 @@ actual open class Query(open val ios: FIRQuery) {
     internal actual fun _orderBy(field: FieldPath, direction: Direction) = Query(ios.queryOrderedByFieldPath(field.ios, direction == Direction.DESCENDING))
 
     internal actual fun _startAfter(document: DocumentSnapshot) = Query(ios.queryStartingAfterDocument(document.ios))
+    internal actual fun _startAfter(vararg fieldValues: Any) = Query(ios.queryStartingAfterValues(fieldValues))
+    internal actual fun _startAt(document: DocumentSnapshot) = Query(ios.queryStartingAtDocument(document.ios))
+    internal actual fun _startAt(vararg fieldValues: Any) = Query(ios.queryStartingAtValues(fieldValues))
+
+    internal actual fun _endBefore(document: DocumentSnapshot) = Query(ios.queryEndingBeforeDocument(document.ios))
+    internal actual fun _endBefore(vararg fieldValues: Any) = Query(ios.queryEndingBeforeValues(fieldValues))
+    internal actual fun _endAt(document: DocumentSnapshot) = Query(ios.queryEndingAtDocument(document.ios))
+    internal actual fun _endAt(vararg fieldValues: Any) = Query(ios.queryEndingAtValues(fieldValues))
 
 }
 @Suppress("UNCHECKED_CAST")

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

@@ -332,9 +332,21 @@ actual open class Query(open val js: firebase.firestore.Query) {
         Query(js.orderBy(field.js, direction.jsString))
     }
 
-    internal actual fun _startAfter(document: DocumentSnapshot) = rethrow {
-        Query(js.startAfter(document.js))
-    }
+    internal actual fun _startAfter(document: DocumentSnapshot) = rethrow { Query(js.startAfter(document.js)) }
+
+    internal actual fun _startAfter(vararg fieldValues: Any) = rethrow { Query(js.startAfter(*fieldValues)) }
+
+    internal actual fun _startAt(document: DocumentSnapshot) = rethrow { Query(js.startAt(document.js)) }
+
+    internal actual fun _startAt(vararg fieldValues: Any) = rethrow { Query(js.startAt(*fieldValues)) }
+
+    internal actual fun _endBefore(document: DocumentSnapshot) = rethrow { Query(js.endBefore(document.js)) }
+
+    internal actual fun _endBefore(vararg fieldValues: Any) = rethrow { Query(js.endBefore(*fieldValues)) }
+
+    internal actual fun _endAt(document: DocumentSnapshot) = rethrow { Query(js.endAt(document.js)) }
+
+    internal actual fun _endAt(vararg fieldValues: Any) = rethrow { Query(js.endAt(*fieldValues)) }
 
     actual val snapshots get() = callbackFlow<QuerySnapshot> {
         val unsubscribe = rethrow {