Skip to content

Commit 1ae9504

Browse files
committed
Generate 'raw_...' instead of '_raw_...'
After changing string properties and references to non-nullable types these raw properties are used more frequently.
1 parent e40a684 commit 1ae9504

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class MetaModelGenerator(val outputDir: Path) {
252252
.mutable(true)
253253
.delegate("""${accessorClass.qualifiedName}(unwrap(), "${feature.originalName}")""")
254254
.build())
255-
addProperty(PropertySpec.builder("_raw_" + feature.validName, String::class.asTypeName().copy(nullable = true))
255+
addProperty(PropertySpec.builder("raw_" + feature.validName, String::class.asTypeName().copy(nullable = true))
256256
.addModifiers(KModifier.OVERRIDE)
257257
.mutable(true)
258258
.delegate("""${RawPropertyAccessor::class.qualifiedName}(unwrap(), "${feature.originalName}")""")
@@ -277,7 +277,7 @@ class MetaModelGenerator(val outputDir: Path) {
277277
.mutable(true)
278278
.delegate("""${accessorClass.qualifiedName}(${ITypedNode::unwrap.name}(), "${feature.originalName}", ${data.type.nodeWrapperInterfaceName()}::class)""")
279279
.build())
280-
addProperty(PropertySpec.builder("_raw_" + feature.validName, INode::class.asTypeName().copy(nullable = true))
280+
addProperty(PropertySpec.builder("raw_" + feature.validName, INode::class.asTypeName().copy(nullable = true))
281281
.addModifiers(KModifier.OVERRIDE)
282282
.mutable(true)
283283
.delegate("""${RawReferenceAccessor::class.qualifiedName}(${ITypedNode::unwrap.name}(), "${feature.originalName}")""")
@@ -300,7 +300,7 @@ class MetaModelGenerator(val outputDir: Path) {
300300
addProperty(PropertySpec.builder(feature.validName, data.type.asKotlinType())
301301
.mutable(true)
302302
.build())
303-
addProperty(PropertySpec.builder("_raw_" + feature.validName, String::class.asTypeName().copy(nullable = true))
303+
addProperty(PropertySpec.builder("raw_" + feature.validName, String::class.asTypeName().copy(nullable = true))
304304
.mutable(true)
305305
.build())
306306
}
@@ -317,7 +317,7 @@ class MetaModelGenerator(val outputDir: Path) {
317317
addProperty(PropertySpec.builder(feature.validName, data.type.parseConceptRef(concept.language).nodeWrapperInterfaceType().copy(nullable = data.optional))
318318
.mutable(true)
319319
.build())
320-
addProperty(PropertySpec.builder("_raw_" + feature.validName, INode::class.asTypeName().copy(nullable = true))
320+
addProperty(PropertySpec.builder("raw_" + feature.validName, INode::class.asTypeName().copy(nullable = true))
321321
.mutable(true)
322322
.build())
323323
}

metamodel-generator/src/main/kotlin/org/modelix/metamodel/generator/TypescriptMMGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,5 @@ fun LanguageSet.LanguageInSet.languageDependencies(): List<LanguageSet.LanguageI
228228

229229
private fun FeatureInConcept.rawValueName() = when ((data as PropertyData).type) {
230230
PropertyType.STRING -> validName
231-
else -> "_raw_" + validName
231+
else -> "raw_" + validName
232232
}

0 commit comments

Comments
 (0)