Skip to content

Commit ee34197

Browse files
Daeda88Daeda88
committed
Refactored buildSettings variable to encodeNextWith cli
1 parent 6d72b0d commit ee34197

File tree

7 files changed

+114
-81
lines changed

7 files changed

+114
-81
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ documentRef.updateFields {
197197
"otherField".to(IntAsStringSerializer(), 1)
198198

199199
// Overwrite build settings. All fields added after this will have these build settings applied
200-
buildSettings = {
200+
encodeNextWith {
201201
encodeDefaults = true
202202
serializersModule = module
203203
}
@@ -215,7 +215,7 @@ query.orderBy("field", "otherField", "city").startAtFieldValues { // similar syn
215215
add(1, IntAsStringSerializer())
216216

217217
// Overwrite build settings. All field values added after this will have these build settings applied
218-
buildSettings = {
218+
encodeNextWith {
219219
encodeDefaults = true
220220
serializersModule = module
221221
}

‎firebase-firestore/api/android/firebase-firestore.api

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ public final class dev/gitlive/firebase/firestore/FieldValueSerializer : kotlinx
172172
public final class dev/gitlive/firebase/firestore/FieldValuesDSL {
173173
public final fun addEncoded (Ljava/lang/Object;)V
174174
public final fun addWithStrategy (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
175-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
176-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
175+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
176+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
177+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
177178
}
178179

179180
public final class dev/gitlive/firebase/firestore/FieldsAndValuesUpdateDSL {
180-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
181-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
181+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
182+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
183+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
182184
public final fun to (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
183185
public final fun to (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
184186
public final fun toEncoded (Ldev/gitlive/firebase/firestore/FieldPath;Ljava/lang/Object;)V
@@ -238,9 +240,10 @@ public final class dev/gitlive/firebase/firestore/FilterBuilder {
238240
public final fun contains (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
239241
public final fun containsAny (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
240242
public final fun containsAny (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
243+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
241244
public final fun equalTo (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
242245
public final fun equalTo (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
243-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
246+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
244247
public final fun greaterThan (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
245248
public final fun greaterThan (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
246249
public final fun greaterThanOrEqualTo (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
@@ -260,7 +263,7 @@ public final class dev/gitlive/firebase/firestore/FilterBuilder {
260263
public final fun notInArray (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
261264
public final fun notInArray (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
262265
public final fun or (Ldev/gitlive/firebase/firestore/Filter;Ldev/gitlive/firebase/firestore/Filter;)Ldev/gitlive/firebase/firestore/Filter$Or;
263-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
266+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
264267
}
265268

266269
public final class dev/gitlive/firebase/firestore/FirebaseFirestore {

‎firebase-firestore/api/jvm/firebase-firestore.api

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ public final class dev/gitlive/firebase/firestore/FieldValueSerializer : kotlinx
172172
public final class dev/gitlive/firebase/firestore/FieldValuesDSL {
173173
public final fun addEncoded (Ljava/lang/Object;)V
174174
public final fun addWithStrategy (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
175-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
176-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
175+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
176+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
177+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
177178
}
178179

179180
public final class dev/gitlive/firebase/firestore/FieldsAndValuesUpdateDSL {
180-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
181-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
181+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
182+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
183+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
182184
public final fun to (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
183185
public final fun to (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
184186
public final fun toEncoded (Ldev/gitlive/firebase/firestore/FieldPath;Ljava/lang/Object;)V
@@ -238,9 +240,10 @@ public final class dev/gitlive/firebase/firestore/FilterBuilder {
238240
public final fun contains (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
239241
public final fun containsAny (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
240242
public final fun containsAny (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
243+
public final fun encodeNextWith (Lkotlin/jvm/functions/Function1;)V
241244
public final fun equalTo (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
242245
public final fun equalTo (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
243-
public final fun getBuildSettings ()Lkotlin/jvm/functions/Function1;
246+
public final fun getEncodeNextWith ()Lkotlin/jvm/functions/Function1;
244247
public final fun greaterThan (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
245248
public final fun greaterThan (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
246249
public final fun greaterThanOrEqualTo (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
@@ -260,7 +263,7 @@ public final class dev/gitlive/firebase/firestore/FilterBuilder {
260263
public final fun notInArray (Ldev/gitlive/firebase/firestore/FieldPath;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
261264
public final fun notInArray (Ljava/lang/String;Lkotlinx/serialization/SerializationStrategy;Ljava/util/List;)Ldev/gitlive/firebase/firestore/Filter$WithConstraint;
262265
public final fun or (Ldev/gitlive/firebase/firestore/Filter;Ldev/gitlive/firebase/firestore/Filter;)Ldev/gitlive/firebase/firestore/Filter$Or;
263-
public final fun setBuildSettings (Lkotlin/jvm/functions/Function1;)V
266+
public final fun setEncodeNextWith (Lkotlin/jvm/functions/Function1;)V
264267
}
265268

266269
public final class dev/gitlive/firebase/firestore/FirebaseFirestore {

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,25 @@ public class FieldValuesDSL internal constructor() {
1111

1212
internal val fieldValues: MutableList<Any> = mutableListOf()
1313

14+
@PublishedApi
15+
internal var encodeNextWith: EncodeSettings.Builder.() -> Unit = {
16+
encodeDefaults = true
17+
}
18+
1419
/**
15-
* The [EncodeSettings.Builder] to apply to the next field values added.
20+
* Sets the [EncodeSettings.Builder] to apply to the next field values added.
1621
* Updating this value will only influence the encoding of field values not yet added to the update.
1722
* This allows for custom encoding per value, e.g.
1823
*
1924
* ```
20-
* buildSettings = { encodeDefaults = true }
25+
* encodeNextWith { encodeDefaults = true }
2126
* add(ClassWithDefaults())
22-
* buildSettings = { encodeDefaults = false }
27+
* encodeNextWith { encodeDefaults = false }
2328
* add(ClassWithDefaults())
2429
* ```
2530
*/
26-
public var buildSettings: EncodeSettings.Builder.() -> Unit = {
27-
encodeDefaults = true
31+
public fun encodeNextWith(builder: EncodeSettings.Builder.() -> Unit) {
32+
encodeNextWith = builder
2833
}
2934

3035
/**
@@ -33,7 +38,7 @@ public class FieldValuesDSL internal constructor() {
3338
* @param value the value [T] to add
3439
*/
3540
public inline fun <reified T> add(value: T) {
36-
addEncoded(encode(value, buildSettings)!!)
41+
addEncoded(encode(value, encodeNextWith)!!)
3742
}
3843

3944
/**
@@ -43,7 +48,7 @@ public class FieldValuesDSL internal constructor() {
4348
* @param value the value [T] to add
4449
*/
4550
public fun <T : Any> addWithStrategy(strategy: SerializationStrategy<T>, value: T) {
46-
addEncoded(dev.gitlive.firebase.internal.encode(strategy, value, buildSettings)!!)
51+
addEncoded(dev.gitlive.firebase.internal.encode(strategy, value, encodeNextWith)!!)
4752
}
4853

4954
@PublishedApi

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,25 @@ public class FieldsAndValuesUpdateDSL internal constructor() {
2323

2424
internal val fieldAndValues: MutableList<FieldAndValue> = mutableListOf()
2525

26+
@PublishedApi
27+
internal var encodeNextWith: EncodeSettings.Builder.() -> Unit = {
28+
encodeDefaults = true
29+
}
30+
2631
/**
27-
* The [EncodeSettings.Builder] to apply to the next values added to this update.
32+
* Sets the [EncodeSettings.Builder] to apply to the next values added to this update.
2833
* Updating this value will only influence the encoding of values not yet added to the update.
2934
* This allows for custom encoding per update, e.g.
3035
*
3136
* ```
32-
* buildSettings = { encodeDefaults = true }
37+
* encodeNextWith { encodeDefaults = true }
3338
* "path" to ClassWithDefaults()
34-
* buildSettings = { encodeDefaults = false }
39+
* encodeNextWith { encodeDefaults = false }
3540
* "otherPath" to ClassWithDefaults()
3641
* ```
3742
*/
38-
public var buildSettings: EncodeSettings.Builder.() -> Unit = {
39-
encodeDefaults = true
43+
public fun encodeNextWith(builder: EncodeSettings.Builder.() -> Unit) {
44+
encodeNextWith = builder
4045
}
4146

4247
/**
@@ -45,7 +50,7 @@ public class FieldsAndValuesUpdateDSL internal constructor() {
4550
* @param value the value [T] to update to
4651
*/
4752
public inline infix fun <reified T> String.to(value: T) {
48-
toEncoded(encode(value, buildSettings))
53+
toEncoded(encode(value, encodeNextWith))
4954
}
5055

5156
/**
@@ -54,7 +59,7 @@ public class FieldsAndValuesUpdateDSL internal constructor() {
5459
* @param value the value [T] to update to
5560
*/
5661
public inline infix fun <reified T> FieldPath.to(value: T) {
57-
toEncoded(encode(value, buildSettings))
62+
toEncoded(encode(value, encodeNextWith))
5863
}
5964

6065
/**
@@ -64,7 +69,7 @@ public class FieldsAndValuesUpdateDSL internal constructor() {
6469
* @param value the value [T] to update to
6570
*/
6671
public fun <T : Any> String.to(strategy: SerializationStrategy<T>, value: T) {
67-
toEncoded(dev.gitlive.firebase.internal.encode(strategy, value, buildSettings))
72+
toEncoded(dev.gitlive.firebase.internal.encode(strategy, value, encodeNextWith))
6873
}
6974

7075
/**
@@ -74,7 +79,7 @@ public class FieldsAndValuesUpdateDSL internal constructor() {
7479
* @param value the value [T] to update to
7580
*/
7681
public fun <T : Any> FieldPath.to(strategy: SerializationStrategy<T>, value: T) {
77-
toEncoded(dev.gitlive.firebase.internal.encode(strategy, value, buildSettings))
82+
toEncoded(dev.gitlive.firebase.internal.encode(strategy, value, encodeNextWith))
7883
}
7984

8085
@PublishedApi

0 commit comments

Comments
 (0)