build.gradle.kts

@@ -10,7 +10,7 @@ val dataforgeVersion by extra("0.8.0")
 
 allprojects {
     group = "space.kscience"
-    version = "0.4.1-dev-1"
+    version = "0.4.0"
 }
 
 subprojects {

gradle.properties

@@ -1,6 +1,7 @@
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.js.compiler=ir
+#kotlin.incremental.js.ir=true
 
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4G

visionforge-compose-html/build.gradle.kts

@@ -23,7 +23,6 @@ kotlin {
             dependencies {
                 api("app.softwork:bootstrap-compose:0.1.15")
                 api("app.softwork:bootstrap-compose-icons:0.1.15")
-                implementation(compose.html.svg)
 
                 api(compose.html.core)
             }

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

@@ -147,7 +147,7 @@ private fun CoroutineScope.collectChange(
 ) {
 
     //Collect properties change
-    source.properties.changes.onEach { propertyName ->
+    source.properties.flowChanges().onEach { propertyName ->
         val newItem = source.properties.own[propertyName]
         collector.propertyChanged(name, propertyName, newItem)
     }.launchIn(this)

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

@@ -40,11 +40,7 @@ public interface VisionProperties : MetaProvider {
     override fun get(name: Name): Meta? = get(name, null, null)
 
 
-    public val changes: Flow<Name>
+    public fun flowChanges(): Flow<Name>
-
-    @Deprecated("Replace with property", ReplaceWith("changes"))
-    public fun flowChanges(): Flow<Name> = changes
-
 
     /**
      * Notify all listeners that a property has been changed and should be invalidated.
@@ -68,7 +64,7 @@ public interface MutableVisionProperties : VisionProperties, MutableMetaProvider
 
     public fun set(
         name: Name,
-        item: Meta?,
+        node: Meta?,
         notify: Boolean,
     )
 
@@ -190,28 +186,28 @@ public open class AbstractVisionProperties(
         return descriptor?.defaultValue
     }
 
-    override fun set(name: Name, item: Meta?, notify: Boolean) {
+    override fun set(name: Name, node: Meta?, notify: Boolean) {
         //ignore if the value is the same as existing
-        if (own[name] == item) return
+        if (own[name] == node) return
 
         if (name.isEmpty()) {
-            if (item == null) {
+            if (node == null) {
                 own.items.keys.forEach {
                     remove(it.asName())
                 }
             } else {
-                (own.items.keys - item.items.keys).forEach {
+                (own.items.keys - node.items.keys).forEach {
                     remove(it.asName())
                 }
-                item.items.forEach { (token, item) ->
+                node.items.forEach { (token, item) ->
                     set(token, item)
                 }
             }
 
-        } else if (item == null) {
+        } else if (node == null) {
-            own[name] = item
+            own[name] = node
         } else {
-            own[name] = item
+            own[name] = node
         }
         if (notify) {
             invalidate(name)
@@ -235,8 +231,7 @@ public open class AbstractVisionProperties(
     @Transient
     protected val changesInternal: MutableSharedFlow<Name> = MutableSharedFlow()
 
-    override val changes: Flow<Name>
+    override fun flowChanges(): Flow<Name> = changesInternal
-        get() = changesInternal
 
     override fun invalidate(propertyName: Name) {
         //send update signal

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

@@ -18,7 +18,7 @@ public fun Vision.flowProperty(
 ): Flow<Meta> = flow {
     //Pass initial value.
     emit(properties.get(propertyName, inherit, includeStyles))
-    properties.changes.collect { name ->
+    properties.flowChanges().collect { name ->
         if (name.startsWith(propertyName)) {
             emit(properties.get(propertyName, inherit, includeStyles))
         }
@@ -41,7 +41,7 @@ public fun Vision.flowPropertyValue(
 ): Flow<Value?> = flow {
     //Pass initial value.
     emit(properties.getValue(propertyName, inherit, includeStyles))
-    properties.changes.collect { name ->
+    properties.flowChanges().collect { name ->
         if (name.startsWith(propertyName)) {
             emit(properties.getValue(propertyName, inherit, includeStyles))
         }

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

@@ -25,7 +25,7 @@ public fun Vision.useProperty(
 ): Job {
     //Pass initial value.
     callback(properties.get(propertyName, inherit, includeStyles))
-    return properties.changes.onEach { name ->
+    return properties.flowChanges().onEach { name ->
         if (name.startsWith(propertyName)) {
             callback(properties.get(propertyName, inherit, includeStyles))
         }
@@ -47,7 +47,7 @@ public fun <V : Vision, T> V.useProperty(
 ): Job {
     //Pass initial value.
     callback(property.get(this))
-    return properties.changes.onEach { name ->
+    return properties.flowChanges().onEach { name ->
         if (name.startsWith(property.name.asName())) {
             callback(property.get(this@useProperty))
         }
@@ -60,7 +60,7 @@ public fun <V : Vision, T> V.useProperty(
 public fun Vision.onPropertyChange(
     scope: CoroutineScope = manager?.context ?: error("Orphan Vision can't observe properties. Use explicit scope."),
     callback: suspend (Name) -> Unit,
-): Job = properties.changes.onEach {
+): Job = properties.flowChanges().onEach {
     callback(it)
 }.launchIn(scope)
 
@@ -71,6 +71,6 @@ public fun <V : Vision, T> V.onPropertyChange(
     property: KProperty1<V, T>,
     scope: CoroutineScope = manager?.context ?: error("Orphan Vision can't observe properties. Use explicit scope."),
     callback: suspend V.(T) -> Unit,
-): Job = properties.changes.filter { it.startsWith(property.name.asName()) }.onEach {
+): Job = properties.flowChanges().filter { it.startsWith(property.name.asName()) }.onEach {
     callback(property.get(this))
 }.launchIn(scope)

visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/html/ElementVisionRenderer.kt

@@ -36,8 +36,6 @@ public interface ElementVisionRenderer {
         meta: Meta = Meta.EMPTY,
     )
 
-    override fun toString(): String
-
     public companion object {
         public const val TYPE: String = "elementVisionRenderer"
         public const val ZERO_RATING: Int = 0
@@ -68,8 +66,6 @@ public class SingleTypeVisionRenderer<T : Vision>(
             renderFunction(name, kClass.cast(vision), meta)
         }
     }
-
-    override fun toString(): String = "ElementVisionRender(${kClass.simpleName})"
 }
 
 public inline fun <reified T : Vision> ElementVisionRenderer(

visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/html/inputRenderers.kt

@@ -41,15 +41,16 @@ private fun HTMLInputElement.subscribeToInput(inputVision: VisionOfHtmlInput) {
     }
 }
 
-internal val htmlVisionRenderer: ElementVisionRenderer = ElementVisionRenderer<VisionOfPlainHtml> { _, vision, _ ->
+internal val htmlVisionRenderer: ElementVisionRenderer =
-    div().also { div ->
+    ElementVisionRenderer<VisionOfPlainHtml> { _, vision, _ ->
-        div.subscribeToVision(vision)
+        div().also { div ->
-        vision.useProperty(VisionOfPlainHtml::content) {
+            div.subscribeToVision(vision)
-            div.clear()
+            vision.useProperty(VisionOfPlainHtml::content) {
-            if (it != null) div.innerHTML = it
+                div.clear()
+                if (it != null) div.innerHTML = it
+            }
         }
     }
-}
 
 internal val inputVisionRenderer: ElementVisionRenderer = ElementVisionRenderer<VisionOfHtmlInput>(
     acceptRating = ElementVisionRenderer.DEFAULT_RATING - 1

visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt

@@ -31,7 +31,7 @@ public actual class MarkupPlugin : VisionPlugin(), ElementVisionRenderer {
         else -> ElementVisionRenderer.ZERO_RATING
     }
 
-    override fun render(element: Element, name: Name, vision: Vision, meta: Meta) {
+    override fun render(element: Element,name: Name, vision: Vision, meta: Meta) {
         require(vision is VisionOfMarkup) { "The vision is not a markup vision" }
         val div = document.createElement("div")
         val flavour = when (vision.format) {
@@ -49,8 +49,6 @@ public actual class MarkupPlugin : VisionPlugin(), ElementVisionRenderer {
         element.append(div)
     }
 
-    override fun toString(): String = "Markup"
-
     override fun content(target: String): Map<Name, Any> = when (target) {
         ElementVisionRenderer.TYPE -> mapOf("markup".asName() to this)
         else -> super.content(target)

visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt

@@ -1,17 +1,23 @@
 package space.kscience.visionforge.plotly
 
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.MutableMeta
+import space.kscience.dataforge.meta.MutableMetaSerializer
+import space.kscience.dataforge.meta.ObservableMeta
+import space.kscience.dataforge.meta.asObservable
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.names.Name
 import space.kscience.plotly.Plot
 import space.kscience.plotly.Plotly
 import space.kscience.plotly.PlotlyConfig
+import space.kscience.visionforge.AbstractVisionProperties
 import space.kscience.visionforge.MutableVisionProperties
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionBuilder
@@ -20,52 +26,36 @@ import space.kscience.visionforge.html.VisionOutput
 @Serializable
 @SerialName("vision.plotly")
 public class VisionOfPlotly private constructor(
-    @Serializable(MutableMetaSerializer::class) private val meta: MutableMeta,
+    @Serializable(MutableMetaSerializer::class) public val meta: MutableMeta,
 ) : Vision {
     public constructor(plot: Plot) : this(plot.meta)
 
-    @Transient
+    public val plot: Plot get() = Plot(meta.asObservable())
-    public val plot: Plot = Plot(meta.asObservable())
 
     @Transient
     override var parent: Vision? = null
 
     @Transient
-    override val properties: MutableVisionProperties = object : MutableVisionProperties {
+    override val properties: MutableVisionProperties = object : AbstractVisionProperties(this, meta) {
-        override val own: Meta get() = plot.meta
 
-        override val changes = callbackFlow {
+        override fun flowChanges(): Flow<Name> = if (meta is ObservableMeta) {
-            plot.meta.onChange(this) {
+            callbackFlow {
-                println(it)
+                meta.onChange(this) {
-                launch {
+                    launch {
-                    send(it)
+                        send(it)
+                    }
+                }
+                awaitClose {
+                    meta.removeListener(this)
                 }
             }
-            awaitClose {
+        } else emptyFlow()
-                plot.meta.removeListener(this)
+
-            }
-        }
 
         override fun invalidate(propertyName: Name) {
-            //do nothing, updates to source already counted
+            // Do nothing
-//            manager?.context?.launch {
-//                changes.emit(propertyName)
-//            }
         }
 
-        override fun getValue(name: Name, inherit: Boolean?, includeStyles: Boolean?): Value? = plot.meta[name]?.value
-
-        override fun set(name: Name, item: Meta?, notify: Boolean) {
-            plot.meta[name] = item
-            if (notify) invalidate(name)
-        }
-
-        override fun setValue(name: Name, value: Value?, notify: Boolean) {
-            plot.meta[name] = value
-            if (notify) invalidate(name)
-        }
-
-        override val descriptor: MetaDescriptor get() = plot.descriptor
     }
 
 

visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt

@@ -33,8 +33,6 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
         element.plot(config, plot)
     }
 
-    override fun toString(): String = "Plotly"
-
     override fun content(target: String): Map<Name, Any> = when (target) {
         ElementVisionRenderer.TYPE -> mapOf("plotly".asName() to this)
         else -> super.content(target)

visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt

@@ -166,16 +166,16 @@ internal class SolidReferenceChild(
             includeStyles: Boolean?,
         ): Value? = own.getValue(name) ?: prototype.properties.getValue(name, inherit, includeStyles)
 
-        override fun set(name: Name, item: Meta?, notify: Boolean) {
+        override fun set(name: Name, node: Meta?, notify: Boolean) {
-            own[name] = item
+            own[name] = node
         }
 
         override fun setValue(name: Name, value: Value?, notify: Boolean) {
             own.setValue(name, value)
         }
 
-        override val changes: Flow<Name>
+        override fun flowChanges(): Flow<Name> =
-            get() = owner.properties.changes.filter { it.startsWith(childToken(childName)) }
+            owner.properties.flowChanges().filter { it.startsWith(childToken(childName)) }
 
         override fun invalidate(propertyName: Name) {
             owner.properties.invalidate(childPropertyName(childName, propertyName))

visionforge-tables/src/jsMain/kotlin/space/kscience/visionforge/tables/TableVisionJsPlugin.kt

@@ -81,8 +81,6 @@ public class TableVisionJsPlugin : AbstractPlugin(), ElementVisionRenderer {
         TabulatorFull(element as HTMLElement, tableOptions)
     }
 
-    override fun toString(): String  = "Table"
-
     override fun content(target: String): Map<Name, Any> = when (target) {
         ElementVisionRenderer.TYPE -> mapOf("table".asName() to this)
         else -> super.content(target)

visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt

@@ -89,7 +89,7 @@ public class ThreePlugin : AbstractPlugin(), ComposeHtmlVisionRenderer {
                 updatePosition(vision)
                 //obj.onChildrenChange()
                 if (observe) {
-                    vision.properties.changes.onEach { name ->
+                    vision.properties.flowChanges().onEach { name ->
                         if (
                             name.startsWith(Solid.POSITION_KEY) ||
                             name.startsWith(Solid.ROTATION_KEY) ||
@@ -169,8 +169,6 @@ public class ThreePlugin : AbstractPlugin(), ComposeHtmlVisionRenderer {
     override fun rateVision(vision: Vision): Int =
         if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
 
-    override fun toString(): String  = "ThreeJS"
-
     /**
      * Render the given [Solid] Vision in a [ThreeCanvas] attached
      * to the [element]. Canvas objects are cached, so subsequent calls

visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/compose/ThreeView.kt

@@ -147,7 +147,7 @@ public fun ThreeView(
                                     }
                                 },
                                 name = Name.EMPTY,
-                                updates = vision.properties.changes,
+                                updates = vision.properties.flowChanges(),
                                 rootDescriptor = vision.descriptor
                             )
                             vision.styles.takeIf { it.isNotEmpty() }?.let { styles ->

visionforge-threejs/visionforge-threejs-server/build.gradle.kts

@@ -32,8 +32,8 @@ kscience {
 
     jsMain {
         api(projects.visionforgeThreejs)
-        api(npm("file-saver", "2.0.5"))
+        implementation(npm("file-saver", "2.0.5"))
-        api(npm("@types/file-saver", "2.0.7"))
+        implementation(npm("@types/file-saver", "2.0.7"))
         compileOnly(npm("webpack-bundle-analyzer", "4.5.0"))
     }
 }