Merge pull request #136 from modelix/feature/MODELIX-457_configurable_CN_typealias_names

MODELIX-457: configurable CN_ typealias names

Author: languitar

docs/global/modules/core/pages/reference/component-model-api-gen-gradle.adoc

@@ -175,6 +175,10 @@ Inside the `metamodel` block a `names` block can be declared to configure `prefi
 |"\_C_TypedImpl_"
 |""
 
+|`conceptTypeAlias`
+|"CN_"
+|""
+
 |===
 
 == Example

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

@@ -141,7 +141,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
         FileSpec.builder(concept.language.name, concept.name)
             .addFileComment(headerComment)
             .addType(generateConceptObject(concept))
-            .addTypeAlias(TypeAliasSpec.builder("CN_" + concept.name, concept.conceptWrapperInterfaceType()).build())
+            .addTypeAlias(TypeAliasSpec.builder(concept.conceptTypeAliasName(), concept.conceptWrapperInterfaceType()).build())
             .addType(generateConceptWrapperInterface(concept))
 //            .addType(generateConceptWrapperImpl(concept))
             .addType(generateNodeWrapperInterface(concept))
@@ -641,6 +641,7 @@ class MetaModelGenerator(val outputDir: Path, val nameConfig: NameConfig = NameC
     private fun ProcessedConcept.nodeWrapperInterfaceName() = nameConfig.typedNode(name)
     private fun ProcessedConcept.nodeWrapperImplName() = nameConfig.typedNodeImpl(name)
     private fun ProcessedConcept.conceptObjectName() = nameConfig.untypedConcept(name)
+    private fun ProcessedConcept.conceptTypeAliasName() = nameConfig.conceptTypeAlias(name)
     //private fun ProcessedConcept.conceptWrapperImplName() = nameConfig.conceptWrapperImplName(name)
     //private fun ProcessedConcept.conceptWrapperInterfaceName() = nameConfig.conceptWrapperInterfaceName(name)
 

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

@@ -3,22 +3,23 @@ package org.modelix.metamodel.generator
 import java.io.Serializable
 
 class NameConfig : Serializable {
-    val languageClass = ConfigurableName(prefix = "L_" ,baseNameConversion = { it.replace(".", "_") })
+    val languageClass = ConfigurableName(prefix = "L_", baseNameConversion = { it.replace(".", "_") })
     val typedNode = ConfigurableName(prefix = "N_")
     val typedNodeImpl = ConfigurableName(prefix = "_N_TypedImpl_")
     val untypedConcept = ConfigurableName(prefix = "_C_UntypedImpl_")
     val typedConcept = ConfigurableName(prefix = "C_")
     val typedConceptImpl = ConfigurableName(prefix = "_C_TypedImpl_")
+    val conceptTypeAlias = ConfigurableName(prefix = "CN_")
 }
 
-private val UNMODIFED_SIMPLE_NAME: (String) -> String = {
+private val UNMODIFIED_SIMPLE_NAME: (String) -> String = {
     require(!it.contains(".")) { "Simple name expected, but full-qualified name provided: $it" }
     it
 }
 class ConfigurableName(
     var prefix: String = "",
     var suffix: String = "",
-    var baseNameConversion: (String) -> String = UNMODIFED_SIMPLE_NAME
+    var baseNameConversion: (String) -> String = UNMODIFIED_SIMPLE_NAME
 ) : Serializable {
     operator fun invoke(baseName: String): String {
         return prefix + baseNameConversion(baseName) + suffix

model-api-gen/src/test/kotlin/org/modelix/metamodel/generator/KotlinGeneratorTest.kt

@@ -5,6 +5,8 @@ import kotlinx.serialization.decodeFromString
 import org.junit.Test
 import org.modelix.model.data.LanguageData
 import java.io.File
+import kotlin.io.path.*
+import kotlin.test.assertContains
 
 class KotlinGeneratorTest {
 
@@ -43,4 +45,46 @@ class KotlinGeneratorTest {
         MetaModelGenerator(outputDir).generate(LanguageSet(listOf(language)).process())
     }
 
+    @OptIn(ExperimentalPathApi::class)
+    @Test
+    fun `uses configured names`() {
+        val input = """
+            name: org.modelix.entities
+            concepts:
+            - name: Entity
+              properties: []
+              children: []
+            enums: []
+        """.trimIndent()
+
+        val language = Yaml.default.decodeFromString<LanguageData>(input)
+        val outputDir = createTempDirectory()
+        try {
+            val nameConfig = NameConfig().apply {
+                conceptTypeAlias.prefix = "AAAA"
+                languageClass.prefix = "BBBB"
+                typedNode.prefix = "CCCC"
+                typedNodeImpl.prefix = "DDDD"
+                untypedConcept.prefix = "EEEE"
+                typedConcept.prefix = "FFFF"
+            }
+
+            MetaModelGenerator(outputDir, nameConfig).generate(LanguageSet(listOf(language)).process())
+
+            val fileContents = outputDir.resolve("org/modelix/entities/Entity.kt").readText()
+            setOf(
+                nameConfig.conceptTypeAlias.prefix,
+                nameConfig.languageClass.prefix,
+                nameConfig.typedNode.prefix,
+                nameConfig.typedNodeImpl.prefix,
+                nameConfig.untypedConcept.prefix,
+                nameConfig.typedConcept.prefix,
+            ).forEach { needle ->
+                assertContains(fileContents, needle)
+            }
+        } finally {
+            outputDir.deleteRecursively()
+        }
+    }
+
 }

model-api-gen/src/test/kotlin/org/modelix/metamodel/generator/NameConfigTest.kt

@@ -27,6 +27,16 @@ class NameConfigTest {
         assertEquals("PREorg_example_MyLanguageSUF", nameConfig.languageClass(input))
     }
 
+    @Test
+    fun `Concept type alias`() {
+        val input = "MyConcept"
+        val nameConfig = NameConfig().apply {
+            conceptTypeAlias.prefix = "PRE"
+            conceptTypeAlias.suffix = "SUF"
+        }
+        assertEquals("PREMyConceptSUF", nameConfig.conceptTypeAlias(input))
+    }
+
     @Test
     fun `ConfigurableName - simple`() {
         val input = "MyInterface"