Skip to content

Commit 7122b86

Browse files
committed
fix encoding any
1 parent 25a9525 commit 7122b86

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

firebase-common/src/androidAndroidTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
package dev.gitlive.firebase
66

7-
actual fun nativeMapOf(vararg pairs: Pair<String, Any>): Any = mapOf(*pairs)
7+
actual fun nativeMapOf(vararg pairs: Pair<String, Any?>): Any = mapOf(*pairs)
88
actual fun nativeListOf(vararg elements: Any): Any = listOf(*elements)
99
actual fun nativeAssertEquals(expected: Any?, actual: Any?) = kotlin.test.assertEquals(expected, actual)

firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/serializers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ inline fun <reified T: Any> T.firebaseSerializer() = runCatching { serializer<T>
1616
is Map<*, *> -> FirebaseMapSerializer()
1717
is List<*> -> FirebaseListSerializer()
1818
is Set<*> -> FirebaseListSerializer()
19-
else -> throw it
19+
else -> this::class.serializer()
2020
} as SerializationStrategy<T>
2121
}
2222

firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlin.test.Test
1010
import kotlin.test.assertEquals
1111
import kotlin.test.assertNull
1212

13-
expect fun nativeMapOf(vararg pairs: Pair<String, Any>): Any
13+
expect fun nativeMapOf(vararg pairs: Pair<String, Any?>): Any
1414
expect fun nativeListOf(vararg elements: Any): Any
1515
expect fun nativeAssertEquals(expected: Any?, actual: Any?): Unit
1616

@@ -20,9 +20,9 @@ data class TestData(val map: Map<String, String>, val bool: Boolean = false, val
2020
class EncodersTest {
2121
@Test
2222
fun encodeMap() {
23-
val encoded = encode(mapOf("key" to "value"), shouldEncodeElementDefault = true)
23+
val encoded = encode(mapOf("key" to "value", "key2" to 12, "key3" to null), shouldEncodeElementDefault = true)
2424

25-
nativeAssertEquals(nativeMapOf("key" to "value"), encoded)
25+
nativeAssertEquals(nativeMapOf("key" to "value", "key2" to 12, "key3" to null), encoded)
2626
}
2727

2828
@Test

firebase-common/src/iosTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
package dev.gitlive.firebase
66

7-
actual fun nativeMapOf(vararg pairs: Pair<String, Any>): Any = mapOf(*pairs)
7+
actual fun nativeMapOf(vararg pairs: Pair<String, Any?>): Any = mapOf(*pairs)
88
actual fun nativeListOf(vararg elements: Any): Any = listOf(*elements)
99
actual fun nativeAssertEquals(expected: Any?, actual: Any?) = kotlin.test.assertEquals(expected, actual)

firebase-common/src/jsTest/kotlin/dev/gitlive/firebase/EncodersTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ package dev.gitlive.firebase
66

77
import kotlin.js.json
88

9-
actual fun nativeMapOf(vararg pairs: Pair<String, Any>): Any = json(*pairs)
9+
actual fun nativeMapOf(vararg pairs: Pair<String, Any?>): Any = json(*pairs)
1010
actual fun nativeListOf(vararg elements: Any): Any = elements
1111
actual fun nativeAssertEquals(expected: Any?, actual: Any?) = kotlin.test.assertEquals(JSON.stringify(expected), JSON.stringify(actual))

0 commit comments

Comments
 (0)