glean-parser 18.0.2__tar.gz → 18.0.3__tar.gz

{glean_parser-18.0.2 → glean_parser-18.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glean-parser
-Version: 18.0.2
+Version: 18.0.3
 Summary: Parser tools for Mozilla's Glean telemetry
 Project-URL: Homepage, https://mozilla.github.io/glean
 Project-URL: Repository, https://github.com/mozilla/glean_parser

{glean_parser-18.0.2 → glean_parser-18.0.3}/glean_parser/templates/kotlin.jinja2

@@ -78,11 +78,14 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
     {% endfor %}
     }
 {%- elif struct.type == "array" -%}
+    @Serializable(with = {{name}}.Serializer::class)
     data class {{ name }}(var items: MutableList<{{ name }}Item> = mutableListOf()) : ObjectSerialize {
         fun add(elem: {{ name }}Item) = items.add(elem)
 
         fun addAll(elements: Collection<{{ name }}Item>) = items.addAll(elements)
 
+        val size get() = items.size
+
         fun clear() = items.clear()
 
         fun remove(element: {{ name }}Item) = items.remove(element)
@@ -106,11 +109,26 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
             }
             return json
         }
+
+        internal object Serializer : KSerializer<{{name}}> {
+            @OptIn(kotlinx.serialization.ExperimentalSerializationApi::class)
+            override val descriptor = listSerialDescriptor<String>()
+
+            override fun deserialize(decoder: Decoder): {{ name }} {
+                val list = decoder.decodeSerializableValue(ListSerializer(serializer<{{name}}Item>()))
+                    return {{name}}(items = list.toMutableList())
+            }
+
+            override fun serialize(encoder: Encoder, value: {{name}}) {
+                encoder.encodeSerializableValue(ListSerializer(serializer<{{name}}Item>()), value.items)
+            }
+        }
     }
 
     {{ generate_structure(name ~ "Item", struct["items"]) }}
 
 {%- elif struct.type == "object" -%}
+    @Serializable
     data class {{ name }}(
         {% for itemname, val in struct.properties.items() %}
           {% if val.type == "array" %}
@@ -127,7 +145,12 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
         override fun intoSerializedObject(): String {
             var __obj: MutableList<String> = mutableListOf()
             {% for itemname, val in struct.properties.items() %}
+            {% if val.type == "array" %}
+            if (this.{{itemname|camelize}}.size > 0) {
+                val {{itemname|camelize}} = this.{{itemname|camelize}}
+            {% else %}
             this.{{itemname|camelize}}?.let { {{itemname|camelize}} ->
+            {% endif %}
                 val __elem = buildString {
                     append("\"{{itemname}}\":")
                     append({{itemname|camelize}}.intoSerializedObject())
@@ -200,6 +223,15 @@ import {{ glean_namespace }}.private.LabeledMetricType // ktlint-disable import-
 {% endif %}
 {% if has_object_metrics %}
 import {{ glean_namespace }}.private.intoSerializedObject
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.serializer
 {% endif %}
 
 {# HACK HACK HACK -- typealiases MUST BE top-level #}