fix(model-api-gen): fixed ids not being part of enum serialization

Author: mhuster23

model-api-gen-runtime/src/commonMain/kotlin/org/modelix/metamodel/IPropertyValueSerializer.kt

@@ -78,24 +78,32 @@ object OptionalIntPropertySerializer : IPropertyValueSerializer<Int?> {
     }
 }
 
-class MandatoryEnumSerializer<E : Enum<*>>(private val valueOf: (String?) -> E) : IPropertyValueSerializer<E> {
+class MandatoryEnumSerializer<E : Enum<*>>(
+    private val memberIdOf: (E) -> String,
+    private val fromString: (String?) -> E
+) : IPropertyValueSerializer<E> {
+
     override fun serialize(value: E): String {
-        return value.name
+        return memberIdOf(value) + "/" + value.name
     }
 
     override fun deserialize(serialized: String?): E {
         val id = serialized?.substringBefore('/')
-        return valueOf(id)
+        return fromString(id)
     }
 }
 
-class OptionalEnumSerializer<E : Enum<*>>(private val valueOf: (String?) -> E?) : IPropertyValueSerializer<Enum<*>?> {
-    override fun serialize(value: Enum<*>?): String? {
-        return value?.name
+class OptionalEnumSerializer<E : Enum<*>>(
+    private val memberIdOf: (E) -> String,
+    private val fromString: (String) -> E
+) : IPropertyValueSerializer<E?> {
+
+    override fun serialize(value: E?): String? {
+        return value?.let { memberIdOf(it) + "/" + it.name}
     }
 
-    override fun deserialize(serialized: String?): Enum<*>? {
-        return serialized?.let { valueOf(serialized) }
+    override fun deserialize(serialized: String?): E? {
+        return serialized?.let { fromString(it) }
     }
 }
 

model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt

@@ -115,22 +115,33 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
     }
 
     private fun generateEnumFile(enum: ProcessedEnum) {
-        val builder = TypeSpec.enumBuilder(enum.name)
+        val constructorSpec = FunSpec.constructorBuilder()
+            .addParameter("memberId", String::class)
+            .addParameter("presentation", String::class.asTypeName().copy(nullable = true))
+            .build()
 
-        builder.primaryConstructor(
-            FunSpec.constructorBuilder()
-                .addParameter("presentation", String::class.asTypeName().copy(nullable = true))
-                .build()
-        )
+        val enumBuilder = TypeSpec.enumBuilder(enum.name)
+            .primaryConstructor(constructorSpec)
+            .addProperty(
+                PropertySpec.builder("memberId", String::class)
+                    .initializer("memberId")
+                    .build()
+            )
+            .addProperty(
+                PropertySpec.builder("presentation", String::class.asTypeName().copy(nullable = true))
+                    .initializer("presentation")
+                    .build()
+            )
 
         val getLiteralFunBuilder = FunSpec.builder("getLiteralByMemberId")
             .addParameter("memberId", String::class)
         val getLiteralCodeBuilder = CodeBlock.builder().beginControlFlow("return when (memberId) {")
 
         for (member in enum.getAllMembers()) {
-            builder.addEnumConstant(
+            enumBuilder.addEnumConstant(
                 member.name,
                 TypeSpec.anonymousClassBuilder()
+                    .addSuperclassConstructorParameter("%S", member.memberId)
                     .addSuperclassConstructorParameter(
                         if (member.presentation == null) "null" else "%S",
                         member.presentation ?: "")
@@ -156,7 +167,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             )
             .build()
 
-        val generatedEnum = builder.addType(companion).build()
+        val generatedEnum = enumBuilder.addType(companion).build()
 
         FileSpec.builder(enum.language.name, enum.name)
             .addFileComment(headerComment)
@@ -345,7 +356,9 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
                         if (feature.type is EnumPropertyType) {
                             if (serializer == MandatoryEnumSerializer::class.asTypeName()) {
                                 propBuilder.initializer(
-                                    """newProperty(%S, %S, %T { if (it != null) %T.getLiteralByMemberId(it) else %T.defaultValue() }, ${feature.optional})""",
+                                    """newProperty(%S, %S, %T({ it.memberId }, 
+                                        |{ if (it != null) %T.getLiteralByMemberId(it) else %T.defaultValue() }), 
+                                        |${feature.optional})""".trimMargin(),
                                     feature.originalName,
                                     feature.uid,
                                     serializer,
@@ -354,7 +367,8 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
                                 )
                             } else {
                                 propBuilder.initializer(
-                                    """newProperty(%S, %S, %T { %T.getLiteralByMemberId(it) }, ${feature.optional})""",
+                                    """newProperty(%S, %S, %T( { it.memberId }, { %T.getLiteralByMemberId(it) }), 
+                                        |${feature.optional})""".trimMargin(),
                                     feature.originalName,
                                     feature.uid,
                                     serializer,