Specialized non-null delegates for spec

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     id("scientifik.publish") version toolsVersion apply false
 }
 
-val dataforgeVersion by extra("0.1.5-dev-5")
+val dataforgeVersion by extra("0.1.5-dev-6")
 
 val bintrayRepo by extra("dataforge")
 val githubProject by extra("dataforge-core")

dataforge-meta/src/commonMain/kotlin/hep/dataforge/descriptors/Described.kt

@@ -1,7 +1,7 @@
 package hep.dataforge.descriptors
 
 import hep.dataforge.descriptors.Described.Companion.DESCRIPTOR_NODE
-import hep.dataforge.meta.Meta
+import hep.dataforge.meta.MetaRepr
 import hep.dataforge.meta.get
 import hep.dataforge.meta.node
 
@@ -19,11 +19,11 @@ interface Described {
 /**
  * If meta node supplies explicit descriptor, return it, otherwise try to use descriptor node from meta itself
  */
-val Meta.descriptor: NodeDescriptor?
+val MetaRepr.descriptor: NodeDescriptor?
     get() {
         return if (this is Described) {
             descriptor
         } else {
-            get(DESCRIPTOR_NODE).node?.let { NodeDescriptor.wrap(it) }
+            toMeta()[DESCRIPTOR_NODE].node?.let { NodeDescriptor.wrap(it) }
         }
     }

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

@@ -1,7 +1,10 @@
 package hep.dataforge.meta
 
 import hep.dataforge.names.Name
+import hep.dataforge.names.asName
 import kotlin.jvm.JvmName
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 /**
  * Marker interface for classes with specifications
@@ -61,13 +64,27 @@ fun <C : Specific, S : Specification<C>> Specific.update(spec: S, action: C.() -
 fun <C : Specific, S : Specification<C>> S.createStyle(action: C.() -> Unit): Meta =
     Config().also { update(it, action) }
 
+class SpecDelegate<T : Specific, S : Specification<T>>(
+    val target: Specific,
+    val spec: S,
+    val key: Name? = null
+) : ReadWriteProperty<Any?, T> {
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+        return target.config[key ?: property.name.asName()]?.node?.let { spec.wrap(it) } ?: spec.empty()
+    }
 
-fun <C : Specific> Specific.spec(
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-    spec: Specification<C>,
+        target.config[key ?: property.name.asName()] = value.config
+    }
+}
+
+fun <T : Specific, S : Specification<T>> Specific.spec(
+    spec: S,
     key: Name? = null
-): MutableMorphDelegate<Config, C> = MutableMorphDelegate(config, key) { spec.wrap(it) }
+): SpecDelegate<T, S> = SpecDelegate(this, spec, key)
 
 fun <T : Specific> MetaItem<*>.spec(spec: Specification<T>): T? = node?.let { spec.wrap(it) }
 
 @JvmName("configSpec")
 fun <T : Specific> MetaItem<Config>.spec(spec: Specification<T>): T? = node?.let { spec.wrap(it) }
+

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

@@ -350,8 +350,8 @@ class MutableNodeDelegate<M : MutableMeta<M>>(
     }
 }
 
-class MutableMorphDelegate<M : MutableMeta<M>, T : Configurable>(
+class MutableMorphDelegate<T : Configurable>(
-    val meta: M,
+    val meta: MutableMeta<*>,
     private val key: Name? = null,
     private val converter: (Meta) -> T
 ) : ReadWriteProperty<Any?, T?> {