Delete kotlin-js-store directory

0.2.0

.gitignore

@@ -7,5 +7,3 @@ build/
 data/
 
 !gradle-wrapper.jar
-
-/kotlin-js-store/yarn.lock

CHANGELOG.md

@@ -2,16 +2,8 @@
 
 ## [Unreleased]
 ### Added
-- Context receivers flag
-- MeshLine for thick lines
 
 ### Changed
-- Visions **must** be rooted in order to subscribe to updates.
-- Visions use flows instead of direct subscriptions.
-- Radical change of inner workings of vision children and properties.
-- Three package changed to `three`.
-- Naming of Canvas3D options.
-- Lights are added to the scene instead of 3D options.
 
 ### Deprecated
 

build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
-    id("space.kscience.gradle.project")
-//    id("org.jetbrains.kotlinx.kover") version "0.5.0"
+    id("ru.mipt.npm.gradle.project")
+    id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
 }
 
-val dataforgeVersion by extra("0.6.0-dev-13")
+val dataforgeVersion by extra("0.5.2")
 val fxVersion by extra("11")
 
 allprojects{
     group = "space.kscience"
-    version = "0.3.0-dev-2"
+    version = "0.2.0"
 }
 
 subprojects {
@@ -19,12 +19,6 @@ subprojects {
         mavenCentral()
         maven("https://maven.jzy3d.org/releases")
     }
-
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>{
-        kotlinOptions{
-            freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
-        }
-    }
 }
 
 ksciencePublish {
@@ -38,8 +32,3 @@ apiValidation {
 }
 
 readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
-
-
-//rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
-//    versions.webpackCli.version = "4.10.0"
-//}

cern-root-loader/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 kscience{

cern-root-loader/src/commonMain/kotlin/ru/mipt/npm/root/DObject.kt

@@ -5,6 +5,7 @@ import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.misc.Named
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.doubleArray
 import kotlin.properties.ReadOnlyProperty
 
 public fun MetaProvider.doubleArray(

cern-root-loader/src/commonMain/kotlin/ru/mipt/npm/root/dRootToSolid.kt

@@ -1,14 +1,10 @@
 package ru.mipt.npm.root
 
-import space.kscience.dataforge.meta.double
-import space.kscience.dataforge.meta.doubleArray
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.int
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.plus
-import space.kscience.visionforge.MutableVisionContainer
+import space.kscience.dataforge.values.doubleArray
 import space.kscience.visionforge.isEmpty
-import space.kscience.visionforge.set
 import space.kscience.visionforge.solid.*
 import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import kotlin.math.*
@@ -24,7 +20,7 @@ private fun degToRad(d: Double) = d * PI / 180.0
 private data class RootToSolidContext(
     val prototypeHolder: PrototypeHolder,
     val currentLayer: Int = 0,
-    val maxLayer: Int = 5,
+    val maxLayer: Int = 5
 )
 
 // converting to XYZ to Tait–Bryan angles according to https://en.wikipedia.org/wiki/Euler_angles#Rotation_matrix
@@ -46,17 +42,14 @@ private fun Solid.useMatrix(matrix: DGeoMatrix?) {
         "TGeoIdentity" -> {
             //do nothing
         }
-
         "TGeoTranslation" -> {
             val fTranslation by matrix.meta.doubleArray()
             translate(fTranslation)
         }
-
         "TGeoRotation" -> {
             val fRotationMatrix by matrix.meta.doubleArray()
             rotate(fRotationMatrix)
         }
-
         "TGeoCombiTrans" -> {
             val fTranslation by matrix.meta.doubleArray()
 
@@ -65,7 +58,6 @@ private fun Solid.useMatrix(matrix: DGeoMatrix?) {
                 rotate(it.doubleArray)
             }
         }
-
         "TGeoHMatrix" -> {
             val fTranslation by matrix.meta.doubleArray()
             val fRotationMatrix by matrix.meta.doubleArray()
@@ -81,7 +73,7 @@ private fun SolidGroup.addShape(
     shape: DGeoShape,
     context: RootToSolidContext,
     name: String? = shape.fName.ifEmpty { null },
-    block: Solid.() -> Unit = {},
+    block: Solid.() -> Unit = {}
 ) {
     when (shape.typename) {
         "TGeoCompositeShape" -> {
@@ -102,7 +94,6 @@ private fun SolidGroup.addShape(
                 }
             }.apply(block)
         }
-
         "TGeoXtru" -> {
             val fNvert by shape.meta.int(0)
             val fX by shape.meta.doubleArray()
@@ -130,7 +121,6 @@ private fun SolidGroup.addShape(
                 }
             }.apply(block)
         }
-
         "TGeoTube" -> {
             val fRmax by shape.meta.double(0.0)
             val fDz by shape.meta.double(0.0)
@@ -144,7 +134,6 @@ private fun SolidGroup.addShape(
                 block = block
             )
         }
-
         "TGeoTubeSeg" -> {
             val fRmax by shape.meta.double(0.0)
             val fDz by shape.meta.double(0.0)
@@ -162,7 +151,6 @@ private fun SolidGroup.addShape(
                 block = block
             )
         }
-
         "TGeoPcon" -> {
             val fDphi by shape.meta.double(0.0)
             val fNz by shape.meta.int(2)
@@ -188,7 +176,6 @@ private fun SolidGroup.addShape(
                 TODO()
             }
         }
-
         "TGeoPgon" -> {
             //TODO add a inner polygone layer
             val fDphi by shape.meta.double(0.0)
@@ -219,18 +206,15 @@ private fun SolidGroup.addShape(
                 }
             }.apply(block)
         }
-
         "TGeoShapeAssembly" -> {
             val fVolume by shape.dObject(::DGeoVolume)
             fVolume?.let { volume ->
                 addRootVolume(volume, context, block = block)
             }
         }
-
         "TGeoBBox" -> {
             box(shape.fDX * 2, shape.fDY * 2, shape.fDZ * 2, name = name, block = block)
         }
-
         "TGeoTrap" -> {
             val fTheta by shape.meta.double(0.0)
             val fPhi by shape.meta.double(0.0)
@@ -258,19 +242,17 @@ private fun SolidGroup.addShape(
             val node8 = Point3D(-fTl2, fH2, fDz)
             hexagon(node1, node2, node3, node4, node5, node6, node7, node8, name)
         }
-
         "TGeoScaledShape" -> {
             val fShape by shape.dObject(::DGeoShape)
             val fScale by shape.dObject(::DGeoScale)
             fShape?.let { scaledShape ->
-                solidGroup(name?.let { Name.parse(it) }) {
+                group(name?.let { Name.parse(it) }) {
                     scale = Point3D(fScale?.x ?: 1.0, fScale?.y ?: 1.0, fScale?.z ?: 1.0)
                     addShape(scaledShape, context)
                     apply(block)
                 }
             }
         }
-
         else -> {
             TODO("A shape with type ${shape.typename} not implemented")
         }
@@ -285,7 +267,6 @@ private fun SolidGroup.addRootNode(obj: DGeoNode, context: RootToSolidContext) {
                 val fMatrix by obj.dObject(::DGeoMatrix)
                 this.useMatrix(fMatrix)
             }
-
             "TGeoNodeOffset" -> {
                 val fOffset by obj.meta.double(0.0)
                 x = fOffset
@@ -295,7 +276,7 @@ private fun SolidGroup.addRootNode(obj: DGeoNode, context: RootToSolidContext) {
 }
 
 private fun buildVolume(volume: DGeoVolume, context: RootToSolidContext): Solid? {
-    val group = SolidGroup().apply {
+    val group = SolidGroup {
         //set current layer
         layer = context.currentLayer
         val nodes = volume.fNodes
@@ -320,10 +301,10 @@ private fun buildVolume(volume: DGeoVolume, context: RootToSolidContext): Solid?
             }
         }
     }
-    return if (group.children.isEmpty()) {
+    return if (group.isEmpty()) {
         null
-    } else if (group.items.size == 1 && group.properties.own == null) {
-        group.items.values.first().apply { parent = null }
+    } else if (group.children.size == 1 && group.meta.isEmpty()) {
+        (group.children.values.first() as Solid).apply { parent = null }
     } else {
         group
     }
@@ -336,7 +317,7 @@ private fun SolidGroup.addRootVolume(
     context: RootToSolidContext,
     name: String? = null,
     cache: Boolean = true,
-    block: Solid.() -> Unit = {},
+    block: Solid.() -> Unit = {}
 ) {
     val combinedName = if (volume.fName.isEmpty()) {
         name
@@ -349,33 +330,33 @@ private fun SolidGroup.addRootVolume(
     if (!cache) {
         val group = buildVolume(volume, context)?.apply {
             volume.fFillColor?.let {
-                properties[MATERIAL_COLOR_KEY] = RootColors[it]
+                meta[MATERIAL_COLOR_KEY] = RootColors[it]
             }
             block()
         }
-        setChild(combinedName?.let { Name.parse(it) }, group)
+        set(combinedName?.let { Name.parse(it) }, group)
     } else {
         val templateName = volumesName + volume.name
         val existing = getPrototype(templateName)
         if (existing == null) {
             context.prototypeHolder.prototypes {
                 val group = buildVolume(volume, context)
-                setChild(templateName, group)
+                set(templateName, group)
             }
         }
 
         ref(templateName, name).apply {
             volume.fFillColor?.let {
-                properties[MATERIAL_COLOR_KEY] = RootColors[it]
+                meta[MATERIAL_COLOR_KEY] = RootColors[it]
             }
             block()
         }
     }
 }
 
-public fun MutableVisionContainer<Solid>.rootGeo(dGeoManager: DGeoManager): SolidGroup = solidGroup {
+public fun DGeoManager.toSolid(): SolidGroup = SolidGroup {
     val context = RootToSolidContext(this)
-    dGeoManager.fNodes.forEach { node ->
+    fNodes.forEach { node ->
         addRootNode(node, context)
     }
 }

cern-root-loader/src/commonMain/kotlin/ru/mipt/npm/root/serialization/jsonToRoot.kt

@@ -14,7 +14,7 @@ import kotlinx.serialization.modules.subclass
 
 private fun <T> jsonRootDeserializer(
     tSerializer: KSerializer<T>,
-    builder: (JsonElement) -> T,
+    builder: (JsonElement) -> T
 ): DeserializationStrategy<T> = object :
     DeserializationStrategy<T> {
     private val jsonElementSerializer = JsonElement.serializer()
@@ -46,7 +46,6 @@ private object RootDecoder {
         private val refCache: List<RefEntry>,
     ) : KSerializer<T> by tSerializer {
 
-        @OptIn(ExperimentalSerializationApi::class)
         @Suppress("UNCHECKED_CAST")
         override fun deserialize(decoder: Decoder): T {
             val input = decoder as JsonDecoder
@@ -91,8 +90,9 @@ private object RootDecoder {
 
     private fun <T> KSerializer<T>.unref(refCache: List<RefEntry>): KSerializer<T> = RootUnrefSerializer(this, refCache)
 
+    @OptIn(ExperimentalSerializationApi::class)
     fun unrefSerializersModule(
-        refCache: List<RefEntry>,
+        refCache: List<RefEntry>
     ): SerializersModule = SerializersModule {
 
         contextual(TObjArray::class) {
@@ -197,13 +197,11 @@ private object RootDecoder {
                         fillCache(it)
                     }
                 }
-
                 is JsonArray -> {
                     element.forEach {
                         fillCache(it)
                     }
                 }
-
                 else -> {
                     //ignore primitives
                 }

cern-root-loader/src/commonMain/kotlin/ru/mipt/npm/root/serialization/rootToSolid.kt

@@ -3,7 +3,6 @@ package ru.mipt.npm.root.serialization
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
-import space.kscience.visionforge.MutableVisionContainer
 import space.kscience.visionforge.solid.*
 import kotlin.math.PI
 import kotlin.math.atan2
@@ -133,7 +132,7 @@ private fun buildGroup(volume: TGeoVolume): SolidGroup {
     return if (volume is TGeoVolumeAssemblyRef) {
         buildGroup(volume.value)
     } else {
-        SolidGroup().apply {
+        SolidGroup {
             volume.fShape?.let { addShape(it) }
             volume.fNodes?.let {
                 it.arr.forEach { obj ->
@@ -161,7 +160,7 @@ private fun SolidGroup.volume(volume: TGeoVolume, name: String? = null, cache: B
         name = combinedName,
         obj = group,
         prototypeHolder = rootPrototypes,
-        prototypeName = volumesName + Name.parse(combinedName ?: "volume[${group.hashCode()}]")
+        templateName = volumesName + Name.parse(combinedName ?: "volume[${group.hashCode()}]")
     )
 }
 
@@ -181,8 +180,8 @@ private fun SolidGroup.volume(volume: TGeoVolume, name: String? = null, cache: B
 //    }
 
 
-public fun MutableVisionContainer<Solid>.rootGeo(tGeoManager: TGeoManager): SolidGroup = solidGroup {
-    tGeoManager.fNodes.arr.forEach {
+public fun TGeoManager.toSolid(): SolidGroup = SolidGroup {
+    fNodes.arr.forEach {
         node(it)
     }
 }

demo/gdml/build.gradle.kts

@@ -1,8 +1,8 @@
-import space.kscience.gradle.DependencyConfiguration
-import space.kscience.gradle.FXModule
+import ru.mipt.npm.gradle.DependencyConfiguration
+import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
@@ -36,7 +36,7 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation(project(":visionforge-fx"))
-                implementation("ch.qos.logback:logback-classic:1.2.11")
+                implementation("ch.qos.logback:logback-classic:1.2.5")
             }
         }
         jsMain {

demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisionTest.kt

@@ -1,11 +1,13 @@
 package space.kscience.visionforge.gdml
 
-import space.kscience.dataforge.meta.asValue
-import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.getChild
+import space.kscience.visionforge.computeProperties
+import space.kscience.visionforge.get
+import space.kscience.visionforge.setProperty
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.SolidMaterial
 import space.kscience.visionforge.solid.material
@@ -18,8 +20,8 @@ class GDMLVisionTest {
 
     @Test
     fun testCubesStyles(){
-        val segment = cubes.children.getChild("composite-000.segment-0") as Solid
-        println(segment.properties.getValue(Vision.STYLE_KEY))
+        val segment = cubes["composite-000.segment-0"] as Solid
+        println(segment.computeProperties().getValue(Vision.STYLE_KEY))
 //        println(segment.computePropertyNode(SolidMaterial.MATERIAL_KEY))
 //        println(segment.computeProperty(SolidMaterial.MATERIAL_COLOR_KEY))
 
@@ -33,7 +35,7 @@ class GDMLVisionTest {
     fun testPrototypeProperty() {
         val child = cubes[Name.of("composite-000","segment-0")]
         assertNotNull(child)
-        child.properties.setValue(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
-        assertEquals("red", child.properties.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string)
+        child.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
+        assertEquals("red", child.getPropertyValue(SolidMaterial.MATERIAL_COLOR_KEY)?.string)
     }
 }

demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt

@@ -10,11 +10,13 @@ import org.w3c.files.get
 import react.Props
 import react.dom.h2
 import react.fc
+import react.useMemo
 import react.useState
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.gdml.markLayers
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
@@ -22,19 +24,18 @@ import space.kscience.visionforge.ring.tab
 import space.kscience.visionforge.setAsRoot
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.ambientLight
-import space.kscience.visionforge.solid.set
 import styled.css
 import styled.styledDiv
 
 external interface GDMLAppProps : Props {
-    var solids: Solids
+    var context: Context
     var vision: Solid?
     var selected: Name?
 }
 
 @JsExport
 val GDMLApp = fc<GDMLAppProps>("GDMLApp") { props ->
+    val visionManager = useMemo(props.context) { props.context.fetch(Solids).visionManager }
     var deferredVision: Deferred<Solid?> by useState {
         CompletableDeferred(props.vision)
     }
@@ -49,15 +50,12 @@ val GDMLApp = fc<GDMLAppProps>("GDMLApp") { props ->
                     name.endsWith(".gdml") || name.endsWith(".xml") -> {
                         val gdml = Gdml.decodeFromString(data)
                         gdml.toVision().apply {
-                            setAsRoot(props.solids.visionManager)
+                            setAsRoot(visionManager)
                             console.info("Marking layers for file $name")
                             markLayers()
-                            ambientLight {
-                                color.set(Colors.white)
                         }
                     }
-                    }
-                    name.endsWith(".json") -> props.solids.visionManager.decodeFromString(data)
+                    name.endsWith(".json") -> visionManager.decodeFromString(data)
                     else -> {
                         window.alert("File extension is not recognized: $name")
                         error("File extension is not recognized: $name")
@@ -78,7 +76,7 @@ val GDMLApp = fc<GDMLAppProps>("GDMLApp") { props ->
         }
         child(ThreeCanvasWithControls) {
             attrs {
-                this.solids = props.solids
+                this.context = props.context
                 this.builderOfSolid = deferredVision
                 this.selected = props.selected
                 tab("Load") {

demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt

@@ -2,17 +2,11 @@ package space.kscience.visionforge.gdml.demo
 
 import kotlinx.browser.document
 import kotlinx.css.*
-import react.dom.client.createRoot
+import react.dom.render
 import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.fetch
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.Application
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.gdml.toVision
-import space.kscience.visionforge.react.render
-import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.ambientLight
-import space.kscience.visionforge.solid.set
 import space.kscience.visionforge.solid.three.ThreePlugin
 import space.kscience.visionforge.startApplication
 import styled.injectGlobal
@@ -45,16 +39,12 @@ private class GDMLDemoApp : Application {
 
         val element = document.getElementById("application") ?: error("Element with id 'application' not found on page")
 
-        createRoot(element).render {
+        render(element) {
             child(GDMLApp) {
-                val vision = GdmlShowCase.cubes().toVision().apply {
-                    ambientLight {
-                        color.set(Colors.white)
-                    }
-                }
+                val vision = GdmlShowCase.cubes().toVision()
                 //println(context.plugins.fetch(VisionManager).encodeToString(vision))
                 attrs {
-                    this.solids = context.fetch(Solids)
+                    this.context = context
                     this.vision = vision
                 }
             }

demo/js-playground/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 kscience{

demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt

@@ -1,17 +1,15 @@
 import kotlinx.browser.document
 import kotlinx.css.*
-import react.dom.client.createRoot
+import react.child
+import react.dom.render
 import ringui.SmartTabs
 import ringui.Tab
 import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.fetch
 import space.kscience.plotly.models.Trace
 import space.kscience.plotly.scatter
 import space.kscience.visionforge.Application
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.VisionClient
 import space.kscience.visionforge.plotly.PlotlyPlugin
-import space.kscience.visionforge.react.render
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
 import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.ring.solid
@@ -40,7 +38,7 @@ private class JsPlaygroundApp : Application {
 
         val element = document.getElementById("playground") ?: error("Element with id 'playground' not found on page")
 
-        createRoot(element).render {
+        render(element) {
             styledDiv {
                 css {
                     padding(0.pt)
@@ -52,7 +50,7 @@ private class JsPlaygroundApp : Application {
                     Tab("gravity") {
                         GravityDemo{
                             attrs {
-                                this.solids = playgroundContext.fetch(Solids)
+                                this.context = playgroundContext
                             }
                         }
                     }
@@ -73,18 +71,15 @@ private class JsPlaygroundApp : Application {
                             child(ThreeCanvasWithControls) {
                                 val random = Random(112233)
                                 attrs {
-                                    solids = playgroundContext.fetch(Solids)
+                                    context = playgroundContext
                                     solid {
-                                        ambientLight {
-                                            color.set(Colors.white)
-                                        }
                                         repeat(100) {
                                             sphere(5, name = "sphere[$it]") {
                                                 x = random.nextDouble(-300.0, 300.0)
                                                 y = random.nextDouble(-300.0, 300.0)
                                                 z = random.nextDouble(-300.0, 300.0)
                                                 material {
-                                                    color.set(random.nextInt())
+                                                    color(random.nextInt())
                                                 }
                                                 detail = 16
                                             }

demo/js-playground/src/main/kotlin/gravityDemo.kt

@@ -4,9 +4,9 @@ import kotlinx.coroutines.launch
 import kotlinx.css.*
 import react.Props
 import react.fc
+import space.kscience.dataforge.context.Context
 import space.kscience.plotly.layout
 import space.kscience.plotly.models.Trace
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.markup.VisionOfMarkup
 import space.kscience.visionforge.react.flexRow
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
@@ -17,7 +17,7 @@ import styled.styledDiv
 import kotlin.math.sqrt
 
 external interface DemoProps : Props {
-    var solids: Solids
+    var context: Context
 }
 
 val GravityDemo = fc<DemoProps> { props ->
@@ -39,19 +39,14 @@ val GravityDemo = fc<DemoProps> { props ->
             }
             child(ThreeCanvasWithControls) {
                 attrs {
-                    solids = props.solids
+                    context = props.context
                     solid {
-                        pointLight(200, 200, 200, name = "light"){
-                            color.set(Colors.white)
-                        }
-                        ambientLight()
-
                         sphere(5.0, "ball") {
                             detail = 16
-                            color.set("red")
+                            color("red")
                             val h = 100.0
                             y = h
-                            solids.context.launch {
+                            context.launch {
                                 val g = 10.0
                                 val dt = 0.1
                                 var time = 0.0

demo/muon-monitor/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
@@ -21,11 +21,19 @@ kotlin {
         useCommonJs()
         browser {
             commonWebpackConfig {
-                cssSupport {
-                    enabled = false
+                cssSupport.enabled = false
             }
         }
     }
+
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            from(jsBrowserDistribution)
+        }
     }
 
     sourceSets {
@@ -37,10 +45,8 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation("org.apache.commons:commons-math3:3.6.1")
-                implementation("io.ktor:ktor-server-cio:${ktorVersion}")
-                implementation("io.ktor:ktor-server-content-negotiation:${ktorVersion}")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:${ktorVersion}")
-                implementation("ch.qos.logback:logback-classic:1.2.11")
+                implementation(npmlibs.ktor.server.cio)
+                implementation(npmlibs.ktor.serialization)
             }
         }
         jsMain {
@@ -57,23 +63,6 @@ application {
     mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
-val jsBrowserDistribution by tasks.getting
-val jsBrowserDevelopmentExecutableDistribution by tasks.getting
-
-val devMode = rootProject.findProperty("visionforge.development") as? Boolean
-    ?: rootProject.version.toString().contains("dev")
-
-tasks.getByName<ProcessResources>("jvmProcessResources") {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    if (devMode) {
-        dependsOn(jsBrowserDevelopmentExecutableDistribution)
-        from(jsBrowserDevelopmentExecutableDistribution)
-    } else {
-        dependsOn(jsBrowserDistribution)
-        from(jsBrowserDistribution)
-    }
-}
-
 //distributions {
 //    main {
 //        contents {

demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt

@@ -3,19 +3,19 @@ package ru.mipt.npm.muon.monitor
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.UPPER_LAYER_Z
-import space.kscience.visionforge.MutableVisionContainer
 import space.kscience.visionforge.VisionManager
+import space.kscience.visionforge.removeAll
 import space.kscience.visionforge.setAsRoot
+import space.kscience.visionforge.setProperty
 import space.kscience.visionforge.solid.*
-import kotlin.collections.set
 import kotlin.math.PI
 
 class Model(val manager: VisionManager) {
     private val map = HashMap<String, SolidGroup>()
     private val events = HashSet<Event>()
 
-    private fun MutableVisionContainer<Solid>.pixel(pixel: SC1) {
-        val group = solidGroup(pixel.name) {
+    private fun SolidGroup.pixel(pixel: SC1) {
+        val group = group(pixel.name) {
             position = Point3D(pixel.center.x, pixel.center.y, pixel.center.z)
             box(pixel.xSize, pixel.ySize, pixel.zSize)
             label(pixel.name) {
@@ -27,7 +27,7 @@ class Model(val manager: VisionManager) {
     }
 
     private fun SolidGroup.detector(detector: SC16) {
-        solidGroup(detector.name) {
+        group(detector.name) {
             detector.pixels.forEach {
                 pixel(it)
             }
@@ -39,39 +39,40 @@ class Model(val manager: VisionManager) {
     val root: SolidGroup = SolidGroup().apply {
         setAsRoot(this@Model.manager)
         material {
-            color.set("darkgreen")
+            wireframe
+            color("darkgreen")
         }
         rotationX = PI / 2
-        solidGroup("bottom") {
+        group("bottom") {
             Monitor.detectors.filter { it.center.z == LOWER_LAYER_Z }.forEach {
                 detector(it)
             }
         }
 
-        solidGroup("middle") {
+        group("middle") {
             Monitor.detectors.filter { it.center.z == CENTRAL_LAYER_Z }.forEach {
                 detector(it)
             }
         }
 
-        solidGroup("top") {
+        group("top") {
             Monitor.detectors.filter { it.center.z == UPPER_LAYER_Z }.forEach {
                 detector(it)
             }
         }
-        tracks = solidGroup("tracks")
+        tracks = group("tracks")
     }
 
     private fun highlight(pixel: String) {
         println("highlight $pixel")
-        map[pixel]?.color.set("blue")
+        map[pixel]?.color?.invoke("blue")
     }
 
     fun reset() {
         map.values.forEach {
-            it.properties.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, null)
+            it.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, null)
         }
-        tracks.children.clear()
+        tracks.removeAll()
     }
 
     fun displayEvent(event: Event) {
@@ -83,7 +84,7 @@ class Model(val manager: VisionManager) {
         event.track?.let {
             tracks.polyline(*it.toTypedArray(), name = "track[${event.id}]") {
                 thickness = 4
-                color.set("red")
+                color("red")
             }
         }
     }

demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt

@@ -16,16 +16,13 @@ import react.dom.p
 import react.fc
 import react.useMemo
 import react.useState
-import space.kscience.dataforge.meta.invoke
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
 import space.kscience.visionforge.ring.tab
-import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.ambientLight
-import space.kscience.visionforge.solid.set
+import space.kscience.visionforge.solid.specifications.Camera
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import space.kscience.visionforge.solid.three.edges
 import styled.css
@@ -35,7 +32,7 @@ import kotlin.math.PI
 
 external interface MMAppProps : Props {
     var model: Model
-    var solids: Solids
+    var context: Context
     var selected: Name?
 }
 
@@ -45,21 +42,17 @@ val MMApp = fc<MMAppProps>("Muon monitor") { props ->
 
     val mmOptions = useMemo {
         Canvas3DOptions {
-            camera {
+            camera = Camera {
                 distance = 2100.0
                 latitude = PI / 6
                 azimuth = PI + PI / 6
             }
-
         }
     }
 
     val root = useMemo(props.model) {
         props.model.root.apply {
             edges()
-            ambientLight{
-                color.set(Colors.white)
-            }
         }
     }
 
@@ -71,7 +64,7 @@ val MMApp = fc<MMAppProps>("Muon monitor") { props ->
         }
         child(ThreeCanvasWithControls) {
             attrs {
-                this.solids = props.solids
+                this.context = props.context
                 this.builderOfSolid = CompletableDeferred(root)
                 this.selected = props.selected
                 this.options = mmOptions
@@ -82,7 +75,7 @@ val MMApp = fc<MMAppProps>("Muon monitor") { props ->
                                 +"Next"
                                 attrs {
                                     onClickFunction = {
-                                        solids.context.launch {
+                                        context.launch {
                                             val event = window.fetch(
                                                 "http://localhost:8080/event",
                                                 RequestInit("GET")

demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt

@@ -1,13 +1,11 @@
 package ru.mipt.npm.muon.monitor
 
 import kotlinx.browser.document
-import react.dom.client.createRoot
+import react.dom.render
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.fetch
 import space.kscience.visionforge.Application
 import space.kscience.visionforge.VisionManager
-import space.kscience.visionforge.react.render
-import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.three.ThreePlugin
 import space.kscience.visionforge.startApplication
 
@@ -18,17 +16,16 @@ private class MMDemoApp : Application {
         val context = Context("MM-demo") {
             plugin(ThreePlugin)
         }
-
         val visionManager = context.fetch(VisionManager)
 
         val model = Model(visionManager)
 
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
-        createRoot(element).render {
+        render(element) {
             child(MMApp) {
                 attrs {
                     this.model = model
-                    this.solids = context.fetch(Solids)
+                    this.context = context
                 }
             }
         }

demo/muon-monitor/src/jsMain/resources/index.html

@@ -5,6 +5,7 @@
     <!--    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">-->
     <title>Three js demo for particle physics</title>
     <script type="text/javascript" src="muon-monitor.js"></script>
+    <link rel="stylesheet" href="css/custom-bootstrap.css">
 </head>
 <body class="application">
 <div class="container-fluid max-vh-100" id = "app"> </div>

demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/MMServer.kt

@@ -1,22 +1,24 @@
 package ru.mipt.npm.muon.monitor.server
 
 
+import io.ktor.application.Application
+import io.ktor.application.call
+import io.ktor.application.install
+import io.ktor.application.log
+import io.ktor.features.CallLogging
+import io.ktor.features.ContentNegotiation
+import io.ktor.features.DefaultHeaders
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.Application
-import io.ktor.server.application.call
-import io.ktor.server.application.install
-import io.ktor.server.application.log
+import io.ktor.http.content.resources
+import io.ktor.http.content.static
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.Routing
+import io.ktor.routing.get
+import io.ktor.serialization.json
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
-import io.ktor.server.http.content.resources
-import io.ktor.server.http.content.static
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.response.respond
-import io.ktor.server.response.respondText
-import io.ktor.server.routing.Routing
-import io.ktor.server.routing.get
 import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
@@ -38,6 +40,8 @@ fun Application.module(context: Context = Global) {
     environment.log.info("Current directory: $currentDir")
     val solidManager = context.fetch(Solids)
 
+    install(DefaultHeaders)
+    install(CallLogging)
     install(ContentNegotiation) {
         json()
     }

demo/playground/build.gradle.kts

@@ -32,7 +32,7 @@ kotlin {
             kotlinOptions {
                 jvmTarget = "11"
                 freeCompilerArgs =
-                    freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy" + "-Xcontext-receivers"
+                    freeCompilerArgs + "-Xjvm-default=all" + "-Xopt-in=kotlin.RequiresOptIn" + "-Xlambdas=indy"
             }
         }
         testRuns["test"].executionTask.configure {

demo/playground/src/jvmMain/kotlin/allThingsDemo.kt

@@ -1,7 +1,7 @@
 package space.kscience.visionforge.examples
 
 import kotlinx.html.h2
-import space.kscience.dataforge.meta.ValueType
+import space.kscience.dataforge.values.ValueType
 import space.kscience.plotly.layout
 import space.kscience.plotly.models.ScatterMode
 import space.kscience.plotly.models.TextPosition

demo/playground/src/jvmMain/kotlin/gdmlCubes.kt

@@ -1,20 +1,13 @@
 package space.kscience.visionforge.examples
 
 import space.kscience.gdml.GdmlShowCase
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.ambientLight
-import space.kscience.visionforge.solid.set
 
 fun main() = makeVisionFile(resourceLocation = ResourceLocation.SYSTEM){
     vision("canvas") {
         requirePlugin(Solids)
-        GdmlShowCase.cubes().toVision().also {
-            it.ambientLight {
-                color.set(Colors.white)
-            }
-        }
+        GdmlShowCase.cubes().toVision()
     }
 }

demo/playground/src/jvmMain/kotlin/gdmlCurve.kt

@@ -7,7 +7,7 @@ import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.color
-import space.kscience.visionforge.solid.set
+import space.kscience.visionforge.solid.invoke
 import space.kscience.visionforge.visible
 import java.nio.file.Path
 
@@ -229,7 +229,7 @@ fun main() = makeVisionFile(Path.of("curves.html"), resourceLocation = ResourceL
                         visible = false
                     }
                     if(solid.name.startsWith("gas")){
-                        color.set("green")
+                        color("green")
                     } else {
                         //make all solids semi-transparent
                         transparent()

demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt

@@ -1,21 +1,12 @@
 package space.kscience.visionforge.examples
 
 import space.kscience.gdml.GdmlShowCase
-import space.kscience.visionforge.Colors
-import space.kscience.visionforge.gdml.gdml
+import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.ambientLight
-import space.kscience.visionforge.solid.set
-import space.kscience.visionforge.solid.solid
 
 fun main() = makeVisionFile {
     vision("canvas") {
         requirePlugin(Solids)
-        solid {
-            ambientLight {
-                color.set(Colors.white)
-            }
-            gdml(GdmlShowCase.babyIaxo(), "D0")
-        }
+        GdmlShowCase.babyIaxo().toVision()
     }
 }

demo/playground/src/jvmMain/kotlin/randomSpheres.kt

@@ -2,7 +2,6 @@ package space.kscience.visionforge.examples
 
 import kotlinx.html.div
 import kotlinx.html.h1
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.*
 import java.nio.file.Paths
@@ -18,16 +17,13 @@ fun main() = makeVisionFile(
     div {
         vision {
             solid {
-                ambientLight {
-                    color.set(Colors.white)
-                }
                 repeat(100) {
                     sphere(5, name = "sphere[$it]") {
                         x = random.nextDouble(-300.0, 300.0)
                         y = random.nextDouble(-300.0, 300.0)
                         z = random.nextDouble(-300.0, 300.0)
                         material {
-                            color.set(random.nextInt())
+                            color(random.nextInt())
                         }
                         detail = 16
                     }

demo/playground/src/jvmMain/kotlin/rootParser.kt

@@ -1,12 +1,12 @@
 package space.kscience.visionforge.examples
 
 import ru.mipt.npm.root.DGeoManager
-import ru.mipt.npm.root.rootGeo
 import ru.mipt.npm.root.serialization.TGeoManager
+import ru.mipt.npm.root.toSolid
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.isLeaf
-import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.values.string
 import space.kscience.visionforge.solid.Solids
 import java.nio.file.Paths
 import java.util.zip.ZipInputStream
@@ -34,7 +34,7 @@ fun main() {
         println(it)
     }
 
-    val solid = Solids.rootGeo(geo)
+    val solid = geo.toSolid()
 
     Paths.get("BM@N.vf.json").writeText(Solids.encodeToString(solid))
     //println(Solids.encodeToString(solid))

demo/playground/src/jvmMain/kotlin/simpleCube.kt

@@ -2,8 +2,8 @@ package space.kscience.visionforge.examples
 
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.box
+import space.kscience.visionforge.solid.invoke
 import space.kscience.visionforge.solid.material
-import space.kscience.visionforge.solid.set
 import space.kscience.visionforge.solid.solid
 
 fun main() = makeVisionFile(resourceLocation = ResourceLocation.SYSTEM) {
@@ -11,7 +11,7 @@ fun main() = makeVisionFile(resourceLocation = ResourceLocation.SYSTEM) {
         solid {
             box(100, 100, 100)
             material {
-                emissiveColor.set("red")
+                emissiveColor("red")
             }
         }
     }

demo/playground/src/jvmMain/kotlin/tables.kt

@@ -1,6 +1,6 @@
 package space.kscience.visionforge.examples
 
-import space.kscience.dataforge.meta.ValueType
+import space.kscience.dataforge.values.ValueType
 import space.kscience.tables.ColumnHeader
 import space.kscience.tables.valueRow
 import space.kscience.visionforge.html.ResourceLocation

demo/sat-demo/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("ru.mipt.npm.gradle.jvm")
     application
 }
 
@@ -15,7 +15,7 @@ group = "ru.mipt.npm"
 
 dependencies{
     implementation(project(":visionforge-threejs:visionforge-threejs-server"))
-    implementation("ch.qos.logback:logback-classic:1.2.11")
+    implementation("ch.qos.logback:logback-classic:1.2.3")
 }
 
 application {

demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt

@@ -6,7 +6,7 @@ import space.kscience.visionforge.style
 import space.kscience.visionforge.useStyle
 import kotlin.math.PI
 
-internal fun Solids.visionOfSatellite(
+internal fun visionOfSatellite(
     layers: Int = 10,
     layerHeight: Number = 10,
     xSegments: Int = 3,
@@ -14,8 +14,8 @@ internal fun Solids.visionOfSatellite(
     xSegmentSize: Number = 30,
     ySegmentSize: Number = xSegmentSize,
     fiberDiameter: Number = 1.0,
-): SolidGroup = solidGroup {
-    color.set("darkgreen")
+): SolidGroup = SolidGroup {
+    color("darkgreen")
     val transparent by style {
         this[SolidMaterial.MATERIAL_OPACITY_KEY] = 0.3
     }
@@ -31,7 +31,7 @@ internal fun Solids.visionOfSatellite(
     val totalXSize = xSegments * xSegmentSize.toDouble()
     val totalYSize = ySegments * ySegmentSize.toDouble()
     for (layer in 1..layers) {
-        solidGroup("layer[$layer]") {
+        group("layer[$layer]") {
             for (i in 1..xSegments) {
                 for (j in 1..ySegments) {
                     box(xSegmentSize, ySegmentSize, layerHeight, name = "segment[$i,$j]") {
@@ -42,7 +42,7 @@ internal fun Solids.visionOfSatellite(
                     }
                 }
             }
-            solidGroup("fibers") {
+            group("fibers") {
                 for (i in 1..xSegments) {
                     cylinder(fiberDiameter, totalYSize) {
                         useStyle(red)

demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt

@@ -5,10 +5,7 @@ import kotlinx.coroutines.*
 import kotlinx.html.div
 import kotlinx.html.h1
 import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.fetch
-import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Colors
 import space.kscience.visionforge.html.Page
 import space.kscience.visionforge.html.plus
 import space.kscience.visionforge.server.close
@@ -20,20 +17,13 @@ import space.kscience.visionforge.visionManager
 import kotlin.random.Random
 
 
-@OptIn(DFExperimental::class)
 fun main() {
     val satContext = Context("sat") {
         plugin(Solids)
     }
 
-    val solids = satContext.fetch(Solids)
-
     //Create a geometry
-    val sat = solids.visionOfSatellite(ySegments = 3).apply {
-        ambientLight {
-            color.set(Colors.white)
-        }
-    }
+    val sat = visionOfSatellite(ySegments = 3)
 
     val server = satContext.visionManager.serve {
         page(header = Page.threeJsHeader + Page.styleSheetHeader("css/styles.css")) {
@@ -54,7 +44,7 @@ fun main() {
             val randomJ = Random.nextInt(1, 4)
             val target = Name.parse("layer[$randomLayer].segment[$randomI,$randomJ]")
             val targetVision = sat[target] as Solid
-            targetVision.color.set("red")
+            targetVision.color("red")
             delay(1000)
             targetVision.color.clear()
             delay(500)

demo/solid-showcase/build.gradle.kts

@@ -1,8 +1,8 @@
-import space.kscience.gradle.DependencyConfiguration
-import space.kscience.gradle.FXModule
+import ru.mipt.npm.gradle.DependencyConfiguration
+import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
@@ -40,5 +40,5 @@ kotlin {
 }
 
 application {
-    mainClass.set("space.kscience.visionforge.solid.demo.FXDemoAppKt")
+    mainClassName = "space.kscience.visionforge.solid.demo.FXDemoAppKt"
 }

demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/VisionLayout.kt

@@ -3,10 +3,7 @@ package space.kscience.visionforge.solid.demo
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.solid.Solids
 
 public interface VisionLayout<in V: Vision> {
-    val solids: Solids
-
     public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY)
 }

demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt

@@ -18,12 +18,7 @@ fun VisionLayout<Solid>.demo(name: String, title: String = name, block: SolidGro
     val meta = Meta {
         "title" put title
     }
-    val vision = solids.solidGroup {
-        block()
-        ambientLight {
-            color.set(Colors.white)
-        }
-    }
+    val vision = SolidGroup(block)
     render(Name.parse(name), vision, meta)
 }
 
@@ -44,31 +39,30 @@ val canvasOptions = Canvas3DOptions {
 @OptIn(DelicateCoroutinesApi::class)
 fun VisionLayout<Solid>.showcase() {
     demo("shapes", "Basic shapes") {
-        ambientLight()
         box(100.0, 100.0, 100.0) {
             z = -110.0
-            color.set("teal")
+            color("teal")
         }
         sphere(50.0) {
             x = 110
             detail = 16
-            color.set("red")
+            color("red")
         }
         tube(50, height = 10, innerRadius = 25, angle = PI) {
             y = 110
             detail = 16
             rotationX = PI / 4
-            color.set("blue")
+            color("blue")
         }
         sphereLayer(50, 40, theta = PI / 2) {
             rotationX = -PI * 3 / 4
             z = 110
-            color.set(Colors.pink)
+            color(Colors.pink)
         }
     }
 
     demo("dynamic", "Dynamic properties") {
-        val group = solidGroup {
+        val group = group {
             box(100, 100, 100) {
                 z = 110.0
                 opacity = 0.5
@@ -78,7 +72,7 @@ fun VisionLayout<Solid>.showcase() {
                 visible = false
                 x = 110.0
                 //override color for this cube
-                color.set(1530)
+                color(1530)
 
                 GlobalScope.launch(Dispatchers.Main) {
                     while (isActive) {
@@ -93,19 +87,19 @@ fun VisionLayout<Solid>.showcase() {
             val random = Random(111)
             while (isActive) {
                 delay(1000)
-                group.color.set(random.nextInt(0, Int.MAX_VALUE))
+                group.color(random.nextInt(0, Int.MAX_VALUE))
             }
         }
     }
 
     demo("rotation", "Rotations") {
         box(100, 100, 100)
-        solidGroup {
+        group {
             x = 200
             rotationY = PI / 4
             box(100, 100, 100) {
                 rotationZ = PI / 4
-                color.set(Colors.red)
+                color(Colors.red)
             }
         }
     }
@@ -118,7 +112,7 @@ fun VisionLayout<Solid>.showcase() {
             for (i in 0..100) {
                 layer(i * 5, 20 * sin(2 * PI / 100 * i), 20 * cos(2 * PI / 100 * i))
             }
-            color.set(Colors.teal)
+            color(Colors.teal)
             rotationX = -PI / 2
         }
     }
@@ -127,13 +121,13 @@ fun VisionLayout<Solid>.showcase() {
         sphere(100) {
             detail = 32
             opacity = 0.4
-            color.set(Colors.blue)
+            color(Colors.blue)
         }
         repeat(20) {
             polyline(Point3D(100, 100, 100), Point3D(-100, -100, -100)) {
                 thickness = 3.0
                 rotationX = it * PI2 / 20
-                color.set(Colors.green)
+                color(Colors.green)
                 //rotationY = it * PI2 / 20
             }
         }
@@ -160,7 +154,7 @@ fun VisionLayout<Solid>.showcaseCSG() {
                 detail = 32
             }
             material {
-                color.set(Colors.pink)
+                color(Colors.pink)
             }
         }
         composite(CompositeType.UNION) {
@@ -170,7 +164,7 @@ fun VisionLayout<Solid>.showcaseCSG() {
             sphere(50) {
                 detail = 32
             }
-            color.set("lightgreen")
+            color("lightgreen")
             opacity = 0.7
         }
         composite(CompositeType.SUBTRACT) {
@@ -181,7 +175,7 @@ fun VisionLayout<Solid>.showcaseCSG() {
             sphere(50) {
                 detail = 32
             }
-            color.set("teal")
+            color("teal")
             opacity = 0.7
         }
     }
@@ -192,7 +186,7 @@ fun VisionLayout<Solid>.showcaseCSG() {
                 detail = 32
             }
             box(100, 100, 100)
-            color.set("red")
+            color("red")
             opacity = 0.5
         }
     }

demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt

@@ -16,7 +16,6 @@ import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.three.ThreeCanvas
 import space.kscience.visionforge.solid.three.ThreePlugin
 
@@ -28,8 +27,6 @@ class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
 
     private val three = Global.fetch(ThreePlugin)
 
-    override val solids: Solids get() = three.solids
-
     init {
         element.clear()
         element.append {

demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt

@@ -1,18 +1,20 @@
 package space.kscience.visionforge.solid.demo
 
-import space.kscience.dataforge.meta.asValue
+import info.laht.threekt.core.Object3D
+import info.laht.threekt.geometries.BoxGeometry
+import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.int
 import space.kscience.dataforge.meta.number
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.startsWith
+import space.kscience.dataforge.values.asValue
 import space.kscience.visionforge.onPropertyChange
-import space.kscience.visionforge.setChild
+import space.kscience.visionforge.set
+import space.kscience.visionforge.setProperty
 import space.kscience.visionforge.solid.SolidGroup
 import space.kscience.visionforge.solid.layer
 import space.kscience.visionforge.solid.three.*
-import three.core.Object3D
-import three.geometries.BoxGeometry
-import three.objects.Mesh
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
@@ -20,7 +22,7 @@ internal fun SolidGroup.varBox(
     ySize: Number,
     name: String = "",
     action: VariableBox.() -> Unit = {},
-): VariableBox = VariableBox(xSize, ySize).apply(action).also { setChild(name, it) }
+): VariableBox = VariableBox(xSize, ySize).apply(action).also { set(name, it) }
 
 internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeJsVision() {
 
@@ -42,13 +44,13 @@ internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeJsVision
                 it.layers.enable(this@VariableBox.layer)
             }
         }
-        mesh.scale.z = properties.getValue(VALUE)?.number?.toDouble() ?: 1.0
+        mesh.scale.z = meta[VALUE].number?.toDouble() ?: 1.0
 
         //add listener to object properties
         onPropertyChange { name ->
             when {
                 name == VALUE -> {
-                    val value = properties.getValue(VALUE)?.int ?: 0
+                    val value = meta.get(VALUE).int ?: 0
                     val size = value.toFloat() / 255f * 20f
                     mesh.scale.z = size.toDouble()
                     mesh.position.z = size.toDouble() / 2
@@ -59,8 +61,7 @@ internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeJsVision
                     material.color.setRGB(r.toFloat() / 256, g.toFloat() / 256, b.toFloat() / 256)
                     mesh.updateMatrix()
                 }
-
-                name.startsWith(ThreeMeshFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
+                name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
         }
@@ -69,9 +70,9 @@ internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeJsVision
     }
 
     var value: Int
-        get() = properties.getValue(VALUE)?.int ?: 0
+        get() = meta[VALUE].int ?: 0
         set(value) {
-            properties.setValue(VALUE, value.asValue())
+            setProperty(VALUE, value.asValue())
         }
 
     companion object {

demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt

@@ -10,11 +10,9 @@ import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.solid.FX3DPlugin
 import space.kscience.visionforge.solid.FXCanvas3D
 import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.Solids
 import tornadofx.*
 
 class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout<Solid> {
-
     private val outputs = FXCollections.observableHashMap<Name, FXCanvas3D>()
 
     override val root: Parent = borderpane {
@@ -26,9 +24,6 @@ class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout<Solid> {
     }
 
     private val fx3d = Global.fetch(FX3DPlugin)
-    override val solids: Solids get() = fx3d.solids
-
-
 
     override fun render(name: Name, vision: Solid, meta: Meta) {
         outputs.getOrPut(name) { FXCanvas3D(fx3d, canvasOptions) }.render(vision)

demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt

@@ -2,10 +2,10 @@ package space.kscience.visionforge.demo
 
 import javafx.geometry.Orientation
 import space.kscience.dataforge.meta.MutableMeta
-import space.kscience.dataforge.meta.ValueType
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.node
 import space.kscience.dataforge.meta.descriptors.value
+import space.kscience.dataforge.values.ValueType
 import space.kscience.visionforge.editor.FXMetaModel
 import space.kscience.visionforge.editor.MetaViewer
 import space.kscience.visionforge.editor.MutableMetaEditor

docs/hierarchy.md

@@ -3,7 +3,7 @@
 ![](../docs/images/hierarchy.png)
 
 ### Vision
-* function `getProperty(name: Name, inherit: Boolean = false, includeStyles: Boolean = true, includeDefaults: Boolean = true)` - get property value with given layer flags.
+* function `getPropertyValue(name: Name, inherit: Boolean = false, includeStyles: Boolean = true, includeDefaults: Boolean = true)` - get property value with given layer flags.
 
 * function `setProperty(name: Name, item: Any?)` - a convenient method to set property node or value. If `item` is null, then node is removed, not a value
   Sets the `item` property to the element with the `name` identification.

docs/inheritance.md

@@ -7,7 +7,7 @@ Properties, which can be inherited by objects, are `styles`, `prototypes` (if th
 All values of `styles` property are contained in class `StyleSheet`, where they all are defined at `Group`s level. The `prototypes` property tree is defined in `SolidGroup` class via `PrototypeHolder` interface, and
 `SolidReference` class helps to reuse a template object. 
 
-The order of inheritance of properties is set in function `getProperty` in `VisionBase` class.
+The order of inheritance of properties is set in function `getPropertyValue` in `VisionBase` class.
 The order is this:
 * own styles
 * prototypes

docs/tutorial.md

@@ -59,7 +59,7 @@ box(10, 10, 10, name = "small box"){
    rotation = Point3D(0, 0, 0)
 }
 ```
-![](../images/small-box.png)
+![](../docs/images/small-box.png)
 
 The `big box` will have properties with custom values. 
 ```kotlin
@@ -72,7 +72,7 @@ box(40, 40, 40, name = "big box"){
    rotation = Point3D(60, 80, 0)
 }
 ```
-![](../images/big-rotated-box.png)
+![](../docs/images/big-rotated-box.png)
 If we compare these boxes, we will see all differences. 
 
 Here is the function `main` with both boxes.
@@ -111,8 +111,8 @@ fun main(){
     }
 }
 ```
-![](../images/two-boxes-1.png)
-![](../images/two-boxes-2.png)
+![](../docs/images/two-boxes-1.png)
+![](../docs/images/two-boxes-2.png)
 
 ***There is plenty of other properties, especially those, which you can create by yourself. Here we mention just a small part.***
 
@@ -142,8 +142,8 @@ polyline(Point3D(30, 20, 10), Point3D(30, -100, 30), Point3D(30, -100, 30), Poin
 }
 ```
 
-![](../images/polyline-points.png)
-![](../images/polyline-points-2.png)
+![](../docs/images/polyline-points.png)
+![](../docs/images/polyline-points-2.png)
 
 ### 2) Box
 
@@ -165,7 +165,7 @@ Let's create just usual `box` with equal ribs.
         color("pink")
    }
 ```
-   ![](../images/box.png)
+   ![](../docs/images/box.png)
 
 Now, let's make `box` with bigger `y` value.
    ```kotlin
@@ -175,7 +175,7 @@ Now, let's make `box` with bigger `y` value.
    ```
 As you can see, only the rib of `y-axis` differs from other ribs.
 
-   ![](../images/high-box.png)
+   ![](../docs/images/high-box.png)
 
 For a final trial, let's create a `box` with a bigger `x` value.
    
@@ -189,7 +189,7 @@ For a final trial, let's create a `box` with a bigger `x` value.
    ```
 Predictably, only the `x-axis` rib is bigger than other ribs. 
 
-   ![](../images/wide-box.png)
+   ![](../docs/images/wide-box.png)
    
 ### 3) Sphere
 
@@ -206,7 +206,7 @@ As for `radius`, it has `Float` type, and, as you can guess, it sets the radius
         color("blue")
    }
    ```
-   ![](../images/sphere.png)
+   ![](../docs/images/sphere.png)
 
 ### 4) Hexagon
 
@@ -220,7 +220,7 @@ It is solid which has six edges. It is set by eight values: `node1`,..., `node8`
 5) Edge with vertices `node1`, `node5`, `node8`, `node4`
 6) Edge with vertices `node8`, `node5`, `node6`, `node7`
 
-![](../images/scheme.png)
+![](../docs/images/scheme.png)
 
 As the hexagon takes in specific points, we understand that this solid cannot be moved, it is fixed in space, and it can't make pivots.
 
@@ -239,7 +239,7 @@ Let's make classic parallelepiped.
         color("green")
    }
 ```
-   ![](../images/classic-hexagon.png)
+   ![](../docs/images/classic-hexagon.png)
 
 Now, let's make a custom hexagon.
 
@@ -258,7 +258,7 @@ hexagon(
     color("brown")
 }
    ```
-   ![](../images/custom-hexagon.png)
+   ![](../docs/images/custom-hexagon.png)
 ### 3) Cone
 It takes in six values: `bottomRadius`, `height`, `upperRadius`, `startAngle`, `angle`, and `name`. 
 
@@ -274,8 +274,8 @@ Let's build a classic cone:
          color("beige")
    }
    ```
-   ![](../images/cone-1.png)
-   ![](../images/cone-2.png)
+   ![](../docs/images/cone-1.png)
+   ![](../docs/images/cone-2.png)
 
 First of all, we have to try to build a frustum cone:
 ```kotlin
@@ -283,7 +283,7 @@ cone(60, 80, name = "cone") {
    color(0u, 40u, 0u)
 }
 ```
-![](../images/frustum-cone.png)
+![](../docs/images/frustum-cone.png)
 
 Now, we need to make a try to build a cone segment:
 
@@ -292,8 +292,8 @@ cone(60, 80, angle = PI, name = "cone") {
    color(0u, 0u, 200u)
 }
 ```
-![](../images/cone-segment-1.png)
-![](../images/cone-segment-2.png)
+![](../docs/images/cone-segment-1.png)
+![](../docs/images/cone-segment-2.png)
 
 Finally, the segment of frustum cone is left for a try:
 ```kotlin
@@ -301,7 +301,7 @@ cone(60, 100, 20, PI*3/4, angle = PI/3, name = "cone") {
    color(190u, 0u, 0u)
 }
 ```
-![](../images/frustum-cone-segment.png)
+![](../docs/images/frustum-cone-segment.png)
 
 ### 4) Cone Surface
 This solid is set by seven values:`bottomOuterRadius`, `bottomInnerRadius`, `height`, `topOuterRadius`, `topInnerRadius`, `startAngle`, and `angle`.
@@ -318,8 +318,8 @@ Let's build usual cone surface with almost all properties set:
         rotation = Point3D(2, 50, -9)
    }
    ```
-![](../images/cone-surface-1.png)
-![](../images/cone-surface-2.png)
+![](../docs/images/cone-surface-1.png)
+![](../docs/images/cone-surface-2.png)
 
 Now, let's create a cone surface and set all it's properties:
 
@@ -329,8 +329,8 @@ coneSurface(30, 25, 10, 10, 8,0f, pi*3/4, name = "cone surface") {
    rotation = Point3D(2, 50, -9)
 }
 ```
-![](../images/cone-surface-fragment.png)
-![](../images/cone-surface-fragment-2.png)
+![](../docs/images/cone-surface-fragment.png)
+![](../docs/images/cone-surface-fragment-2.png)
 
 ### 5) Cylinder
 
@@ -344,8 +344,8 @@ cylinder(40, 100, "cylinder"){
    color("indigo")
 }
 ```
-![](../images/cylinder-1.png)
-![](../images/cylinder-2.png)
+![](../docs/images/cylinder-1.png)
+![](../docs/images/cylinder-2.png)
 ### 6) Tube
 
 `tube` takes in `radius`, `height`, `innerRadius`, `startAngle`, `angle`, and `name`. *All values are familiar from `cone`, and `coneSurface` solids.*
@@ -356,7 +356,7 @@ tube(50, 40, 20, name = "usual tube"){
    opacity = 0.4
 }                    
 ```
-![](../images/tube.png)
+![](../docs/images/tube.png)
 
 This is an example of tube fragment:
 
@@ -365,7 +365,7 @@ tube(50, 40, 20, 0f, PI, name = "fragmented tube"){
    color("white")
 }
 ```
-![](../images/tube-fragment.png)
+![](../docs/images/tube-fragment.png)
 ### 7) Extruded
 
 `extruded` is set by two values: `shape`, and `layer`. 

docs/uml/Vision.puml

@@ -3,7 +3,7 @@
 
 interface Vision{
     val parent: VisionGroup?
-    fun getProperty(name,inherit,includeStyles,includeDefaults): Value?
+    fun getPropertyValue(name,inherit,includeStyles,includeDefaults): Value?
 }
 
 interface Solid{
@@ -81,7 +81,7 @@ Solid <--- Composite
 
 interface SolidReference{
     val prototype: Solid
-    fun getProperty(name,inherit,includeStyles,includeDefaults): Value?
+    fun getPropertyValue(name,inherit,includeStyles,includeDefaults): Value?
 }
 VisionGroup <---- SolidReference
 SolidReferenceGroup -- SolidReference
@@ -91,7 +91,7 @@ class SolidReferenceGroup{
     var properties: MutableMeta?
     val prototype: Solid
     val children: Map<NameToken, Vision>
-    fun getProperty(name,inherit,includeStyles,includeDefaults): Value?
+    fun getPropertyValue(name,inherit,includeStyles,includeDefaults): Value?
 }
 VisionBase <-- SolidReferenceGroup
 VisionGroup <-- SolidReferenceGroup

gradle.properties

@@ -1,9 +1,12 @@
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
+
 kotlin.jupyter.add.scanner=false
-#kotlin.incremental.js.ir=true
 
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx4G
 
-toolsVersion=0.12.0-kotlin-1.7.20-Beta
+publishing.github=false
+publishing.sonatype=false
+
+toolsVersion=0.11.1-kotlin-1.6.10

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jupyter/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     id("org.jetbrains.kotlin.jupyter.api")
 }
 
@@ -21,5 +21,5 @@ kotlin {
 }
 
 readme {
-    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }

jupyter/visionforge-jupyter-gdml/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 description = "Jupyter api artifact for GDML rendering"
@@ -56,5 +56,5 @@ kscience {
 }
 
 readme {
-    maturity = space.kscience.gradle.Maturity.EXPERIMENTAL
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }

settings.gradle.kts

@@ -12,14 +12,13 @@ pluginManagement {
         maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 
     plugins {
-        id("space.kscience.gradle.project") version toolsVersion
-        id("space.kscience.gradle.mpp") version toolsVersion
-        id("space.kscience.gradle.jvm") version toolsVersion
-        id("space.kscience.gradle.js") version toolsVersion
+        id("ru.mipt.npm.gradle.project") version toolsVersion
+        id("ru.mipt.npm.gradle.mpp") version toolsVersion
+        id("ru.mipt.npm.gradle.jvm") version toolsVersion
+        id("ru.mipt.npm.gradle.js") version toolsVersion
     }
 }
 
@@ -35,7 +34,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("npmlibs") {
-            from("space.kscience:version-catalog:$toolsVersion")
+            from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
 }

ui/bootstrap/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     kotlin("js")
-    id("space.kscience.gradle.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 val dataforgeVersion: String by rootProject.extra

ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt

@@ -1,7 +1,5 @@
 package space.kscience.visionforge.bootstrap
 
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
 import kotlinx.css.BorderStyle
 import kotlinx.css.Color
 import kotlinx.css.padding
@@ -17,6 +15,7 @@ import react.RBuilder
 import react.dom.attrs
 import react.dom.button
 import react.fc
+import space.kscience.dataforge.meta.withDefault
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.encodeToString
 import space.kscience.visionforge.react.flexColumn
@@ -48,7 +47,6 @@ public external interface CanvasControlsProps : Props {
     public var vision: Vision?
 }
 
-
 public val CanvasControls: FC<CanvasControlsProps> = fc("CanvasControls") { props ->
     flexColumn {
         flexRow {
@@ -70,10 +68,9 @@ public val CanvasControls: FC<CanvasControlsProps> = fc("CanvasControls") { prop
                 }
             }
         }
-        @OptIn(DelicateCoroutinesApi::class)
         propertyEditor(
-            scope = props.vision?.manager?.context ?: GlobalScope,
-            properties = props.canvasOptions.meta,
+            ownProperties = props.canvasOptions.meta,
+            allProperties = props.canvasOptions.meta.withDefault(Canvas3DOptions.descriptor.defaultNode),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )

ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt

@@ -30,7 +30,7 @@ public external interface TabPaneProps : PropsWithChildren {
 public val TabPane: FC<TabPaneProps> = fc("TabPane") { props ->
     var activeTab: String? by useState(props.activeTab)
 
-    val children: Array<out ReactElement<*>?> = Children.map(props.children) {
+    val children: Array<out ReactElement?> = Children.map(props.children) {
         it.asElementOrNull()
     } ?: emptyArray()
 

ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt

@@ -10,8 +10,8 @@ import react.fc
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.isEmpty
 import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.react.visionTree
-import space.kscience.visionforge.solid.SolidGroup
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
@@ -51,7 +51,7 @@ public val ThreeControls: FC<ThreeControlsProps> = fc { props ->
                 val selectedObject: Vision? = when {
                     selected == null -> null
                     selected.isEmpty() -> props.vision
-                    else -> (props.vision as? SolidGroup)?.get(selected)
+                    else -> (props.vision as? VisionGroup)?.get(selected)
                 }
                 if (selectedObject != null) {
                     visionPropertyEditor(selectedObject, key = selected)

ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt

@@ -2,17 +2,13 @@ package space.kscience.visionforge.bootstrap
 
 import org.w3c.dom.Element
 import react.RBuilder
-import react.dom.client.createRoot
-import react.key
+import react.dom.render
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.isEmpty
 import space.kscience.visionforge.Vision
+import space.kscience.visionforge.computeProperties
 import space.kscience.visionforge.getStyle
-import space.kscience.visionforge.react.EditorPropertyState
-import space.kscience.visionforge.react.PropertyEditor
 import space.kscience.visionforge.react.metaViewer
-import space.kscience.visionforge.react.render
-import space.kscience.visionforge.root
+import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.SolidReference
 import space.kscience.visionforge.styles
 
@@ -23,26 +19,12 @@ public fun RBuilder.visionPropertyEditor(
 ) {
 
     card("Properties") {
-        child(PropertyEditor) {
-            attrs {
-                this.key = key?.toString()
-                this.meta = vision.properties.root()
-                this.updates = vision.properties.changes
-                this.descriptor = descriptor
-                this.scope = vision.manager?.context ?: error("Orphan vision could not be observed")
-                this.getPropertyState = { name ->
-                    val ownMeta = vision.properties.own?.getMeta(name)
-                    if (ownMeta != null && !ownMeta.isEmpty()) {
-                        EditorPropertyState.Defined
-                    } else if (vision.properties.root().getValue(name) != null) {
-                        // TODO differentiate
-                        EditorPropertyState.Default()
-                    } else {
-                        EditorPropertyState.Undefined
-                    }
-                }
-            }
-        }
+        propertyEditor(
+            ownProperties = vision.meta,
+            allProperties = vision.computeProperties(),
+            descriptor = descriptor,
+            key = key
+        )
     }
     val styles = if (vision is SolidReference) {
         (vision.styles + vision.prototype.styles).distinct()
@@ -68,6 +50,6 @@ public fun RBuilder.visionPropertyEditor(
 public fun Element.visionPropertyEditor(
     item: Vision,
     descriptor: MetaDescriptor? = item.descriptor,
-): Unit = createRoot(this).render {
+): Unit = render(this) {
     visionPropertyEditor(item, descriptor = descriptor)
 }

ui/react/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 dependencies{

ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt

@@ -10,22 +10,22 @@ import react.dom.attrs
 import react.dom.option
 import react.dom.select
 import react.fc
-import space.kscience.dataforge.meta.asValue
 import space.kscience.dataforge.meta.descriptors.allowedValues
-import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
 
 @JsExport
 public val MultiSelectChooser: FC<ValueChooserProps> = fc("MultiSelectChooser") { props ->
     val onChange: (Event) -> Unit = { event: Event ->
         val newSelected = (event.target as HTMLSelectElement).selectedOptions.asList()
             .map { (it as HTMLOptionElement).value.asValue() }
-        props.onValueChange(newSelected.asValue())
+        props.meta.value = newSelected.asValue()
     }
 
     select {
         attrs {
             multiple = true
-            values = (props.value?.list ?: emptyList()).mapTo(HashSet()) { it.string }
+            values = (props.actual.value?.list ?: emptyList()).mapTo(HashSet()) { it.string }
             onChangeFunction = onChange
         }
         props.descriptor?.allowedValues?.forEach { optionValue ->

ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt

@@ -1,18 +1,13 @@
 package space.kscience.visionforge.react
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import kotlinx.css.*
 import kotlinx.css.properties.TextDecoration
 import kotlinx.html.js.onClickFunction
+import org.w3c.dom.Element
 import org.w3c.dom.events.Event
 import react.*
 import react.dom.attrs
+import react.dom.render
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.ValueRequirement
@@ -24,30 +19,17 @@ import styled.styledButton
 import styled.styledDiv
 import styled.styledSpan
 
-/**
- * The display state of a property
- */
-public sealed class EditorPropertyState {
-    public object Defined : EditorPropertyState()
-    public class Default(public val source: String = "unknown") : EditorPropertyState()
-
-    public object Undefined : EditorPropertyState()
-
-}
-
-
 public external interface PropertyEditorProps : Props {
 
     /**
      * Root config object - always non-null
      */
-    public var meta: MutableMeta
+    public var meta: ObservableMutableMeta
 
-    public var getPropertyState: (Name) -> EditorPropertyState
-
-    public var scope: CoroutineScope
-
-    public var updates: Flow<Name>
+    /**
+     * Provide default item (greyed out if used)
+     */
+    public var withDefault: MetaProvider
 
     /**
      * Full path to the displayed node in [meta]. Could be empty
@@ -72,9 +54,7 @@ private val PropertyEditorItem: FC<PropertyEditorProps> = fc("PropertyEditorItem
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { props.expanded ?: true }
     val descriptor: MetaDescriptor? = useMemo(props.descriptor, props.name) { props.descriptor?.get(props.name) }
-    var property: MutableMeta by useState { props.meta.getOrCreate(props.name) }
-    var editorPropertyState: EditorPropertyState by useState { props.getPropertyState(props.name) }
-
+    var ownProperty: ObservableMutableMeta by useState { props.meta.getOrCreate(props.name) }
 
     val keys = useMemo(descriptor) {
         buildSet {
@@ -90,19 +70,17 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
-        property = props.meta.getOrCreate(props.name)
-        editorPropertyState = props.getPropertyState(props.name)
+        ownProperty = props.meta.getOrCreate(props.name)
     }
 
     useEffect(props.meta) {
-        val job = props.updates.onEach { updatedName ->
+        props.meta.onChange(props) { updatedName ->
             if (updatedName == props.name) {
                 update()
             }
-        }.launchIn(props.scope)
-
+        }
         cleanup {
-            job.cancel()
+            props.meta.removeListener(props)
         }
     }
 
@@ -137,7 +115,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
         styledSpan {
             css {
                 +TreeStyles.treeLabel
-                if (editorPropertyState != EditorPropertyState.Defined) {
+                if (ownProperty.isEmpty()) {
                     +TreeStyles.treeLabelInactive
                 }
             }
@@ -153,12 +131,8 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                 ValueChooser {
                     attrs {
                         this.descriptor = descriptor
-                        this.state = editorPropertyState
-                        this.value = property.value
-                        this.onValueChange = {
-                            property.value = it
-                            editorPropertyState = props.getPropertyState(props.name)
-                        }
+                        this.meta = ownProperty
+                        this.actual = props.withDefault.getMeta(props.name) ?: ownProperty
                     }
                 }
             }
@@ -182,7 +156,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                 }
                 +"\u00D7"
                 attrs {
-                    if (editorPropertyState!= EditorPropertyState.Defined) {
+                    if (ownProperty.isEmpty()) {
                         disabled = true
                     } else {
                         onClickFunction = removeClick
@@ -205,11 +179,9 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                         attrs {
                             this.key = props.name.toString()
                             this.meta = props.meta
+                            this.withDefault = props.withDefault
                             this.name = props.name + token
                             this.descriptor = props.descriptor
-                            this.scope = props.scope
-                            this.getPropertyState = { props.getPropertyState(props.name + token) }
-                            this.updates = props.updates
                         }
                     }
                     //configEditor(props.root, props.name + token, props.descriptor, props.default)
@@ -225,51 +197,44 @@ public val PropertyEditor: FC<PropertyEditorProps> = fc("PropertyEditor") { prop
         attrs {
             this.key = ""
             this.meta = props.meta
+            this.withDefault = props.withDefault
             this.name = Name.EMPTY
             this.descriptor = props.descriptor
             this.expanded = props.expanded
-            this.scope = props.scope
-            this.getPropertyState = props.getPropertyState
-            this.updates = props.updates
         }
     }
 }
 
-@OptIn(ExperimentalCoroutinesApi::class)
 public fun RBuilder.propertyEditor(
-    scope: CoroutineScope,
-    properties: ObservableMutableMeta,
+    ownProperties: ObservableMutableMeta,
+    allProperties: MetaProvider = ownProperties,
     descriptor: MetaDescriptor? = null,
     key: Any? = null,
     expanded: Boolean? = null,
 ) {
     child(PropertyEditor) {
         attrs {
-            this.meta = properties
+            this.meta = ownProperties
+            this.withDefault = allProperties
             this.descriptor = descriptor
             this.key = key?.toString() ?: ""
             this.expanded = expanded
-            this.scope = scope
-            this.getPropertyState = { name ->
-                if (properties[name] != null) {
-                    EditorPropertyState.Defined
-                } else if (descriptor?.get(name)?.defaultValue != null) {
-                    EditorPropertyState.Default("descriptor")
-                } else {
-                    EditorPropertyState.Undefined
         }
     }
-            this.updates = callbackFlow {
-                properties.onChange(scope) { name ->
-                    scope.launch {
-                        send(name)
-                    }
 }
 
-                invokeOnClose {
-                    properties.removeListener(scope)
-                }
-            }
-        }
-    }
+public fun RBuilder.configEditor(
+    config: ObservableMutableMeta,
+    default: MetaProvider = config,
+    descriptor: MetaDescriptor? = null,
+    key: Any? = null,
+): Unit = propertyEditor(config, default, descriptor, key = key)
+
+public fun Element.configEditor(
+    config: ObservableMutableMeta,
+    default: Meta = config,
+    descriptor: MetaDescriptor? = null,
+    key: Any? = null,
+): Unit = render(this) {
+    configEditor(config, default, descriptor, key = key)
 }

ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt

@@ -10,34 +10,32 @@ import react.FC
 import react.dom.attrs
 import react.fc
 import react.useState
-import space.kscience.dataforge.meta.asValue
 import space.kscience.dataforge.meta.descriptors.ValueRequirement
 import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.values.asValue
 import styled.css
 import styled.styledInput
 
 @JsExport
 public val RangeValueChooser: FC<ValueChooserProps> = fc("RangeValueChooser") { props ->
-    var innerValue by useState(props.value?.double)
-    var rangeDisabled: Boolean by useState(props.state != EditorPropertyState.Defined)
+    var innerValue by useState(props.actual.double)
+    var rangeDisabled: Boolean by useState(props.meta.value == null)
 
     val handleDisable: (Event) -> Unit = {
         val checkBoxValue = (it.target as HTMLInputElement).checked
         rangeDisabled = !checkBoxValue
-        props.onValueChange(
-            if (!checkBoxValue) {
+        props.meta.value = if (!checkBoxValue) {
             null
         } else {
             innerValue?.asValue()
         }
-        )
     }
 
     val handleChange: (Event) -> Unit = {
         val newValue = (it.target as HTMLInputElement).value
-        props.onValueChange(newValue.toDoubleOrNull()?.asValue())
+        props.meta.value = newValue.toDoubleOrNull()?.asValue()
         innerValue = newValue.toDoubleOrNull()
     }
 

ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt

@@ -16,7 +16,6 @@ import space.kscience.dataforge.names.plus
 import space.kscience.dataforge.names.startsWith
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
-import space.kscience.visionforge.asSequence
 import space.kscience.visionforge.isEmpty
 import styled.css
 import styled.styledDiv
@@ -62,7 +61,7 @@ private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
     //display as node if any child is visible
     if (obj is VisionGroup) {
         flexRow {
-            if (obj.children.keys.any { !it.body.startsWith("@") }) {
+            if (obj.children.any { !it.key.body.startsWith("@") }) {
                 styledSpan {
                     css {
                         +TreeStyles.treeCaret
@@ -82,9 +81,9 @@ private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
                 css {
                     +TreeStyles.tree
                 }
-                obj.children.asSequence()
-                    .filter { !it.first.toString().startsWith("@") } // ignore statics and other hidden children
-                    .sortedBy { (it.second as? VisionGroup)?.children?.isEmpty() ?: true } // ignore empty groups
+                obj.children.entries
+                    .filter { !it.key.toString().startsWith("@") } // ignore statics and other hidden children
+                    .sortedBy { (it.value as? VisionGroup)?.isEmpty() ?: true } // ignore empty groups
                     .forEach { (childToken, child) ->
                         styledDiv {
                             css {

ui/react/src/main/kotlin/space/kscience/visionforge/react/ext.kt

@@ -1,10 +0,0 @@
-package space.kscience.visionforge.react
-
-import react.Props
-import react.RBuilder
-import react.createElement
-import react.dom.client.Root
-
-public fun Root.render(block: RBuilder.() -> Unit) {
-    render(createElement<Props>(block))
-}

ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt

@@ -19,27 +19,29 @@ import react.useState
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.allowedValues
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.int
+import space.kscience.dataforge.values.string
 import space.kscience.visionforge.Colors
 import space.kscience.visionforge.widgetType
 import styled.css
 import styled.styledInput
 import styled.styledSelect
-import three.math.Color
 
 public external interface ValueChooserProps : Props {
     public var descriptor: MetaDescriptor?
-    public var state: EditorPropertyState
-    public var value: Value?
-    public var onValueChange: (Value?) -> Unit
+    public var meta: ObservableMutableMeta
+    public var actual: Meta
 }
 
 @JsExport
 public val StringValueChooser: FC<ValueChooserProps> = fc("StringValueChooser") { props ->
-    var value by useState(props.value?.string ?: "")
+    var value by useState(props.actual.string ?: "")
     val keyDown: (Event) -> Unit = { event ->
         if (event.type == "keydown" && event.asDynamic().key == "Enter") {
             value = (event.target as HTMLInputElement).value
-            props.onValueChange(value.asValue())
+            props.meta.value = value.asValue()
         }
     }
     val handleChange: (Event) -> Unit = {
@@ -61,7 +63,7 @@ public val StringValueChooser: FC<ValueChooserProps> = fc("StringValueChooser")
 public val BooleanValueChooser: FC<ValueChooserProps> = fc("BooleanValueChooser") { props ->
     val handleChange: (Event) -> Unit = {
         val newValue = (it.target as HTMLInputElement).checked
-        props.onValueChange(newValue.asValue())
+        props.meta.value = newValue.asValue()
     }
     styledInput(type = InputType.checkBox) {
         css {
@@ -69,7 +71,7 @@ public val BooleanValueChooser: FC<ValueChooserProps> = fc("BooleanValueChooser"
         }
         attrs {
             //this.attributes["indeterminate"] = (props.item == null).toString()
-            checked = props.value?.boolean ?: false
+            checked = props.actual.boolean ?: false
             onChangeFunction = handleChange
         }
     }
@@ -77,7 +79,7 @@ public val BooleanValueChooser: FC<ValueChooserProps> = fc("BooleanValueChooser"
 
 @JsExport
 public val NumberValueChooser: FC<ValueChooserProps> = fc("NumberValueChooser") { props ->
-    var innerValue by useState(props.value?.string ?: "")
+    var innerValue by useState(props.actual.string ?: "")
     val keyDown: (Event) -> Unit = { event ->
         if (event.type == "keydown" && event.asDynamic().key == "Enter") {
             innerValue = (event.target as HTMLInputElement).value
@@ -85,7 +87,7 @@ public val NumberValueChooser: FC<ValueChooserProps> = fc("NumberValueChooser")
             if (number == null) {
                 console.error("The input value $innerValue is not a number")
             } else {
-                props.onValueChange(number.asValue())
+                props.meta.value = number.asValue()
             }
         }
     }
@@ -115,10 +117,10 @@ public val NumberValueChooser: FC<ValueChooserProps> = fc("NumberValueChooser")
 
 @JsExport
 public val ComboValueChooser: FC<ValueChooserProps> = fc("ComboValueChooser") { props ->
-    var selected by useState(props.value?.string ?: "")
+    var selected by useState(props.actual.string ?: "")
     val handleChange: (Event) -> Unit = {
         selected = (it.target as HTMLSelectElement).value
-        props.onValueChange(selected.asValue())
+        props.meta.value = selected.asValue()
     }
     styledSelect {
         css {
@@ -130,7 +132,7 @@ public val ComboValueChooser: FC<ValueChooserProps> = fc("ComboValueChooser") {
             }
         }
         attrs {
-            this.value = props.value?.string ?: ""
+            this.value = props.actual.string ?: ""
             multiple = false
             onChangeFunction = handleChange
         }
@@ -140,7 +142,7 @@ public val ComboValueChooser: FC<ValueChooserProps> = fc("ComboValueChooser") {
 @JsExport
 public val ColorValueChooser: FC<ValueChooserProps> = fc("ColorValueChooser") { props ->
     val handleChange: (Event) -> Unit = {
-        props.onValueChange((it.target as HTMLInputElement).value.asValue())
+        props.meta.value = (it.target as HTMLInputElement).value.asValue()
     }
     styledInput(type = InputType.color) {
         css {
@@ -148,9 +150,9 @@ public val ColorValueChooser: FC<ValueChooserProps> = fc("ColorValueChooser") {
             margin(0.px)
         }
         attrs {
-            this.value = props.value?.let { value ->
+            this.value = props.actual.value?.let { value ->
                 if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
-                else "#" + Color(value.string).getHexString()
+                else value.string
             } ?: "#000000"
             onChangeFunction = handleChange
         }

ui/ring/build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-    id("space.kscience.gradle.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
 
 kotlin{
-    js(IR){
+    js{
         useCommonJs()
         browser {
             commonWebpackConfig {

ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt

@@ -5,46 +5,39 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.css.*
 import react.*
-import react.dom.b
 import react.dom.div
-import react.dom.p
 import react.dom.span
 import ringui.*
-import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.isEmpty
 import space.kscience.dataforge.names.length
 import space.kscience.visionforge.*
-import space.kscience.visionforge.react.*
+import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.flexRow
+import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.SolidGroup
-import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.solidGroup
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
 
 public external interface ThreeCanvasWithControlsProps : Props {
-    public var solids: Solids
+    public var context: Context
     public var builderOfSolid: Deferred<Solid?>
     public var selected: Name?
     public var options: Canvas3DOptions?
     public var additionalTabs: Map<String, RBuilder.() -> Unit>?
 }
 
-private val ThreeCanvasWithControlsProps.context get() = solids.context
-
 public fun ThreeCanvasWithControlsProps.solid(block: SolidGroup.() -> Unit) {
     builderOfSolid = context.async {
-        solids.solidGroup(null, block)
+        SolidGroup(block)
     }
 }
 
-public fun ThreeCanvasWithControlsProps.options(block: Canvas3DOptions.() -> Unit) {
-    options = Canvas3DOptions(block)
-}
-
 public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.() -> Unit) {
     additionalTabs = (additionalTabs ?: emptyMap()) + (title to block)
 }
@@ -84,7 +77,7 @@ public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): Unit = styled
 
 @JsExport
 public val ThreeCanvasWithControls: FC<ThreeCanvasWithControlsProps> = fc("ThreeViewWithControls") { props ->
-    var selected: Name? by useState { props.selected }
+    var selected by useState { props.selected }
     var solid: Solid? by useState(null)
 
     useEffect {
@@ -111,7 +104,7 @@ public val ThreeCanvasWithControls: FC<ThreeCanvasWithControlsProps> = fc("Three
         selected?.let {
             when {
                 it.isEmpty() -> solid
-                else -> (solid as? SolidGroup)?.get(it)
+                else -> (solid as? VisionGroup)?.get(it)
             }
         }
     }
@@ -167,31 +160,12 @@ public val ThreeCanvasWithControls: FC<ThreeCanvasWithControlsProps> = fc("Three
                             nameCrumbs(selected) { selected = it }
                         }
                         IslandContent {
-                            child(PropertyEditor) {
-                                attrs {
-                                    this.key = selected.toString()
-                                    this.meta = vision.properties.root()
-                                    this.updates = vision.properties.changes
-                                    this.descriptor = vision.descriptor
-                                    this.scope = props.context
-                                    this.getPropertyState = { name ->
-                                        if (vision.properties.own?.get(name) != null) {
-                                            EditorPropertyState.Defined
-                                        } else if (vision.properties.root()[name] != null) {
-                                            // TODO differentiate
-                                            EditorPropertyState.Default()
-                                        } else {
-                                            EditorPropertyState.Undefined
-                                        }
-                                    }
-                                }
-                            }
-                            vision.styles.takeIf { it.isNotEmpty() }?.let { styles ->
-                                p {
-                                    b { +"Styles: " }
-                                    +styles.joinToString(separator = ", ")
-                                }
-                            }
+                            propertyEditor(
+                                ownProperties = vision.meta,
+                                allProperties = vision.computeProperties(),
+                                descriptor = vision.descriptor,
+                                key = selected
+                            )
                         }
                     }
                 }

ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt

@@ -2,7 +2,7 @@ package space.kscience.visionforge.ring
 
 import kotlinx.coroutines.async
 import org.w3c.dom.Element
-import react.dom.client.createRoot
+import react.child
 import space.kscience.dataforge.context.AbstractPlugin
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.PluginFactory
@@ -12,7 +12,6 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.visionforge.ElementVisionRenderer
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.react.render
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.three.ThreePlugin
 import kotlin.reflect.KClass
@@ -26,10 +25,10 @@ public class ThreeWithControlsPlugin : AbstractPlugin(), ElementVisionRenderer {
         if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING * 2 else ElementVisionRenderer.ZERO_RATING
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
-        createRoot(element).render {
+        react.dom.render(element) {
             child(ThreeCanvasWithControls) {
                 attrs {
-                    this.solids = three.solids
+                    this.context = this@ThreeWithControlsPlugin.context
                     this.builderOfSolid = context.async { vision as Solid}
                 }
             }
@@ -46,7 +45,6 @@ public class ThreeWithControlsPlugin : AbstractPlugin(), ElementVisionRenderer {
     public companion object : PluginFactory<ThreeWithControlsPlugin> {
         override val tag: PluginTag = PluginTag("vision.threejs.withControls", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<ThreeWithControlsPlugin> = ThreeWithControlsPlugin::class
-
-        override fun build(context: Context, meta: Meta): ThreeWithControlsPlugin = ThreeWithControlsPlugin()
+        override fun invoke(meta: Meta, context: Context): ThreeWithControlsPlugin = ThreeWithControlsPlugin()
     }
 }

ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt

@@ -2,18 +2,18 @@ package space.kscience.visionforge.ring
 
 import org.w3c.dom.Element
 import react.RBuilder
-import react.dom.client.createRoot
 import react.dom.p
-import react.key
+import react.dom.render
 import ringui.Island
 import ringui.SmartTabs
 import ringui.Tab
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.get
 import space.kscience.visionforge.Vision
+import space.kscience.visionforge.computeProperties
 import space.kscience.visionforge.getStyle
-import space.kscience.visionforge.react.*
-import space.kscience.visionforge.root
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.metaViewer
+import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.SolidReference
 import space.kscience.visionforge.styles
 
@@ -30,25 +30,12 @@ public fun RBuilder.ringPropertyEditor(
 
     flexColumn {
         Island("Properties") {
-            child(PropertyEditor) {
-                attrs {
-                    this.key = key?.toString()
-                    this.meta = vision.properties.root()
-                    this.updates = vision.properties.changes
-                    this.descriptor = descriptor
-                    this.scope = vision.manager?.context ?: error("Orphan vision could not be observed")
-                    this.getPropertyState = {name->
-                        if(vision.properties.own?.get(name)!= null){
-                            EditorPropertyState.Defined
-                        } else if(vision.properties.root()[name] != null){
-                            // TODO differentiate
-                            EditorPropertyState.Default()
-                        } else {
-                            EditorPropertyState.Undefined
-                        }
-                    }
-                }
-            }
+            propertyEditor(
+                ownProperties = vision.meta,
+                allProperties = vision.computeProperties(),
+                descriptor = descriptor,
+                key = key
+            )
         }
 
         if (styles.isNotEmpty()) {
@@ -85,6 +72,6 @@ public fun RBuilder.ringPropertyEditor(
 public fun Element.ringPropertyEditor(
     item: Vision,
     descriptor: MetaDescriptor? = item.descriptor,
-): Unit = createRoot(this).render {
+): Unit = render(this) {
     ringPropertyEditor(item, descriptor = descriptor)
 }

ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt

@@ -1,7 +1,5 @@
 package space.kscience.visionforge.ring
 
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
 import kotlinx.css.BorderStyle
 import kotlinx.css.Color
 import kotlinx.css.padding
@@ -20,6 +18,7 @@ import react.fc
 import ringui.Island
 import ringui.SmartTabs
 import ringui.Tab
+import space.kscience.dataforge.meta.withDefault
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.encodeToString
@@ -53,7 +52,6 @@ internal external interface CanvasControlsProps : Props {
     public var vision: Vision?
 }
 
-@OptIn(DelicateCoroutinesApi::class)
 internal val CanvasControls: FC<CanvasControlsProps> = fc("CanvasControls") { props ->
     flexColumn {
         flexRow {
@@ -77,8 +75,8 @@ internal val CanvasControls: FC<CanvasControlsProps> = fc("CanvasControls") { pr
             }
         }
         propertyEditor(
-            scope = props.vision?.manager?.context ?: GlobalScope,
-            properties = props.options.meta,
+            ownProperties = props.options.meta,
+            allProperties = props.options.meta.withDefault(Canvas3DOptions.descriptor.defaultNode),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )

visionforge-core/api/visionforge-core.api

@@ -183,7 +183,7 @@ public class space/kscience/visionforge/SimpleVisionPropertyContainer : space/ks
 	public fun <init> (Lspace/kscience/dataforge/meta/ObservableMutableMeta;)V
 	public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta;
 	public fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta;
-	public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
+	public fun getPropertyValue (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
 }
 
 public final class space/kscience/visionforge/StyleReference {
@@ -241,8 +241,8 @@ public abstract interface class space/kscience/visionforge/Vision : space/kscien
 	public fun getManager ()Lspace/kscience/visionforge/VisionManager;
 	public abstract fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta;
 	public abstract fun getParent ()Lspace/kscience/visionforge/VisionGroup;
-	public abstract fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
-	public static synthetic fun getProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
+	public abstract fun getPropertyValue (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
+	public static synthetic fun getPropertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
 	public abstract fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V
 	public abstract fun setParent (Lspace/kscience/visionforge/VisionGroup;)V
 	public abstract fun update (Lspace/kscience/visionforge/VisionChange;)V
@@ -266,7 +266,7 @@ public class space/kscience/visionforge/VisionBase : space/kscience/visionforge/
 	protected final fun getOrCreateProperties ()Lspace/kscience/dataforge/meta/MutableMeta;
 	public fun getParent ()Lspace/kscience/visionforge/VisionGroup;
 	protected final fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta;
-	public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
+	public fun getPropertyValue (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
 	public fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V
 	public fun setParent (Lspace/kscience/visionforge/VisionGroup;)V
 	protected final fun setProperties (Lspace/kscience/dataforge/meta/MutableMeta;)V
@@ -446,8 +446,8 @@ public final class space/kscience/visionforge/VisionGroupKt {
 
 public final class space/kscience/visionforge/VisionKt {
 	public static final fun getPropertyChanges (Lspace/kscience/visionforge/Vision;)Lkotlinx/coroutines/flow/Flow;
-	public static final fun getProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZ)Lspace/kscience/dataforge/values/Value;
-	public static synthetic fun getProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
+	public static final fun getPropertyValue (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZ)Lspace/kscience/dataforge/values/Value;
+	public static synthetic fun getPropertyValue$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
 	public static final fun getVisible (Lspace/kscience/visionforge/Vision;)Ljava/lang/Boolean;
 	public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlin/jvm/functions/Function2;)V
 	public static final fun setProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Object;)V
@@ -499,8 +499,8 @@ public abstract class space/kscience/visionforge/VisionPlugin : space/kscience/d
 
 public abstract interface class space/kscience/visionforge/VisionPropertyContainer {
 	public abstract fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta;
-	public abstract fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
-	public static synthetic fun getProperty$default (Lspace/kscience/visionforge/VisionPropertyContainer;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
+	public abstract fun getPropertyValue (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
+	public static synthetic fun getPropertyValue$default (Lspace/kscience/visionforge/VisionPropertyContainer;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
 }
 
 public final class space/kscience/visionforge/html/HeadersKt {

visionforge-core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("space.kscience.gradle.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 val dataforgeVersion: String by rootProject.extra
@@ -13,11 +13,6 @@ kotlin {
                 api("org.jetbrains.kotlin-wrappers:kotlin-css")
             }
         }
-        commonTest{
-            dependencies{
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${space.kscience.gradle.KScienceVersions.coroutinesVersion}")
-            }
-        }
         jsMain {
             dependencies {
                 api("org.jetbrains.kotlin-wrappers:kotlin-extensions")
@@ -33,5 +28,5 @@ kscience{
 }
 
 readme{
-    maturity = space.kscience.gradle.Maturity.DEVELOPMENT
+    maturity = ru.mipt.npm.gradle.Maturity.DEVELOPMENT
 }

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/AbstractVision.kt

@@ -1,30 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-
-
-@Serializable
-public abstract class AbstractVision : Vision {
-
-    @Transient
-    override var parent: Vision? = null
-
-    @SerialName("properties")
-    protected var propertiesInternal: MutableMeta? = null
-
-    final override val properties: MutableVisionProperties by lazy {
-        object : AbstractVisionProperties(this) {
-            override var properties: MutableMeta?
-                get() = propertiesInternal
-                set(value) {
-                    propertiesInternal = value
-                }
-        }
-    }
-
-    override val descriptor: MetaDescriptor? get() = null
-}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt

@@ -1,6 +1,11 @@
 package space.kscience.visionforge
 
-import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.number
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.int
+import space.kscience.dataforge.values.string
 import kotlin.math.max
 
 /**

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/ComputedVisionProperties.kt

@@ -0,0 +1,84 @@
+package space.kscience.visionforge
+
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.MutableValueProvider
+import space.kscience.dataforge.values.Value
+
+private class ComputedVisionProperties(
+    val vision: Vision,
+    val pathName: Name,
+    val visionDescriptor: MetaDescriptor,
+    val parentInheritFlag: Boolean?,
+    val parentStylesFlag: Boolean?
+) : Meta {
+
+    val descriptor: MetaDescriptor? by lazy { visionDescriptor[pathName] }
+
+    override val items: Map<NameToken, Meta>
+        get() {
+            val metaKeys = vision.meta.getMeta(pathName)?.items?.keys ?: emptySet()
+            val descriptorKeys = descriptor?.children?.map { NameToken(it.key) } ?: emptySet()
+            val inheritFlag = descriptor?.inherited ?: parentInheritFlag
+            val stylesFlag = descriptor?.usesStyles ?: parentStylesFlag
+            return (metaKeys + descriptorKeys).associateWith {
+                ComputedVisionProperties(
+                    vision,
+                    pathName + it,
+                    visionDescriptor,
+                    inheritFlag,
+                    stylesFlag
+                )
+            }
+        }
+
+    override val value: Value?
+        get() {
+            val inheritFlag = descriptor?.inherited ?: parentInheritFlag ?: false
+            val stylesFlag = descriptor?.usesStyles ?: parentStylesFlag ?: true
+            return vision.getPropertyValue(pathName, inheritFlag, stylesFlag, true)
+        }
+
+    override fun toString(): String = Meta.toString(this)
+    override fun equals(other: Any?): Boolean = Meta.equals(this, other as? Meta)
+    override fun hashCode(): Int = Meta.hashCode(this)
+}
+
+/**
+ * Compute property node based on inheritance and style information from the descriptor
+ */
+public fun Vision.computeProperties(descriptor: MetaDescriptor? = this.descriptor): Meta =
+    if (descriptor == null) meta else ComputedVisionProperties(this, Name.EMPTY, descriptor, null, null)
+
+public fun Vision.computePropertyNode(
+    name: Name,
+    descriptor: MetaDescriptor? = this.descriptor
+): Meta? = computeProperties(descriptor)[name]
+
+/**
+ * Compute the property based on the provided value descriptor. By default, use Vision own descriptor
+ */
+public fun Vision.computeProperty(name: Name, valueDescriptor: MetaDescriptor? = descriptor?.get(name)): Value? {
+    val inheritFlag = valueDescriptor?.inherited ?: false
+    val stylesFlag = valueDescriptor?.usesStyles ?: true
+    return getPropertyValue(name, inheritFlag, stylesFlag)
+}
+
+/**
+ * Accessor to all vision properties
+ */
+public fun Vision.computePropertyValues(
+    descriptor: MetaDescriptor? = this.descriptor
+): MutableValueProvider = object : MutableValueProvider {
+    override fun getValue(name: Name): Value? = computeProperty(name, descriptor?.get(name))
+
+    override fun setValue(name: Name, value: Value?) {
+        setProperty(name, value)
+    }
+}
+

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt

@@ -9,7 +9,7 @@ import kotlin.properties.ReadOnlyProperty
 /**
  * A reference to a style defined in a specific container
  */
-public class StyleReference(public val owner: Vision, public val name: String)
+public class StyleReference(public val owner: VisionGroup, public val name: String)
 
 private tailrec fun styleIsDefined(vision: Vision, reference: StyleReference): Boolean = when {
     reference.owner === vision -> true
@@ -18,14 +18,14 @@ private tailrec fun styleIsDefined(vision: Vision, reference: StyleReference): B
 }
 
 @VisionBuilder
-public fun Vision.useStyle(reference: StyleReference, notify: Boolean = true) {
+public fun Vision.useStyle(reference: StyleReference) {
     //check that style is defined in a parent
     //check(styleIsDefined(this, reference)) { "Style reference does not belong to a Vision parent" }
-    useStyle(reference.name, notify)
+    useStyle(reference.name)
 }
 
 @VisionBuilder
-public fun Vision.style(
+public fun VisionGroup.style(
     styleKey: String? = null,
     builder: MutableMeta.() -> Unit,
 ): ReadOnlyProperty<Any?, StyleReference> = ReadOnlyProperty { _, property ->
@@ -35,7 +35,7 @@ public fun Vision.style(
 }
 
 @VisionBuilder
-public fun <T : Scheme> Vision.style(
+public fun <T : Scheme> VisionGroup.style(
     spec: Specification<T>,
     styleKey: String? = null,
     builder: T.() -> Unit,

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt

@@ -5,17 +5,20 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.stringList
 import kotlin.jvm.JvmInline
 
 /**
  * A container for styles
  */
 @JvmInline
-public value class StyleSheet(private val owner: Vision) {
+public value class StyleSheet(private val owner: VisionGroup) {
 
-    private val styleNode: Meta get() = owner.properties.getProperty(STYLESHEET_KEY)
+    private val styleNode: Meta? get() = owner.meta[STYLESHEET_KEY]
 
-    public val items: Map<NameToken, Meta> get() = styleNode.items
+    public val items: Map<NameToken, Meta>? get() = styleNode?.items
 
     public operator fun get(key: String): Meta? = owner.getStyle(key)
 
@@ -23,7 +26,7 @@ public value class StyleSheet(private val owner: Vision) {
      * Define a style without notifying owner
      */
     public fun define(key: String, style: Meta?) {
-        owner.properties.setProperty(STYLESHEET_KEY + key, style)
+        owner.meta.setMeta(STYLESHEET_KEY + key, style)
     }
 
     /**
@@ -40,7 +43,7 @@ public value class StyleSheet(private val owner: Vision) {
     /**
      * Create and set a style
      */
-    public fun update(key: String, builder: MutableMeta.() -> Unit) {
+    public operator fun set(key: String, builder: MutableMeta.() -> Unit) {
         val newStyle = get(key)?.toMutableMeta()?.apply(builder) ?: Meta(builder)
         set(key, newStyle.seal())
     }
@@ -56,48 +59,49 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
         val tokens: Collection<Name> =
             ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
                 .map { it.asName() }
-        tokens.forEach { parent?.properties?.invalidate(it) }
+        tokens.forEach { parent?.invalidateProperty(it) }
     }
-    children?.forEach { _, vision ->
-        vision.styleChanged(key, oldStyle, newStyle)
+    if (this is VisionGroup) {
+        for (obj in this) {
+            obj.styleChanged(key, oldStyle, newStyle)
         }
     }
+}
+
 
 /**
  * List of names of styles applied to this object. Order matters. Not inherited.
  */
 public var Vision.styles: List<String>
-    get() = properties.getValue(Vision.STYLE_KEY, inherit = false, includeStyles = false)?.stringList ?: emptyList()
+    get() = meta.getValue(Vision.STYLE_KEY)?.stringList ?: emptyList()
     set(value) {
-        properties.setValue(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
+        meta.setValue(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
     }
 
 /**
  * A stylesheet for this group and its descendants. Stylesheet is not applied directly,
  * but instead is just a repository for named configurations.
  */
-public val Vision.styleSheet: StyleSheet get() = StyleSheet(this)
+public val VisionGroup.styleSheet: StyleSheet get() = StyleSheet(this)
 
 /**
- * Add style name to the list of styles to be resolved later.
- * The style with given name does not necessary exist at the moment.
+ * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
-public fun Vision.useStyle(name: String, notify: Boolean = true) {
-    val newStyle = properties.own?.get(Vision.STYLE_KEY)?.value?.list?.plus(name.asValue()) ?: listOf(name.asValue())
-    properties.setValue(Vision.STYLE_KEY, newStyle.asValue(), notify)
+public fun Vision.useStyle(name: String) {
+    styles = (meta.getMeta(Vision.STYLE_KEY)?.stringList ?: emptyList()) + name
 }
 
 
 /**
- * Resolve a style with given name for given [Vision]. The style is not necessarily applied to this [Vision].
+ * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
  */
-public fun Vision.getStyle(name: String): Meta? =
-    properties.own?.getMeta(StyleSheet.STYLESHEET_KEY + name) ?: parent?.getStyle(name)
+public tailrec fun Vision.getStyle(name: String): Meta? =
+    meta.getMeta(StyleSheet.STYLESHEET_KEY + name) ?: parent?.getStyle(name)
 
 /**
  * Resolve a property from all styles
  */
-public fun Vision.getStyleProperty(name: Name): Meta? = styles.firstNotNullOfOrNull { getStyle(it)?.get(name) }
+public fun Vision.getStyleProperty(name: Name): Value? = styles.firstNotNullOfOrNull { getStyle(it)?.get(name)?.value }
 
 /**
  * Resolve an item in all style layers

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt

@@ -1,73 +1,147 @@
 package space.kscience.visionforge
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import space.kscience.dataforge.meta.asValue
-import space.kscience.dataforge.meta.boolean
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.launch
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.Described
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.misc.Type
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
-import space.kscience.visionforge.AbstractVisionGroup.Companion.updateProperties
+import space.kscience.dataforge.names.startsWith
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.boolean
 import space.kscience.visionforge.Vision.Companion.TYPE
+import kotlin.reflect.KProperty1
 
 /**
  * A root type for display hierarchy
  */
 @Type(TYPE)
-public interface Vision : Described {
+public interface Vision : Described, Configurable {
 
     /**
      * The parent object of this one. If null, this one is a root.
      */
-    public var parent: Vision?
+    public var parent: VisionGroup?
 
     /**
      * Owner [VisionManager]. Used to define coroutine scope a serialization
      */
     public val manager: VisionManager? get() = parent?.manager
 
+    /**
+     * This Vision own properties (ignoring inheritance, styles and defaults)
+     */
+    override val meta: ObservableMutableMeta
 
-    public val properties: MutableVisionProperties
+    /**
+     * Get property value with given layer flags.
+     * @param inherit toggles parent node property lookup. Null means inference from descriptor. Default is false.
+     * @param includeStyles toggles inclusion of properties from styles. default is true
+     */
+    public fun getPropertyValue(
+        name: Name,
+        inherit: Boolean = false,
+        includeStyles: Boolean = true,
+        includeDefaults: Boolean = true,
+    ): Value?
+
+
+    /**
+     * Notify all listeners that a property has been changed and should be invalidated
+     */
+    public fun invalidateProperty(propertyName: Name)
 
     /**
      * Update this vision using a dif represented by [VisionChange].
      */
-    public fun update(change: VisionChange) {
-        change.properties?.let {
-            updateProperties(it, Name.EMPTY)
-        }
-    }
+    public fun update(change: VisionChange)
 
     override val descriptor: MetaDescriptor?
 
     public companion object {
         public const val TYPE: String = "vision"
         public val STYLE_KEY: Name = "@style".asName()
-        public const val STYLE_TARGET: String = "style"
 
         public val VISIBLE_KEY: Name = "visible".asName()
     }
 }
 
 /**
- * Control visibility of the element
+ * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
+ * if it should include inherited properties etc.
  */
-public var Vision.visible: Boolean?
-    get() = properties.getValue(Vision.VISIBLE_KEY)?.boolean
-    set(value) {
-        properties.setValue(Vision.VISIBLE_KEY, value?.asValue())
+@OptIn(ExperimentalCoroutinesApi::class)
+@DFExperimental
+public val Vision.propertyChanges: Flow<Name>
+    get() = callbackFlow {
+        meta.onChange(this) { name ->
+            launch {
+                send(name)
+            }
+        }
+        awaitClose {
+            meta.removeListener(this)
+        }
     }
 
 /**
  * Subscribe on property updates. The subscription is bound to the given scope and canceled when the scope is canceled
  */
-public fun Vision.onPropertyChange(
-    scope: CoroutineScope? = manager?.context,
-    callback: (Name) -> Unit
-): Job = properties.changes.onEach {
-    callback(it)
-}.launchIn(scope ?: error("Orphan Vision can't observe properties"))
+public fun Vision.onPropertyChange(callback: Meta.(Name) -> Unit) {
+    meta.onChange(null, callback)
+}
+
+/**
+ * Get [Vision] property using key as a String
+ */
+public fun Vision.getPropertyValue(
+    key: String,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+): Value? = getPropertyValue(Name.parse(key), inherit, includeStyles, includeDefaults)
+
+/**
+ * A convenience method to set property node or value. If Item is null, then node is removed, not a value
+ */
+public fun Vision.setProperty(name: Name, item: Any?) {
+    when (item) {
+        null -> meta.remove(name)
+        is Meta -> meta.setMeta(name, item)
+        is Value -> meta.setValue(name, item)
+        else -> meta.setValue(name, Value.of(item))
+    }
+}
+
+public fun Vision.setPropertyNode(key: String, item: Any?) {
+    setProperty(Name.parse(key), item)
+}
+
+/**
+ * Control visibility of the element
+ */
+public var Vision.visible: Boolean?
+    get() = getPropertyValue(Vision.VISIBLE_KEY)?.boolean
+    set(value) = meta.setValue(Vision.VISIBLE_KEY, value?.asValue())
+
+
+public fun <V : Vision, T> V.useProperty(
+    property: KProperty1<V, T>,
+    owner: Any? = null,
+    callBack: V.(T) -> Unit,
+) {
+    //Pass initial value.
+    callBack(property.get(this))
+    meta.onChange(owner) { name ->
+        if (name.startsWith(property.name.asName())) {
+            callBack(property.get(this@useProperty))
+        }
+    }
+}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt

@@ -0,0 +1,176 @@
+package space.kscience.visionforge
+
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MutableMeta
+import space.kscience.dataforge.meta.ObservableMutableMeta
+import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.meta.descriptors.value
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.*
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.ValueType
+import space.kscience.visionforge.Vision.Companion.STYLE_KEY
+import kotlin.jvm.Synchronized
+
+internal data class MetaListener(
+    val owner: Any? = null,
+    val callback: Meta.(name: Name) -> Unit,
+)
+
+/**
+ * A full base implementation for a [Vision]
+ * @param parent the parent object for this vision. Could've set later. Not serialized.
+ */
+@Serializable
+@SerialName("vision")
+public open class VisionBase(
+    @Transient override var parent: VisionGroup? = null,
+    @EncodeDefault protected var properties: MutableMeta? = null,
+) : Vision {
+
+    @Synchronized
+    protected fun getOrCreateProperties(): MutableMeta {
+        if (properties == null) {
+            val newProperties = MutableMeta()
+            properties = newProperties
+        }
+        return properties!!
+    }
+
+    @Transient
+    private val listeners: MutableList<MetaListener> = mutableListOf()
+
+    private inner class VisionProperties(val pathName: Name) : ObservableMutableMeta {
+
+        override val items: Map<NameToken, ObservableMutableMeta>
+            get() = properties?.get(pathName)?.items?.mapValues { entry ->
+                VisionProperties(pathName + entry.key)
+            } ?: emptyMap()
+
+        override var value: Value?
+            get() = properties?.get(pathName)?.value
+            set(value) {
+                val oldValue = properties?.get(pathName)?.value
+                getOrCreateProperties().setValue(pathName, value)
+                if (oldValue != value) {
+                    invalidate(Name.EMPTY)
+                }
+            }
+
+        override fun getOrCreate(name: Name): ObservableMutableMeta = VisionProperties(pathName + name)
+
+        override fun setMeta(name: Name, node: Meta?) {
+            getOrCreateProperties().setMeta(pathName + name, node)
+            invalidate(name)
+        }
+
+        @DFExperimental
+        override fun attach(name: Name, node: ObservableMutableMeta) {
+            val ownProperties = getOrCreateProperties()
+            if (ownProperties is ObservableMutableMeta) {
+                ownProperties.attach(pathName + name, node)
+            } else {
+                ownProperties.setMeta(pathName + name, node)
+                node.onChange(this) { childName ->
+                    ownProperties.setMeta(pathName + name + childName, this[childName])
+                }
+            }
+        }
+
+        override fun invalidate(name: Name) {
+            invalidateProperty(pathName + name)
+        }
+
+        @Synchronized
+        override fun onChange(owner: Any?, callback: Meta.(name: Name) -> Unit) {
+            if (pathName.isEmpty()) {
+                listeners.add((MetaListener(owner, callback)))
+            } else {
+                listeners.add(MetaListener(owner) { name ->
+                    if (name.startsWith(pathName)) {
+                        (this@MetaListener[pathName] ?: Meta.EMPTY).callback(name.removeHeadOrNull(pathName)!!)
+                    }
+                })
+            }
+        }
+
+        @Synchronized
+        override fun removeListener(owner: Any?) {
+            listeners.removeAll { it.owner === owner }
+        }
+
+        override fun toString(): String = Meta.toString(this)
+        override fun equals(other: Any?): Boolean = Meta.equals(this, other as? Meta)
+        override fun hashCode(): Int = Meta.hashCode(this)
+    }
+
+    final override val meta: ObservableMutableMeta get() = VisionProperties(Name.EMPTY)
+
+    override fun getPropertyValue(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean,
+    ): Value? {
+        properties?.get(name)?.value?.let { return it }
+        if (includeStyles) {
+            getStyleProperty(name)?.let { return it }
+        }
+        if (inherit) {
+            parent?.getPropertyValue(name, inherit, includeStyles, includeDefaults)?.let { return it }
+        }
+        if (includeDefaults) {
+            descriptor?.defaultNode?.get(name)?.value.let { return it }
+        }
+        return null
+    }
+
+    override val descriptor: MetaDescriptor? get() = null
+
+    override fun invalidateProperty(propertyName: Name) {
+        if (propertyName == STYLE_KEY) {
+            styles.mapNotNull { getStyle(it) }.asSequence()
+                .flatMap { it.items.asSequence() }
+                .distinctBy { it.key }
+                .forEach {
+                    invalidateProperty(it.key.asName())
+                }
+        }
+        listeners.forEach { it.callback(properties ?: Meta.EMPTY, propertyName) }
+    }
+
+    override fun update(change: VisionChange) {
+        change.properties?.let {
+            updateProperties(Name.EMPTY, it)
+        }
+    }
+
+    public companion object {
+        public val descriptor: MetaDescriptor = MetaDescriptor {
+            value(STYLE_KEY, ValueType.STRING) {
+                multiple = true
+            }
+        }
+
+        public fun Vision.updateProperties(at: Name, item: Meta) {
+            meta.setValue(at, item.value)
+            item.items.forEach { (token, item) ->
+                updateProperties(at + token, item)
+            }
+        }
+
+    }
+}
+
+//fun VisualObject.findStyle(styleName: Name): Meta? {
+//    if (this is VisualGroup) {
+//        val style = resolveStyle(styleName)
+//        if (style != null) return style
+//    }
+//    return parent?.findStyle(styleName)
+//}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt

@@ -7,75 +7,54 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.isEmpty
 import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.Null
 import kotlin.jvm.Synchronized
 import kotlin.time.Duration
 
 /**
  * Create a deep copy of given Vision without external connections.
  */
-private fun Vision.deepCopy(manager: VisionManager): Vision {
-    if (this is NullVision) return NullVision
-
+private fun Vision.deepCopy(): Vision {
     //Assuming that unrooted visions are already isolated
+    val manager = this.manager ?: return this
     //TODO replace by efficient deep copy
     val json = manager.encodeToJsonElement(this)
     return manager.decodeFromJson(json)
 }
 
 /**
- * A vision used only in change propagation and showing that the target should be removed
+ * An update for a [Vision] or a [VisionGroup]
  */
-@Serializable
-public object NullVision : Vision {
-    override var parent: Vision?
-        get() = null
-        set(_) {
-            error("Can't set parent for null vision")
-        }
-
-    override val properties: MutableVisionProperties get() = error("Can't get properties of `NullVision`")
-
-    override val descriptor: MetaDescriptor? = null
-
-}
-
-
-/**
- * An update for a [Vision]
- */
-public class VisionChangeBuilder(private val manager: VisionManager) : MutableVisionContainer<Vision> {
+public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
 
+    private var reset: Boolean = false
     private var vision: Vision? = null
-    private var propertyChange = MutableMeta()
+    private val propertyChange = MutableMeta()
     private val children: HashMap<Name, VisionChangeBuilder> = HashMap()
 
     public fun isEmpty(): Boolean = propertyChange.isEmpty() && propertyChange.isEmpty() && children.isEmpty()
 
     @Synchronized
     private fun getOrPutChild(visionName: Name): VisionChangeBuilder =
-        children.getOrPut(visionName) { VisionChangeBuilder(manager) }
+        children.getOrPut(visionName) { VisionChangeBuilder() }
 
     public fun propertyChanged(visionName: Name, propertyName: Name, item: Meta?) {
         if (visionName == Name.EMPTY) {
             //Write property removal as [Null]
-            if (propertyName.isEmpty()) {
-                propertyChange = item?.toMutableMeta() ?: MutableMeta()
-            } else {
             propertyChange[propertyName] = (item ?: Meta(Null))
-            }
         } else {
             getOrPutChild(visionName).propertyChanged(Name.EMPTY, propertyName, item)
         }
     }
 
-    override fun setChild(name: Name?, child: Vision?) {
+    override fun set(name: Name?, child: Vision?) {
         if (name == null) error("Static children are not allowed in VisionChange")
         getOrPutChild(name).apply {
-            vision = child ?: NullVision
+            vision = child
+            reset = vision == null
         }
     }
 
@@ -83,28 +62,32 @@ public class VisionChangeBuilder(private val manager: VisionManager) : MutableVi
      * Isolate collected changes by creating detached copies of given visions
      */
     public fun deepCopy(): VisionChange = VisionChange(
-        vision?.deepCopy(manager),
+        reset,
+        vision?.deepCopy(),
         if (propertyChange.isEmpty()) null else propertyChange.seal(),
         if (children.isEmpty()) null else children.mapValues { it.value.deepCopy() }
     )
 }
 
 /**
- * @param vision a new value for vision content. If the Vision is to be removed should be [NullVision]
+ * @param delete flag showing that this vision child should be removed
+ * @param vision a new value for vision content
  * @param properties updated properties
  * @param children a map of children changed in ths [VisionChange]. If a child to be removed, set [delete] flag to true.
  */
 @Serializable
 public data class VisionChange(
+    public val delete: Boolean = false,
     public val vision: Vision? = null,
-    public val properties: Meta? = null,
+    @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
 )
 
-public inline fun VisionManager.VisionChange(block: VisionChangeBuilder.() -> Unit): VisionChange =
-    VisionChangeBuilder(this).apply(block).deepCopy()
+public inline fun VisionChange(block: VisionChangeBuilder.() -> Unit): VisionChange =
+    VisionChangeBuilder().apply(block).deepCopy()
 
 
+@OptIn(DFExperimental::class)
 private fun CoroutineScope.collectChange(
     name: Name,
     source: Vision,
@@ -112,26 +95,29 @@ private fun CoroutineScope.collectChange(
 ) {
 
     //Collect properties change
-    source.onPropertyChange(this) { propertyName ->
-        val newItem = source.properties.own?.get(propertyName)
+    source.onPropertyChange { propertyName ->
+        val newItem = source.meta[propertyName]
         collector().propertyChanged(name, propertyName, newItem)
     }
 
-    val children = source.children
+    if (source is VisionGroup) {
         //Subscribe for children changes
-    children?.forEach { token, child ->
+        source.children.forEach { (token, child) ->
             collectChange(name + token, child, collector)
         }
 
         //Subscribe for structure change
-    children?.changes?.onEach { changedName ->
-        val after = children[changedName]
+        if (source is MutableVisionGroup) {
+            source.structureChanges.onEach { changedName ->
+                val after = source[changedName]
                 val fullName = name + changedName
                 if (after != null) {
                     collectChange(fullName, after, collector)
                 }
-        collector().setChild(fullName, after)
-    }?.launchIn(this)
+                collector()[fullName] = after
+            }.launchIn(this)
+        }
+    }
 }
 
 /**
@@ -140,14 +126,13 @@ private fun CoroutineScope.collectChange(
 public fun Vision.flowChanges(
     collectionDuration: Duration,
 ): Flow<VisionChange> = flow {
-    val manager = manager ?: error("Orphan vision could not collect changes")
 
-    var collector = VisionChangeBuilder(manager)
+    var collector = VisionChangeBuilder()
     coroutineScope {
         collectChange(Name.EMPTY, this@flowChanges) { collector }
 
         //Send initial vision state
-        val initialChange = VisionChange(vision = deepCopy(manager))
+        val initialChange = VisionChange(vision = deepCopy())
         emit(initialChange)
 
         while (currentCoroutineContext().isActive) {
@@ -158,7 +143,7 @@ public fun Vision.flowChanges(
                 //emit changes
                 emit(collector.deepCopy())
                 //Reset the collector
-                collector = VisionChangeBuilder(manager)
+                collector = VisionChangeBuilder()
             }
         }
     }

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionContainer.kt

@@ -1,217 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import space.kscience.dataforge.names.*
-import space.kscience.visionforge.VisionChildren.Companion.STATIC_TOKEN_BODY
-import kotlin.jvm.Synchronized
-
-@DslMarker
-public annotation class VisionBuilder
-
-public interface VisionContainer<out V : Vision> {
-    public fun getChild(name: Name): V?
-}
-
-public interface MutableVisionContainer<in V : Vision> {
-    //TODO add documentation
-    public fun setChild(name: Name?, child: V?)
-}
-
-/**
- * A serializable representation of [Vision] children container
- */
-public interface VisionChildren : VisionContainer<Vision> {
-    public val group: Vision?
-
-    public val keys: Set<NameToken>
-
-    public val values: Iterable<Vision> get() = keys.map { get(it)!! }
-
-    public val changes: Flow<Name>
-
-    public operator fun get(token: NameToken): Vision?
-
-    override fun getChild(name: Name): Vision? = when (name.length) {
-        0 -> group
-        1 -> get(name.first())
-        else -> get(name.first())?.children?.getChild(name.cutFirst())
-    }
-
-    public companion object {
-        public const val STATIC_TOKEN_BODY: String = "@static"
-
-        public fun empty(owner: Vision): VisionChildren = object : VisionChildren {
-            override val group: Vision get() = owner
-            override val keys: Set<NameToken> get() = emptySet()
-            override val changes: Flow<Name> get() = emptyFlow()
-            override fun get(token: NameToken): Vision? = null
-        }
-    }
-}
-
-public operator fun VisionChildren.get(name: Name): Vision? = getChild(name)
-public operator fun VisionChildren.get(name: String): Vision? = getChild(name)
-
-
-public fun VisionChildren.isEmpty(): Boolean = keys.isEmpty()
-
-public inline fun VisionChildren.forEach(block: (NameToken, Vision) -> Unit) {
-    keys.forEach { block(it, get(it)!!) }
-}
-
-public interface MutableVisionChildren : VisionChildren, MutableVisionContainer<Vision> {
-
-    public override val group: MutableVisionGroup
-
-    public operator fun set(token: NameToken, value: Vision?)
-
-    override fun setChild(name: Name?, child: Vision?) {
-        when {
-            name == null -> {
-                if (child != null) {
-                    static(child)
-                }
-            }
-
-            name.isEmpty() -> error("Empty names are not allowed in VisionGroup::set")
-            name.length == 1 -> {
-                val token = name.tokens.first()
-                set(token, child)
-            }
-
-            else -> {
-                val currentParent = get(name.first())
-                if (currentParent != null && currentParent !is MutableVisionGroup) error("Can't assign a child to $currentParent")
-                val parent: MutableVisionGroup = currentParent as? MutableVisionGroup ?: group.createGroup().also {
-                    set(name.first(), it)
-                }
-                parent.children.setChild(name.cutFirst(), child)
-            }
-        }
-    }
-
-    public fun clear()
-}
-
-public operator fun MutableVisionChildren.set(name: Name?, vision: Vision?) {
-    setChild(name, vision)
-}
-
-public operator fun MutableVisionChildren.set(name: String?, vision: Vision?) {
-    setChild(name, vision)
-}
-
-
-/**
- * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
- */
-public fun MutableVisionChildren.static(child: Vision) {
-    set(NameToken(STATIC_TOKEN_BODY, index = child.hashCode().toString()), child)
-}
-
-public fun VisionChildren.asSequence(): Sequence<Pair<NameToken, Vision>> = sequence {
-    keys.forEach { yield(it to get(it)!!) }
-}
-
-public operator fun VisionChildren.iterator(): Iterator<Pair<NameToken, Vision>> = asSequence().iterator()
-
-public fun <V : Vision> VisionContainer<V>.getChild(str: String): V? = getChild(Name.parse(str))
-
-public fun <V : Vision> MutableVisionContainer<V>.setChild(
-    str: String?, vision: V?,
-): Unit = setChild(str?.parseAsName(), vision)
-
-internal abstract class VisionChildrenImpl(
-    override val group: MutableVisionGroup,
-) : MutableVisionChildren {
-
-    private val updateJobs = HashMap<NameToken, Job>()
-
-    abstract var items: MutableMap<NameToken, Vision>?
-
-    @Synchronized
-    private fun buildItems(): MutableMap<NameToken, Vision> {
-        if (items == null) {
-            items = LinkedHashMap()
-        }
-        return items!!
-    }
-
-    private val scope: CoroutineScope? get() = group.manager?.context
-
-    override val keys: Set<NameToken> get() = items?.keys ?: emptySet()
-
-    override fun get(token: NameToken): Vision? = items?.get(token)
-
-    private val _changes = MutableSharedFlow<Name>()
-    override val changes: SharedFlow<Name> get() = _changes
-
-    private fun onChange(name: Name) {
-        scope?.launch {
-            _changes.emit(name)
-        }
-    }
-
-    override operator fun set(token: NameToken, value: Vision?) {
-        //fast return if value equals existing
-        if (value == get(token)) return
-
-        val currentUpdateJob = updateJobs[token]
-        if (currentUpdateJob != null) {
-            currentUpdateJob.cancel()
-            updateJobs.remove(token)
-        }
-
-        if (value == null) {
-            items?.remove(token)
-        } else {
-            (items ?: buildItems())[token] = value
-            //check if parent already exists and is different from the current one
-            if (value.parent != null && value.parent != group) error("Can't reassign parent Vision for $value")
-            //set parent
-            value.parent = group
-            //start update jobs (only if the vision is rooted)
-            scope?.let { scope ->
-                val job = value.children?.changes?.onEach {
-                    onChange(token + it)
-                }?.launchIn(scope)
-                if (job != null) {
-                    updateJobs[token] = job
-                }
-            }
-        }
-
-        onChange(token.asName())
-    }
-
-    override fun clear() {
-        items?.forEach { set(it.key, null) }
-//        if (!items.isNullOrEmpty()) {
-//            updateJobs.values.forEach {
-//                it.cancel()
-//            }
-//            updateJobs.clear()
-//            items?.clear()
-//        }
-    }
-}
-//
-//internal object VisionChildrenContainerSerializer : KSerializer<MutableVisionChildren> {
-//    private val mapSerializer = serializer<Map<NameToken, Vision>>()
-//
-//    override val descriptor: SerialDescriptor = mapSerializer.descriptor
-//
-//    override fun deserialize(decoder: Decoder): MutableVisionChildren {
-//        val map = decoder.decodeSerializableValue(mapSerializer)
-//        return VisionChildrenImpl(map)
-//    }
-//
-//    override fun serialize(encoder: Encoder, value: MutableVisionChildren) {
-//        val map = value.keys.associateWith { value[it]!! }
-//        encoder.encodeSerializableValue(mapSerializer, map)
-//    }
-//
-//}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt

@@ -1,119 +1,109 @@
 package space.kscience.visionforge
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.ValueType
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.value
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.names.parseAsName
-import space.kscience.dataforge.names.plus
-import space.kscience.visionforge.Vision.Companion.STYLE_KEY
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.launch
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.*
+import space.kscience.dataforge.provider.Provider
 
+@DslMarker
+public annotation class VisionBuilder
 
-public interface VisionGroup : Vision {
-    public val children: VisionChildren
+public interface VisionContainer<out V : Vision> {
+    public operator fun get(name: Name): V?
 }
 
-public interface MutableVisionGroup : VisionGroup {
-
-    override val children: MutableVisionChildren
-
-    public fun createGroup(): MutableVisionGroup
-}
-
-public val Vision.children: VisionChildren? get() = (this as? VisionGroup)?.children
-
 /**
- * A full base implementation for a [Vision]
+ * Represents a group of [Vision] instances
  */
-@Serializable
-public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
+public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
+    /**
+     * A map of top level named children
+     */
+    public val children: Map<NameToken, Vision>
 
-    override fun update(change: VisionChange) {
-        change.children?.forEach { (name, change) ->
-            when {
-                change.vision == NullVision -> children.setChild(name, null)
-                change.vision != null -> children.setChild(name, change.vision)
-                else -> children.getChild(name)?.update(change)
-            }
-        }
-        change.properties?.let {
-            updateProperties(it, Name.EMPTY)
+    override val defaultTarget: String get() = Vision.TYPE
+
+    /**
+     * A map of direct children for specific target
+     * (currently "visual" or "style")
+     */
+    override fun content(target: String): Map<Name, Any> =
+        when (target) {
+            Vision.TYPE -> children.flatMap { (key, value) ->
+                val res: Map<Name, Any> = if (value is VisionGroup) {
+                    value.content(target).mapKeys { key + it.key }
+                } else {
+                    mapOf(key.asName() to value)
                 }
+                res.entries
+            }.associate { it.toPair() }
+            STYLE_TARGET -> styleSheet.items?.mapKeys { it.key.asName() } ?: emptyMap()
+            else -> emptyMap()
         }
 
-    @SerialName("children")
-    protected var childrenInternal: MutableMap<NameToken, Vision>? = null
-
-
-    init {
-        childrenInternal?.forEach { it.value.parent = this }
-    }
-
-    override val children: MutableVisionChildren by lazy {
-        object : VisionChildrenImpl(this) {
-            override var items: MutableMap<NameToken, Vision>?
-                get() = this@AbstractVisionGroup.childrenInternal
-                set(value) {
-                    this@AbstractVisionGroup.childrenInternal = value
+    public override operator fun get(name: Name): Vision? {
+        return when {
+            name.isEmpty() -> this
+            name.length == 1 -> children[name.tokens.first()]
+            else -> (children[name.tokens.first()] as? VisionGroup)?.get(name.cutFirst())
         }
     }
-    }
-
-    abstract override fun createGroup(): AbstractVisionGroup
 
     public companion object {
-        public val descriptor: MetaDescriptor = MetaDescriptor {
-            value(STYLE_KEY, ValueType.STRING) {
-                multiple = true
-            }
-        }
-
-        public fun Vision.updateProperties(item: Meta, name: Name = Name.EMPTY) {
-            properties.setValue(name, item.value)
-            item.items.forEach { (token, item) ->
-                updateProperties(item, name + token)
-            }
-        }
-
+        public const val STYLE_TARGET: String = "style"
     }
 }
 
 /**
- * A simple vision group that just holds children. Nothing else.
+ * Iterate over children of this group
  */
-@Serializable
-@SerialName("vision.group")
-public class SimpleVisionGroup : AbstractVisionGroup(), MutableVisionContainer<Vision> {
-    override fun createGroup(): SimpleVisionGroup = SimpleVisionGroup()
+public operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.iterator()
 
-    override fun setChild(name: Name?, child: Vision?) {
-        children.setChild(name, child)
-    }
-}
+public fun VisionGroup.isEmpty(): Boolean = this.children.isEmpty()
 
-@VisionBuilder
-public inline fun MutableVisionContainer<Vision>.group(
-    name: Name? = null,
-    builder: SimpleVisionGroup.() -> Unit = {},
-): SimpleVisionGroup = SimpleVisionGroup().also { setChild(name, it) }.apply(builder)
+public interface VisionContainerBuilder<in V : Vision> {
+    //TODO add documentation
+    public operator fun set(name: Name?, child: V?)
+}
 
 /**
- * Define a group with given [name], attach it to this parent and return it.
+ * Mutable version of [VisionGroup]
  */
-@VisionBuilder
-public inline fun MutableVisionContainer<Vision>.group(
-    name: String,
-    builder: SimpleVisionGroup.() -> Unit = {},
-): SimpleVisionGroup = group(name.parseAsName(), builder)
+public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision> {
+    public fun onStructureChanged(owner: Any?, block: VisionGroup.(Name) -> Unit)
 
-//fun VisualObject.findStyle(styleName: Name): Meta? {
-//    if (this is VisualGroup) {
-//        val style = resolveStyle(styleName)
-//        if (style != null) return style
-//    }
-//    return parent?.findStyle(styleName)
-//}
+    public fun removeStructureListener(owner: Any?)
+}
+
+
+/**
+ * Flow structure changes of this group. Unconsumed changes are discarded
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+@DFExperimental
+public val MutableVisionGroup.structureChanges: Flow<Name>
+    get() = callbackFlow {
+        meta.onChange(this) { name ->
+            launch {
+                send(name)
+            }
+        }
+        awaitClose {
+            removeStructureListener(this)
+        }
+    }
+
+
+public operator fun <V : Vision> VisionContainer<V>.get(str: String): V? = get(Name.parse(str))
+
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit =
+    set(token.asName(), child)
+
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String?, child: V?): Unit =
+    set(key?.let(Name::parse), child)
+
+public fun MutableVisionGroup.removeAll(): Unit = children.keys.map { it.asName() }.forEach { this[it] = null }

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt

@@ -0,0 +1,168 @@
+package space.kscience.visionforge
+
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import space.kscience.dataforge.names.*
+import kotlin.jvm.Synchronized
+
+private class StructureChangeListener(val owner: Any?, val callback: VisionGroup.(Name) -> Unit)
+
+/**
+ * Abstract implementation of mutable group of [Vision]
+ *
+ * @param childrenInternal Internal mutable container for group children
+ */
+@Serializable
+@SerialName("vision.group")
+public open class VisionGroupBase(
+    @EncodeDefault @SerialName("children") protected val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(),
+) : VisionBase(), MutableVisionGroup {
+
+    /**
+     * A map of top level named children
+     */
+    override val children: Map<NameToken, Vision> get() = childrenInternal
+
+    init {
+        childrenInternal.forEach { (token, child) ->
+            if (child.parent != null && child.parent != this) error("Can't reassign existing parent for child $token")
+            child.parent = this
+        }
+    }
+
+    override fun invalidateProperty(propertyName: Name) {
+        super.invalidateProperty(propertyName)
+        for (obj in this) {
+            obj.invalidateProperty(propertyName)
+        }
+    }
+
+    @Transient
+    private val structureListeners = HashSet<StructureChangeListener>()
+
+    @Synchronized
+    override fun onStructureChanged(owner: Any?, block: VisionGroup.(Name) -> Unit) {
+        structureListeners.add(StructureChangeListener(owner, block))
+    }
+
+    @Synchronized
+    override fun removeStructureListener(owner: Any?) {
+        structureListeners.removeAll { it.owner == owner }
+    }
+
+    /**
+     * Propagate children change event upwards
+     */
+    protected fun childrenChanged(name: Name) {
+        structureListeners.forEach {
+            it.callback(this, name)
+        }
+    }
+
+    /**
+     * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
+     */
+    protected open fun addStatic(child: Vision): Unit {
+        attachChild(NameToken("@static", index = child.hashCode().toString()), child)
+    }
+
+    /**
+     * Create a vision group of the same type as this vision group. Do not attach it.
+     */
+    protected open fun createGroup(): VisionGroupBase = VisionGroupBase()
+
+    /**
+     * Set parent for given child and attach it
+     */
+    private fun attachChild(token: NameToken, child: Vision?) {
+        val before = childrenInternal[token]
+        when {
+            child == null -> {
+                childrenInternal.remove(token)
+            }
+            child.parent == null -> {
+                child.parent = this
+                childrenInternal[token] = child
+            }
+            child.parent !== this -> {
+                error("Can't reassign existing parent for child $token")
+            }
+        }
+        if (before != child) {
+            childrenChanged(token.asName())
+            if (child is MutableVisionGroup) {
+                child.onStructureChanged(this) { changedName ->
+                    this@VisionGroupBase.childrenChanged(token + changedName)
+                }
+            }
+        }
+    }
+
+    /**
+     * Recursively create a child group
+     */
+    private fun createGroups(name: Name): VisionGroupBase = when {
+        name.isEmpty() -> error("Should be unreachable")
+        name.length == 1 -> {
+            val token = name.tokens.first()
+            when (val current = children[token]) {
+                null -> createGroup().also { child ->
+                    attachChild(token, child)
+                }
+                is VisionGroupBase -> current
+                else -> error("Can't create group with name $name because it exists and not a group")
+            }
+        }
+        else -> createGroups(name.tokens.first().asName()).createGroups(name.cutFirst())
+    }
+
+    /**
+     * Add named or unnamed child to the group. If key is null the child is considered unnamed. Both key and value are not
+     * allowed to be null in the same time. If name is present and [child] is null, the appropriate element is removed.
+     */
+    override fun set(name: Name?, child: Vision?): Unit {
+        when {
+            name == null -> {
+                if (child != null) {
+                    addStatic(child)
+                }
+            }
+            name.isEmpty() -> error("Empty names are not allowed in VisionGroup::set")
+            name.length == 1 -> {
+                val token = name.tokens.first()
+                attachChild(token, child)
+            }
+            else -> {
+                //TODO add safety check
+                val parent = (get(name.cutLast()) as? MutableVisionGroup) ?: createGroups(name.cutLast())
+                parent[name.tokens.last().asName()] = child
+            }
+        }
+    }
+
+    override fun update(change: VisionChange) {
+        change.children?.forEach { (name, change) ->
+            when {
+                change.delete -> set(name, null)
+                change.vision != null -> set(name, change.vision)
+                else -> get(name)?.update(change)
+            }
+        }
+        super.update(change)
+    }
+}
+
+/**
+ * Non-serializable root group used to propagate manager to its children
+ */
+internal class RootVisionGroup(override val manager: VisionManager) : VisionGroupBase()
+
+/**
+ * Designate this [VisionGroup] as a root and assign a [VisionManager] as its parent
+ */
+public fun Vision.setAsRoot(manager: VisionManager) {
+    if (parent != null) error("Vision $this already has a parent. It could not be set as root")
+    parent = RootVisionGroup(manager)
+}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt

@@ -19,20 +19,19 @@ import space.kscience.visionforge.html.VisionOfNumberField
 import space.kscience.visionforge.html.VisionOfTextField
 import kotlin.reflect.KClass
 
-public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionContainer<Vision> {
+public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     /**
      * Combined [SerializersModule] for all registered visions
      */
-    public val serializersModule: SerializersModule by lazy {
-        SerializersModule {
+    public val serializersModule: SerializersModule
+        get() = SerializersModule {
             include(defaultSerialModule)
             context.gather<SerializersModule>(VISION_SERIALIZER_MODULE_TARGET).values.forEach {
                 include(it)
             }
         }
-    }
 
     public val jsonFormat: Json
         get() = Json(defaultJson) {
@@ -58,23 +57,19 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta), MutableVisionCont
     public fun encodeToMeta(vision: Vision, descriptor: MetaDescriptor? = null): Meta =
         encodeToJsonElement(vision).toMeta(descriptor)
 
-    override fun setChild(name: Name?, child: Vision?) {
-        child?.setAsRoot(this)
-    }
-
     public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out VisionManager> = VisionManager::class
 
         public const val VISION_SERIALIZER_MODULE_TARGET: String = "visionSerializerModule"
 
-        override fun build(context: Context, meta: Meta): VisionManager = VisionManager(meta)
+        override fun invoke(meta: Meta, context: Context): VisionManager = VisionManager(meta)
 
         private val defaultSerialModule: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
-                default { SimpleVisionGroup.serializer() }
-                subclass(NullVision.serializer())
-                subclass(SimpleVisionGroup.serializer())
+                default { VisionBase.serializer() }
+                subclass(VisionBase.serializer())
+                subclass(VisionGroupBase.serializer())
                 subclass(VisionOfNumberField.serializer())
                 subclass(VisionOfTextField.serializer())
                 subclass(VisionOfCheckbox.serializer())
@@ -113,19 +108,4 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met
 public val Context.visionManager: VisionManager get() = fetch(VisionManager)
 
 public fun Vision.encodeToString(): String =
-    manager?.encodeToString(this) ?: error("Orphan vision could not be encoded")
-
-/**
- * A root vision attached to [VisionManager]
- */
-public class RootVision(override val manager: VisionManager) : AbstractVisionGroup() {
-    override fun createGroup(): SimpleVisionGroup = SimpleVisionGroup()
-}
-
-/**
- * Designate this [Vision] as a root and assign a [VisionManager] as its parent
- */
-public fun Vision.setAsRoot(manager: VisionManager) {
-    if (parent != null) error("Vision $this already has a parent. It could not be set as root")
-    parent = RootVision(manager)
-}
+    manager?.encodeToString(this) ?: error("VisionManager not defined in Vision")

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionProperties.kt

@@ -1,296 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.launch
-import kotlinx.serialization.Transient
-import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.names.*
-import kotlin.jvm.Synchronized
-
-public interface VisionProperties {
-
-    /**
-     * Raw Visions own properties without styles, defaults, etc.
-     */
-    public val own: Meta?
-
-    public val descriptor: MetaDescriptor?
-
-    public fun getValue(
-        name: Name,
-        inherit: Boolean? = null,
-        includeStyles: Boolean? = null,
-    ): Value?
-
-    /**
-     * Get property with given layer flags.
-     * @param inherit toggles parent node property lookup. Null means inference from descriptor.
-     * @param includeStyles toggles inclusion of properties from styles.
-     */
-    public fun getProperty(
-        name: Name,
-        inherit: Boolean? = null,
-        includeStyles: Boolean? = null,
-    ): Meta
-
-    public val changes: Flow<Name>
-
-    /**
-     * Notify all listeners that a property has been changed and should be invalidated.
-     * This method does not check that the property has actually changed.
-     */
-    public fun invalidate(propertyName: Name)
-}
-
-public interface MutableVisionProperties : VisionProperties {
-
-    override fun getProperty(
-        name: Name,
-        inherit: Boolean?,
-        includeStyles: Boolean?,
-    ): MutableMeta = VisionPropertiesItem(
-        this,
-        name,
-        inherit,
-        includeStyles,
-    )
-
-    public fun setProperty(
-        name: Name,
-        node: Meta?,
-        notify: Boolean = true,
-    )
-
-    public fun setValue(
-        name: Name,
-        value: Value?,
-        notify: Boolean = true,
-    )
-}
-
-public fun MutableVisionProperties.remove(name: Name) {
-    setProperty(name, null)
-}
-
-public fun MutableVisionProperties.remove(name: String) {
-    remove(name.parseAsName())
-}
-
-@VisionBuilder
-public operator fun MutableVisionProperties.invoke(block: MutableMeta.() -> Unit) {
-    root(inherit = false, includeStyles = false).apply(block)
-}
-
-private class VisionPropertiesItem(
-    val properties: MutableVisionProperties,
-    val nodeName: Name,
-    val inherit: Boolean? = null,
-    val useStyles: Boolean? = null,
-    val default: Meta? = null,
-) : MutableMeta {
-
-    val descriptor: MetaDescriptor? by lazy { properties.descriptor?.get(nodeName) }
-
-
-    override val items: Map<NameToken, MutableMeta>
-        get() {
-            val metaKeys = properties.own?.getMeta(nodeName)?.items?.keys ?: emptySet()
-            val descriptorKeys = descriptor?.children?.map { NameToken(it.key) } ?: emptySet()
-            val defaultKeys = default?.get(nodeName)?.items?.keys ?: emptySet()
-            val inheritFlag = descriptor?.inherited ?: inherit
-            val stylesFlag = descriptor?.usesStyles ?: useStyles
-            return (metaKeys + descriptorKeys + defaultKeys).associateWith {
-                VisionPropertiesItem(
-                    properties,
-                    nodeName + it,
-                    inheritFlag,
-                    stylesFlag,
-                    default
-                )
-            }
-        }
-
-    override var value: Value?
-        get() {
-            val inheritFlag = descriptor?.inherited ?: inherit ?: false
-            val stylesFlag = descriptor?.usesStyles ?: useStyles ?: true
-            return properties.getValue(nodeName, inheritFlag, stylesFlag) ?: default?.getValue(nodeName)
-        }
-        set(value) {
-            properties.setValue(nodeName, value)
-        }
-
-    override fun getOrCreate(name: Name): MutableMeta = VisionPropertiesItem(
-        properties,
-        nodeName + name,
-        inherit,
-        useStyles,
-        default
-    )
-
-    override fun setMeta(name: Name, node: Meta?) {
-        properties.setProperty(nodeName + name, node)
-    }
-
-    override fun toString(): String = Meta.toString(this)
-    override fun equals(other: Any?): Boolean = Meta.equals(this, other as? Meta)
-    override fun hashCode(): Int = Meta.hashCode(this)
-}
-
-public abstract class AbstractVisionProperties(
-    private val vision: Vision,
-) : MutableVisionProperties {
-    override val descriptor: MetaDescriptor? get() = vision.descriptor
-
-    protected abstract var properties: MutableMeta?
-
-    override val own: Meta? get() = properties
-
-    @Synchronized
-    protected fun getOrCreateProperties(): MutableMeta {
-        if (properties == null) {
-            //TODO check performance issues
-            val newProperties = MutableMeta()
-            properties = newProperties
-        }
-        return properties!!
-    }
-
-    override fun getValue(
-        name: Name,
-        inherit: Boolean?,
-        includeStyles: Boolean?,
-    ): Value? {
-        own?.get(name)?.value?.let { return it }
-
-        val descriptor = descriptor?.get(name)
-        val stylesFlag = includeStyles ?: descriptor?.usesStyles ?: true
-
-        if (stylesFlag) {
-            vision.getStyleProperty(name)?.value?.let { return it }
-        }
-
-        val inheritFlag = inherit ?: descriptor?.inherited ?: false
-        if (inheritFlag) {
-            vision.parent?.properties?.getValue(name, inheritFlag, stylesFlag)?.let { return it }
-        }
-        return descriptor?.defaultValue
-    }
-
-    override fun setProperty(name: Name, node: Meta?, notify: Boolean) {
-        //TODO check old value?
-        if (name.isEmpty()) {
-            properties = node?.asMutableMeta()
-        } else if (node == null) {
-            properties?.setMeta(name, node)
-        } else {
-            getOrCreateProperties().setMeta(name, node)
-        }
-        if (notify) {
-            invalidate(name)
-        }
-    }
-
-    override fun setValue(name: Name, value: Value?, notify: Boolean) {
-        //TODO check old value?
-        if (value == null) {
-            properties?.getMeta(name)?.value = null
-        } else {
-            getOrCreateProperties().setValue(name, value)
-        }
-        if (notify) {
-            invalidate(name)
-        }
-    }
-
-    @Transient
-    protected val changesInternal: MutableSharedFlow<Name> = MutableSharedFlow<Name>()
-    override val changes: SharedFlow<Name> get() = changesInternal
-
-    override fun invalidate(propertyName: Name) {
-        //send update signal
-        @OptIn(DelicateCoroutinesApi::class)
-        (vision.manager?.context ?: GlobalScope).launch {
-            changesInternal.emit(propertyName)
-        }
-
-        //notify children if there are any
-        if (vision is VisionGroup) {
-            vision.children.values.forEach {
-                it.properties.invalidate(propertyName)
-            }
-        }
-
-        // update styles
-        if (propertyName == Vision.STYLE_KEY) {
-            vision.styles.asSequence()
-                .mapNotNull { vision.getStyle(it) }
-                .flatMap { it.items.asSequence() }
-                .distinctBy { it.key }
-                .forEach {
-                    invalidate(it.key.asName())
-                }
-        }
-    }
-}
-
-public fun VisionProperties.getValue(
-    name: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Value? = getValue(name.parseAsName(), inherit, includeStyles)
-
-/**
- * Get [Vision] property using key as a String
- */
-public fun VisionProperties.getProperty(
-    name: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Meta = getProperty(name.parseAsName(), inherit, includeStyles)
-
-/**
- * The root property node with given inheritance and style flags
- * @param inherit - inherit properties from the [Vision] parent. If null, infer from descriptor
- * @param includeStyles - include style information. If null, infer from descriptor
- */
-public fun MutableVisionProperties.root(
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): MutableMeta = getProperty(Name.EMPTY, inherit, includeStyles)
-
-
-/**
- * Get [Vision] property using key as a String
- */
-public fun MutableVisionProperties.getProperty(
-    name: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): MutableMeta = getProperty(name.parseAsName(), inherit, includeStyles)
-
-
-public operator fun MutableVisionProperties.set(name: Name, value: Number): Unit =
-    setValue(name, value.asValue())
-
-public operator fun MutableVisionProperties.set(name: String, value: Number): Unit =
-    set(name.parseAsName(), value)
-
-public operator fun MutableVisionProperties.set(name: Name, value: Boolean): Unit =
-    setValue(name, value.asValue())
-
-public operator fun MutableVisionProperties.set(name: String, value: Boolean): Unit =
-    set(name.parseAsName(), value)
-
-public operator fun MutableVisionProperties.set(name: Name, value: String): Unit =
-    setValue(name, value.asValue())
-
-public operator fun MutableVisionProperties.set(name: String, value: String): Unit =
-    set(name.parseAsName(), value)
-

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt

@@ -0,0 +1,34 @@
+package space.kscience.visionforge
+
+import space.kscience.dataforge.meta.Configurable
+import space.kscience.dataforge.meta.MutableMeta
+import space.kscience.dataforge.meta.ObservableMutableMeta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.Value
+
+/**
+ * Property containers are used to create a symmetric behaviors for vision properties and style builders
+ */
+public interface VisionPropertyContainer<out V : Vision> {
+
+    public val meta: MutableMeta
+
+    public fun getPropertyValue(
+        name: Name,
+        inherit: Boolean = false,
+        includeStyles: Boolean = true,
+        includeDefaults: Boolean = true,
+    ): Value?
+}
+
+public open class SimpleVisionPropertyContainer<out V : Vision>(
+    override val meta: ObservableMutableMeta,
+) : VisionPropertyContainer<V>, Configurable {
+    override fun getPropertyValue(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean
+    ): Value? = meta[name]?.value
+}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/flowProperty.kt

@@ -1,55 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.Value
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.parseAsName
-import space.kscience.dataforge.names.startsWith
-
-/**
- * Create a flow of a specific property
- */
-public fun Vision.flowProperty(
-    propertyName: Name,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Flow<Meta> = flow {
-    //Pass initial value.
-    emit(properties.getProperty(propertyName, inherit, includeStyles))
-    properties.changes.collect { name ->
-        if (name.startsWith(propertyName)) {
-            emit(properties.getProperty(propertyName, inherit, includeStyles))
-        }
-    }
-}
-
-public fun Vision.flowProperty(
-    propertyName: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Flow<Meta> = flowProperty(propertyName.parseAsName(), inherit, includeStyles)
-
-/**
- * Flow the value of specific property
- */
-public fun Vision.flowPropertyValue(
-    propertyName: Name,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Flow<Value?> = flow {
-    //Pass initial value.
-    emit(properties.getValue(propertyName, inherit, includeStyles))
-    properties.changes.collect { name ->
-        if (name.startsWith(propertyName)) {
-            emit(properties.getValue(propertyName, inherit, includeStyles))
-        }
-    }
-}
-
-public fun Vision.flowPropertyValue(
-    propertyName: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-): Flow<Value?> = flowPropertyValue(propertyName.parseAsName(), inherit, includeStyles)

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt

@@ -22,7 +22,7 @@ internal const val RENDER_FUNCTION_NAME = "renderAllVisionsById"
 
 /**
  * Render a fragment in the given consumer and return a map of extracted visions
- * @param context a context used to create a vision fragment
+ * @param manager a VisionManager used for serialization
  * @param embedData embed Vision initial state in the HTML
  * @param fetchDataUrl fetch data after first render from given url
  * @param fetchUpdatesUrl receive push updates from the server at given url

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlForm.kt

@@ -15,7 +15,7 @@ import space.kscience.dataforge.meta.node
 public class VisionOfHtmlForm(
     public val formId: String,
 ) : VisionOfHtmlInput() {
-    public var values: Meta? by mutableProperties.node()
+    public var values: Meta? by meta.node()
 }
 
 public class HtmlFormFragment internal constructor(

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionOfHtmlInput.kt

@@ -5,15 +5,11 @@ import kotlinx.serialization.Serializable
 import space.kscience.dataforge.meta.boolean
 import space.kscience.dataforge.meta.number
 import space.kscience.dataforge.meta.string
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.*
-
-//TODO replace by something
-internal val Vision.mutableProperties get() = properties.getProperty(Name.EMPTY, false, false)
+import space.kscience.visionforge.VisionBase
 
 @Serializable
-public abstract class VisionOfHtmlInput : AbstractVision() {
-    public var disabled: Boolean by mutableProperties.boolean { false }
+public abstract class VisionOfHtmlInput : VisionBase() {
+    public var disabled: Boolean by meta.boolean(false)
 }
 
 @Serializable
@@ -22,7 +18,7 @@ public class VisionOfTextField(
     public val label: String? = null,
     public val name: String? = null,
 ) : VisionOfHtmlInput() {
-    public var text: String? by mutableProperties.string()
+    public var text: String? by meta.string()
 }
 
 @Serializable
@@ -31,7 +27,7 @@ public class VisionOfCheckbox(
     public val label: String? = null,
     public val name: String? = null,
 ) : VisionOfHtmlInput() {
-    public var checked: Boolean? by mutableProperties.boolean()
+    public var checked: Boolean? by meta.boolean()
 }
 
 @Serializable
@@ -40,7 +36,7 @@ public class VisionOfNumberField(
     public val label: String? = null,
     public val name: String? = null,
 ) : VisionOfHtmlInput() {
-    public var value: Number? by mutableProperties.number()
+    public var value: Number? by meta.number()
 }
 
 @Serializable
@@ -52,6 +48,6 @@ public class VisionOfRangeField(
     public val label: String? = null,
     public val name: String? = null,
 ) : VisionOfHtmlInput() {
-    public var value: Number? by mutableProperties.number()
+    public var value: Number? by meta.number()
 }
 

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt

@@ -86,9 +86,7 @@ public abstract class VisionTagConsumer<R>(
     ): T = div {
         id = resolveId(name)
         classes = setOf(OUTPUT_CLASS)
-        if (vision.parent == null) {
         vision.setAsRoot(manager)
-        }
         attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString()
         if (!outputMeta.isEmpty()) {
             //Hard-code output configuration

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/useProperty.kt

@@ -1,54 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.names.parseAsName
-import space.kscience.dataforge.names.startsWith
-import kotlin.reflect.KProperty1
-
-
-/**
- * Call [callBack] on initial value of the property and then on all subsequent values after change
- */
-public fun Vision.useProperty(
-    propertyName: Name,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-    scope: CoroutineScope? = manager?.context,
-    callBack: (Meta) -> Unit,
-): Job {
-    //Pass initial value.
-    callBack(properties.getProperty(propertyName, inherit, includeStyles))
-    return properties.changes.onEach { name ->
-        if (name.startsWith(propertyName)) {
-            callBack(properties.getProperty(propertyName, inherit, includeStyles))
-        }
-    }.launchIn(scope ?: error("Orphan Vision can't observe properties"))
-}
-
-public fun Vision.useProperty(
-    propertyName: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
-    scope: CoroutineScope? = manager?.context,
-    callBack: (Meta) -> Unit,
-): Job = useProperty(propertyName.parseAsName(), inherit, includeStyles, scope, callBack)
-
-public fun <V : Vision, T> V.useProperty(
-    property: KProperty1<V, T>,
-    scope: CoroutineScope? = manager?.context,
-    callBack: V.(T) -> Unit,
-): Job {
-    //Pass initial value.
-    callBack(property.get(this))
-    return properties.changes.onEach { name ->
-        if (name.startsWith(property.name.asName())) {
-            callBack(property.get(this@useProperty))
-        }
-    }.launchIn(scope ?: error("Orphan Vision can't observe properties"))
-}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDelegates.kt

@@ -0,0 +1,91 @@
+package space.kscience.visionforge
+
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.number
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+//public fun Vision.propertyNode(
+//    name: Name? = null,
+//    inherit: Boolean = false,
+//    includeStyles: Boolean = true,
+//    includeDefaults: Boolean = true,
+//): ReadWriteProperty<Any?, Meta?> = object : ReadWriteProperty<Any?, Meta?> {
+//    override fun getValue(thisRef: Any?, property: KProperty<*>): Meta? =
+//        getProperty(name ?: Name.parse(property.name), inherit, includeStyles, includeDefaults)
+//
+//    override fun setValue(thisRef: Any?, property: KProperty<*>, value: Meta?) {
+//        meta.setMeta(name ?: Name.parse(property.name), value)
+//    }
+//}
+//
+//public fun <T> Vision.propertyNode(
+//    converter: MetaConverter<T>,
+//    name: Name? = null,
+//    inherit: Boolean = false,
+//    includeStyles: Boolean = true,
+//    includeDefaults: Boolean = true,
+//): ReadWriteProperty<Any?, T?> = object : ReadWriteProperty<Any?, T?> {
+//    override fun getValue(thisRef: Any?, property: KProperty<*>): T? = getProperty(
+//        name ?: Name.parse(property.name),
+//        inherit,
+//        includeStyles,
+//        includeDefaults
+//    )?.let(converter::metaToObject)
+//
+//    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) {
+//        meta.setMeta(name ?: Name.parse(property.name), value?.let(converter::objectToMeta))
+//    }
+//}
+
+public fun Vision.propertyValue(
+    name: Name? = null,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+): ReadWriteProperty<Any?, Value?> = object : ReadWriteProperty<Any?, Value?> {
+    override fun getValue(thisRef: Any?, property: KProperty<*>): Value? =
+        getPropertyValue(name ?: Name.parse(property.name), inherit, includeStyles, includeDefaults)
+
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: Value?) {
+        meta.setValue(name ?: Name.parse(property.name), value)
+    }
+}
+
+public fun <T> Vision.propertyValue(
+    name: Name? = null,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+    setter: (T) -> Value? = { it?.let(Value::of) },
+    getter: (Value?) -> T,
+): ReadWriteProperty<Any?, T> = object : ReadWriteProperty<Any?, T> {
+    override fun getValue(thisRef: Any?, property: KProperty<*>): T = getPropertyValue(
+        name ?: Name.parse(property.name),
+        inherit,
+        includeStyles,
+        includeDefaults
+    ).let(getter)
+
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+        meta.setValue(name ?: Name.parse(property.name), value?.let(setter))
+    }
+}
+
+public fun Vision.numberProperty(
+    name: Name? = null,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true
+): ReadWriteProperty<Any?, Number?> = propertyValue(name, inherit, includeStyles, includeDefaults) { it?.number }
+
+public fun Vision.numberProperty(
+    name: Name? = null,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+    default: () -> Number
+): ReadWriteProperty<Any?, Number> = propertyValue(name, inherit, includeStyles, includeDefaults) {
+    it?.number ?: default()
+}

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt

@@ -2,7 +2,7 @@ package space.kscience.visionforge
 
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.*
-import space.kscience.dataforge.meta.set
+import space.kscience.dataforge.values.asValue
 
 private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
 private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles"

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt

@@ -1,5 +1,6 @@
 package space.kscience.visionforge.visitor
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -10,6 +11,7 @@ import space.kscience.visionforge.Vision
 import kotlin.reflect.KClass
 
 
+@OptIn(ExperimentalCoroutinesApi::class)
 public suspend fun <T> Vision.flowStatistics(statistics: (Name, Vision) -> T): Flow<T> = callbackFlow<T> {
     val visitor = object : VisionVisitor {
         override suspend fun visit(name: Name, vision: Vision){

visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt

@@ -6,8 +6,7 @@ import kotlinx.coroutines.launch
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.plus
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.children
-import space.kscience.visionforge.forEach
+import space.kscience.visionforge.VisionGroup
 
 public interface VisionVisitor {
     /**
@@ -20,7 +19,7 @@ public interface VisionVisitor {
     /**
      * Rearrange children of given group
      */
-    public suspend fun visitChildren(name: Name, group: Vision) {
+    public suspend fun visitChildren(name: Name, group: VisionGroup) {
         //Do nothing by default
     }
 
@@ -30,19 +29,19 @@ public interface VisionVisitor {
         private fun CoroutineScope.visitTreeAsync(
             visionVisitor: VisionVisitor,
             name: Name,
-            vision: Vision,
+            vision: Vision
         ): Job = launch {
             if (visionVisitor.skip(name, vision)) return@launch
             visionVisitor.visit(name, vision)
 
-
+            if (vision is VisionGroup) {
                 visionVisitor.visitChildren(name, vision)
 
-            vision.children?.forEach { token, child ->
+                for ((token, child) in vision.children) {
                     visitTreeAsync(visionVisitor, name + token, child)
                 }
             }
-
+        }
 
         /**
          * Recursively visit this [Vision] and all children

visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt

@@ -4,9 +4,13 @@ import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import space.kscience.dataforge.context.Global
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.configure
+import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.*
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionBase
+import space.kscience.visionforge.VisionManager
 import kotlin.collections.set
 import kotlin.test.Test
 
@@ -29,12 +33,11 @@ fun FlowContent.renderVisionFragment(
 }
 
 
-@DFExperimental
-private fun VisionOutput.base(block: VisionGroup.() -> Unit) = context.visionManager.group().apply(block)
-
 @DFExperimental
 class HtmlTagTest {
 
+    fun VisionOutput.base(block: VisionBase.() -> Unit) = VisionBase().apply(block)
+
     val fragment: HtmlVisionFragment = {
         div {
             h1 { +"Head" }
@@ -43,8 +46,10 @@ class HtmlTagTest {
                     "metaProperty" put 87
                 }
                 base {
-                    properties["myProp"] = 82
-                    properties["otherProp"] = false
+                    configure {
+                        set("myProp", 82)
+                        set("otherProp", false)
+                    }
                 }
             }
         }
@@ -54,7 +59,7 @@ class HtmlTagTest {
         div {
             h2 { +"Properties" }
             ul {
-                vision.properties.own?.items?.forEach {
+                (vision as? VisionBase)?.meta?.items?.forEach {
                     li {
                         a { +it.key.toString() }
                         p { +it.value.toString() }

visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/meta/VisionPropertyTest.kt

@@ -1,123 +1,44 @@
 package space.kscience.visionforge.meta
 
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.test.runTest
-import space.kscience.dataforge.context.Global
-import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.*
-import space.kscience.visionforge.*
+import space.kscience.dataforge.values.asValue
+import space.kscience.visionforge.VisionBase
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
-
-private class TestScheme : Scheme() {
-    var ddd by int()
-
-    companion object : SchemeSpec<TestScheme>(::TestScheme)
-}
-
-@OptIn(ExperimentalCoroutinesApi::class)
-internal class VisionPropertyTest {
-
-    private val manager = Global.fetch(VisionManager)
-
+class VisionPropertyTest {
     @Test
     fun testPropertyWrite(){
-        val vision = manager.group()
-        vision.properties["fff"] = 2
-        vision.properties["fff.ddd"] = false
+        val vision = VisionBase()
+        vision.meta["fff"] = 2
+        vision.meta["fff.ddd"] = false
 
-        assertEquals(2, vision.properties.getValue("fff")?.int)
-        assertEquals(false, vision.properties.getValue("fff.ddd")?.boolean)
+        assertEquals(2, vision.meta["fff"]?.int)
+        assertEquals(false, vision.meta["fff.ddd"]?.boolean)
     }
 
     @Test
     fun testPropertyEdit(){
-        val vision = manager.group()
-        vision.properties.getProperty("fff.ddd").apply {
+        val vision = VisionBase()
+        vision.meta.getOrCreate("fff.ddd").apply {
             value = 2.asValue()
         }
-        assertEquals(2, vision.properties.getValue("fff.ddd")?.int)
-        assertNotEquals(true, vision.properties.getValue("fff.ddd")?.boolean)
+        assertEquals(2, vision.meta["fff.ddd"]?.int)
+        assertNotEquals(true, vision.meta["fff.ddd"]?.boolean)
+    }
+
+    internal class TestScheme: Scheme(){
+        var ddd by int()
+        companion object: SchemeSpec<TestScheme>(::TestScheme)
     }
 
     @Test
     fun testPropertyUpdate(){
-        val vision = manager.group()
-        vision.properties.getProperty("fff").updateWith(TestScheme) {
+        val vision = VisionBase()
+        vision.meta.getOrCreate("fff").updateWith(TestScheme){
             ddd = 2
         }
-        assertEquals(2, vision.properties.getValue("fff.ddd")?.int)
-    }
-
-    @Test
-    fun testChildrenPropertyPropagation() = runTest(dispatchTimeoutMs = 200) {
-        val group = Global.fetch(VisionManager).group {
-            properties {
-                "test" put 11
-            }
-            group("child") {
-                properties {
-                    "test" put 22
-                }
-            }
-        }
-
-        val child = group.children["child"]!!
-
-        val deferred: CompletableDeferred<Value?> = CompletableDeferred()
-
-        var callCounter = 0
-
-        val subscription = child.useProperty("test", inherit = true) {
-            deferred.complete(it.value)
-            callCounter++
-        }
-
-        assertEquals(22, deferred.await()?.int)
-        assertEquals(1, callCounter)
-
-        child.properties.remove("test")
-
-        assertEquals(11, child.properties.getProperty("test", inherit = true).int)
-//        assertEquals(11, deferred.await()?.int)
-//        assertEquals(2, callCounter)
-        subscription.cancel()
-    }
-
-    @Test
-    fun testChildrenPropertyFlow() = runTest(dispatchTimeoutMs = 200) {
-        val group = Global.fetch(VisionManager).group {
-
-            properties {
-                "test" put 11
-            }
-
-            group("child") {
-                properties {
-                    "test" put 22
-                }
-            }
-
-        }
-
-        val child = group.children["child"]!!
-
-        launch {
-            val list = child.flowPropertyValue("test", inherit = true).take(3).map { it?.int }.toList()
-            assertEquals(22, list.first())
-            //assertEquals(11, list[1]) //a race
-            assertEquals(33, list.last())
-        }
-
-        //wait for subscription to be created
-        delay(5)
-
-        child.properties.remove("test")
-        group.properties["test"] = 33
+        assertEquals(2, vision.meta["fff.ddd"]?.int)
     }
 }

visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt

@@ -65,7 +65,6 @@ public class VisionClient : AbstractPlugin() {
 
     private fun renderVision(name: String, element: Element, vision: Vision?, outputMeta: Meta) {
         if (vision != null) {
-            vision.setAsRoot(visionManager)
             val renderer = findRendererFor(vision)
                 ?: error("Could not find renderer for ${visionManager.encodeToString(vision)}")
             renderer.render(element, vision, outputMeta)
@@ -116,7 +115,7 @@ public class VisionClient : AbstractPlugin() {
 
                     onopen = {
                         feedbackJob = vision.flowChanges(
-                            feedbackAggregationTime.milliseconds,
+                            feedbackAggregationTime.milliseconds
                         ).onEach { change ->
                             send(visionManager.encodeToString(change))
                         }.launchIn(visionManager.context)
@@ -204,7 +203,8 @@ public class VisionClient : AbstractPlugin() {
     ) else super.content(target)
 
     public companion object : PluginFactory<VisionClient> {
-        override fun build(context: Context, meta: Meta): VisionClient  = VisionClient()
+
+        override fun invoke(meta: Meta, context: Context): VisionClient = VisionClient()
 
         override val tag: PluginTag = PluginTag(name = "vision.client", group = PluginTag.DATAFORGE_GROUP)
 

visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/HtmlVisionContext.kt

@@ -1,96 +0,0 @@
-package space.kscience.visionforge.html
-
-import kotlinx.html.*
-import space.kscience.dataforge.context.ContextAware
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.MetaSerializer
-import space.kscience.dataforge.meta.isEmpty
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.names.parseAsName
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionManager
-import space.kscience.visionforge.setAsRoot
-import space.kscience.visionforge.visionManager
-
-/**
- * Rendering context for visions in HTML
- */
-public interface HtmlVisionContext : ContextAware {
-
-    /**
-     * Generate div id for vision div tag
-     */
-    public fun generateId(name: Name): String = "vision[$name]"
-
-    /**
-     * Render vision at given [DIV]
-     */
-    public fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta)
-}
-
-
-public typealias HtmlVisionContextFragment = context(HtmlVisionContext) TagConsumer<*>.() -> Unit
-
-context(HtmlVisionContext)
-        public fun HtmlVisionContextFragment(content: TagConsumer<*>.() -> Unit): HtmlVisionFragment = content
-
-context(HtmlVisionContext)
-        private fun <T> TagConsumer<T>.vision(
-    visionManager: VisionManager,
-    name: Name,
-    vision: Vision,
-    outputMeta: Meta = Meta.EMPTY,
-): T = div {
-    id = generateId(name)
-    classes = setOf(VisionTagConsumer.OUTPUT_CLASS)
-    vision.setAsRoot(visionManager)
-    attributes[VisionTagConsumer.OUTPUT_NAME_ATTRIBUTE] = name.toString()
-    if (!outputMeta.isEmpty()) {
-        //Hard-code output configuration
-        script {
-            attributes["class"] = VisionTagConsumer.OUTPUT_META_CLASS
-            unsafe {
-                +visionManager.jsonFormat.encodeToString(MetaSerializer, outputMeta)
-            }
-        }
-    }
-    renderVision(name, vision, outputMeta)
-}
-
-context(HtmlVisionContext)
-        private fun <T> TagConsumer<T>.vision(
-    name: Name,
-    vision: Vision,
-    outputMeta: Meta = Meta.EMPTY,
-): T = vision(context.visionManager, name, vision, outputMeta)
-
-/**
- * Insert a vision in this HTML.
- */
-context(HtmlVisionContext)
-        @DFExperimental
-        @VisionDSL
-        public fun <T> TagConsumer<T>.vision(
-    name: Name? = null,
-    visionProvider: VisionOutput.() -> Vision,
-): T {
-    val output = VisionOutput(context, name)
-    val vision = output.visionProvider()
-    val actualName =
-        name ?: NameToken(VisionTagConsumer.DEFAULT_VISION_NAME, vision.hashCode().toUInt().toString()).asName()
-    return vision(output.buildVisionManager(), actualName, vision, output.meta)
-}
-
-/**
- * Insert a vision in this HTML.
- */
-context(HtmlVisionContext)
-        @DFExperimental
-        @VisionDSL
-        public fun <T> TagConsumer<T>.vision(
-    name: String?,
-    visionProvider: VisionOutput.() -> Vision,
-): T = vision(name?.parseAsName(), visionProvider)

visionforge-fx/build.gradle.kts

@@ -1,12 +1,12 @@
 plugins {
-    id("space.kscience.gradle.jvm")
+    id("ru.mipt.npm.gradle.jvm")
 }
 
 val dataforgeVersion: String by rootProject.extra
 val fxVersion: String by rootProject.extra
 
 kscience{
-    useFx(space.kscience.gradle.FXModule.CONTROLS, version = fxVersion)
+    useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
 }
 
 dependencies {
@@ -15,12 +15,12 @@ dependencies {
     api("org.fxyz3d:fxyz3d:0.5.4") {
         exclude(module = "slf4j-simple")
     }
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${space.kscience.gradle.KScienceVersions.coroutinesVersion}")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}")
     implementation("eu.mihosoft.vrl.jcsg:jcsg:0.5.7") {
         exclude(module = "slf4j-simple")
     }
 }
 
 readme{
-    maturity = space.kscience.gradle.Maturity.PROTOTYPE
+    maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
 }

visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt

@@ -95,9 +95,8 @@ public class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
     public companion object : PluginFactory<FXPlugin> {
         override val type: KClass<out FXPlugin> = FXPlugin::class
         override val tag: PluginTag = PluginTag("vis.fx", group = PluginTag.DATAFORGE_GROUP)
-
-        override fun build(context: Context, meta: Meta): FXPlugin =  FXPlugin(meta)
-
+        override fun invoke(meta: Meta, context: Context): FXPlugin =
+            FXPlugin(meta)
     }
 
 }

visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt

@@ -3,9 +3,13 @@ package space.kscience.visionforge.editor
 import javafx.scene.control.ColorPicker
 import javafx.scene.paint.Color
 import org.slf4j.LoggerFactory
-import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
 import tornadofx.*
 
 /**

visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt

@@ -8,10 +8,14 @@ package space.kscience.visionforge.editor
 import javafx.collections.FXCollections
 import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
-import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.descriptors.allowedValues
+import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.parseValue
+import space.kscience.dataforge.values.string
 import java.util.*
 
 public class ComboBoxValueChooser(public val values: Collection<Value>? = null) : ValueChooserBase<ComboBox<Value>>() {