Use contextual descriptor where available for contextual deserialization

charleskorn · Jun 24, 2024 · 5ddac45 · 5ddac45
1 parent 59a42fe
commit 5ddac45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/commonMain/kotlin/com/charleskorn/kaml/YamlInput.kt b/src/commonMain/kotlin/com/charleskorn/kaml/YamlInput.kt
@@ -26,6 +26,7 @@ import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.SerialKind
 import kotlinx.serialization.descriptors.StructureKind
+import kotlinx.serialization.descriptors.getContextualDescriptor
 import kotlinx.serialization.encoding.AbstractDecoder
 import kotlinx.serialization.modules.SerializersModule
 
@@ -47,21 +48,21 @@ public sealed class YamlInput(
 
             is YamlScalar -> when {
                 descriptor.kind is PrimitiveKind || descriptor.kind is SerialKind.ENUM || descriptor.isInline -> YamlScalarInput(node, yaml, context, configuration)
-                descriptor.kind is SerialKind.CONTEXTUAL -> YamlContextualInput(node, yaml, context, configuration)
+                descriptor.kind is SerialKind.CONTEXTUAL -> createContextual(node, yaml, context, configuration, descriptor)
                 descriptor.kind is PolymorphicKind -> throw MissingTypeTagException(node.path)
                 else -> throw IncorrectTypeException("Expected ${descriptor.kind.friendlyDescription}, but got a scalar value", node.path)
             }
 
             is YamlList -> when (descriptor.kind) {
                 is StructureKind.LIST -> YamlListInput(node, yaml, context, configuration)
-                is SerialKind.CONTEXTUAL -> YamlContextualInput(node, yaml, context, configuration)
+                is SerialKind.CONTEXTUAL -> createContextual(node, yaml, context, configuration, descriptor)
                 else -> throw IncorrectTypeException("Expected ${descriptor.kind.friendlyDescription}, but got a list", node.path)
             }
 
             is YamlMap -> when (descriptor.kind) {
                 is StructureKind.CLASS, StructureKind.OBJECT -> YamlObjectInput(node, yaml, context, configuration)
                 is StructureKind.MAP -> YamlMapInput(node, yaml, context, configuration)
-                is SerialKind.CONTEXTUAL -> YamlContextualInput(node, yaml, context, configuration)
+                is SerialKind.CONTEXTUAL -> createContextual(node, yaml, context, configuration, descriptor)
                 is PolymorphicKind -> when (configuration.polymorphismStyle) {
                     PolymorphismStyle.None ->
                         throw IncorrectTypeException("Encountered a polymorphic map descriptor but PolymorphismStyle is 'None'", node.path)
@@ -82,6 +83,16 @@ public sealed class YamlInput(
             }
         }
 
+        private fun createContextual(
+            node: YamlNode,
+            yaml: Yaml,
+            context: SerializersModule,
+            configuration: YamlConfiguration,
+            descriptor: SerialDescriptor,
+        ): YamlInput = context.getContextualDescriptor(descriptor)
+            ?.let { createFor(node, yaml, context, configuration, it) }
+            ?: YamlContextualInput(node, yaml, context, configuration)
+
         private fun createPolymorphicMapDeserializer(node: YamlMap, yaml: Yaml, context: SerializersModule, configuration: YamlConfiguration): YamlPolymorphicInput {
             val desiredKey = configuration.polymorphismPropertyName
             when (val typeName = node.getValue(desiredKey)) {

diff --git a/src/commonTest/kotlin/com/charleskorn/kaml/YamlReadingTest.kt b/src/commonTest/kotlin/com/charleskorn/kaml/YamlReadingTest.kt
@@ -2079,7 +2079,7 @@ class YamlReadingTest : FlatFunSpec({
                     override val descriptor: SerialDescriptor
                         get() = String.serializer().descriptor
 
-                    override fun deserialize(decoder: Decoder): Inner = Inner("from context serializer")
+                    override fun deserialize(decoder: Decoder): Inner = Inner(decoder.decodeString())
                     override fun serialize(encoder: Encoder, value: Inner) = throw UnsupportedOperationException()
                 }
 
@@ -2093,7 +2093,7 @@ class YamlReadingTest : FlatFunSpec({
                 val result = parser.decodeFromString(Container.serializer(), input)
 
                 test("deserializes it using the dynamically installed serializer") {
-                    result shouldBe Container(Inner("from context serializer"))
+                    result shouldBe Container(Inner("this is the input"))
                 }
             }