fix(model-api-gen-gradle): merged uid and memberId

mhuster23 · mhuster23 · commit a797a38c6f7d · 2023-06-14T16:01:57.000+02:00
diff --git a/metamodel-export/org.modelix.metamodel.export/models/org.modelix.metamodel.export.mps b/metamodel-export/org.modelix.metamodel.export/models/org.modelix.metamodel.export.mps
@@ -1836,19 +1836,7 @@
                                     <node concept="3clFbF" id="4zSRxm70zVx" role="3cqZAp">
                                       <node concept="2ShNRf" id="4zSRxm70zVv" role="3clFbG">
                                         <node concept="1pGfFk" id="4zSRxm70Bwh" role="2ShVmc">
-                                          <ref role="37wK5l" to="sgfj:~EnumMemberData.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,java.lang.String)" resolve="EnumMemberData" />
-                                          <node concept="2OqwBi" id="1lNY4J8WpV6" role="37wK5m">
-                                            <node concept="2YIFZM" id="1lNY4J8Wg5q" role="2Oq$k0">
-                                              <ref role="37wK5l" to="e8bb:~MetaIdByDeclaration.getEnumLiteralId(org.jetbrains.mps.openapi.model.SNode)" resolve="getEnumLiteralId" />
-                                              <ref role="1Pybhc" to="e8bb:~MetaIdByDeclaration" resolve="MetaIdByDeclaration" />
-                                              <node concept="37vLTw" id="1lNY4J8Wh67" role="37wK5m">
-                                                <ref role="3cqZAo" node="4zSRxm70ylt" resolve="it" />
-                                              </node>
-                                            </node>
-                                            <node concept="liA8E" id="1lNY4J8Wsd4" role="2OqNvi">
-                                              <ref role="37wK5l" to="e8bb:~SEnumerationLiteralId.toString()" resolve="toString" />
-                                            </node>
-                                          </node>
+                                          <ref role="37wK5l" to="sgfj:~EnumMemberData.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String)" resolve="EnumMemberData" />
                                           <node concept="2OqwBi" id="7ryKvClc3z$" role="37wK5m">
                                             <node concept="2ShNRf" id="7ryKvClbWLm" role="2Oq$k0">
                                               <node concept="1pGfFk" id="7ryKvClc1fD" role="2ShVmc">
diff --git a/model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/GeneratorInput.kt b/model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/GeneratorInput.kt
@@ -168,7 +168,7 @@ internal class ProcessedLanguage(var name: String, var uid: String?) {
         for (data in dataList) {
             val enum = ProcessedEnum(data.name, data.uid, maxOf(0, data.defaultIndex))
             for (memberData in data.members) {
-                val member = ProcessedEnumMember(memberData.name, memberData.uid, memberData.memberId, memberData.presentation)
+                val member = ProcessedEnumMember(memberData.name, memberData.uid, memberData.presentation)
                 enum.addMember(member)
             }
             addEnum(enum)
@@ -196,7 +196,7 @@ internal class ProcessedEnum(var name: String, var uid: String?, var defaultInde
     }
 }
 
-internal class ProcessedEnumMember(var name: String, var uid: String?, var memberId: String, var presentation: String?) {
+internal class ProcessedEnumMember(var name: String, var uid: String, var presentation: String?) {
     lateinit var enum: ProcessedEnum
 }
 
diff --git a/model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt b/model-api-gen/src/main/kotlin/org/modelix/metamodel/generator/MetaModelGenerator.kt
@@ -116,15 +116,15 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
 
     private fun generateEnumFile(enum: ProcessedEnum) {
         val constructorSpec = FunSpec.constructorBuilder()
-            .addParameter("memberId", String::class)
+            .addParameter("uid", String::class)
             .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")
+                PropertySpec.builder("uid", String::class)
+                    .initializer("uid")
                     .build()
             )
             .addProperty(
@@ -134,20 +134,20 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
             )
 
         val getLiteralFunBuilder = FunSpec.builder("getLiteralByMemberId")
-            .addParameter("memberId", String::class)
-        val getLiteralCodeBuilder = CodeBlock.builder().beginControlFlow("return when (memberId) {")
+            .addParameter("uid", String::class)
+        val getLiteralCodeBuilder = CodeBlock.builder().beginControlFlow("return when (uid) {")
 
         for (member in enum.getAllMembers()) {
             enumBuilder.addEnumConstant(
                 member.name,
                 TypeSpec.anonymousClassBuilder()
-                    .addSuperclassConstructorParameter("%S", member.memberId)
+                    .addSuperclassConstructorParameter("%S", member.uid)
                     .addSuperclassConstructorParameter(
                         if (member.presentation == null) "null" else "%S",
                         member.presentation ?: "")
                     .build()
             )
-            getLiteralCodeBuilder.addStatement("%S -> %L", member.memberId, member.name)
+            getLiteralCodeBuilder.addStatement("%S -> %L", member.uid, member.name)
         }
 
         getLiteralFunBuilder.addCode(
@@ -356,7 +356,7 @@ 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({ it.memberId }, 
+                                    """newProperty(%S, %S, %T({ it.uid }, 
                                         |{ if (it != null) %T.getLiteralByMemberId(it) else %T.defaultValue() }), 
                                         |${feature.optional})""".trimMargin(),
                                     feature.originalName,
@@ -367,7 +367,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
                                 )
                             } else {
                                 propBuilder.initializer(
-                                    """newProperty(%S, %S, %T( { it.memberId }, { %T.getLiteralByMemberId(it) }), 
+                                    """newProperty(%S, %S, %T( { it.uid }, { %T.getLiteralByMemberId(it) }), 
                                         |${feature.optional})""".trimMargin(),
                                     feature.originalName,
                                     feature.uid,
diff --git a/model-api/src/commonMain/kotlin/org/modelix/model/data/MetaModelData.kt b/model-api/src/commonMain/kotlin/org/modelix/model/data/MetaModelData.kt
@@ -50,8 +50,7 @@ data class EnumData(
 
 @Serializable
 data class EnumMemberData(
-    val uid: String? = null,
-    val memberId: String,
+    val uid: String,
     val name: String,
     val presentation: String? = null
 )

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ internal class ProcessedLanguage(var name: String, var uid: String?) {`
`168`	`168`	`for (data in dataList) {`
`169`	`169`	`val enum = ProcessedEnum(data.name, data.uid, maxOf(0, data.defaultIndex))`
`170`	`170`	`for (memberData in data.members) {`
`171`		`- val member = ProcessedEnumMember(memberData.name, memberData.uid, memberData.memberId, memberData.presentation)`
	`171`	`+ val member = ProcessedEnumMember(memberData.name, memberData.uid, memberData.presentation)`
`172`	`172`	`enum.addMember(member)`
`173`	`173`	`}`
`174`	`174`	`addEnum(enum)`
`@@ -196,7 +196,7 @@ internal class ProcessedEnum(var name: String, var uid: String?, var defaultInde`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`-internal class ProcessedEnumMember(var name: String, var uid: String?, var memberId: String, var presentation: String?) {`
	`199`	`+internal class ProcessedEnumMember(var name: String, var uid: String, var presentation: String?) {`
`200`	`200`	`lateinit var enum: ProcessedEnum`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ data class EnumData(`
`50`	`50`
`51`	`51`	`@Serializable`
`52`	`52`	`data class EnumMemberData(`
`53`		`- val uid: String? = null,`
`54`		`- val memberId: String,`
	`53`	`+ val uid: String,`
`55`	`54`	`val name: String,`
`56`	`55`	`val presentation: String? = null`
`57`	`56`	`)`