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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: glean-parser
-Version: 18.0.2
+Version: 18.0.4
 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.4}/glean_parser/templates/kotlin.jinja2

@@ -68,21 +68,89 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
 
 {%- macro generate_structure(name, struct) %}
 {%- if struct.type == "oneof" -%}
+    @Serializable(with = {{name}}.Serializer::class)
     sealed class {{ name }}(): ObjectSerialize {
+        internal object Serializer : KSerializer<{{name}}> {
+            @OptIn(kotlinx.serialization.ExperimentalSerializationApi::class)
+            override val descriptor = SerialKind.CONTEXTUAL
+
+            override fun deserialize(decoder: Decoder): {{name}} {
+                throw NullPointerException()
+                {{ struct.subtypes[0]|Camelize }}()
+            }
+
+            override fun serialize(encoder: Encoder, value: {{name}}) {
+                when (value) {
+                {% for ty in struct.subtypes %}
+                    is {{ty|Camelize}} -> {{ty|Camelize}}.Serializer.seralize(encoder, it)
+                {% endfor %}
+                }
+            }
+        }
+
     {% for ty in struct.subtypes %}
-        class {{ty|Camelize}}(val inner: kotlin.{{ty|structure_type_name}}? = null) : {{ name }}() {
+        {% set inner_ty = ty|Camelize %}
+        @Serializable(with = {{inner_ty}}.Serializer::class)
+        class {{inner_ty}}(val inner: kotlin.{{ty|structure_type_name}}? = null) : {{ name }}() {
             override fun intoSerializedObject(): kotlin.String {
                 return this.inner?.intoSerializedObject() ?: "null"
             }
+
+            internal object Serializer : KSerializer<{{inner_ty}}> {
+                @OptIn(kotlinx.serialization.ExperimentalSerializationApi::class)
+                {% if ty == "string" %}
+                override val descriptor = kotlin.String.Companion.serializer().descriptor
+
+                override fun deserialize(decoder: Decoder): {{inner_ty}} {
+                    val inner = decoder.decodeInline(descriptor).decodeString()
+                    return {{inner_ty}}(inner = inner)
+                }
+
+                override fun serialize(encoder: Encoder, value: {{inner_ty}}) {
+                    value.inner?.let {
+                        encoder.encodeInline(descriptor).encodeString(it)
+                    }
+                }
+                {% elif ty == "number" %}
+                override val descriptor = kotlin.Int.Companion.serializer().descriptor
+
+                override fun deserialize(decoder: Decoder): {{inner_ty}} {
+                    val inner = decoder.decodeInline(descriptor).decodeInt()
+                    return {{inner_ty}}(inner = inner)
+                }
+
+                override fun serialize(encoder: Encoder, value: {{inner_ty}}) {
+                    value.inner?.let {
+                        encoder.encodeInline(descriptor).encodeInt(it)
+                    }
+                }
+                {% elif ty == "boolean" %}
+                override val descriptor = kotlin.Boolean.Companion.serializer().descriptor
+
+                override fun deserialize(decoder: Decoder): {{inner_ty}} {
+                    val inner = decoder.decodeInline(descriptor).decodeBoolean()
+                    return {{inner_ty}}(inner = inner)
+                }
+
+                override fun serialize(encoder: Encoder, value: {{inner_ty}}) {
+                    value.inner?.let {
+                        encoder.encodeInline(descriptor).encodeBoolean(it)
+                    }
+                }
+                {% endif %}
+            }
         }
     {% 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 +174,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 +210,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 +288,17 @@ 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.builtins.serializer
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.descriptors.SerialKind
+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 #}