refactor(mps-multiplatform-lib): id generation of mps-compatible models and modules without mps

Author: abstraktor

commitlint.config.js

@@ -23,6 +23,7 @@ module.exports = {
         "mps-model-adapters",
         "mps-model-server",
         "mps-sync-plugin",
+        "mps-multiplatform-lib",
         "openapi",
         "streams",
         "ts-model-api",

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSArea.kt

@@ -18,7 +18,9 @@ import org.modelix.model.api.NodeReference
 import org.modelix.model.area.IArea
 import org.modelix.model.area.IAreaListener
 import org.modelix.model.area.IAreaReference
+import org.modelix.mps.multiplatform.model.MPSModelImportReference
 import org.modelix.mps.multiplatform.model.MPSModelReference
+import org.modelix.mps.multiplatform.model.MPSModuleDependencyReference
 import org.modelix.mps.multiplatform.model.MPSModuleReference
 import org.modelix.mps.multiplatform.model.MPSNodeReference
 
@@ -203,7 +205,7 @@ data class MPSArea(val repository: SRepository) : IArea, IAreaReference {
     private fun resolveMPSModelImportReference(ref: INodeReference): MPSModelImportAsNode? {
         val serialized = ref.serialize()
         val importedModelRef = if (ref is MPSModelImportReference) {
-            ref.importedModel
+            ref.importedModel.toMPS()
         } else {
             val serializedModelRef = serialized
                 .substringAfter("${MPSModelImportReference.PREFIX}:")
@@ -212,7 +214,7 @@ data class MPSArea(val repository: SRepository) : IArea, IAreaReference {
         }
 
         val importingModelRef = if (ref is MPSModelImportReference) {
-            ref.importingModel
+            ref.importingModel.toMPS()
         } else {
             val serializedModelRef = serialized.substringAfter(MPSModelImportReference.SEPARATOR)
             MPSReferenceParser.parseSModelReference(serializedModelRef)
@@ -227,7 +229,7 @@ data class MPSArea(val repository: SRepository) : IArea, IAreaReference {
     private fun resolveMPSModuleDependencyReference(ref: INodeReference): MPSModuleDependencyAsNode? {
         val serialized = ref.serialize()
         val usedModuleId = if (ref is MPSModuleDependencyReference) {
-            ref.usedModuleId
+            PersistenceFacade.getInstance().createModuleId(ref.usedModuleId)
         } else {
             val serializedModuleId = serialized
                 .substringAfter("${MPSModuleDependencyReference.PREFIX}:")
@@ -236,7 +238,7 @@ data class MPSArea(val repository: SRepository) : IArea, IAreaReference {
         }
 
         val userModuleReference = if (ref is MPSModuleDependencyReference) {
-            ref.userModuleReference
+            ref.userModuleReference.toMPS()
         } else {
             val serializedModuleRef = serialized.substringAfter(MPSModuleDependencyReference.SEPARATOR)
             MPSReferenceParser.parseSModuleReference(serializedModuleRef)

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModelImportAsNode.kt

@@ -9,6 +9,7 @@ import org.modelix.model.api.INodeReference
 import org.modelix.model.api.IPropertyReference
 import org.modelix.model.api.IReferenceLinkReference
 import org.modelix.model.api.IWritableNode
+import org.modelix.mps.multiplatform.model.MPSModelImportReference
 
 data class MPSModelImportAsNode(val importedModel: SModelReference, val importingModel: SModel) : MPSGenericNodeAdapter<MPSModelImportAsNode>() {
 
@@ -60,8 +61,8 @@ data class MPSModelImportAsNode(val importedModel: SModelReference, val importin
 
     override fun getNodeReference(): INodeReference {
         return MPSModelImportReference(
-            importedModel = importedModel,
-            importingModel = importingModel.reference,
+            importedModel = importedModel.toModelix(),
+            importingModel = importingModel.reference.toModelix(),
         )
     }
 

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModuleDependencyAsNode.kt

@@ -13,6 +13,7 @@ import org.modelix.model.api.INodeReference
 import org.modelix.model.api.IPropertyReference
 import org.modelix.model.api.IReferenceLinkReference
 import org.modelix.model.api.IWritableNode
+import org.modelix.mps.multiplatform.model.MPSModuleDependencyReference
 
 data class MPSModuleDependencyAsNode(
     val owner: SModule,
@@ -167,8 +168,8 @@ data class MPSModuleDependencyAsNode(
 
     override fun getNodeReference(): INodeReference {
         return MPSModuleDependencyReference(
-            usedModuleId = moduleReference.moduleId,
-            userModuleReference = owner.moduleReference,
+            usedModuleId = moduleReference.moduleId.toString(),
+            userModuleReference = owner.moduleReference.toModelix(),
         )
     }
 

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSReferences.kt

@@ -85,36 +85,6 @@ data class MPSJavaModuleFacetReference(val moduleReference: SModuleReference) :
     }
 }
 
-data class MPSModelImportReference(
-    val importedModel: SModelReference,
-    val importingModel: SModelReference,
-) : INodeReference() {
-
-    companion object {
-        internal const val PREFIX = "mps-model-import"
-        internal const val SEPARATOR = "#IN#"
-    }
-
-    override fun serialize(): String {
-        return "$PREFIX:${importedModel.withoutNames()}$SEPARATOR${importingModel.withoutNames()}"
-    }
-}
-
-data class MPSModuleDependencyReference(
-    val usedModuleId: SModuleId,
-    val userModuleReference: SModuleReference,
-) : INodeReference() {
-
-    companion object {
-        internal const val PREFIX = "mps-module-dep"
-        internal const val SEPARATOR = "#IN#"
-    }
-
-    override fun serialize(): String {
-        return "$PREFIX:$usedModuleId$SEPARATOR${userModuleReference.withoutNames()}"
-    }
-}
-
 data class MPSProjectReference(val projectName: String) : INodeReference() {
 
     companion object {

mps-multiplatform-lib/src/commonMain/kotlin/org/modelix/mps/multiplatform/model/MPSModelImportReference.kt

@@ -0,0 +1,18 @@
+package org.modelix.mps.multiplatform.model
+
+import org.modelix.model.api.INodeReference
+
+data class MPSModelImportReference(
+    val importedModel: MPSModelReference,
+    val importingModel: MPSModelReference,
+) : INodeReference() {
+
+    companion object {
+        const val PREFIX = "mps-model-import"
+        const val SEPARATOR = "#IN#"
+    }
+
+    override fun serialize(): String {
+        return "$PREFIX:${importedModel.toMPSString()}$SEPARATOR${importingModel.toMPSString()}"
+    }
+}

mps-multiplatform-lib/src/commonMain/kotlin/org/modelix/mps/multiplatform/model/MPSModuleDependencyReference.kt

@@ -0,0 +1,18 @@
+package org.modelix.mps.multiplatform.model
+
+import org.modelix.model.api.INodeReference
+
+data class MPSModuleDependencyReference(
+    val usedModuleId: String,
+    val userModuleReference: MPSModuleReference,
+) : INodeReference() {
+
+    companion object {
+        const val PREFIX = "mps-module-dep"
+        const val SEPARATOR = "#IN#"
+    }
+
+    override fun serialize(): String {
+        return "$PREFIX:$usedModuleId$SEPARATOR${userModuleReference.toMPSString()}"
+    }
+}