Merge pull request #1306 from modelix/MODELIX-829-Split-INode-interface-into-multiple-interfaces

MODELIX-829 Split INode interface into multiple interfaces

Author: slisson

.github/workflows/mps-compatibility.yaml

@@ -17,6 +17,7 @@ jobs:
     strategy:
       matrix:
         version:
+          - "2020.3"
           - "2021.1"
           - "2021.2"
           - "2021.3"
@@ -42,6 +43,7 @@ jobs:
         run: >-
           ./gradlew --build-cache
           :bulk-model-sync-mps:build
+          :bulk-model-sync-lib:mps-test:build
           :metamodel-export:build
           :mps-model-adapters:build
           :mps-model-adapters-plugin:build

build-logic/src/main/kotlin/modelix-project-repositories.gradle.kts

@@ -2,11 +2,6 @@
 // because plugins like npm and intellij may override our settings
 repositories {
     val modelixRegex = "org\\.modelix.*"
-    mavenLocal {
-        content {
-            includeGroupByRegex(modelixRegex)
-        }
-    }
     gradlePluginPortal {
         content {
             excludeGroupByRegex(modelixRegex)
@@ -24,4 +19,5 @@ repositories {
             excludeGroupByRegex(modelixRegex)
         }
     }
+    mavenLocal()
 }

build-logic/src/main/kotlin/modelix-repositories.settings.gradle.kts

@@ -1,11 +1,6 @@
 val modelixRegex = "org\\.modelix.*"
 pluginManagement {
     repositories {
-        mavenLocal {
-            content {
-                includeGroupByRegex(modelixRegex)
-            }
-        }
         gradlePluginPortal {
             content {
                 excludeGroupByRegex(modelixRegex)
@@ -22,6 +17,7 @@ pluginManagement {
                 includeGroupByRegex(modelixRegex)
             }
         }
+        mavenLocal()
     }
 }
 dependencyResolutionManagement {
@@ -44,5 +40,6 @@ dependencyResolutionManagement {
                 includeGroup("com.jetbrains")
             }
         }
+        mavenLocal()
     }
 }

build-logic/src/main/kotlin/org/modelix/CopyMps.kt

@@ -1,17 +1,19 @@
 package org.modelix
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.exclude
 import java.io.File
 import java.util.zip.ZipInputStream
 
 val Project.mpsMajorVersion: String get() {
-    if (project != rootProject) return rootProject.mpsVersion
+    if (project != rootProject) return rootProject.mpsMajorVersion
     return project.findProperty("mps.version.major")?.toString()?.takeIf { it.isNotEmpty() }
         ?: project.findProperty("mps.version")?.toString()?.takeIf { it.isNotEmpty() }?.replace(Regex("""(20\d\d\.\d+).*"""), "$1")
-        ?: "2021.1"
+        ?: "2024.1"
 }
 
 val Project.mpsVersion: String get() {
@@ -25,11 +27,12 @@ val Project.mpsVersion: String get() {
                     "2021.1" to "2021.1.4",
                     "2021.2" to "2021.2.6",
                     "2021.3" to "2021.3.5",
-                    "2022.2" to "2022.2.3",
-                    "2022.3" to "2022.3.1",
-                    "2023.2" to "2023.2",
-                    "2023.3" to "2023.3",
-                    "2024.1" to "2024.1-EAP1",
+                    "2022.2" to "2022.2.4",
+                    "2022.3" to "2022.3.3",
+                    "2023.2" to "2023.2.2",
+                    "2023.3" to "2023.3.2",
+                    "2024.1" to "2024.1.1",
+                    "2024.3" to "2024.3",
                 )[it],
             ) { "Unknown MPS version: $it" }
         }
@@ -100,3 +103,14 @@ fun Project.copyMps(): File {
     println("Extracting MPS done.")
     return mpsHome
 }
+
+val excludeMPSLibraries: (ModuleDependency).() -> Unit = {
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-swing")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-common")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+    exclude("org.jetbrains", "annotations")
+}

bulk-model-sync-gradle-test/gradle.properties

@@ -1 +1,5 @@
 kotlin.code.style=official
+org.gradle.jvmargs=-Xmx1024m -Xms256m -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.parallel=true
+systemProp.org.gradle.internal.http.socketTimeout=120000
+kotlin.daemon.jvmargs=-Xmx2G

bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/bulk/gradle/test/PullTest.kt

@@ -1,10 +1,13 @@
 package org.modelix.model.sync.bulk.gradle.test
 
+import GraphLang.L_GraphLang
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import org.modelix.model.api.ConceptReference
 import org.xmlunit.builder.Input
 import org.xmlunit.xpath.JAXPXPathEngine
 import java.io.File
+import javax.xml.transform.Source
 import kotlin.test.assertContains
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
@@ -25,10 +28,21 @@ class PullTest {
             .readText(),
     ).build()
 
+    private fun getRegisteredConcepts(xml: Source): Map<ConceptReference, String> {
+        val conceptNodes = JAXPXPathEngine().selectNodes("model/registry/language/concept", xml)
+        return conceptNodes.associate { c ->
+            val conceptId = c.attributes.getNamedItem("id").nodeValue
+            val languageId = c.parentNode.attributes.getNamedItem("id").nodeValue
+            val shortId = c.attributes.getNamedItem("index").nodeValue
+            ConceptReference("mps:$languageId/$conceptId") to shortId
+        }
+    }
+
     @Test
     fun `properties were synced to local`() {
+        val shortConceptId = getRegisteredConcepts(solution1Xml)[L_GraphLang.Node.untyped().getReference()]
         val properties = JAXPXPathEngine()
-            .selectNodes("model/node/node[@concept='1DmExO']/property", solution1Xml)
+            .selectNodes("model/node/node[@concept='$shortConceptId']/property", solution1Xml)
 
         val actual = properties.map { it.attributes.getNamedItem("value").nodeValue }
         val expected = listOf("X", "Y", "Z", "NewNode", "D", "E")
@@ -38,8 +52,9 @@ class PullTest {
 
     @Test
     fun `added child was synced to local`() {
+        val shortConceptId = getRegisteredConcepts(solution1Xml)[L_GraphLang.Node.untyped().getReference()]
         val xpath = JAXPXPathEngine()
-        val nodes = xpath.selectNodes("model/node/node[@concept='1DmExO']", solution1Xml)
+        val nodes = xpath.selectNodes("model/node/node[@concept='$shortConceptId']", solution1Xml)
 
         val nodeNames = nodes.flatMap { xpath.selectNodes("property", it) }
             .map { it.attributes.getNamedItem("value").nodeValue }

bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/bulk/gradle/test/PushTest.kt

@@ -20,7 +20,6 @@ import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.asExported
 import org.modelix.model.withAutoTransactions
 import java.io.File
-import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -41,9 +40,9 @@ class PushTest {
         val files = inputDir.listFiles()?.filter { it.extension == "json" } ?: error("no json files found in ${inputDir.absolutePath}")
 
         val modules = files.map { ModelData.fromJson(it.readText()) }
-        val inputModel = ModelData(root = NodeData(children = modules.map { it.root }))
+        val inputModel = ModelData(root = NodeData(children = modules.map { it.root }).normalize())
 
-        assertContentEquals(inputModel.root.children, root.allChildren.map { it.asExported() })
+        assertEquals(inputModel.toJson(), ModelData(root = NodeData(children = root.allChildren.map { it.asExported() }).normalize()).toJson())
     }
 
     @Test

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt

@@ -89,7 +89,7 @@ abstract class ExportFromModelServer : DefaultTask() {
         val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
 
         return root.allChildren.filter {
-            val isModule = it.concept?.getUID() == BuiltinLanguages.MPSRepositoryConcepts.Module.getUID()
+            val isModule = it.concept?.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.Module) == true
             val moduleName = it.getPropertyValue(nameRole) ?: return@filter false
             val isIncluded = isModuleIncluded(
                 moduleName,

bulk-model-sync-gradle/src/test/kotlin/org/modelix/model/sync/bulk/gradle/ExportFunctionalTest.kt

@@ -2,7 +2,7 @@ package org.modelix.model.sync.bulk.gradle
 
 import io.kotest.matchers.file.shouldContainFile
 import io.kotest.matchers.file.shouldContainNFiles
-import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.internal.DefaultGradleRunner
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
@@ -15,7 +15,7 @@ class ExportFunctionalTest {
 
     @TempDir(cleanup = CleanupMode.ON_SUCCESS)
     private lateinit var projectDir: File
-    private val gradle by lazy { GradleRunner.create().withProjectDir(projectDir) }
+    private val gradle by lazy { DefaultGradleRunner().withJvmArguments("-Xmx1024m").withProjectDir(projectDir) }
 
     @BeforeTest
     fun setup() {

bulk-model-sync-lib/build.gradle.kts

@@ -7,6 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(project(":model-api"))
+                implementation(project(":model-datastructure"))
                 implementation(libs.kotlin.serialization.json)
                 implementation(libs.kotlin.logging)
             }