upgrade MapperSerializer

Update ksp to v1.9.22-1.0.16

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.20.24
+
+* `Serialization`:
+    * `Mapper`:
+        * `Mapper` pass decoder into callback of deserialization strategy
+
 ## 0.20.23
 
 * `Versions`:

gradle.properties

@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.20.23
-android_code_version=229
+version=0.20.24
+android_code_version=230

gradle/libs.versions.toml

@@ -21,7 +21,7 @@ koin = "3.5.3"
 
 okio = "3.7.0"
 
-ksp = "1.9.21-1.0.16"
+ksp = "1.9.22-1.0.16"
 kotlin-poet = "1.15.3"
 
 versions = "0.50.0"

serialization/mapper/src/commonMain/kotlin/MapperDeserializationStrategy.kt

@@ -16,11 +16,16 @@ import kotlinx.serialization.encoding.Encoder
  */
 open class MapperDeserializationStrategy<I, O>(
     private val base: DeserializationStrategy<I>,
-    private val deserialize: (I) -> O
+    private val deserialize: (Decoder, I) -> O
 ) : DeserializationStrategy<O> {
     override val descriptor: SerialDescriptor = base.descriptor
 
+    constructor(
+        base: DeserializationStrategy<I>,
+        deserialize: (I) -> O
+    ) : this(base, { _, i -> deserialize(i) })
+
     override fun deserialize(decoder: Decoder): O {
-        return deserialize(base.deserialize(decoder))
+        return deserialize(decoder, base.deserialize(decoder))
     }
 }

serialization/mapper/src/commonMain/kotlin/MapperSerializer.kt

@@ -1,6 +1,8 @@
 package dev.inmo.micro_utils.serialization.mapper
 
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
@@ -16,15 +18,15 @@ import kotlinx.serialization.encoding.Encoder
 open class MapperSerializer<I, O>(
     private val base: KSerializer<I>,
     private val serialize: (O) -> I,
-    private val deserialize: (I) -> O
-) : KSerializer<O> {
+    private val deserialize: (Decoder, I) -> O
+) : KSerializer<O>,
+    DeserializationStrategy<O> by MapperDeserializationStrategy<I, O>(base, deserialize),
+    SerializationStrategy<O> by MapperSerializationStrategy<I, O>(base, serialize) {
     override val descriptor: SerialDescriptor = base.descriptor
 
-    override fun deserialize(decoder: Decoder): O {
-        return deserialize(base.deserialize(decoder))
-    }
-
-    override fun serialize(encoder: Encoder, value: O) {
-        base.serialize(encoder, serialize(value))
-    }
+    constructor(
+        base: KSerializer<I>,
+        serialize: (O) -> I,
+        deserialize: (I) -> O
+    ) : this(base, serialize, { _, i -> deserialize(i) })
 }