fix(bulk-model-sync-gradle): add missing includedModules checks for model-server tasks

Author: mhuster23

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

@@ -113,6 +113,8 @@ class ModelSyncGradlePlugin : Plugin<Project> {
             it.repositoryId.set(serverSource.repositoryId)
             it.branchName.set(serverSource.branchName)
             it.revision.set(serverSource.revision)
+            it.includedModules.set(syncDirection.includedModules)
+            it.includedModulePrefixes.set(syncDirection.includedModulePrefixes)
         }
         return exportFromModelServer
     }
@@ -173,6 +175,8 @@ class ModelSyncGradlePlugin : Plugin<Project> {
             it.url.set(serverTarget.url)
             it.repositoryId.set(serverTarget.repositoryId)
             it.branchName.set(serverTarget.branchName)
+            it.includedModules.set(syncDirection.includedModules)
+            it.includedModulePrefixes.set(syncDirection.includedModulePrefixes)
         }
 
         project.tasks.register("runSync${syncDirection.name.replaceFirstChar { it.uppercaseChar() }}") {

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

@@ -20,6 +20,7 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
@@ -28,6 +29,7 @@ import org.gradle.api.tasks.TaskAction
 import org.modelix.model.ModelFacade
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IBranch
+import org.modelix.model.api.INode
 import org.modelix.model.api.PBranch
 import org.modelix.model.api.getRootNode
 import org.modelix.model.client2.IModelClientV2
@@ -36,6 +38,7 @@ import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
 import org.modelix.model.client2.getReplicatedModel
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.ModelExporter
+import org.modelix.model.sync.bulk.isModuleIncluded
 import javax.inject.Inject
 
 abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
@@ -58,6 +61,12 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
     @OutputDirectory
     val outputDir: DirectoryProperty = of.directoryProperty()
 
+    @Input
+    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+
+    @Input
+    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+
     @TaskAction
     fun export() {
         val client = ModelClientV2PlatformSpecificBuilder()
@@ -76,15 +85,27 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
             val root = branch.getRootNode()
             logger.info("Got root node: {}", root)
             val outputDir = outputDir.get().asFile
-            root.allChildren.forEach {
-                val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
-                val fileName = it.getPropertyValue(nameRole)
+
+            getIncludedModules(root).forEach {
+                val fileName = it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
                 val outputFile = outputDir.resolve("$fileName.json")
                 ModelExporter(it).export(outputFile)
             }
         }
     }
 
+    private fun getIncludedModules(root: INode): Iterable<INode> {
+        val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
+
+        return root.allChildren.filter {
+            val isModule = it.concept == BuiltinLanguages.MPSRepositoryConcepts.Module
+            val moduleName = it.getPropertyValue(nameRole) ?: return@filter false
+            val isIncluded = isModuleIncluded(moduleName, includedModules.get(), includedModulePrefixes.get())
+
+            isModule && isIncluded
+        }
+    }
+
     private fun getBranchByRepoIdAndBranch(client: ModelClientV2): IBranch {
         val repoId = RepositoryId(repositoryId.get())
         val branchRef = ModelFacade.createBranchReference(repoId, branchName.get())

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

@@ -20,6 +20,7 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input
@@ -35,6 +36,7 @@ import org.modelix.model.client2.runWrite
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.ModelImporter
 import org.modelix.model.sync.bulk.importFilesAsRootChildren
+import org.modelix.model.sync.bulk.isModuleIncluded
 import javax.inject.Inject
 
 abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
@@ -55,6 +57,12 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
     @Input
     val registeredLanguages: SetProperty<ILanguage> = of.setProperty(ILanguage::class.java)
 
+    @Input
+    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+
+    @Input
+    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+
     @TaskAction
     fun import() {
         registeredLanguages.get().forEach {
@@ -66,8 +74,10 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
 
         val branchRef = ModelFacade.createBranchReference(repoId, branchName.get())
         val client = ModelClientV2PlatformSpecificBuilder().url(url.get()).build()
-        val files = inputDir.listFiles()?.filter { it.extension == "json" }
-        if (files.isNullOrEmpty()) error("no json files found")
+        val files = inputDir.listFiles()?.filter {
+            it.extension == "json" && isModuleIncluded(it.nameWithoutExtension, includedModules.get(), includedModulePrefixes.get())
+        }
+        if (files.isNullOrEmpty()) error("no json files found for included modules")
 
         runBlocking {
             client.init()

bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt

@@ -21,6 +21,21 @@ import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
 
+/**
+ * Helper-method used by the gradle plugin and the MPS solution.
+ * Checks if a module is included in the sync.
+ *
+ * @param moduleName name of the module to be checked
+ * @param includedModules collection of included module names
+ * @param includedPrefixes collection of included module name prefixes
+ */
+fun isModuleIncluded(moduleName: String, includedModules: Collection<String>, includedPrefixes: Collection<String>): Boolean {
+    val includedDirectly = includedModules.contains(moduleName)
+    val includedByPrefix = includedPrefixes.any { prefix -> moduleName.startsWith(prefix) }
+
+    return includedDirectly || includedByPrefix
+}
+
 fun mergeModelData(models: Collection<ModelData>): ModelData {
     return ModelData(root = NodeData(children = models.map { it.root }))
 }