Skip to content

Commit e277eb3

Browse files
Daeda88Daeda88
committed
PR remarks
1 parent 50b3b61 commit e277eb3

File tree

4 files changed

+26
-24
lines changed
  • firebase-firestore/src

4 files changed

+26
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ actual open class Query(open val android: AndroidQuery) {
308308
awaitClose { listener.remove() }
309309
}
310310

311-
actual fun where(field: String, vararg clauses: WhereClause) = Query(
311+
internal actual fun where(field: String, vararg clauses: WhereClause) = Query(
312312
clauses.fold(android) { query, clause ->
313313
when (clause) {
314314
is WhereClause.ForNullableObject -> {
@@ -340,7 +340,7 @@ actual open class Query(open val android: AndroidQuery) {
340340
}
341341
)
342342

343-
actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
343+
internal actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
344344
clauses.fold(android) { query, clause ->
345345
when (clause) {
346346
is WhereClause.ForNullableObject -> {

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import kotlinx.serialization.KSerializer
1111
import kotlinx.serialization.Serializable
1212
import kotlinx.serialization.SerializationException
1313
import kotlinx.serialization.SerializationStrategy
14+
import kotlin.jvm.JvmInline
1415
import kotlin.jvm.JvmName
1516

1617
/** Returns the [FirebaseFirestore] instance of the default [FirebaseApp]. */
@@ -53,32 +54,32 @@ expect class Transaction {
5354
suspend fun get(documentRef: DocumentReference): DocumentSnapshot
5455
}
5556

56-
sealed class WhereClause {
57+
internal sealed interface WhereClause {
5758

58-
sealed class ForNullableObject : WhereClause() {
59+
sealed interface ForNullableObject : WhereClause {
5960
abstract val value: Any?
6061
val safeValue get() = value?.safeValue
6162
}
6263

63-
sealed class ForObject : WhereClause() {
64+
sealed interface ForObject : WhereClause {
6465
abstract val value: Any
6566
val safeValue get() = value.safeValue
6667
}
67-
sealed class ForArray : WhereClause() {
68+
sealed interface ForArray : WhereClause {
6869
abstract val values: List<Any>
6970
val safeValues get() = values.map { it.safeValue }
7071
}
7172

72-
data class EqualTo(override val value: Any?) : ForNullableObject()
73-
data class NotEqualTo(override val value: Any?) : ForNullableObject()
74-
data class LessThan(override val value: Any) : ForObject()
75-
data class GreaterThan(override val value: Any) : ForObject()
76-
data class LessThanOrEqualTo(override val value: Any) : ForObject()
77-
data class GreaterThanOrEqualTo(override val value: Any) : ForObject()
78-
data class ArrayContains(override val value: Any) : ForObject()
79-
data class InArray(override val values: List<Any>) : ForArray()
80-
data class ArrayContainsAny(override val values: List<Any>) : ForArray()
81-
data class NotInArray(override val values: List<Any>) : ForArray()
73+
data class EqualTo(override val value: Any?) : ForNullableObject
74+
data class NotEqualTo(override val value: Any?) : ForNullableObject
75+
data class LessThan(override val value: Any) : ForObject
76+
data class GreaterThan(override val value: Any) : ForObject
77+
data class LessThanOrEqualTo(override val value: Any) : ForObject
78+
data class GreaterThanOrEqualTo(override val value: Any) : ForObject
79+
data class ArrayContains(override val value: Any) : ForObject
80+
data class InArray(override val values: List<Any>) : ForArray
81+
data class ArrayContainsAny(override val values: List<Any>) : ForArray
82+
data class NotInArray(override val values: List<Any>) : ForArray
8283
}
8384

8485
expect open class Query {
@@ -87,8 +88,8 @@ expect open class Query {
8788
fun snapshots(includeMetadataChanges: Boolean = false): Flow<QuerySnapshot>
8889
suspend fun get(): QuerySnapshot
8990

90-
fun where(field: String, vararg clauses: WhereClause): Query
91-
fun where(path: FieldPath, vararg clauses: WhereClause): Query
91+
internal fun where(field: String, vararg clauses: WhereClause): Query
92+
internal fun where(path: FieldPath, vararg clauses: WhereClause): Query
9293

9394
internal fun _orderBy(field: String, direction: Direction): Query
9495
internal fun _orderBy(field: FieldPath, direction: Direction): Query
@@ -115,8 +116,8 @@ private val Any.safeValue: Any get() = when (this) {
115116

116117
fun Query.where(field: String, equalTo: Any?) = where(field, clause = WhereClause.EqualTo(equalTo))
117118
fun Query.where(path: FieldPath, equalTo: Any?) = where(path, clause = WhereClause.EqualTo(equalTo))
118-
fun Query.where(field: String, clause: WhereClause): Query = where(field, clauses = listOf(clause).toTypedArray())
119-
fun Query.where(path: FieldPath, clause: WhereClause): Query = where(path, clauses = listOf(clause).toTypedArray())
119+
private fun Query.where(field: String, clause: WhereClause): Query = where(field, clauses = listOf(clause).toTypedArray())
120+
private fun Query.where(path: FieldPath, clause: WhereClause): Query = where(path, clauses = listOf(clause).toTypedArray())
120121
fun Query.whereNot(field: String, notEqualTo: Any?) = where(field, clause = WhereClause.NotEqualTo(notEqualTo))
121122
fun Query.whereNot(path: FieldPath, notEqualTo: Any?) = where(path, clause = WhereClause.NotEqualTo(notEqualTo))
122123
fun Query.where(field: String,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ actual open class Query(open val ios: FIRQuery) {
272272
awaitClose { listener.remove() }
273273
}
274274

275-
actual fun where(field: String, vararg clauses: WhereClause) = Query(
275+
internal actual fun where(field: String, vararg clauses: WhereClause) = Query(
276276
clauses.fold(ios) { query, clause ->
277277
when (clause) {
278278
is WhereClause.EqualTo -> query.queryWhereField(field, isEqualTo = clause.safeValue ?: NSNull)
@@ -289,7 +289,7 @@ actual open class Query(open val ios: FIRQuery) {
289289
}
290290
)
291291

292-
actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
292+
internal actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
293293
clauses.fold(ios) { query, clause ->
294294
when (clause) {
295295
is WhereClause.EqualTo -> query.queryWhereFieldPath(path.ios, isEqualTo = clause.safeValue ?: NSNull)

‎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
@@ -293,7 +293,7 @@ actual open class Query(open val js: JsQuery) {
293293

294294
actual fun limit(limit: Number) = Query(query(js, jsLimit(limit)))
295295

296-
actual fun where(field: String, vararg clauses: WhereClause) = Query(
296+
internal actual fun where(field: String, vararg clauses: WhereClause) = Query(
297297
clauses.fold(js) { query, clause ->
298298
val value = when (clause) {
299299
is WhereClause.ForNullableObject -> clause.safeValue
@@ -303,7 +303,8 @@ actual open class Query(open val js: JsQuery) {
303303
query(query, jsWhere(field, clause.filterOp, value))
304304
}
305305
)
306-
actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
306+
307+
internal actual fun where(path: FieldPath, vararg clauses: WhereClause) = Query(
307308
clauses.fold(js) { query, clause ->
308309
val value = when (clause) {
309310
is WhereClause.ForNullableObject -> clause.safeValue

0 commit comments

Comments
 (0)