Fix DecompoundedAttributes serialization

Author: q-litzler

src/commonMain/kotlin/com/algolia/search/model/settings/DecompoundedAttributes.kt

@@ -3,7 +3,7 @@ package com.algolia.search.model.settings
 import com.algolia.search.model.Attribute
 import com.algolia.search.model.search.Language
 import kotlinx.serialization.*
-import kotlinx.serialization.internal.HashMapSerializer
+import kotlinx.serialization.internal.PairSerializer
 
 
 /**
@@ -14,16 +14,12 @@ import kotlinx.serialization.internal.HashMapSerializer
  * The goal of decompounding, regarding the previous example, is to index both Baum and Haus separately,
  * nstead of as a single word.
  */
-@Serializable(DecompoundedAttributes.Companion::class)
+@Serializable
 public data class DecompoundedAttributes internal constructor(
-    val map: Map<Language, List<Attribute>>
+    val language: Language,
+    val attributes: List<Attribute>
 ) {
 
-    internal constructor(
-        language: Language,
-        attributes: List<Attribute>
-    ) : this(mapOf(language to attributes.toList()))
-
     public constructor(
         language: Language.German,
         vararg attributes: Attribute
@@ -38,19 +34,4 @@ public data class DecompoundedAttributes internal constructor(
         language: Language.Dutch,
         vararg attributes: Attribute
     ) : this(language, attributes.toList())
-
-    companion object : KSerializer<DecompoundedAttributes> {
-
-        private val serializer = HashMapSerializer(Language, Attribute.list)
-
-        override val descriptor: SerialDescriptor = serializer.descriptor
-
-        override fun serialize(encoder: Encoder, obj: DecompoundedAttributes) {
-            serializer.serialize(encoder, obj.map)
-        }
-
-        override fun deserialize(decoder: Decoder): DecompoundedAttributes {
-            return DecompoundedAttributes(serializer.deserialize(decoder))
-        }
-    }
 }

src/commonMain/kotlin/com/algolia/search/model/settings/Settings.kt

@@ -210,7 +210,7 @@ public data class Settings(
      * Engine default: []
      * [Documentation][https://www.algolia.com/doc/api-reference/api-parameters/decompoundedAttributes/?language=kotlin]
      */
-    @SerialName(KeyDecompoundedAttributes) var decompoundedAttributes: List<DecompoundedAttributes>? = null,
+    @SerialName(KeyDecompoundedAttributes) @Serializable(KSerializerDecompoundedAttributes::class) var decompoundedAttributes: List<DecompoundedAttributes>? = null,
 
     /**
      * Characters that should not be automatically normalized by the search engine.

src/commonMain/kotlin/com/algolia/search/serialize/KSerializerDecompoundedAttributes.kt

@@ -0,0 +1,37 @@
+package com.algolia.search.serialize
+
+import com.algolia.search.model.Attribute
+import com.algolia.search.model.search.Language
+import com.algolia.search.model.settings.DecompoundedAttributes
+import kotlinx.serialization.*
+import kotlinx.serialization.internal.HashMapSerializer
+import kotlinx.serialization.json.json
+
+
+public object KSerializerDecompoundedAttributes : KSerializer<List<DecompoundedAttributes>> {
+
+    private val serializer = HashMapSerializer(Language, Attribute.list)
+
+    override val descriptor: SerialDescriptor = serializer.descriptor
+
+    override fun deserialize(decoder: Decoder): List<DecompoundedAttributes> {
+        val json = decoder.asJsonInput().jsonObject
+
+        return json.content.map {
+            val language = Json.parse(Language.serializer(), it.key)
+            val attributes = JsonNoDefaults.fromJson(Attribute.serializer().list, it.value.jsonArray)
+
+            DecompoundedAttributes(language, attributes)
+        }
+    }
+
+    override fun serialize(encoder: Encoder, obj: List<DecompoundedAttributes>) {
+        val json = json {
+            obj.forEach {
+                it.language.raw to Json.toJson(Attribute.list, it.attributes)
+            }
+        }
+
+        encoder.asJsonOutput().encodeJson(json)
+    }
+}

src/commonTest/kotlin/serialize/serializer/TestKSerializerDecompoundedAttributes.kt

@@ -0,0 +1,24 @@
+package serialize.serializer
+
+import attributeA
+import attributeB
+import com.algolia.search.model.search.Language
+import com.algolia.search.model.settings.DecompoundedAttributes
+import com.algolia.search.serialize.KSerializerDecompoundedAttributes
+import kotlinx.serialization.json.json
+import kotlinx.serialization.json.jsonArray
+import serialize.TestSerializer
+
+
+internal class TestKSerializerDecompoundedAttributes :
+    TestSerializer<List<DecompoundedAttributes>>(KSerializerDecompoundedAttributes) {
+
+    override val items = listOf(
+        listOf(DecompoundedAttributes(Language.German, listOf(attributeA, attributeB))) to json {
+            Language.German.raw to jsonArray {
+                +attributeA.raw
+                +attributeB.raw
+            }
+        }
+    )
+}

src/commonTest/kotlin/serialize/settings/TestDecompoundedAttributes.kt

@@ -1,6 +1,7 @@
 package serialize.settings
 
 import attributeA
+import attributeB
 import attributes
 import attributesJson
 import boolean
@@ -58,7 +59,13 @@ internal class TestSettings : TestSerializer<Settings>(Settings.serializer()) {
             ignorePlurals = IgnorePlurals.True,
             removeStopWords = RemoveStopWords.True,
             camelCaseAttributes = attributes,
-            decompoundedAttributes = listOf(TestDecompoundedAttributes.item),
+            decompoundedAttributes = listOf(
+                DecompoundedAttributes(
+                    Language.German,
+                    attributeA,
+                    attributeB
+                )
+            ),
             keepDiacriticsOnCharacters = string,
             queryLanguages = listOf(Language.Afrikaans, Language.Albanian),
             // Query-rules
@@ -122,7 +129,12 @@ internal class TestSettings : TestSerializer<Settings>(Settings.serializer()) {
             KeyIgnorePlurals to boolean
             KeyRemoveStopWords to boolean
             KeyCamelCaseAttributes to attributesJson
-            KeyDecompoundedAttributes to jsonArray { +TestDecompoundedAttributes.json }
+            KeyDecompoundedAttributes to json {
+                Language.German.raw to jsonArray {
+                    +attributeA.raw
+                    +attributeB.raw
+                }
+            }
             KeyKeepDiacriticsOnCharacters to string
             KeyQueryLanguages to jsonArray {
                 +Language.Afrikaans.raw