Values package merged into meta

CHANGELOG.md

@@ -8,6 +8,8 @@
 - More fine-grained types in Action builders.
 
 ### Changed
+- `dataforge.meta.values` package is merged into `dataforge.meta` for better star imports
+- Kotlin 1.7.20
 - `Factory` is now `fun interface` and uses `build` instead of `invoke`. `invoke moved to an extension.
 - KTor 2.0
 - DataTree `items` call is blocking.

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
     group = "space.kscience"
-    version = "0.6.0-dev-12"
+    version = "0.6.0-dev-13"
 }
 
 subprojects {

dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormat.kt

@@ -8,16 +8,11 @@ import space.kscience.dataforge.io.MetaFormat
 import space.kscience.dataforge.io.MetaFormatFactory
 import space.kscience.dataforge.io.readUtf8String
 import space.kscience.dataforge.io.writeUtf8String
-import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.meta.isLeaf
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.withIndex
-import space.kscience.dataforge.values.ListValue
-import space.kscience.dataforge.values.Null
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.parseValue
 import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.collections.set

dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaFormatTest.kt

@@ -2,8 +2,6 @@ package space.kscience.dataforge.io
 
 import kotlinx.serialization.json.*
 import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.values.ListValue
-import space.kscience.dataforge.values.double
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/workDirectory.kt

@@ -2,8 +2,8 @@ package space.kscience.dataforge.io
 
 import space.kscience.dataforge.context.ContextBuilder
 import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.meta.string
-import space.kscience.dataforge.values.set
 import java.nio.file.Path
 import kotlin.io.path.Path
 

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/JsonMeta.kt

@@ -6,7 +6,6 @@ import kotlinx.serialization.json.*
 import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.get
 import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.values.*
 
 private const val jsonArrayKey: String = "@jsonArray"
 

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Laminate.kt

@@ -2,7 +2,6 @@ package space.kscience.dataforge.meta
 
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.values.Value
 
 /**
  * A meta laminate consisting of multiple immutable meta layers. For mutable front layer, use [Scheme].

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Meta.kt

@@ -5,7 +5,6 @@ import kotlinx.serialization.json.Json
 import space.kscience.dataforge.misc.Type
 import space.kscience.dataforge.misc.unsafeCast
 import space.kscience.dataforge.names.*
-import space.kscience.dataforge.values.*
 
 
 /**

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaDelegate.kt

@@ -3,7 +3,6 @@ package space.kscience.dataforge.meta
 import space.kscience.dataforge.meta.transformations.MetaConverter
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.values.*
 import kotlin.properties.ReadOnlyProperty
 
 /* Meta delegates */

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableMeta.kt

@@ -3,10 +3,6 @@ package space.kscience.dataforge.meta
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
-import space.kscience.dataforge.values.EnumValue
-import space.kscience.dataforge.values.MutableValueProvider
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.asValue
 import kotlin.js.JsName
 import kotlin.jvm.Synchronized
 

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableMetaDelegate.kt

@@ -3,7 +3,6 @@ package space.kscience.dataforge.meta
 import space.kscience.dataforge.meta.transformations.MetaConverter
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.values.*
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ObservableMetaWrapper.kt

@@ -2,7 +2,6 @@ package space.kscience.dataforge.meta
 
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
-import space.kscience.dataforge.values.Value
 import kotlin.jvm.Synchronized
 
 /**

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Scheme.kt

@@ -6,7 +6,6 @@ import space.kscience.dataforge.meta.descriptors.get
 import space.kscience.dataforge.meta.descriptors.validate
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
-import space.kscience.dataforge.values.Value
 import kotlin.jvm.Synchronized
 
 /**

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/SealedMeta.kt

@@ -2,8 +2,6 @@ package space.kscience.dataforge.meta
 
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.asValue
 
 /**
  * The meta implementation which is guaranteed to be immutable.

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Value.kt

@@ -1,4 +1,4 @@
-package space.kscience.dataforge.values
+package space.kscience.dataforge.meta
 
 import kotlinx.serialization.Serializable
 import kotlin.jvm.JvmInline

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ValueProvider.kt

@@ -1,6 +1,5 @@
-package space.kscience.dataforge.values
+package space.kscience.dataforge.meta
 
-import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.asName

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ValueSerializer.kt

@@ -1,4 +1,4 @@
-package space.kscience.dataforge.values
+package space.kscience.dataforge.meta
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
@@ -12,7 +12,7 @@ public object ValueSerializer : KSerializer<Value> {
     private val listSerializer by lazy { ListSerializer(ValueSerializer) }
 
     override val descriptor: SerialDescriptor =
-        buildClassSerialDescriptor("space.kscience.dataforge.values.Value") {
+        buildClassSerialDescriptor("space.kscience.dataforge.meta.Value") {
             element<Boolean>("isList")
             element<ValueType>("valueType")
             element<String>("value")

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/MetaDescriptor.kt

@@ -1,12 +1,8 @@
 package space.kscience.dataforge.meta.descriptors
 
 import kotlinx.serialization.Serializable
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.set
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.names.*
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.ValueType
 
 /**
  * Restrictions on value in the node

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/MetaDescriptorBuilder.kt

@@ -1,14 +1,11 @@
 package space.kscience.dataforge.meta.descriptors
 
 import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.cutFirst
 import space.kscience.dataforge.names.first
 import space.kscience.dataforge.names.length
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.ValueType
-import space.kscience.dataforge.values.asValue
-import space.kscience.dataforge.values.set
 import kotlin.collections.set
 
 public class MetaDescriptorBuilder  @PublishedApi internal constructor() {

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/schemeDescriptor.kt

@@ -2,7 +2,7 @@ package space.kscience.dataforge.meta.descriptors
 
 import space.kscience.dataforge.meta.Scheme
 import space.kscience.dataforge.meta.SchemeSpec
-import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.meta.ValueType
 import kotlin.reflect.KProperty1
 import kotlin.reflect.typeOf
 

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/exoticValues.kt

@@ -1,4 +1,4 @@
-package space.kscience.dataforge.values
+package space.kscience.dataforge.meta
 
 
 /**

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/mapMeta.kt

@@ -4,9 +4,6 @@ import space.kscience.dataforge.meta.descriptors.MetaDescriptor
 import space.kscience.dataforge.meta.descriptors.get
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.values.ListValue
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.setValue
 
 /**
  * Convert meta to map of maps

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaConverter.kt

@@ -1,8 +1,6 @@
 package space.kscience.dataforge.meta.transformations
 
 import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.asValue
 
 /**
  * A converter of generic object to and from [Meta]

dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/valueExtensions.kt

@@ -1,6 +1,4 @@
-package space.kscience.dataforge.values
-
-import space.kscience.dataforge.meta.Meta
+package space.kscience.dataforge.meta
 
 /**
  * Check if value is null

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/ConfigTest.kt

@@ -1,6 +1,5 @@
 package space.kscience.dataforge.meta
 
-import space.kscience.dataforge.values.set
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaBuilderTest.kt

@@ -1,8 +1,5 @@
 package space.kscience.dataforge.meta
 
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.asValue
-import space.kscience.dataforge.values.set
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaDelegateTest.kt

@@ -1,6 +1,5 @@
 package space.kscience.dataforge.meta
 
-import space.kscience.dataforge.values.set
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaSerializationTest.kt

@@ -1,7 +1,6 @@
 package space.kscience.dataforge.meta
 
 import kotlinx.serialization.json.Json
-import space.kscience.dataforge.values.string
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaTest.kt

@@ -1,10 +1,6 @@
 package space.kscience.dataforge.meta
 
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.dataforge.values.NumberValue
-import space.kscience.dataforge.values.True
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.set
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SchemeTest.kt

@@ -1,8 +1,6 @@
 package space.kscience.dataforge.meta
 
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.dataforge.values.ListValue
-import space.kscience.dataforge.values.Value
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorTest.kt

@@ -1,8 +1,8 @@
 package space.kscience.dataforge.meta.descriptors
 
+import space.kscience.dataforge.meta.ValueType
 import space.kscience.dataforge.meta.boolean
 import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.values.ValueType
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull

dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/values/ValueEqualityTest.kt

@@ -1,5 +1,7 @@
 package space.kscience.dataforge.values
 
+import space.kscience.dataforge.meta.asValue
+import space.kscience.dataforge.meta.number
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals

dataforge-meta/src/jsMain/kotlin/space/kscience/dataforge/meta/DynamicMeta.kt

@@ -1,9 +1,6 @@
 package space.kscience.dataforge.meta
 
 import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.values.Value
-import space.kscience.dataforge.values.asValue
-import space.kscience.dataforge.values.isList
 
 
 //TODO add Meta wrapper for dynamic

dataforge-meta/src/jsTest/kotlin/space/kscience/dataforge/meta/DynamicMetaTest.kt

@@ -1,7 +1,5 @@
 package space.kscience.dataforge.meta
 
-import space.kscience.dataforge.values.ListValue
-import space.kscience.dataforge.values.int
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue