Another defaults fix

lightningkite · Nov 19, 2024 · 7873efd · 7873efd
1 parent 4cf8bde
commit 7873efd
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/shared/src/commonMain/kotlin/com/lightningkite/serialization/VirtualType.kt b/shared/src/commonMain/kotlin/com/lightningkite/serialization/VirtualType.kt
@@ -76,7 +76,12 @@ data class VirtualStruct(
             }
         }
         val defaults by lazy {
-            serializers.map { it.default() }
+            fields.zip(serializers) { field, serializer ->
+                field.defaultJson?.let {
+                    return@zip DefaultDecoder.json.decodeFromString(serializer, it)
+                }
+                serializer.default()
+            }
         }
         val defaultInstance by lazy { VirtualInstance(this, defaults) }
         val serializableProperties: Array<SerializableProperty<VirtualInstance, Any?>> by lazy {
@@ -102,7 +107,9 @@ data class VirtualStruct(
         }
 
         override fun deserialize(decoder: Decoder): VirtualInstance {
-            val values = Array<Any?>(fields.size) { specifiedDefaults[it] }
+            val values = Array<Any?>(fields.size) {
+                specifiedDefaults[it].takeUnless { it == DefaultNotPresent }
+            }
             val s = decoder.beginStructure(descriptor)
             while (true) {
                 val index = s.decodeElementIndex(descriptor)