Task builder for WorkspacePlugin

dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaBuilder.kt

@@ -65,6 +65,11 @@ fun Meta.builder(): MetaBuilder {
     }
 }
 
+/**
+ * Create a deep copy of this meta and apply builder to it
+ */
+fun Meta.edit(builder: MetaBuilder.() -> Unit): MetaBuilder = builder().apply(builder)
+
 /**
  * Build a [MetaBuilder] using given transformation
  */

dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt

@@ -242,11 +242,3 @@ class TaskBuilder<R : Any>(val name: Name, val type: KClass<out R>) {
     }
 }
 
-fun <T : Any> Workspace.Companion.task(
-    name: String,
-    type: KClass<out T>,
-    builder: TaskBuilder<T>.() -> Unit
-): GenericTask<T> = TaskBuilder(name.toName(), type).apply(builder).build()
-
-
-//TODO add delegates to build gradle-like tasks

dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/WorkspacePlugin.kt

@@ -3,12 +3,15 @@ package hep.dataforge.workspace
 import hep.dataforge.context.AbstractPlugin
 import hep.dataforge.context.toMap
 import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import kotlin.reflect.KClass
 
 /**
  * An abstract plugin with some additional boilerplate to effectively work with workspace context
  */
 abstract class WorkspacePlugin : AbstractPlugin() {
-    abstract val tasks: Collection<Task<*>>
+    private val _tasks = HashSet<Task<*>>()
+    val tasks: Collection<Task<*>> get() = _tasks
 
     override fun provideTop(target: String): Map<Name, Any> {
         return when (target) {
@@ -16,4 +19,24 @@ abstract class WorkspacePlugin : AbstractPlugin() {
             else -> emptyMap()
         }
     }
+
+    fun task(task: Task<*>){
+        _tasks.add(task)
+    }
+
+    fun <T : Any> task(
+        name: String,
+        type: KClass<out T>,
+        builder: TaskBuilder<T>.() -> Unit
+    ): GenericTask<T> = TaskBuilder(name.toName(), type).apply(builder).build().also {
+        _tasks.add(it)
+    }
+
+    inline fun <reified T : Any> task(
+        name: String,
+        noinline builder: TaskBuilder<T>.() -> Unit
+    ) = task(name, T::class, builder)
+
+//
+////TODO add delegates to build gradle-like tasks
 }

dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt

@@ -3,7 +3,10 @@ package hep.dataforge.workspace
 import hep.dataforge.context.PluginTag
 import hep.dataforge.data.*
 import hep.dataforge.meta.boolean
+import hep.dataforge.meta.builder
 import hep.dataforge.meta.get
+import hep.dataforge.meta.int
+import hep.dataforge.names.plus
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -13,12 +16,11 @@ class SimpleWorkspaceTest {
     val testPlugin = object : WorkspacePlugin() {
         override val tag: PluginTag = PluginTag("test")
 
-        val contextTask = Workspace.task("test", Any::class) {
+        val contextTask = task("test", Any::class) {
             pipe<Any> {
                 context.logger.info { "Test: $it" }
             }
         }
-        override val tasks: Collection<Task<*>> = listOf(contextTask)
     }
 
     val workspace = Workspace {
@@ -108,6 +110,18 @@ class SimpleWorkspaceTest {
             }
         }
 
+        val customPipeTask = task<Int>("custom") {
+            customPipe<Int> {
+                meta = meta.builder().apply {
+                    "newValue" to 22
+                }
+                name += "new"
+                result {
+                    meta["value"].int ?: 0 + it
+                }
+            }
+        }
+
         target("empty") {}
     }