support nullable contextual serializers

yakivy · yakivy · commit d4df8dc167c3 · 2025-07-11T15:20:09.000+01:00
diff --git a/krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/SerializationUtils.kt b/krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/SerializationUtils.kt
@@ -10,6 +10,7 @@ import kotlinx.rpc.descriptor.RpcTypeKrpc
 import kotlinx.rpc.internal.rpcInternalKClass
 import kotlinx.rpc.internal.utils.InternalRpcApi
 import kotlinx.serialization.*
+import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.encoding.*
@@ -29,7 +30,7 @@ internal fun SerializersModule.buildContextualInternal(type: KType): KSerializer
     )
 
     @Suppress("UNCHECKED_CAST")
-    return result as? KSerializer<Any?>
+    return if (type.isMarkedNullable) result?.nullable else result as? KSerializer<Any?>
 }
 
 private fun SerializersModule.buildContextual(type: KType): KSerializer<Any?> {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import kotlinx.rpc.descriptor.RpcTypeKrpc`
`10`	`10`	`import kotlinx.rpc.internal.rpcInternalKClass`
`11`	`11`	`import kotlinx.rpc.internal.utils.InternalRpcApi`
`12`	`12`	`import kotlinx.serialization.*`
	`13`	`+import kotlinx.serialization.builtins.nullable`
`13`	`14`	`import kotlinx.serialization.descriptors.SerialDescriptor`
`14`	`15`	`import kotlinx.serialization.descriptors.buildClassSerialDescriptor`
`15`	`16`	`import kotlinx.serialization.encoding.*`
`@@ -29,7 +30,7 @@ internal fun SerializersModule.buildContextualInternal(type: KType): KSerializer`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`@Suppress("UNCHECKED_CAST")`
`32`		`- return result as? KSerializer<Any?>`
	`33`	`+ return if (type.isMarkedNullable) result?.nullable else result as? KSerializer<Any?>`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`private fun SerializersModule.buildContextual(type: KType): KSerializer<Any?> {`