From cf0c934acf369c04d91b0e090a731b101c570a96 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 23 Feb 2021 17:40:05 +0300 Subject: [PATCH 01/10] Move logging to implementation --- .../kotlin/hep/dataforge/context/logging.kt | 21 ++++++-- .../kotlin/hep/dataforge/context/loggingJs.kt | 8 +++ .../hep/dataforge/context/loggingJvm.kt | 8 +++ .../hep/dataforge/context/loggingNative.kt | 53 +++++++++++++++++++ 4 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt create mode 100644 dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt create mode 100644 dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt index c43f7ea2..6868e0f2 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt @@ -2,20 +2,31 @@ package hep.dataforge.context import hep.dataforge.misc.Named import hep.dataforge.provider.Path -import mu.KLogger -import mu.KotlinLogging + +/** + * Part of kotlin-logging interface + */ +public expect interface Logger { + public fun trace(msg: () -> Any?) + public fun debug(msg: () -> Any?) + public fun info(msg: () -> Any?) + public fun warn(msg: () -> Any?) + public fun error(msg: () -> Any?) +} + +public expect fun Context.buildLogger(name: String): Logger /** * The logger specific to this context */ -public val Context.logger: KLogger get() = KotlinLogging.logger(name.toString()) +public val Context.logger: Logger get() = buildLogger(name.toString()) /** * The logger */ -public val ContextAware.logger: KLogger +public val ContextAware.logger: Logger get() = if (this is Named) { - KotlinLogging.logger(Path(context.name, this.name).toString()) + context.buildLogger(Path(context.name, this.name).toString()) } else { context.logger } diff --git a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt new file mode 100644 index 00000000..bf2df3bb --- /dev/null +++ b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt @@ -0,0 +1,8 @@ +package hep.dataforge.context + +import mu.KLogger +import mu.KotlinLogging + +public actual typealias Logger = KLogger + +public actual fun Context.buildLogger(name: String): Logger = KotlinLogging.logger(name) \ No newline at end of file diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt new file mode 100644 index 00000000..bf2df3bb --- /dev/null +++ b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt @@ -0,0 +1,8 @@ +package hep.dataforge.context + +import mu.KLogger +import mu.KotlinLogging + +public actual typealias Logger = KLogger + +public actual fun Context.buildLogger(name: String): Logger = KotlinLogging.logger(name) \ No newline at end of file diff --git a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt new file mode 100644 index 00000000..4654ebac --- /dev/null +++ b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt @@ -0,0 +1,53 @@ +package hep.dataforge.context + + +public actual interface Logger { + /** + * Lazy add a log message if isTraceEnabled is true + */ + public actual fun trace(msg: () -> Any?) + + /** + * Lazy add a log message if isDebugEnabled is true + */ + public actual fun debug(msg: () -> Any?) + + /** + * Lazy add a log message if isInfoEnabled is true + */ + public actual fun info(msg: () -> Any?) + + /** + * Lazy add a log message if isWarnEnabled is true + */ + public actual fun warn(msg: () -> Any?) + + /** + * Lazy add a log message if isErrorEnabled is true + */ + public actual fun error(msg: () -> Any?) + +} + +public actual fun Context.buildLogger(name: String): Logger = object :Logger{ + override fun trace(msg: () -> Any?) { + println("[TRACE] $name - ${msg()}") + } + + override fun debug(msg: () -> Any?) { + println("[DEBUG] $name - ${msg()}") + } + + override fun info(msg: () -> Any?) { + println("[INFO] $name - ${msg()}") + } + + override fun warn(msg: () -> Any?) { + println("[WARNING] $name - ${msg()}") + } + + override fun error(msg: () -> Any?) { + println("[ERROR] $name - ${msg()}") + } + +} \ No newline at end of file From 488cd5a9394d46e9459e4864d298cc76b89a7f88 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 23 Feb 2021 17:40:28 +0300 Subject: [PATCH 02/10] Tables refactor to KType --- CHANGELOG.md | 1 + build.gradle.kts | 14 ++++---- dataforge-context/api/dataforge-context.api | 4 +++ dataforge-context/build.gradle.kts | 25 ++++++++++---- dataforge-data/build.gradle.kts | 4 +-- dataforge-io/build.gradle.kts | 4 +-- .../dataforge-io-yaml/build.gradle.kts | 4 +-- dataforge-meta/build.gradle.kts | 4 +-- dataforge-output/build.gradle.kts | 4 +-- dataforge-scripting/build.gradle.kts | 2 +- dataforge-tables/build.gradle.kts | 8 +++-- .../kotlin/hep/dataforge/tables/ColumnDef.kt | 4 +-- .../hep/dataforge/tables/ColumnHeader.kt | 6 ++-- .../hep/dataforge/tables/ColumnTable.kt | 4 +-- .../kotlin/hep/dataforge/tables/ListColumn.kt | 9 ++--- .../dataforge/tables/MutableColumnTable.kt | 2 +- .../hep/dataforge/tables/MutableTable.kt | 33 ++++++++++++------- .../kotlin/hep/dataforge/tables/RowTable.kt | 24 +++++++++----- .../kotlin/hep/dataforge/tables/Table.kt | 28 ++++++---------- .../dataforge/tables/TransformationColumn.kt | 23 ++++++++----- .../hep/dataforge/tables/io/TextRows.kt | 18 +++++----- .../dataforge/tables/io/textTableEnvelope.kt | 11 ++++--- .../hep/dataforge/tables/numericColumns.kt | 8 ++--- .../kotlin/hep/dataforge/tables/CastColumn.kt | 19 ++++++----- .../hep/dataforge/tables/io/TextRowsTest.kt | 23 ++++++------- dataforge-workspace/build.gradle.kts | 4 +-- gradle.properties | 16 +++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 14 ++++---- 29 files changed, 177 insertions(+), 145 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccbd72a1..82e3a927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added ### Changed +- Kotlin-logging moved from common to JVM and JS. Replaced by console for native. ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index 21633df0..478af371 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,20 +1,20 @@ plugins { - id("ru.mipt.npm.project") + id("ru.mipt.npm.gradle.project") } -val dataforgeVersion by extra("0.3.0") - - - allprojects { group = "hep.dataforge" - version = dataforgeVersion + version = "0.3.1" apply() } subprojects { - apply(plugin = "ru.mipt.npm.publish") + apply(plugin = "ru.mipt.npm.gradle.publish") + repositories{ + maven("https://dl.bintray.com/mipt-npm/kscience") + maven("https://dl.bintray.com/mipt-npm/dev") + } } readme { diff --git a/dataforge-context/api/dataforge-context.api b/dataforge-context/api/dataforge-context.api index d2d736d9..21ffb157 100644 --- a/dataforge-context/api/dataforge-context.api +++ b/dataforge-context/api/dataforge-context.api @@ -95,6 +95,10 @@ public final class hep/dataforge/context/Global : hep/dataforge/context/Context public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; } +public final class hep/dataforge/context/LoggingJvmKt { + public static final fun buildLogger (Lhep/dataforge/context/Context;Ljava/lang/String;)Lmu/KLogger; +} + public final class hep/dataforge/context/LoggingKt { public static final fun getLogger (Lhep/dataforge/context/Context;)Lmu/KLogger; public static final fun getLogger (Lhep/dataforge/context/ContextAware;)Lmu/KLogger; diff --git a/dataforge-context/build.gradle.kts b/dataforge-context/build.gradle.kts index 84785ce8..3f80796e 100644 --- a/dataforge-context/build.gradle.kts +++ b/dataforge-context/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } description = "Context and provider definitions" @@ -11,22 +11,33 @@ kscience { kotlin { sourceSets { - val commonMain by getting { + val commonMain by getting{ dependencies { api(project(":dataforge-meta")) - api("io.github.microutils:kotlin-logging:1.9.0-dev-npm-2") } } - val jvmMain by getting { + jvmMain { dependencies { api(kotlin("reflect")) - api("ch.qos.logback:logback-classic:1.2.3") + api("io.github.microutils:kotlin-logging-jvm:2.0.4") + implementation("ch.qos.logback:logback-classic:1.2.3") } } - val jsMain by getting { + jsMain { dependencies { + api("io.github.microutils:kotlin-logging-js:2.0.4") } } +// +// val nativeMain by getting{ +// dependsOn(commonMain) +// } +// val mingwX64Main by getting{ +// dependsOn(nativeMain) +// } +// val linuxX64Main by getting{ +// dependsOn(nativeMain) +// } } } diff --git a/dataforge-data/build.gradle.kts b/dataforge-data/build.gradle.kts index 16d98ced..74ed12db 100644 --- a/dataforge-data/build.gradle.kts +++ b/dataforge-data/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } kscience{ diff --git a/dataforge-io/build.gradle.kts b/dataforge-io/build.gradle.kts index 01f749cb..c5292aec 100644 --- a/dataforge-io/build.gradle.kts +++ b/dataforge-io/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } description = "IO module" diff --git a/dataforge-io/dataforge-io-yaml/build.gradle.kts b/dataforge-io/dataforge-io-yaml/build.gradle.kts index 4ee1029a..1b57fc71 100644 --- a/dataforge-io/dataforge-io-yaml/build.gradle.kts +++ b/dataforge-io/dataforge-io-yaml/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") -// id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") +// id("ru.mipt.npm.gradle.native") } description = "YAML meta IO" diff --git a/dataforge-meta/build.gradle.kts b/dataforge-meta/build.gradle.kts index 45ca68f3..a2cc3c66 100644 --- a/dataforge-meta/build.gradle.kts +++ b/dataforge-meta/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } kscience { diff --git a/dataforge-output/build.gradle.kts b/dataforge-output/build.gradle.kts index 6051cb1c..7faac326 100644 --- a/dataforge-output/build.gradle.kts +++ b/dataforge-output/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } kotlin { diff --git a/dataforge-scripting/build.gradle.kts b/dataforge-scripting/build.gradle.kts index e0c47057..a538a980 100644 --- a/dataforge-scripting/build.gradle.kts +++ b/dataforge-scripting/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.mpp") + id("ru.mipt.npm.gradle.mpp") } kotlin { diff --git a/dataforge-tables/build.gradle.kts b/dataforge-tables/build.gradle.kts index d0f008c3..507b1f71 100644 --- a/dataforge-tables/build.gradle.kts +++ b/dataforge-tables/build.gradle.kts @@ -1,14 +1,16 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } kotlin { sourceSets { - val commonMain by getting{ + commonMain{ dependencies { api(project(":dataforge-context")) api(project(":dataforge-io")) + + api(kotlin("reflect")) } } } diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt index 2dd2e85b..a309443e 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt @@ -1,10 +1,10 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta -import kotlin.reflect.KClass +import kotlin.reflect.KType public data class ColumnDef( override val name: String, - override val type: KClass, + override val type: KType, override val meta: Meta ): ColumnHeader \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt index 4aeb3124..95241682 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt @@ -6,7 +6,7 @@ import hep.dataforge.meta.int import hep.dataforge.meta.string import hep.dataforge.values.Value import hep.dataforge.values.ValueType -import kotlin.reflect.KClass +import kotlin.reflect.KType public typealias TableHeader = List> @@ -14,13 +14,13 @@ public typealias ValueTableHeader = List> public interface ColumnHeader { public val name: String - public val type: KClass + public val type: KType public val meta: Meta } public data class SimpleColumnHeader( override val name: String, - override val type: KClass, + override val type: KType, override val meta: Meta ) : ColumnHeader diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt index e79ebd08..c9c8ac97 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt @@ -13,11 +13,11 @@ public class ColumnTable(override val columns: Collection>) : override val rows: List> get() = (0 until rowsNum).map { VirtualRow(this, it) } - override fun getValue(row: Int, column: String): T? = columns[column]?.get(row) + override fun get(row: Int, column: String): T? = columns[column]?.get(row) } internal class VirtualRow(val table: Table, val index: Int) : Row { - override fun getValue(column: String): T? = table.getValue(index, column) + override fun get(column: String): T? = table.get(index, column) // override fun get(columnHeader: ColumnHeader): T? { // return table.co[columnHeader][index] diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt index 7b0549fa..165ff6de 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt @@ -1,12 +1,13 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta -import kotlin.reflect.KClass +import kotlin.reflect.KType +import kotlin.reflect.typeOf public class ListColumn( override val name: String, private val data: List, - override val type: KClass, + override val type: KType, override val meta: Meta ) : Column { override val size: Int get() = data.size @@ -18,7 +19,7 @@ public class ListColumn( name: String, def: ColumnScheme, data: List - ): ListColumn = ListColumn(name, data, T::class, def.toMeta()) + ): ListColumn = ListColumn(name, data, typeOf(), def.toMeta()) public inline operator fun invoke( name: String, @@ -31,5 +32,5 @@ public class ListColumn( public inline fun Column.map(meta: Meta = this.meta, noinline block: (T?) -> R): Column { val data = List(size) { block(get(it)) } - return ListColumn(name, data, R::class, meta) + return ListColumn(name, data, typeOf(), meta) } \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt index eb69d7e7..01882902 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt @@ -11,7 +11,7 @@ public class MutableColumnTable(public val size: Int) : Table { VirtualRow(this, it) } - override fun getValue(row: Int, column: String): C? = columns[column]?.get(row) + override fun get(row: Int, column: String): C? = columns[column]?.get(row) /** * Add a fixed column to the end of the table diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt index f4070146..8fca7705 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt @@ -1,27 +1,36 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta -import hep.dataforge.meta.invoke import hep.dataforge.values.Value -import kotlin.reflect.KClass +import kotlin.properties.PropertyDelegateProvider +import kotlin.properties.ReadOnlyProperty +import kotlin.reflect.KType +import kotlin.reflect.typeOf public class MutableTable( override val rows: MutableList>, - override val header: MutableList> -) : RowTable(rows, header) { + override val headers: MutableList>, +) : RowTable(rows, headers) { - public fun column(name: String, type: KClass, meta: Meta): ColumnHeader { - val column = SimpleColumnHeader(name, type, meta) - header.add(column) + @PublishedApi + internal fun addColumn(name: String, type: KType, meta: Meta): ColumnHeader { + val column = SimpleColumnHeader(name, type, meta) + headers.add(column) return column } - public inline fun column( + public inline fun addColumn( name: String, + noinline columnMetaBuilder: ColumnScheme.() -> Unit = {}, + ): ColumnHeader = addColumn(name, typeOf(), ColumnScheme(columnMetaBuilder).toMeta()) + + public inline fun column( noinline columnMetaBuilder: ColumnScheme.() -> Unit = {} - ): ColumnHeader { - return column(name, T::class, ColumnScheme(columnMetaBuilder).toMeta()) - } + ): PropertyDelegateProvider>> = + PropertyDelegateProvider { _, property -> + val res = addColumn(property.name, columnMetaBuilder) + ReadOnlyProperty { _, _ -> res } + } public fun row(map: Map): Row { val row = MapRow(map) @@ -37,5 +46,5 @@ public fun MutableTable.row(vararg pairs: Pair, Any?> row(pairs.associate { it.first.name to Value.of(it.second) }) public fun Table.edit(block: MutableTable.() -> Unit): Table { - return MutableTable(rows.toMutableList(), header.toMutableList()).apply(block) + return MutableTable(rows.toMutableList(), headers.toMutableList()).apply(block) } \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt index 9ea908cc..6b7b1261 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt @@ -2,25 +2,31 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta import kotlinx.coroutines.flow.toList -import kotlin.reflect.KClass +import kotlin.reflect.KType public inline class MapRow(private val values: Map) : Row { - override fun getValue(column: String): C? = values[column] + override fun get(column: String): C? = values[column] } -internal class RowTableColumn(val table: Table, val header: ColumnHeader) : Column { +internal class RowTableColumn(val table: Table, val header: ColumnHeader) : Column { + init { + require(header in table.headers){"Header $header does not belong to $table"} + } + override val name: String get() = header.name - override val type: KClass get() = header.type + override val type: KType get() = header.type override val meta: Meta get() = header.meta override val size: Int get() = table.rows.size - override fun get(index: Int): T? = table.rows[index].getValue(name, type) + @Suppress("UNCHECKED_CAST") + override fun get(index: Int): R? = table[index, name]?.let { it as R} } -public open class RowTable(override val rows: List>, override val header: List>) : Table { - override fun getValue(row: Int, column: String): C? = rows[row].getValue(column) +public open class RowTable(override val rows: List>, override val headers: List>) : + Table { + override fun get(row: Int, column: String): C? = rows[row].get(column) - override val columns: List> get() = header.map { RowTableColumn(this, it) } + override val columns: List> get() = headers.map { RowTableColumn(this, it) } } -public suspend fun Rows.collect(): Table = this as? Table ?: RowTable(rowFlow().toList(), header) \ No newline at end of file +public suspend fun Rows.collect(): Table = this as? Table ?: RowTable(rowFlow().toList(), headers) \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt index 72875a05..bd0410e1 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt @@ -2,22 +2,20 @@ package hep.dataforge.tables import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow -import kotlin.reflect.KClass -import kotlin.reflect.cast /** * Finite or infinite row set. Rows are produced in a lazy suspendable [Flow]. - * Each row must contain at least all the fields mentioned in [header]. + * Each row must contain at least all the fields mentioned in [headers]. */ public interface Rows { - public val header: TableHeader + public val headers: TableHeader public fun rowFlow(): Flow> } public interface Table : Rows { - public fun getValue(row: Int, column: String): T? + public operator fun get(row: Int, column: String): T? public val columns: Collection> - override val header: TableHeader get() = columns.toList() + override val headers: TableHeader get() = columns.toList() public val rows: List> override fun rowFlow(): Flow> = rows.asFlow() @@ -31,16 +29,13 @@ public interface Table : Rows { } } -public fun Table.getValue(row: Int, column: String, type: KClass): T? = - type.cast(getValue(row, column)) - public operator fun Collection>.get(name: String): Column? = find { it.name == name } -public inline operator fun Table.get(row: Int, column: String): T? = - getValue(row, column, T::class) -public operator fun Table.get(row: Int, column: ColumnHeader): T? = - getValue(row, column.name, column.type) +public inline operator fun Table.get(row: Int, column: ColumnHeader): R? { + require(headers.contains(column)) { "Column $column is not in table headers" } + return get(row, column.name) as? R +} public interface Column : ColumnHeader { public val size: Int @@ -56,10 +51,7 @@ public operator fun Column.iterator(): Iterator = iterator { } public interface Row { - public fun getValue(column: String): T? + public operator fun get(column: String): T? } -public fun Row.getValue(column: String, type: KClass): T? = type.cast(getValue(column)) - -public inline operator fun Row.get(column: String): T? = T::class.cast(getValue(column)) -public operator fun Row.get(column: ColumnHeader): T? = getValue(column.name, column.type) \ No newline at end of file +public inline operator fun Row.get(column: ColumnHeader): R? = get(column.name) as? R \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt index 83fdc06b..a0f78eea 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt @@ -1,17 +1,18 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta -import kotlin.reflect.KClass +import kotlin.reflect.KType +import kotlin.reflect.typeOf /** * A virtual column obtained by transforming Given row to a single value */ public class TransformationColumn( public val table: Table, - override val type: KClass, + override val type: KType, override val name: String, override val meta: Meta, - public val mapper: (Row) -> R? + public val mapper: (Row) -> R?, ) : Column { override val size: Int get() = table.rows.size @@ -25,10 +26,10 @@ public class TransformationColumn( */ public class CachedTransformationColumn( public val table: Table, - override val type: KClass, + override val type: KType, override val name: String, override val meta: Meta, - public val mapper: (Row) -> R? + public val mapper: (Row) -> R?, ) : Column { override val size: Int get() = table.rows.size private val values: HashMap = HashMap() @@ -42,14 +43,18 @@ public inline fun Table.mapRows( name: String, meta: Meta = Meta.EMPTY, cache: Boolean = false, - noinline mapper: (Row) -> R? + noinline mapper: (Row) -> R?, ): Column = if (cache) { - CachedTransformationColumn(this, R::class, name, meta, mapper) + CachedTransformationColumn(this, typeOf(), name, meta, mapper) } else { - TransformationColumn(this, R::class, name, meta, mapper) + TransformationColumn(this, typeOf(), name, meta, mapper) } -public fun Table.mapRowsToDouble(name: String, meta: Meta = Meta.EMPTY, block: (Row) -> Double): RealColumn { +public fun Table.mapRowsToDouble( + name: String, + meta: Meta = Meta.EMPTY, + block: (Row) -> Double, +): RealColumn { val data = DoubleArray(rows.size) { block(rows[it]) } return RealColumn(name, data, meta) } diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt index e9e6e31e..0ef003c4 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt @@ -32,7 +32,7 @@ private fun readLine(header: ValueTableHeader, line: String): Row { * Finite or infinite [Rows] created from a fixed width text binary */ @ExperimentalIoApi -public class TextRows(override val header: ValueTableHeader, private val binary: Binary) : Rows { +public class TextRows(override val headers: ValueTableHeader, private val binary: Binary) : Rows { /** * A flow of indexes of string start offsets ignoring empty strings @@ -52,7 +52,7 @@ public class TextRows(override val header: ValueTableHeader, private val binary: flow { forEachUtf8Line { line -> if (line.isNotBlank()) { - val row = readLine(header, line) + val row = readLine(headers, line) emit(row) } } @@ -73,25 +73,25 @@ public suspend fun TextRows.buildRowIndex(): List = indexFlow().toList() */ @ExperimentalIoApi public class TextTable( - override val header: ValueTableHeader, + override val headers: ValueTableHeader, private val binary: Binary, public val index: List ) : Table { - override val columns: Collection> get() = header.map { RowTableColumn(this, it) } + override val columns: Collection> get() = headers.map { RowTableColumn(this, it) } override val rows: List> get() = index.map { readAt(it) } - override fun rowFlow(): Flow> = TextRows(header, binary).rowFlow() + override fun rowFlow(): Flow> = TextRows(headers, binary).rowFlow() private fun readAt(offset: Int): Row { return binary.read(offset) { val line = readUtf8Line() - return@read readLine(header, line) + return@read readLine(headers, line) } } - override fun getValue(row: Int, column: String): Value? { + override fun get(row: Int, column: String): Value? { val offset = index[row] return readAt(offset)[column] } @@ -132,11 +132,11 @@ private fun Output.writeValue(value: Value, width: Int, left: Boolean = true) { * Write rows without header to the output */ public suspend fun Output.writeRows(rows: Rows) { - val widths: List = rows.header.map { + val widths: List = rows.headers.map { it.textWidth } rows.rowFlow().collect { row -> - rows.header.forEachIndexed { index, columnHeader -> + rows.headers.forEachIndexed { index, columnHeader -> writeValue(row[columnHeader] ?: Null, widths[index]) } writeUtf8String("\r\n") diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt index b6be63e0..d0cca162 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt @@ -10,12 +10,13 @@ import kotlinx.io.Binary import kotlinx.io.ByteArrayOutput import kotlinx.io.ExperimentalIoApi import kotlinx.io.asBinary +import kotlin.reflect.typeOf @ExperimentalIoApi -public suspend fun Table.wrap(): Envelope = Envelope { +public suspend fun Table.toEnvelope(): Envelope = Envelope { meta { - header.forEachIndexed { index, columnHeader -> + headers.forEachIndexed { index, columnHeader -> set("column", index.toString(), Meta { "name" put columnHeader.name if (!columnHeader.meta.isEmpty()) { @@ -26,9 +27,9 @@ public suspend fun Table.wrap(): Envelope = Envelope { } type = "table.value" - dataID = "valueTable[${this@wrap.hashCode()}]" + dataID = "valueTable[${this@toEnvelope.hashCode()}]" - data = ByteArrayOutput().apply { writeRows(this@wrap) }.toByteArray().asBinary() + data = ByteArrayOutput().apply { writeRows(this@toEnvelope) }.toByteArray().asBinary() } @DFExperimental @@ -37,7 +38,7 @@ public fun TextRows.Companion.readEnvelope(envelope: Envelope): TextRows { val header = envelope.meta.getIndexed("column") .entries.sortedBy { it.key?.toInt() } .map { (_, item) -> - SimpleColumnHeader(item.node["name"].string!!, Value::class, item.node["meta"].node ?: Meta.EMPTY) + SimpleColumnHeader(item.node["name"].string!!, typeOf(), item.node["meta"].node ?: Meta.EMPTY) } return TextRows(header, envelope.data ?: Binary.EMPTY) } \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt index 86868a22..05d26d49 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt @@ -1,8 +1,8 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta -import hep.dataforge.meta.invoke -import kotlin.reflect.KClass +import kotlin.reflect.KType +import kotlin.reflect.typeOf public class RealColumn( @@ -10,7 +10,7 @@ public class RealColumn( public val data: DoubleArray, override val meta: Meta = Meta.EMPTY ) : Column { - override val type: KClass get() = Double::class + override val type: KType get() = typeOf() override val size: Int get() = data.size @@ -49,7 +49,7 @@ public class IntColumn( public val data: IntArray, override val meta: Meta = Meta.EMPTY ) : Column { - override val type: KClass get() = Int::class + override val type: KType get() = typeOf() override val size: Int get() = data.size diff --git a/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt b/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt index 0ab6c515..b9e62e96 100644 --- a/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt +++ b/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt @@ -2,30 +2,31 @@ package hep.dataforge.tables import hep.dataforge.meta.Meta import kotlin.properties.ReadOnlyProperty -import kotlin.reflect.KClass import kotlin.reflect.KProperty -import kotlin.reflect.full.isSubclassOf -import kotlin.reflect.safeCast +import kotlin.reflect.KType +import kotlin.reflect.full.isSubtypeOf @Suppress("UNCHECKED_CAST") -public fun Column<*>.cast(type: KClass): Column { - return if (type.isSubclassOf(this.type)) { +public fun Column<*>.cast(type: KType): Column { + return if (type.isSubtypeOf(this.type)) { this as Column } else { CastColumn(this, type) } } -public class CastColumn(private val origin: Column<*>, override val type: KClass) : Column { +private class CastColumn(private val origin: Column<*>, override val type: KType) : Column { override val name: String get() = origin.name override val meta: Meta get() = origin.meta override val size: Int get() = origin.size - - override fun get(index: Int): T? = type.safeCast(origin[index]) + @Suppress("UNCHECKED_CAST") + override fun get(index: Int): T? = origin[index]?.let { + it as T + } } -public class ColumnProperty(public val table: Table, public val type: KClass) : ReadOnlyProperty> { +public class ColumnProperty(public val table: Table, public val type: KType) : ReadOnlyProperty> { override fun getValue(thisRef: Any?, property: KProperty<*>): Column { val name = property.name return (table.columns[name] ?: error("Column with name $name not found in the table")).cast(type) diff --git a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt b/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt index 90fa3a01..b03bec33 100644 --- a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt +++ b/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt @@ -2,7 +2,6 @@ package hep.dataforge.tables.io import hep.dataforge.misc.DFExperimental import hep.dataforge.tables.Table -import hep.dataforge.tables.get import hep.dataforge.tables.row import hep.dataforge.values.Value import hep.dataforge.values.int @@ -19,22 +18,20 @@ import kotlin.test.assertEquals @ExperimentalIoApi class TextRowsTest { val table = Table { - val a = column("a") - val b = column("b") + val a by column() + val b by column() row(a to 1, b to "b1") row(a to 2, b to "b2") } @Test - fun testTableWriteRead() { - runBlocking { - val envelope = table.wrap() - val string = envelope.data!!.toByteArray().decodeToString() - println(string) - val table = TextRows.readEnvelope(envelope) - val rows = table.rowFlow().toList() - assertEquals(1, rows[0]["a"]?.int) - assertEquals("b2", rows[1]["b"]?.string) - } + fun testTableWriteRead() = runBlocking { + val envelope = table.toEnvelope() + val string = envelope.data!!.toByteArray().decodeToString() + println(string) + val table = TextRows.readEnvelope(envelope) + val rows = table.rowFlow().toList() + assertEquals(1, rows[0]["a"]?.int) + assertEquals("b2", rows[1]["b"]?.string) } } \ No newline at end of file diff --git a/dataforge-workspace/build.gradle.kts b/dataforge-workspace/build.gradle.kts index ae83b062..c6e62b36 100644 --- a/dataforge-workspace/build.gradle.kts +++ b/dataforge-workspace/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.mpp") - id("ru.mipt.npm.native") + id("ru.mipt.npm.gradle.mpp") + id("ru.mipt.npm.gradle.native") } kotlin { diff --git a/gradle.properties b/gradle.properties index a782b701..9b6d2aef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,11 @@ -kotlin.code.style=official -kotlin.parallel.tasks.in.project=true -kotlin.mpp.enableGranularSourceSetsMetadata=true -//kotlin.native.enableDependencyPropagation=false -kotlin.mpp.stability.nowarn=true - org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m org.gradle.parallel=true -systemProp.org.gradle.internal.publish.checksums.insecure=true \ No newline at end of file + +kotlin.code.style=official +kotlin.parallel.tasks.in.project=true + +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false +kotlin.mpp.stability.nowarn=true + +bintrayPublish=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446a..442d9132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index defbc0e5..8746a320 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { repositories { - mavenLocal() + maven("https://repo.kotlin.link") jcenter() gradlePluginPortal() maven("https://dl.bintray.com/kotlin/kotlin-eap") @@ -10,15 +10,15 @@ pluginManagement { maven("https://dl.bintray.com/mipt-npm/dev") } - val toolsVersion = "0.7.6" + val toolsVersion = "0.8.3" val kotlinVersion = "1.4.30" plugins { - id("ru.mipt.npm.project") version toolsVersion - id("ru.mipt.npm.mpp") version toolsVersion - id("ru.mipt.npm.jvm") version toolsVersion - id("ru.mipt.npm.js") version toolsVersion - id("ru.mipt.npm.publish") 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 + id("ru.mipt.npm.gradle.publish") version toolsVersion kotlin("jvm") version kotlinVersion kotlin("js") version kotlinVersion } From c98ffd1eb4bb62716123c38ea324420168e5f313 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 28 Feb 2021 11:45:19 +0300 Subject: [PATCH 03/10] Logging refactor. Remove Kotlin-logging from common --- build.gradle.kts | 6 +- dataforge-context/api/dataforge-context.api | 70 ++++++++++++------- dataforge-context/build.gradle.kts | 10 --- .../kotlin/hep/dataforge/context/Global.kt | 8 +++ .../hep/dataforge/context/LogManager.kt | 38 ++++++++++ .../hep/dataforge/context/PluginManager.kt | 4 +- .../kotlin/hep/dataforge/context/logging.kt | 33 --------- .../kotlin/hep/dataforge/context/loggingJs.kt | 29 +++++++- .../hep/dataforge/context/loggingJvm.kt | 29 +++++++- .../hep/dataforge/context/loggingNative.kt | 62 +++++----------- dataforge-meta/api/dataforge-meta.api | 5 -- 11 files changed, 167 insertions(+), 127 deletions(-) create mode 100644 dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt delete mode 100644 dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt diff --git a/build.gradle.kts b/build.gradle.kts index 478af371..65be5b8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "hep.dataforge" - version = "0.3.1" + version = "0.4.0-dev-1" apply() } @@ -25,4 +25,8 @@ ksciencePublish { bintrayRepo = "dataforge" githubProject = "dataforge-core" spaceRepo = "https://maven.jetbrains.space/mipt-npm/p/df/maven" +} + +apiValidation{ + nonPublicMarkers.add("hep.dataforge.misc.DFExperimental") } \ No newline at end of file diff --git a/dataforge-context/api/dataforge-context.api b/dataforge-context/api/dataforge-context.api index 21ffb157..baeaad1f 100644 --- a/dataforge-context/api/dataforge-context.api +++ b/dataforge-context/api/dataforge-context.api @@ -93,15 +93,53 @@ public final class hep/dataforge/context/Global : hep/dataforge/context/Context public static synthetic fun context$default (Lhep/dataforge/context/Global;Ljava/lang/String;Lhep/dataforge/context/Context;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/context/Context; public final fun getContext (Ljava/lang/String;)Lhep/dataforge/context/Context; public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; + public final fun getLogger ()Lhep/dataforge/context/LogManager; } -public final class hep/dataforge/context/LoggingJvmKt { - public static final fun buildLogger (Lhep/dataforge/context/Context;Ljava/lang/String;)Lmu/KLogger; +public final class hep/dataforge/context/KLoggingManager : hep/dataforge/context/AbstractPlugin, hep/dataforge/context/LogManager { + public static final field Companion Lhep/dataforge/context/KLoggingManager$Companion; + public fun ()V + public fun getTag ()Lhep/dataforge/context/PluginTag; + public fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V } -public final class hep/dataforge/context/LoggingKt { - public static final fun getLogger (Lhep/dataforge/context/Context;)Lmu/KLogger; - public static final fun getLogger (Lhep/dataforge/context/ContextAware;)Lmu/KLogger; +public final class hep/dataforge/context/KLoggingManager$Companion : hep/dataforge/context/PluginFactory { + public fun getTag ()Lhep/dataforge/context/PluginTag; + public fun getType ()Lkotlin/reflect/KClass; + public fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Lhep/dataforge/context/KLoggingManager; + public synthetic fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; +} + +public abstract interface class hep/dataforge/context/LogManager : hep/dataforge/context/Plugin { + public static final field Companion Lhep/dataforge/context/LogManager$Companion; + public static final field DEBUG Ljava/lang/String; + public static final field ERROR Ljava/lang/String; + public static final field INFO Ljava/lang/String; + public static final field TRACE Ljava/lang/String; + public static final field WARNING Ljava/lang/String; + public abstract fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V +} + +public final class hep/dataforge/context/LogManager$Companion { + public static final field DEBUG Ljava/lang/String; + public static final field ERROR Ljava/lang/String; + public static final field INFO Ljava/lang/String; + public static final field TRACE Ljava/lang/String; + public static final field WARNING Ljava/lang/String; +} + +public final class hep/dataforge/context/LogManager$DefaultImpls { + public static fun content (Lhep/dataforge/context/LogManager;Ljava/lang/String;)Ljava/util/Map; + public static fun getDefaultChainTarget (Lhep/dataforge/context/LogManager;)Ljava/lang/String; + public static fun getDefaultTarget (Lhep/dataforge/context/LogManager;)Ljava/lang/String; + public static fun getName (Lhep/dataforge/context/LogManager;)Lhep/dataforge/names/Name; + public static fun toMeta (Lhep/dataforge/context/LogManager;)Lhep/dataforge/meta/Meta; +} + +public final class hep/dataforge/context/LogManagerKt { + public static final fun getLogger (Lhep/dataforge/context/Context;)Lhep/dataforge/context/LogManager; + public static final fun info (Lhep/dataforge/context/LogManager;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun info$default (Lhep/dataforge/context/LogManager;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V } public abstract interface class hep/dataforge/context/Plugin : hep/dataforge/context/ContextAware, hep/dataforge/meta/MetaRepr, hep/dataforge/misc/Named, hep/dataforge/provider/Provider { @@ -188,7 +226,6 @@ public final class hep/dataforge/context/PluginTag$Companion { public final class hep/dataforge/context/ResolveKt { public static final fun gather (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;Z)Ljava/util/Map; public static synthetic fun gather$default (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Ljava/util/Map; - public static final fun gatherInSequence (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;Z)Lkotlin/sequences/Sequence; public static synthetic fun gatherInSequence$default (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Lkotlin/sequences/Sequence; public static final fun getValues (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence; public static final fun resolve (Lhep/dataforge/context/Context;Ljava/lang/String;Lhep/dataforge/names/Name;Lkotlin/reflect/KClass;)Ljava/lang/Object; @@ -216,33 +253,12 @@ public abstract interface annotation class hep/dataforge/descriptors/ValueDef : public abstract fun type ()[Lhep/dataforge/values/ValueType; } -public final class hep/dataforge/properties/ConfigProperty : hep/dataforge/properties/Property { - public fun (Lhep/dataforge/meta/Config;Lhep/dataforge/names/Name;Lhep/dataforge/meta/transformations/MetaConverter;)V - public final fun getConfig ()Lhep/dataforge/meta/Config; - public final fun getConverter ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getName ()Lhep/dataforge/names/Name; - public fun getValue ()Ljava/lang/Object; - public fun onChange (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V - public fun removeChangeListener (Ljava/lang/Object;)V - public fun setValue (Ljava/lang/Object;)V -} - -public abstract interface class hep/dataforge/properties/Property { - public abstract fun getValue ()Ljava/lang/Object; - public abstract fun onChange (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V - public abstract fun removeChangeListener (Ljava/lang/Object;)V - public abstract fun setValue (Ljava/lang/Object;)V -} - public final class hep/dataforge/properties/Property$DefaultImpls { public static synthetic fun onChange$default (Lhep/dataforge/properties/Property;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public static synthetic fun removeChangeListener$default (Lhep/dataforge/properties/Property;Ljava/lang/Object;ILjava/lang/Object;)V } public final class hep/dataforge/properties/PropertyKt { - public static final fun bind (Lhep/dataforge/properties/Property;Lhep/dataforge/properties/Property;)V - public static final fun mirror (Lhep/dataforge/properties/Property;Lhep/dataforge/properties/Property;Lkotlinx/coroutines/CoroutineScope;)V - public static final fun toFlow (Lhep/dataforge/properties/Property;)Lkotlinx/coroutines/flow/StateFlow; } public final class hep/dataforge/provider/DfTypeKt { diff --git a/dataforge-context/build.gradle.kts b/dataforge-context/build.gradle.kts index 3f80796e..0eb1083e 100644 --- a/dataforge-context/build.gradle.kts +++ b/dataforge-context/build.gradle.kts @@ -28,16 +28,6 @@ kotlin { api("io.github.microutils:kotlin-logging-js:2.0.4") } } -// -// val nativeMain by getting{ -// dependsOn(commonMain) -// } -// val mingwX64Main by getting{ -// dependsOn(nativeMain) -// } -// val linuxX64Main by getting{ -// dependsOn(nativeMain) -// } } } diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt index 0193ca4b..3d995037 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt @@ -7,6 +7,9 @@ import kotlinx.coroutines.SupervisorJob import kotlin.coroutines.CoroutineContext import kotlin.native.concurrent.ThreadLocal + +internal expect val globalLogger: LogManager + /** * A global root context. Closing [Global] terminates the framework. */ @@ -15,6 +18,11 @@ public object Global : Context("GLOBAL".asName(), null, Meta.EMPTY) { override val coroutineContext: CoroutineContext = GlobalScope.coroutineContext + SupervisorJob() + /** + * The default logging manager + */ + public val logger: LogManager = globalLogger + /** * Closing all contexts * diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt new file mode 100644 index 00000000..830861b8 --- /dev/null +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt @@ -0,0 +1,38 @@ +package hep.dataforge.context + +import hep.dataforge.names.Name + +public interface LogManager : Plugin { + + public fun log(name: Name, tag: String, body: () -> String) + + public companion object { + public const val TRACE: String = "TRACE" + public const val INFO: String = "INFO" + public const val DEBUG: String = "DEBUG" + public const val WARNING: String = "WARNING" + public const val ERROR: String = "ERROR" + } +} + +public fun LogManager.info(name: Name = Name.EMPTY, body: () -> String): Unit = log(name,LogManager.INFO,body) + +public val Context.logger: LogManager + get() = plugins.find(inherit = true) { it is LogManager } as? LogManager ?: Global.logger + + +///** +// * The logger specific to this context +// */ +//public val Context.logger: Logger get() = buildLogger(name.toString()) +// +///** +// * The logger +// */ +//public val ContextAware.logger: Logger +// get() = if (this is Named) { +// context.buildLogger(Path(context.name, this.name).toString()) +// } else { +// context.logger +// } + diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt index 4854b328..66d7e1f8 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt @@ -93,7 +93,7 @@ public class PluginManager(override val context: Context) : ContextAware, Iterab fetch(factory, meta, true) } - logger.info { "Loading plugin ${plugin.name} into ${context.name}" } + Global.logger.info { "Loading plugin ${plugin.name} into ${context.name}" } plugin.attach(context) plugins.add(plugin) return plugin @@ -114,7 +114,7 @@ public class PluginManager(override val context: Context) : ContextAware, Iterab */ public fun remove(plugin: Plugin) { if (plugins.contains(plugin)) { - logger.info { "Removing plugin ${plugin.name} from ${context.name}" } + Global.logger.info { "Removing plugin ${plugin.name} from ${context.name}" } plugin.detach() plugins.remove(plugin) } diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt deleted file mode 100644 index 6868e0f2..00000000 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/logging.kt +++ /dev/null @@ -1,33 +0,0 @@ -package hep.dataforge.context - -import hep.dataforge.misc.Named -import hep.dataforge.provider.Path - -/** - * Part of kotlin-logging interface - */ -public expect interface Logger { - public fun trace(msg: () -> Any?) - public fun debug(msg: () -> Any?) - public fun info(msg: () -> Any?) - public fun warn(msg: () -> Any?) - public fun error(msg: () -> Any?) -} - -public expect fun Context.buildLogger(name: String): Logger - -/** - * The logger specific to this context - */ -public val Context.logger: Logger get() = buildLogger(name.toString()) - -/** - * The logger - */ -public val ContextAware.logger: Logger - get() = if (this is Named) { - context.buildLogger(Path(context.name, this.name).toString()) - } else { - context.logger - } - diff --git a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt index bf2df3bb..ffeb68f6 100644 --- a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt +++ b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt @@ -1,8 +1,31 @@ package hep.dataforge.context -import mu.KLogger +import hep.dataforge.meta.Meta +import hep.dataforge.names.Name import mu.KotlinLogging +import kotlin.reflect.KClass -public actual typealias Logger = KLogger +public class KLoggingManager : AbstractPlugin(), LogManager { -public actual fun Context.buildLogger(name: String): Logger = KotlinLogging.logger(name) \ No newline at end of file + override fun log(name: Name, tag: String, body: () -> String) { + val logger = KotlinLogging.logger("[${context.name}] $name") + when (tag) { + LogManager.DEBUG -> logger.debug(body) + LogManager.INFO -> logger.info(body) + LogManager.WARNING -> logger.warn(body) + LogManager.ERROR -> logger.error(body) + else -> logger.trace(body) + } + } + + override val tag: PluginTag get() = Companion.tag + + public companion object : PluginFactory { + override fun invoke(meta: Meta, context: Context): KLoggingManager = KLoggingManager() + + override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.kotlinLogging") + override val type: KClass = KLoggingManager::class + } +} + +internal actual val globalLogger: LogManager = KLoggingManager().apply { attach(Global) } diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt index bf2df3bb..ffeb68f6 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt +++ b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt @@ -1,8 +1,31 @@ package hep.dataforge.context -import mu.KLogger +import hep.dataforge.meta.Meta +import hep.dataforge.names.Name import mu.KotlinLogging +import kotlin.reflect.KClass -public actual typealias Logger = KLogger +public class KLoggingManager : AbstractPlugin(), LogManager { -public actual fun Context.buildLogger(name: String): Logger = KotlinLogging.logger(name) \ No newline at end of file + override fun log(name: Name, tag: String, body: () -> String) { + val logger = KotlinLogging.logger("[${context.name}] $name") + when (tag) { + LogManager.DEBUG -> logger.debug(body) + LogManager.INFO -> logger.info(body) + LogManager.WARNING -> logger.warn(body) + LogManager.ERROR -> logger.error(body) + else -> logger.trace(body) + } + } + + override val tag: PluginTag get() = Companion.tag + + public companion object : PluginFactory { + override fun invoke(meta: Meta, context: Context): KLoggingManager = KLoggingManager() + + override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.kotlinLogging") + override val type: KClass = KLoggingManager::class + } +} + +internal actual val globalLogger: LogManager = KLoggingManager().apply { attach(Global) } diff --git a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt index 4654ebac..9caa3398 100644 --- a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt +++ b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt @@ -1,53 +1,29 @@ package hep.dataforge.context +import hep.dataforge.meta.Meta +import hep.dataforge.names.Name +import kotlin.reflect.KClass -public actual interface Logger { - /** - * Lazy add a log message if isTraceEnabled is true - */ - public actual fun trace(msg: () -> Any?) - /** - * Lazy add a log message if isDebugEnabled is true - */ - public actual fun debug(msg: () -> Any?) +public class NativeLogManager : AbstractPlugin(), LogManager { - /** - * Lazy add a log message if isInfoEnabled is true - */ - public actual fun info(msg: () -> Any?) + override fun log(name: Name, tag: String, body: () -> String) { + val text = try { + body() + } catch (t: Throwable){ + "Error while evaluating log string: ${t.message}" + } + println("[${context.name}] $name: $text") + } - /** - * Lazy add a log message if isWarnEnabled is true - */ - public actual fun warn(msg: () -> Any?) + override val tag: PluginTag get() = Companion.tag - /** - * Lazy add a log message if isErrorEnabled is true - */ - public actual fun error(msg: () -> Any?) + public companion object : PluginFactory { + override fun invoke(meta: Meta, context: Context): NativeLogManager = NativeLogManager() + override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.native") + override val type: KClass = NativeLogManager::class + } } -public actual fun Context.buildLogger(name: String): Logger = object :Logger{ - override fun trace(msg: () -> Any?) { - println("[TRACE] $name - ${msg()}") - } - - override fun debug(msg: () -> Any?) { - println("[DEBUG] $name - ${msg()}") - } - - override fun info(msg: () -> Any?) { - println("[INFO] $name - ${msg()}") - } - - override fun warn(msg: () -> Any?) { - println("[WARNING] $name - ${msg()}") - } - - override fun error(msg: () -> Any?) { - println("[ERROR] $name - ${msg()}") - } - -} \ No newline at end of file +internal actual val globalLogger: LogManager = NativeLogManager().apply { attach(Global) } diff --git a/dataforge-meta/api/dataforge-meta.api b/dataforge-meta/api/dataforge-meta.api index 06901639..4fcac8ce 100644 --- a/dataforge-meta/api/dataforge-meta.api +++ b/dataforge-meta/api/dataforge-meta.api @@ -175,7 +175,6 @@ public final class hep/dataforge/meta/LaminateKt { public final class hep/dataforge/meta/MapMetaKt { public static final fun toMap (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Ljava/util/Map; public static synthetic fun toMap$default (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Ljava/util/Map; - public static final fun toMeta (Ljava/util/Map;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lhep/dataforge/meta/Meta; public static synthetic fun toMeta$default (Ljava/util/Map;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lhep/dataforge/meta/Meta; } @@ -417,7 +416,6 @@ public final class hep/dataforge/meta/MutableMeta$DefaultImpls { public final class hep/dataforge/meta/MutableMetaKt { public static final fun append (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Object;)V public static final fun append (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Object;)V - public static final fun edit (Lhep/dataforge/meta/AbstractMutableMeta;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V } public abstract interface class hep/dataforge/meta/ObservableItemProvider : hep/dataforge/meta/ItemProvider { @@ -662,7 +660,6 @@ public final class hep/dataforge/meta/transformations/MetaTransformation { public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (Ljava/util/Collection;Ljava/lang/Object;)Z public static final fun equals-impl0 (Ljava/util/Collection;Ljava/util/Collection;)Z - public static final fun generate-impl (Ljava/util/Collection;Lhep/dataforge/meta/Config;)Lhep/dataforge/meta/ObservableItemProvider; public static final fun generate-impl (Ljava/util/Collection;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Meta; public final fun getTransformations ()Ljava/util/Collection; public fun hashCode ()I @@ -805,9 +802,7 @@ public final class hep/dataforge/names/NameKt { } public final class hep/dataforge/names/NameMatcherKt { - public static final fun matches (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;)Z public static final fun matches (Lhep/dataforge/names/Name;Ljava/lang/String;)Z - public static final fun matches (Lhep/dataforge/names/NameToken;Lhep/dataforge/names/NameToken;)Z } public final class hep/dataforge/names/NameToken { From f3d43cd40adacf04c10626207559f314a1388bab Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 28 Feb 2021 22:03:40 +0300 Subject: [PATCH 04/10] Remove kotlinx-io --- CHANGELOG.md | 3 + dataforge-context/api/dataforge-context.api | 22 ++++- .../kotlin/hep/dataforge/context/Global.kt | 1 - .../hep/dataforge/context/LogManager.kt | 56 ++++++++----- dataforge-io/build.gradle.kts | 4 +- .../io/yaml/FrontMatterEnvelopeFormat.kt | 31 ++++--- .../hep/dataforge/io/yaml/YamlMetaFormat.kt | 8 +- .../kotlin/hep/dataforge/io/Binary.kt | 74 +++++++++++++++++ .../hep/dataforge/io/BinaryMetaFormat.kt | 13 ++- .../kotlin/hep/dataforge/io/Envelope.kt | 1 - .../hep/dataforge/io/EnvelopeBuilder.kt | 7 +- .../kotlin/hep/dataforge/io/EnvelopeFormat.kt | 6 +- .../kotlin/hep/dataforge/io/EnvelopeParts.kt | 2 - .../kotlin/hep/dataforge/io/IOFormat.kt | 26 +++--- .../kotlin/hep/dataforge/io/JsonMetaFormat.kt | 7 +- .../kotlin/hep/dataforge/io/MetaFormat.kt | 15 ++-- .../hep/dataforge/io/TaggedEnvelopeFormat.kt | 17 ++-- .../hep/dataforge/io/TaglessEnvelopeFormat.kt | 32 ++++---- .../kotlin/hep/dataforge/io/ioMisc.kt | 26 ++++-- .../kotlin/hep/dataforge/io/BinaryTest.kt | 4 +- .../hep/dataforge/io/EnvelopeFormatTest.kt | 4 +- .../kotlin/hep/dataforge/io/IOTest.kt | 17 ++++ .../kotlin/hep/dataforge/io/MetaFormatTest.kt | 2 +- .../kotlin/hep/dataforge/io/MultipartTest.kt | 1 - .../kotlin/hep/dataforge/io/ioTestUtils.kt | 13 ++- .../jvmMain/kotlin/hep/dataforge/io/fileIO.kt | 41 ++++++++-- .../kotlin/hep/dataforge/io/streamsIO.kt | 81 +++++++++---------- .../kotlin/hep/dataforge/io/FileBinaryTest.kt | 4 +- .../hep/dataforge/io/FileEnvelopeTest.kt | 3 +- .../hep/dataforge/scripting/Builders.kt | 6 +- .../hep/dataforge/tables/io/TextRows.kt | 75 +++++++++-------- .../dataforge/tables/io/textTableEnvelope.kt | 13 ++- .../hep/dataforge/tables/io/TextRowsTest.kt | 4 +- .../dataforge/workspace/ContextGoalLogger.kt | 1 + .../hep/dataforge/workspace/fileData.kt | 27 ++----- .../hep/dataforge/workspace/FileDataTest.kt | 8 +- 36 files changed, 401 insertions(+), 254 deletions(-) create mode 100644 dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt create mode 100644 dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 82e3a927..a880a8ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Added +- LogManager plugin ### Changed - Kotlin-logging moved from common to JVM and JS. Replaced by console for native. @@ -9,6 +10,8 @@ ### Deprecated ### Removed +- Common dependency on Kotlin-logging +- Kotlinx-io fork dependency. Replaced by Ktor-io. ### Fixed diff --git a/dataforge-context/api/dataforge-context.api b/dataforge-context/api/dataforge-context.api index baeaad1f..b603c615 100644 --- a/dataforge-context/api/dataforge-context.api +++ b/dataforge-context/api/dataforge-context.api @@ -110,14 +110,13 @@ public final class hep/dataforge/context/KLoggingManager$Companion : hep/datafor public synthetic fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; } -public abstract interface class hep/dataforge/context/LogManager : hep/dataforge/context/Plugin { +public abstract interface class hep/dataforge/context/LogManager : hep/dataforge/context/Logable, hep/dataforge/context/Plugin { public static final field Companion Lhep/dataforge/context/LogManager$Companion; public static final field DEBUG Ljava/lang/String; public static final field ERROR Ljava/lang/String; public static final field INFO Ljava/lang/String; public static final field TRACE Ljava/lang/String; public static final field WARNING Ljava/lang/String; - public abstract fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V } public final class hep/dataforge/context/LogManager$Companion { @@ -137,9 +136,24 @@ public final class hep/dataforge/context/LogManager$DefaultImpls { } public final class hep/dataforge/context/LogManagerKt { + public static final fun debug (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun debug$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun error (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static final fun error (Lhep/dataforge/context/Logable;Ljava/lang/Throwable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun error$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static synthetic fun error$default (Lhep/dataforge/context/Logable;Ljava/lang/Throwable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V public static final fun getLogger (Lhep/dataforge/context/Context;)Lhep/dataforge/context/LogManager; - public static final fun info (Lhep/dataforge/context/LogManager;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun info$default (Lhep/dataforge/context/LogManager;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun getLogger (Lhep/dataforge/context/ContextAware;)Lhep/dataforge/context/Logable; + public static final fun info (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun info$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun trace (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun trace$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun warn (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun warn$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V +} + +public abstract interface class hep/dataforge/context/Logable { + public abstract fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V } public abstract interface class hep/dataforge/context/Plugin : hep/dataforge/context/ContextAware, hep/dataforge/meta/MetaRepr, hep/dataforge/misc/Named, hep/dataforge/provider/Provider { diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt index 3d995037..b1b38179 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt @@ -7,7 +7,6 @@ import kotlinx.coroutines.SupervisorJob import kotlin.coroutines.CoroutineContext import kotlin.native.concurrent.ThreadLocal - internal expect val globalLogger: LogManager /** diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt index 830861b8..032f4e09 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt @@ -1,10 +1,14 @@ package hep.dataforge.context +import hep.dataforge.misc.Named import hep.dataforge.names.Name +import hep.dataforge.names.plus -public interface LogManager : Plugin { - +public interface Logable{ public fun log(name: Name, tag: String, body: () -> String) +} + +public interface LogManager : Plugin, Logable { public companion object { public const val TRACE: String = "TRACE" @@ -15,24 +19,40 @@ public interface LogManager : Plugin { } } -public fun LogManager.info(name: Name = Name.EMPTY, body: () -> String): Unit = log(name,LogManager.INFO,body) + +public fun Logable.trace(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.TRACE, body) +public fun Logable.info(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.INFO, body) +public fun Logable.debug(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.DEBUG, body) +public fun Logable.warn(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.WARNING, body) +public fun Logable.error(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.ERROR, body) + +public fun Logable.error(throwable: Throwable?, name: Name = Name.EMPTY, body: () -> String): Unit = + log(name, LogManager.ERROR) { + buildString { + appendLine(body()) + throwable?.let { appendLine(throwable.stackTraceToString())} + } + } + +/** + * Context log manager inherited from parent + */ public val Context.logger: LogManager get() = plugins.find(inherit = true) { it is LogManager } as? LogManager ?: Global.logger - -///** -// * The logger specific to this context -// */ -//public val Context.logger: Logger get() = buildLogger(name.toString()) -// -///** -// * The logger -// */ -//public val ContextAware.logger: Logger -// get() = if (this is Named) { -// context.buildLogger(Path(context.name, this.name).toString()) -// } else { -// context.logger -// } +/** + * The named proxy logger for a context member + */ +public val ContextAware.logger: Logable + get() = if (this is Named) { + object :Logable{ + val contextLog = context.logger + override fun log(name: Name, tag: String, body: () -> String) { + contextLog.log(this@logger.name + name,tag, body) + } + } + } else { + context.logger + } diff --git a/dataforge-io/build.gradle.kts b/dataforge-io/build.gradle.kts index c5292aec..cb5d3c1a 100644 --- a/dataforge-io/build.gradle.kts +++ b/dataforge-io/build.gradle.kts @@ -11,14 +11,14 @@ kscience { } } -val ioVersion by rootProject.extra("0.2.0-npm-dev-11") +//val ioVersion by rootProject.extra("0.2.0-npm-dev-11") kotlin { sourceSets { commonMain { dependencies { api(project(":dataforge-context")) - api("org.jetbrains.kotlinx:kotlinx-io:$ioVersion") + api("io.ktor:ktor-io:${ru.mipt.npm.gradle.KScienceVersions.ktorVersion}") } } } diff --git a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt index 9a6d38f8..3dbdf635 100644 --- a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt +++ b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt @@ -6,9 +6,10 @@ import hep.dataforge.io.IOFormat.Companion.META_KEY import hep.dataforge.io.IOFormat.Companion.NAME_KEY import hep.dataforge.meta.Meta import hep.dataforge.misc.DFExperimental -import kotlinx.io.* -import kotlinx.io.text.readUtf8Line -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output +import io.ktor.utils.io.core.readBytes +import io.ktor.utils.io.core.readUTF8Line @DFExperimental public class FrontMatterEnvelopeFormat( @@ -20,7 +21,7 @@ public class FrontMatterEnvelopeFormat( var line: String var offset = 0u do { - line = input.readUtf8Line() //?: error("Input does not contain front matter separator") + line = input.readUTF8Line() ?: error("Input does not contain front matter separator") offset += line.encodeToByteArray().size.toUInt() } while (!line.startsWith(SEPARATOR)) @@ -31,7 +32,7 @@ public class FrontMatterEnvelopeFormat( //TODO replace by preview val meta = Binary { do { - line = input.readUtf8Line() + line = input.readSafeUtf8Line() writeUtf8String(line + "\r\n") offset += line.encodeToByteArray().size.toUInt() } while (!line.startsWith(SEPARATOR)) @@ -45,7 +46,7 @@ public class FrontMatterEnvelopeFormat( override fun readObject(input: Input): Envelope { var line: String do { - line = input.readUtf8Line() //?: error("Input does not contain front matter separator") + line = input.readSafeUtf8Line() //?: error("Input does not contain front matter separator") } while (!line.startsWith(SEPARATOR)) val readMetaFormat = @@ -54,12 +55,12 @@ public class FrontMatterEnvelopeFormat( val meta = Binary { do { - writeUtf8String(input.readUtf8Line() + "\r\n") + writeUtf8String(input.readSafeUtf8Line() + "\r\n") } while (!line.startsWith(SEPARATOR)) }.read { readMetaFormat.readMeta(input) } - val bytes = input.readByteArray() + val bytes = input.readBytes() val data = bytes.asBinary() return SimpleEnvelope(meta, data) } @@ -94,14 +95,12 @@ public class FrontMatterEnvelopeFormat( return FrontMatterEnvelopeFormat(context.io, meta) } - override fun peekFormat(io: IOPlugin, input: Input): EnvelopeFormat? { - return input.preview { - val line = readUtf8Line() - return@preview if (line.startsWith("---")) { - invoke() - } else { - null - } + override fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? = binary.read { + val line = readSafeUtf8Line() + return@read if (line.startsWith("---")) { + invoke() + } else { + null } } diff --git a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt index 9f5cdda3..ccf38835 100644 --- a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt +++ b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt @@ -5,6 +5,8 @@ import hep.dataforge.io.IOFormat.Companion.META_KEY import hep.dataforge.io.IOFormat.Companion.NAME_KEY import hep.dataforge.io.MetaFormat import hep.dataforge.io.MetaFormatFactory +import hep.dataforge.io.readUtf8String +import hep.dataforge.io.writeUtf8String import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.ItemDescriptor import hep.dataforge.meta.descriptors.NodeDescriptor @@ -14,10 +16,8 @@ import hep.dataforge.names.withIndex import hep.dataforge.values.ListValue import hep.dataforge.values.Null import hep.dataforge.values.parseValue -import kotlinx.io.Input -import kotlinx.io.Output -import kotlinx.io.text.readUtf8String -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output import net.mamoe.yamlkt.* public fun Meta.toYaml(): YamlMap { diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt new file mode 100644 index 00000000..6450279e --- /dev/null +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt @@ -0,0 +1,74 @@ +package hep.dataforge.io + +import io.ktor.utils.io.core.* +import kotlin.math.min + +/** + * [Binary] represents a fixed-size multi-read byte block, which is not attached to the Input which was used to create it. + * The binary could be associated with a resource, but it should guarantee that when someone is trying to read the binary, + * this resource is re-acquired. + */ +public interface Binary { + + public val size: Int + + /** + * Read maximum of [atMost] bytes as input from the binary, starting at [offset]. The generated input is always closed + * when leaving scope, so it could not be leaked outside of scope of [block]. + */ + public fun read(offset: Int = 0, atMost: Int = size - offset, block: Input.() -> R): R + + public companion object { + public val EMPTY: Binary = ByteArrayBinary(ByteArray(0)) + } +} + +internal class ByteArrayBinary( + internal val array: ByteArray, + internal val start: Int = 0, + override val size: Int = array.size - start, +) : Binary { + + override fun read(offset: Int, atMost: Int, block: Input.() -> R): R { + require(offset >= 0) { "Offset must be positive" } + require(offset < array.size) { "Offset $offset is larger than array size" } + val input = ByteReadPacket( + array, + offset + start, + min(atMost, size - offset) + ) + return input.use(block) + } +} + +public fun ByteArray.asBinary(): Binary = ByteArrayBinary(this) + +/** + * Produce a [buildByteArray] representing an exact copy of this [Binary] + */ +public fun Binary.toByteArray(): ByteArray = if (this is ByteArrayBinary) { + array.copyOf() // TODO do we need to ensure data safety here? +} else { + read { + readBytes() + } +} + +public fun Input.readBinary(size: Int): Binary { + val array = readBytes(size) + return ByteArrayBinary(array) +} + +/** + * Direct write of binary to the output. Returns the number of bytes written + */ +public fun Output.writeBinary(binary: Binary): Int { + return if (binary is ByteArrayBinary) { + writeFully(binary.array, binary.start, binary.start + binary.size) + binary.size + } else { + binary.read { + copyTo(this@writeBinary).toInt() + } + } +} \ No newline at end of file diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt index 43ee98b8..04689744 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt @@ -4,9 +4,7 @@ import hep.dataforge.context.Context import hep.dataforge.meta.* import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.values.* -import kotlinx.io.* -import kotlinx.io.text.readUtf8String -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.* /** * A DataForge-specific simplified binary format for meta @@ -26,7 +24,7 @@ public object BinaryMetaFormat : MetaFormat, MetaFormatFactory { private fun Output.writeString(str: String) { writeInt(str.length) - writeUtf8String(str) + writeFully(str.encodeToByteArray()) } public fun Output.writeValue(value: Value): Unit = when (value.type) { @@ -76,8 +74,8 @@ public object BinaryMetaFormat : MetaFormat, MetaFormatFactory { } override fun writeMeta( - output: kotlinx.io.Output, - meta: hep.dataforge.meta.Meta, + output: Output, + meta: Meta, descriptor: hep.dataforge.meta.descriptors.NodeDescriptor?, ) { output.writeChar('M') @@ -97,7 +95,8 @@ public object BinaryMetaFormat : MetaFormat, MetaFormatFactory { private fun Input.readString(): String { val length = readInt() - return readUtf8String(length) + val array = readBytes(length) + return array.decodeToString() } @Suppress("UNCHECKED_CAST") diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt index 123da62c..cad2666f 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt @@ -7,7 +7,6 @@ import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.plus -import kotlinx.io.Binary public interface Envelope { public val meta: Meta diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt index 20710198..77d7df61 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt @@ -1,7 +1,7 @@ package hep.dataforge.io import hep.dataforge.meta.* -import kotlinx.io.* +import io.ktor.utils.io.core.Output public class EnvelopeBuilder : Envelope { private val metaBuilder = MetaBuilder() @@ -33,11 +33,8 @@ public class EnvelopeBuilder : Envelope { /** * Construct a data binary from given builder */ - @OptIn(ExperimentalIoApi::class) public fun data(block: Output.() -> Unit) { - val arrayBuilder = ByteArrayOutput() - arrayBuilder.block() - data = arrayBuilder.toByteArray().asBinary() + data = buildByteArray { block() }.asBinary() } public fun seal(): Envelope = SimpleEnvelope(metaBuilder.seal(), data) diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt index 085c1cde..55527be1 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt @@ -6,8 +6,8 @@ import hep.dataforge.meta.Meta import hep.dataforge.misc.Type import hep.dataforge.names.Name import hep.dataforge.names.asName -import kotlinx.io.Input -import kotlinx.io.Output +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -48,7 +48,7 @@ public interface EnvelopeFormatFactory : IOFormatFactory, EnvelopeForm * Try to infer specific format from input and return null if the attempt is failed. * This method does **not** return Input into initial state. */ - public fun peekFormat(io: IOPlugin, input: Input): EnvelopeFormat? + public fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? public companion object { public const val ENVELOPE_FORMAT_TYPE: String = "io.format.envelope" diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt index 45bfd988..9aa68b59 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt @@ -11,8 +11,6 @@ import hep.dataforge.meta.* import hep.dataforge.names.asName import hep.dataforge.names.plus import hep.dataforge.names.toName -import kotlinx.io.Binary -import kotlinx.io.writeBinary private class PartDescriptor : Scheme() { var offset by int(0) diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt index 6ba7d6e3..163e354a 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt @@ -12,9 +12,7 @@ import hep.dataforge.misc.Type import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.values.Value -import kotlinx.io.* -import kotlinx.io.buffer.Buffer -import kotlinx.io.pool.ObjectPool +import io.ktor.utils.io.core.* import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -35,6 +33,10 @@ public interface IOFormat : MetaRepr { public fun Input.readWith(format: IOFormat): T = format.readObject(this@readWith) +public fun IOFormat.readObject(binary: Binary): T = binary.read { + readObject(this) +} + /** * Read given binary as object using given format */ @@ -73,15 +75,15 @@ public inline fun IOFormat.Companion.listOf( } -public fun ObjectPool.fill(block: Buffer.() -> Unit): Buffer { - val buffer = borrow() - return try { - buffer.apply(block) - } catch (ex: Exception) { - //recycle(buffer) - throw ex - } -} +//public fun ObjectPool.fill(block: Buffer.() -> Unit): Buffer { +// val buffer = borrow() +// return try { +// buffer.apply(block) +// } catch (ex: Exception) { +// //recycle(buffer) +// throw ex +// } +//} @Type(IO_FORMAT_TYPE) public interface IOFormatFactory : Factory>, Named, MetaRepr { diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt index 255a08e5..667c2d60 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt @@ -10,10 +10,9 @@ import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.node import hep.dataforge.meta.toJson import hep.dataforge.meta.toMetaItem -import kotlinx.io.Input -import kotlinx.io.Output -import kotlinx.io.text.readUtf8String -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output + import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlin.reflect.KType diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt index bb59e1a0..673b63d2 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt @@ -8,10 +8,11 @@ import hep.dataforge.misc.Type import hep.dataforge.names.Name import hep.dataforge.names.asName import hep.dataforge.names.plus -import kotlinx.io.ByteArrayInput -import kotlinx.io.Input -import kotlinx.io.Output -import kotlinx.io.use +import io.ktor.utils.io.core.ByteReadPacket +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output +import io.ktor.utils.io.core.use + import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -54,13 +55,15 @@ public interface MetaFormatFactory : IOFormatFactory, MetaFormat { } public fun Meta.toString(format: MetaFormat): String = buildByteArray { - format.run { writeObject(this@buildByteArray, this@toString) } + format.run { + writeObject(this@buildByteArray, this@toString) + } }.decodeToString() public fun Meta.toString(formatFactory: MetaFormatFactory): String = toString(formatFactory()) public fun MetaFormat.parse(str: String): Meta { - return ByteArrayInput(str.encodeToByteArray()).use { readObject(it) } + return ByteReadPacket(str.encodeToByteArray()).use { readObject(it) } } public fun MetaFormatFactory.parse(str: String, formatMeta: Meta): Meta = invoke(formatMeta).parse(str) diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt index 389c5054..40824fd8 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt @@ -10,7 +10,7 @@ import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.names.plus import hep.dataforge.names.toName -import kotlinx.io.* +import io.ktor.utils.io.core.* /** * A streaming-friendly envelope format with a short binary tag. @@ -57,7 +57,6 @@ public class TaggedEnvelopeFormat( envelope.data?.let { output.writeBinary(it) } - output.flush() } /** @@ -72,7 +71,9 @@ public class TaggedEnvelopeFormat( val metaFormat = io.resolveMetaFormat(tag.metaFormatKey) ?: error("Meta format with key ${tag.metaFormatKey} not found") - val meta: Meta = metaFormat.readObject(input.limit(tag.metaSize.toInt())) + val metaBinary = input.readBinary(tag.metaSize.toInt()) + + val meta: Meta = metaFormat.readObject(metaBinary) val data = input.readBinary(tag.dataSize.toInt()) @@ -85,7 +86,9 @@ public class TaggedEnvelopeFormat( val metaFormat = io.resolveMetaFormat(tag.metaFormatKey) ?: error("Meta format with key ${tag.metaFormatKey} not found") - val meta: Meta = metaFormat.readObject(input.limit(tag.metaSize.toInt())) + val metaBinary = input.readBinary(tag.metaSize.toInt()) + + val meta: Meta = metaFormat.readObject(metaBinary) return PartialEnvelope(meta, version.tagSize + tag.metaSize, tag.dataSize) @@ -143,11 +146,11 @@ public class TaggedEnvelopeFormat( return Tag(metaFormatKey, metaLength, dataLength) } - override fun peekFormat(io: IOPlugin, input: Input): EnvelopeFormat? { + override fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? { return try { - input.preview { + binary.read{ val header = readRawString(6) - return@preview when (header.substring(2..5)) { + return@read when (header.substring(2..5)) { VERSION.DF02.name -> TaggedEnvelopeFormat(io, VERSION.DF02) VERSION.DF03.name -> TaggedEnvelopeFormat(io, VERSION.DF03) else -> null diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt index f89f9bbb..5de70105 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt @@ -9,9 +9,7 @@ import hep.dataforge.meta.isEmpty import hep.dataforge.meta.string import hep.dataforge.names.Name import hep.dataforge.names.asName -import kotlinx.io.* -import kotlinx.io.text.readUtf8Line -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.* import kotlin.collections.set /** @@ -27,7 +25,7 @@ public class TaglessEnvelopeFormat( private val dataStart = meta[DATA_START_PROPERTY].string ?: DEFAULT_DATA_START private fun Output.writeProperty(key: String, value: Any) { - writeUtf8String("#? $key: $value;\r\n") + writeFully("#? $key: $value;\r\n".encodeToByteArray()) } override fun writeEnvelope( @@ -69,7 +67,7 @@ public class TaglessEnvelopeFormat( override fun readObject(input: Input): Envelope { var line: String do { - line = input.readUtf8Line() // ?: error("Input does not contain tagless envelope header") + line = input.readSafeUtf8Line() // ?: error("Input does not contain tagless envelope header") } while (!line.startsWith(TAGLESS_ENVELOPE_HEADER)) val properties = HashMap() @@ -82,8 +80,8 @@ public class TaglessEnvelopeFormat( properties[key] = value } //If can't read line, return envelope without data - if (input.exhausted()) return SimpleEnvelope(Meta.EMPTY, null) - line = input.readUtf8Line() + if (input.endOfInput) return SimpleEnvelope(Meta.EMPTY, null) + line = input.readSafeUtf8Line() } var meta: Meta = Meta.EMPTY @@ -92,7 +90,7 @@ public class TaglessEnvelopeFormat( val metaFormat = properties[META_TYPE_PROPERTY]?.let { io.resolveMetaFormat(it) } ?: JsonMetaFormat val metaSize = properties[META_LENGTH_PROPERTY]?.toInt() meta = if (metaSize != null) { - metaFormat.readObject(input.limit(metaSize)) + metaFormat.readObject(input.readBinary(metaSize)) } else { metaFormat.readObject(input) } @@ -100,14 +98,14 @@ public class TaglessEnvelopeFormat( do { try { - line = input.readUtf8Line() + line = input.readSafeUtf8Line() } catch (ex: EOFException) { //returning an Envelope without data if end of input is reached return SimpleEnvelope(meta, null) } } while (!line.startsWith(dataStart)) - val data: Binary? = if (properties.containsKey(DATA_LENGTH_PROPERTY)) { + val data: Binary = if (properties.containsKey(DATA_LENGTH_PROPERTY)) { input.readBinary(properties[DATA_LENGTH_PROPERTY]!!.toInt()) // val bytes = ByteArray(properties[DATA_LENGTH_PROPERTY]!!.toInt()) // readByteArray(bytes) @@ -125,7 +123,7 @@ public class TaglessEnvelopeFormat( var offset = 0u var line: String do { - line = input.readUtf8Line()// ?: error("Input does not contain tagless envelope header") + line = input.readSafeUtf8Line()// ?: error("Input does not contain tagless envelope header") offset += line.encodeToByteArray().size.toUInt() } while (!line.startsWith(TAGLESS_ENVELOPE_HEADER)) val properties = HashMap() @@ -139,7 +137,7 @@ public class TaglessEnvelopeFormat( properties[key] = value } try { - line = input.readUtf8Line() + line = input.readSafeUtf8Line() offset += line.encodeToByteArray().size.toUInt() } catch (ex: EOFException) { return PartialEnvelope(Meta.EMPTY, offset.toUInt(), 0.toULong()) @@ -153,14 +151,14 @@ public class TaglessEnvelopeFormat( val metaSize = properties[META_LENGTH_PROPERTY]?.toInt() meta = if (metaSize != null) { offset += metaSize.toUInt() - metaFormat.readObject(input.limit(metaSize)) + metaFormat.readObject(input.readBinary(metaSize)) } else { error("Can't partially read an envelope with undefined meta size") } } do { - line = input.readUtf8Line() //?: return PartialEnvelope(Meta.EMPTY, offset.toUInt(), 0.toULong()) + line = input.readSafeUtf8Line() //?: return PartialEnvelope(Meta.EMPTY, offset.toUInt(), 0.toULong()) offset += line.encodeToByteArray().size.toUInt() //returning an Envelope without data if end of input is reached } while (!line.startsWith(dataStart)) @@ -220,11 +218,11 @@ public class TaglessEnvelopeFormat( override fun readObject(input: Input): Envelope = default.readObject(input) - override fun peekFormat(io: IOPlugin, input: Input): EnvelopeFormat? { + override fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? { return try { - input.preview { + binary.read { val string = readRawString(TAGLESS_ENVELOPE_HEADER.length) - return@preview if (string == TAGLESS_ENVELOPE_HEADER) { + return@read if (string == TAGLESS_ENVELOPE_HEADER) { TaglessEnvelopeFormat(io) } else { null diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt index 283f7638..ade64e28 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt +++ b/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt @@ -1,21 +1,33 @@ package hep.dataforge.io -import kotlinx.io.* +import io.ktor.utils.io.charsets.Charsets +import io.ktor.utils.io.charsets.decodeExactBytes +import io.ktor.utils.io.core.* import kotlin.math.min public fun Output.writeRawString(str: String) { - str.forEach { writeByte(it.toByte()) } + writeFully(str.toByteArray(Charsets.ISO_8859_1)) } +public fun Output.writeUtf8String(str: String) { + writeFully(str.encodeToByteArray()) +} + +@OptIn(ExperimentalIoApi::class) public fun Input.readRawString(size: Int): String { - val array = CharArray(size) { readByte().toChar() } - return array.concatToString() + return Charsets.ISO_8859_1.newDecoder().decodeExactBytes(this, size) } -public inline fun buildByteArray(expectedSize: Int = 16, block: Output.() -> Unit): ByteArray = - ByteArrayOutput(expectedSize).apply(block).toByteArray() +public fun Input.readUtf8String(): String = readBytes().decodeToString() + +public fun Input.readSafeUtf8Line(): String = readUTF8Line() ?: error("Line not found") + +public inline fun buildByteArray(expectedSize: Int = 16, block: Output.() -> Unit): ByteArray { + val builder = BytePacketBuilder(expectedSize) + builder.block() + return builder.build().readBytes() +} -@Suppress("FunctionName") public inline fun Binary(expectedSize: Int = 16, block: Output.() -> Unit): Binary = buildByteArray(expectedSize, block).asBinary() diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt index 157b695f..d613469a 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt @@ -1,8 +1,6 @@ package hep.dataforge.io -import kotlinx.io.asBinary -import kotlinx.io.readByte -import kotlinx.io.readInt +import io.ktor.utils.io.core.readInt import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt index 2ce87c19..74fe5a03 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt @@ -1,7 +1,7 @@ package hep.dataforge.io -import kotlinx.io.readDouble -import kotlinx.io.writeDouble +import io.ktor.utils.io.core.readDouble +import io.ktor.utils.io.core.writeDouble import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt new file mode 100644 index 00000000..b82c3f79 --- /dev/null +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt @@ -0,0 +1,17 @@ +package hep.dataforge.io + +import io.ktor.utils.io.core.ByteReadPacket +import io.ktor.utils.io.core.readBytes +import kotlin.test.Test +import kotlin.test.assertEquals + +class IOTest { + @Test + fun readBytes() { + val bytes = ByteArray(8) { it.toByte() } + val input = ByteReadPacket(bytes) + val first = input.readBytes(4) + val second = input.readBytes(4) + assertEquals(4.toByte(), second[0]) + } +} \ No newline at end of file diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt index 9e71a907..5e970c35 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt @@ -4,7 +4,7 @@ import hep.dataforge.meta.* import hep.dataforge.meta.JsonMeta.Companion.JSON_ARRAY_KEY import hep.dataforge.values.ListValue import hep.dataforge.values.number -import kotlinx.io.asBinary + import kotlinx.serialization.json.* import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt index e511a472..c26d30e9 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt @@ -4,7 +4,6 @@ import hep.dataforge.context.Global import hep.dataforge.meta.get import hep.dataforge.meta.int import hep.dataforge.misc.DFExperimental -import kotlinx.io.text.writeUtf8String import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt index 55831f03..377cb62a 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt +++ b/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt @@ -1,7 +1,12 @@ package hep.dataforge.io -import kotlinx.io.ByteArrayInput -import kotlinx.io.use +import io.ktor.utils.io.core.ByteReadPacket +import io.ktor.utils.io.core.use -fun IOFormat.writeToByteArray(obj: T): ByteArray = buildByteArray { writeObject(this, obj) } -fun IOFormat.readFromByteArray(array: ByteArray): T = ByteArrayInput(array).use { readObject(it) } \ No newline at end of file + +fun IOFormat.writeToByteArray(obj: T): ByteArray = buildByteArray { + writeObject(this, obj) +} +fun IOFormat.readFromByteArray(array: ByteArray): T = ByteReadPacket(array).use { + readObject(it) +} \ No newline at end of file diff --git a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt b/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt index 54cf6b2c..16a6d0fc 100644 --- a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt +++ b/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt @@ -4,14 +4,39 @@ import hep.dataforge.meta.Meta import hep.dataforge.meta.descriptors.NodeDescriptor import hep.dataforge.meta.isEmpty import hep.dataforge.misc.DFExperimental -import kotlinx.io.* +import io.ktor.utils.io.core.* +import io.ktor.utils.io.streams.asOutput import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardOpenOption +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.inputStream +import kotlin.math.min import kotlin.reflect.full.isSupertypeOf import kotlin.reflect.typeOf import kotlin.streams.asSequence + +internal class PathBinary( + private val path: Path, + private val fileOffset: Int = 0, + override val size: Int = Files.size(path).toInt() - fileOffset, +) : Binary { + + @OptIn(ExperimentalPathApi::class) + override fun read(offset: Int, atMost: Int, block: Input.() -> R): R { + val actualOffset = offset + fileOffset + val actualSize = min(atMost, size - offset) + val array = path.inputStream().use { + it.skip(actualOffset.toLong()) + it.readNBytes(actualSize) + } + return ByteReadPacket(array).block() + } +} + +public fun Path.asBinary(): Binary = PathBinary(this) + public fun Path.read(block: Input.() -> R): R = asBinary().read(block = block) /** @@ -46,11 +71,13 @@ public fun Path.rewrite(block: Output.() -> Unit): Unit { public fun Path.readEnvelope(format: EnvelopeFormat): Envelope { val partialEnvelope: PartialEnvelope = asBinary().read { - format.run { readPartial(this@read) } + format.run { + readPartial(this@read) + } } val offset: Int = partialEnvelope.dataOffset.toInt() val size: Int = partialEnvelope.dataSize?.toInt() ?: (Files.size(this).toInt() - offset) - val binary = FileBinary(this, offset, size) + val binary = PathBinary(this, offset, size) return SimpleEnvelope(partialEnvelope.meta, binary) } @@ -60,7 +87,7 @@ public fun Path.readEnvelope(format: EnvelopeFormat): Envelope { @Suppress("UNCHECKED_CAST") @DFExperimental public inline fun IOPlugin.resolveIOFormat(): IOFormat? { - return ioFormatFactories.find { it.type.isSupertypeOf(typeOf())} as IOFormat? + return ioFormatFactories.find { it.type.isSupertypeOf(typeOf()) } as IOFormat? } /** @@ -119,9 +146,7 @@ public fun IOPlugin.writeMetaFile( public fun IOPlugin.peekFileEnvelopeFormat(path: Path): EnvelopeFormat? { val binary = path.asBinary() val formats = envelopeFormatFactories.mapNotNull { factory -> - binary.read { - factory.peekFormat(this@peekFileEnvelopeFormat, this@read) - } + factory.peekFormat(this@peekFileEnvelopeFormat, binary) } return when (formats.size) { @@ -231,7 +256,7 @@ public fun IOPlugin.writeEnvelopeDirectory( dataFile.write { envelope.data?.read { val copied = copyTo(this@write) - if (copied != envelope.data?.size) { + if (copied != envelope.data?.size?.toLong()) { error("The number of copied bytes does not equal data size") } } diff --git a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt b/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt index ff392552..5b7262ea 100644 --- a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt +++ b/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt @@ -1,45 +1,40 @@ package hep.dataforge.io -import kotlinx.io.* -import kotlinx.io.buffer.Buffer -import kotlinx.io.buffer.set -import java.io.InputStream -import java.io.OutputStream - -private class BlockingStreamInput(val source: InputStream) : Input() { - override fun closeSource() { - source.close() - } - - override fun fill(buffer: Buffer, startIndex: Int, endIndex: Int): Int { - while (source.available() == 0) { - //block until input is available - } - // Zero-copy attempt - if (buffer.buffer.hasArray()) { - val result = source.read(buffer.buffer.array(), startIndex, endIndex - startIndex) - return result.coerceAtLeast(0) // -1 when IS is closed - } - - for (i in startIndex until endIndex) { - val byte = source.read() - if (byte == -1) return (i - startIndex) - buffer[i] = byte.toByte() - } - return endIndex - startIndex - } -} - -public fun InputStream.read(size: Int, block: Input.() -> R): R { - val buffer = ByteArray(size) - read(buffer) - return buffer.asBinary().read(block = block) -} - -public fun InputStream.read(block: Input.() -> R): R = asInput().block() - -public fun InputStream.readBlocking(block: Input.() -> R): R = BlockingStreamInput(this).block() - -public inline fun OutputStream.write(block: Output.() -> Unit) { - asOutput().block() -} \ No newline at end of file +// +//private class BlockingStreamInput(val source: InputStream) : AbstractInput() { +// override fun closeSource() { +// source.close() +// } +// +// override fun fill(destination: Memory, offset: Int, length: Int): Int { +// while (source.available() == 0) { +// //block until input is available +// } +// // Zero-copy attempt +// if (buffer.buffer.hasArray()) { +// val result = source.read(buffer.buffer.array(), startIndex, endIndex - startIndex) +// return result.coerceAtLeast(0) // -1 when IS is closed +// } +// +// for (i in startIndex until endIndex) { +// val byte = source.read() +// if (byte == -1) return (i - startIndex) +// buffer[i] = byte.toByte() +// } +// return endIndex - startIndex +// } +//} +// +//public fun InputStream.read(size: Int, block: Input.() -> R): R { +// val buffer = ByteArray(size) +// read(buffer) +// return buffer.asBinary().read(block = block) +//} +// +//public fun InputStream.read(block: Input.() -> R): R = asInput().block() +// +//public fun InputStream.readBlocking(block: Input.() -> R): R = BlockingStreamInput(this).block() +// +//public inline fun OutputStream.write(block: Output.() -> Unit) { +// asOutput().block() +//} \ No newline at end of file diff --git a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt index 8bfefd6d..8fe947d2 100644 --- a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt +++ b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt @@ -2,9 +2,7 @@ package hep.dataforge.io import hep.dataforge.context.Global import hep.dataforge.misc.DFExperimental -import kotlinx.io.asBinary -import kotlinx.io.toByteArray -import kotlinx.io.writeDouble +import io.ktor.utils.io.core.writeDouble import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt index fba3ed8e..d1ec8147 100644 --- a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt +++ b/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt @@ -2,7 +2,7 @@ package hep.dataforge.io import hep.dataforge.context.Global import hep.dataforge.misc.DFExperimental -import kotlinx.io.writeDouble +import io.ktor.utils.io.core.writeDouble import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertTrue @@ -19,7 +19,6 @@ class FileEnvelopeTest { dataID = "myData" // добавил только что data { writeDouble(16.7) - } } diff --git a/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt b/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt index 1842ba45..7628293b 100644 --- a/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt +++ b/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt @@ -1,8 +1,6 @@ package hep.dataforge.scripting -import hep.dataforge.context.Context -import hep.dataforge.context.Global -import hep.dataforge.context.logger +import hep.dataforge.context.* import hep.dataforge.workspace.Workspace import hep.dataforge.workspace.WorkspaceBuilder import java.io.File @@ -44,7 +42,7 @@ public object Builders { error(scriptDiagnostic.toString()) } ScriptDiagnostic.Severity.WARNING -> context.logger.warn { scriptDiagnostic.toString() } - ScriptDiagnostic.Severity.INFO -> context.logger.info { scriptDiagnostic.toString() } + ScriptDiagnostic.Severity.INFO -> context.logger.info { scriptDiagnostic.toString() } ScriptDiagnostic.Severity.DEBUG -> context.logger.debug { scriptDiagnostic.toString() } } } diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt index 0ef003c4..2bb99e8e 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt @@ -1,23 +1,18 @@ package hep.dataforge.tables.io +import hep.dataforge.io.Binary +import hep.dataforge.io.readSafeUtf8Line +import hep.dataforge.io.writeUtf8String import hep.dataforge.tables.* import hep.dataforge.values.* -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.toList -import kotlinx.io.Binary -import kotlinx.io.ExperimentalIoApi -import kotlinx.io.Output -import kotlinx.io.text.forEachUtf8Line -import kotlinx.io.text.readUtf8Line -import kotlinx.io.text.readUtf8StringUntilDelimiter -import kotlinx.io.text.writeUtf8String +import io.ktor.utils.io.core.Output +import io.ktor.utils.io.core.readBytes +import kotlinx.coroutines.flow.* /** * Read a lin as a fixed width [Row] */ -private fun readLine(header: ValueTableHeader, line: String): Row { +private fun readRow(header: ValueTableHeader, line: String): Row { val values = line.trim().split("\\s+".toRegex()).map { it.lazyParseValue() } if (values.size == header.size) { @@ -31,32 +26,45 @@ private fun readLine(header: ValueTableHeader, line: String): Row { /** * Finite or infinite [Rows] created from a fixed width text binary */ -@ExperimentalIoApi public class TextRows(override val headers: ValueTableHeader, private val binary: Binary) : Rows { /** * A flow of indexes of string start offsets ignoring empty strings */ public fun indexFlow(): Flow = binary.read { - var counter: Int = 0 - flow { - val string = readUtf8StringUntilDelimiter('\n') - counter += string.length - if (!string.isBlank()) { - emit(counter) - } - } + //TODO replace by line reader + val text = readBytes().decodeToString() + text.lineSequence() + .map { it.trim() } + .filter { it.isNotEmpty() } + .scan(0) { acc, str -> acc + str.length }.asFlow() +// var counter: Int = 0 +// flow { +// do { +// val line = readUTF8Line() +// counter += line?.length ?: 0 +// if (!line.isNullOrBlank()) { +// emit(counter) +// } +// } while (!endOfInput) +// } } override fun rowFlow(): Flow> = binary.read { - flow { - forEachUtf8Line { line -> - if (line.isNotBlank()) { - val row = readLine(headers, line) - emit(row) - } - } - } + val text = readBytes().decodeToString() + text.lineSequence() + .map { it.trim() } + .filter { it.isNotEmpty() } + .map { readRow(headers, it) }.asFlow() +// flow { +// do { +// val line = readUTF8Line() +// if (!line.isNullOrBlank()) { +// val row = readRow(headers, line) +// emit(row) +// } +// } while (!endOfInput) +// } } public companion object @@ -65,17 +73,15 @@ public class TextRows(override val headers: ValueTableHeader, private val binary /** * Create a row offset index for [TextRows] */ -@ExperimentalIoApi public suspend fun TextRows.buildRowIndex(): List = indexFlow().toList() /** * Finite table created from [RandomAccessBinary] with fixed width text table */ -@ExperimentalIoApi public class TextTable( override val headers: ValueTableHeader, private val binary: Binary, - public val index: List + public val index: List, ) : Table { override val columns: Collection> get() = headers.map { RowTableColumn(this, it) } @@ -86,8 +92,8 @@ public class TextTable( private fun readAt(offset: Int): Row { return binary.read(offset) { - val line = readUtf8Line() - return@read readLine(headers, line) + val line = readSafeUtf8Line() + return@read readRow(headers, line) } } @@ -139,6 +145,7 @@ public suspend fun Output.writeRows(rows: Rows) { rows.headers.forEachIndexed { index, columnHeader -> writeValue(row[columnHeader] ?: Null, widths[index]) } +// appendLine() writeUtf8String("\r\n") } } \ No newline at end of file diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt index d0cca162..6d6c790b 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt +++ b/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt @@ -1,19 +1,17 @@ package hep.dataforge.tables.io +import hep.dataforge.io.Binary import hep.dataforge.io.Envelope +import hep.dataforge.io.asBinary +import hep.dataforge.io.buildByteArray import hep.dataforge.meta.* import hep.dataforge.misc.DFExperimental import hep.dataforge.tables.SimpleColumnHeader import hep.dataforge.tables.Table import hep.dataforge.values.Value -import kotlinx.io.Binary -import kotlinx.io.ByteArrayOutput -import kotlinx.io.ExperimentalIoApi -import kotlinx.io.asBinary import kotlin.reflect.typeOf -@ExperimentalIoApi public suspend fun Table.toEnvelope(): Envelope = Envelope { meta { headers.forEachIndexed { index, columnHeader -> @@ -29,11 +27,12 @@ public suspend fun Table.toEnvelope(): Envelope = Envelope { type = "table.value" dataID = "valueTable[${this@toEnvelope.hashCode()}]" - data = ByteArrayOutput().apply { writeRows(this@toEnvelope) }.toByteArray().asBinary() + data = buildByteArray { + writeRows(this@toEnvelope) + }.asBinary() } @DFExperimental -@ExperimentalIoApi public fun TextRows.Companion.readEnvelope(envelope: Envelope): TextRows { val header = envelope.meta.getIndexed("column") .entries.sortedBy { it.key?.toInt() } diff --git a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt b/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt index b03bec33..71f3c266 100644 --- a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt +++ b/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt @@ -1,5 +1,6 @@ package hep.dataforge.tables.io +import hep.dataforge.io.toByteArray import hep.dataforge.misc.DFExperimental import hep.dataforge.tables.Table import hep.dataforge.tables.row @@ -8,14 +9,11 @@ import hep.dataforge.values.int import hep.dataforge.values.string import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking -import kotlinx.io.ExperimentalIoApi -import kotlinx.io.toByteArray import kotlin.test.Test import kotlin.test.assertEquals @DFExperimental -@ExperimentalIoApi class TextRowsTest { val table = Table { val a by column() diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt index aae36ac6..5f144798 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt +++ b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt @@ -1,6 +1,7 @@ package hep.dataforge.workspace import hep.dataforge.context.Context +import hep.dataforge.context.info import hep.dataforge.context.logger import hep.dataforge.data.GoalLogger import kotlinx.coroutines.launch diff --git a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt b/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt index a8378046..fb621fbf 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt @@ -5,10 +5,10 @@ import hep.dataforge.data.* import hep.dataforge.io.* import hep.dataforge.meta.* import hep.dataforge.misc.DFExperimental +import io.ktor.utils.io.streams.asOutput import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext -import kotlinx.io.asOutput import java.nio.file.FileSystem import java.nio.file.Files import java.nio.file.Path @@ -166,6 +166,7 @@ public suspend fun IOPlugin.writeDataDirectory( } +@Suppress("BlockingMethodInNonBlockingContext") private suspend fun ZipOutputStream.writeNode( name: String, treeItem: DataTreeItem, @@ -180,7 +181,10 @@ private suspend fun ZipOutputStream.writeNode( val entry = ZipEntry(name) putNextEntry(entry) envelopeFormat.run { - writeObject(asOutput(), envelope) + asOutput().run { + writeEnvelope(this, envelope) + flush() + } } } is DataTreeItem.Node -> { @@ -196,8 +200,9 @@ private suspend fun ZipOutputStream.writeNode( } } +@Suppress("BlockingMethodInNonBlockingContext") @DFExperimental -suspend fun IOPlugin.writeZip( +public suspend fun IOPlugin.writeZip( path: Path, tree: DataTree, format: IOFormat, @@ -217,22 +222,6 @@ suspend fun IOPlugin.writeZip( zos.use { it.writeNode("", DataTreeItem.Node(tree), format, envelopeFormat) } - -// if (Files.exists(actualFile) && Files.size(path) == 0.toLong()) { -// Files.delete(path) -// } -// //Files.createFile(actualFile) -// newZFS(actualFile).use { zipfs -> -// val zipRootPath = zipfs.getPath("/") -// Files.createDirectories(zipRootPath) -// val tmp = Files.createTempDirectory("df_zip") -// writeDataDirectory(tmp, node, format, envelopeFormat, metaFormat) -// Files.list(tmp).forEach { sourcePath -> -// val targetPath = sourcePath.fileName.toString() -// val internalTargetPath = zipRootPath.resolve(targetPath) -// Files.copy(sourcePath, internalTargetPath, StandardCopyOption.REPLACE_EXISTING) -// } -// } } } diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt index df8e2673..19e029d5 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt @@ -4,13 +4,13 @@ import hep.dataforge.context.Global import hep.dataforge.data.* import hep.dataforge.io.IOFormat import hep.dataforge.io.io +import hep.dataforge.io.readUtf8String +import hep.dataforge.io.writeUtf8String import hep.dataforge.meta.Meta import hep.dataforge.misc.DFExperimental +import io.ktor.utils.io.core.Input +import io.ktor.utils.io.core.Output import kotlinx.coroutines.runBlocking -import kotlinx.io.Input -import kotlinx.io.Output -import kotlinx.io.text.readUtf8String -import kotlinx.io.text.writeUtf8String import java.nio.file.Files import java.nio.file.Path import kotlin.reflect.KType From b6dad141f8f08cebc200294f83c54288bc89e4c6 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 1 Mar 2021 10:25:02 +0300 Subject: [PATCH 05/10] Fix log loading --- dataforge-context/api/dataforge-context.api | 28 +++++++++---------- dataforge-context/build.gradle.kts | 3 +- .../kotlin/hep/dataforge/context/Global.kt | 4 +-- .../hep/dataforge/context/LogManager.kt | 18 ++++++++---- .../kotlin/hep/dataforge/context/loggingJs.kt | 24 ++++++++-------- .../hep/dataforge/context/loggingJvm.kt | 26 +++++++++-------- .../hep/dataforge/context/loggingNative.kt | 10 ++----- .../workspace/SimpleWorkspaceTest.kt | 2 ++ 8 files changed, 59 insertions(+), 56 deletions(-) diff --git a/dataforge-context/api/dataforge-context.api b/dataforge-context/api/dataforge-context.api index b603c615..8ea82998 100644 --- a/dataforge-context/api/dataforge-context.api +++ b/dataforge-context/api/dataforge-context.api @@ -96,20 +96,6 @@ public final class hep/dataforge/context/Global : hep/dataforge/context/Context public final fun getLogger ()Lhep/dataforge/context/LogManager; } -public final class hep/dataforge/context/KLoggingManager : hep/dataforge/context/AbstractPlugin, hep/dataforge/context/LogManager { - public static final field Companion Lhep/dataforge/context/KLoggingManager$Companion; - public fun ()V - public fun getTag ()Lhep/dataforge/context/PluginTag; - public fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V -} - -public final class hep/dataforge/context/KLoggingManager$Companion : hep/dataforge/context/PluginFactory { - public fun getTag ()Lhep/dataforge/context/PluginTag; - public fun getType ()Lkotlin/reflect/KClass; - public fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Lhep/dataforge/context/KLoggingManager; - public synthetic fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; -} - public abstract interface class hep/dataforge/context/LogManager : hep/dataforge/context/Logable, hep/dataforge/context/Plugin { public static final field Companion Lhep/dataforge/context/LogManager$Companion; public static final field DEBUG Ljava/lang/String; @@ -245,6 +231,20 @@ public final class hep/dataforge/context/ResolveKt { public static final fun resolve (Lhep/dataforge/context/Context;Ljava/lang/String;Lhep/dataforge/names/Name;Lkotlin/reflect/KClass;)Ljava/lang/Object; } +public final class hep/dataforge/context/SlfLogManager : hep/dataforge/context/AbstractPlugin, hep/dataforge/context/LogManager { + public static final field Companion Lhep/dataforge/context/SlfLogManager$Companion; + public fun ()V + public fun getTag ()Lhep/dataforge/context/PluginTag; + public fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V +} + +public final class hep/dataforge/context/SlfLogManager$Companion : hep/dataforge/context/PluginFactory { + public fun getTag ()Lhep/dataforge/context/PluginTag; + public fun getType ()Lkotlin/reflect/KClass; + public fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Lhep/dataforge/context/SlfLogManager; + public synthetic fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; +} + public abstract interface annotation class hep/dataforge/descriptors/Attribute : java/lang/annotation/Annotation { public abstract fun key ()Ljava/lang/String; public abstract fun value ()Ljava/lang/String; diff --git a/dataforge-context/build.gradle.kts b/dataforge-context/build.gradle.kts index 0eb1083e..abbaf290 100644 --- a/dataforge-context/build.gradle.kts +++ b/dataforge-context/build.gradle.kts @@ -19,13 +19,12 @@ kotlin { jvmMain { dependencies { api(kotlin("reflect")) - api("io.github.microutils:kotlin-logging-jvm:2.0.4") implementation("ch.qos.logback:logback-classic:1.2.3") } } jsMain { dependencies { - api("io.github.microutils:kotlin-logging-js:2.0.4") + } } } diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt index b1b38179..f288d65a 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt @@ -7,7 +7,7 @@ import kotlinx.coroutines.SupervisorJob import kotlin.coroutines.CoroutineContext import kotlin.native.concurrent.ThreadLocal -internal expect val globalLogger: LogManager +internal expect val globalLoggerFactory: PluginFactory /** * A global root context. Closing [Global] terminates the framework. @@ -20,7 +20,7 @@ public object Global : Context("GLOBAL".asName(), null, Meta.EMPTY) { /** * The default logging manager */ - public val logger: LogManager = globalLogger + public val logger: LogManager by lazy { globalLoggerFactory.invoke(context = this).apply { attach(this@Global) } } /** * Closing all contexts diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt index 032f4e09..a96f4f40 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt +++ b/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt @@ -4,7 +4,7 @@ import hep.dataforge.misc.Named import hep.dataforge.names.Name import hep.dataforge.names.plus -public interface Logable{ +public interface Logable { public fun log(name: Name, tag: String, body: () -> String) } @@ -19,19 +19,25 @@ public interface LogManager : Plugin, Logable { } } - - public fun Logable.trace(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.TRACE, body) public fun Logable.info(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.INFO, body) public fun Logable.debug(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.DEBUG, body) public fun Logable.warn(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.WARNING, body) public fun Logable.error(name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.ERROR, body) +internal val (() -> String).safe: String + get() = try { + invoke() + } catch (t: Throwable) { + "Error while evaluating log string: ${t.message}" + } + + public fun Logable.error(throwable: Throwable?, name: Name = Name.EMPTY, body: () -> String): Unit = log(name, LogManager.ERROR) { buildString { appendLine(body()) - throwable?.let { appendLine(throwable.stackTraceToString())} + throwable?.let { appendLine(throwable.stackTraceToString()) } } } @@ -46,10 +52,10 @@ public val Context.logger: LogManager */ public val ContextAware.logger: Logable get() = if (this is Named) { - object :Logable{ + object : Logable { val contextLog = context.logger override fun log(name: Name, tag: String, body: () -> String) { - contextLog.log(this@logger.name + name,tag, body) + contextLog.log(this@logger.name + name, tag, body) } } } else { diff --git a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt index ffeb68f6..172edece 100644 --- a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt +++ b/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt @@ -2,30 +2,28 @@ package hep.dataforge.context import hep.dataforge.meta.Meta import hep.dataforge.names.Name -import mu.KotlinLogging import kotlin.reflect.KClass -public class KLoggingManager : AbstractPlugin(), LogManager { +public class ConsoleLogManager : AbstractPlugin(), LogManager { override fun log(name: Name, tag: String, body: () -> String) { - val logger = KotlinLogging.logger("[${context.name}] $name") + val message: String = body.safe when (tag) { - LogManager.DEBUG -> logger.debug(body) - LogManager.INFO -> logger.info(body) - LogManager.WARNING -> logger.warn(body) - LogManager.ERROR -> logger.error(body) - else -> logger.trace(body) + LogManager.INFO -> console.info("[${context.name}] $name: $message") + LogManager.WARNING -> console.warn("[${context.name}] $name: $message") + LogManager.ERROR -> console.error("[${context.name}] $name: $message") + else -> console.log("[${context.name}] $name: $message") } } override val tag: PluginTag get() = Companion.tag - public companion object : PluginFactory { - override fun invoke(meta: Meta, context: Context): KLoggingManager = KLoggingManager() + public companion object : PluginFactory { + override fun invoke(meta: Meta, context: Context): ConsoleLogManager = ConsoleLogManager() - override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.kotlinLogging") - override val type: KClass = KLoggingManager::class + override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.jsConsole") + override val type: KClass = ConsoleLogManager::class } } -internal actual val globalLogger: LogManager = KLoggingManager().apply { attach(Global) } +internal actual val globalLoggerFactory: PluginFactory = ConsoleLogManager diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt index ffeb68f6..4796bb24 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt +++ b/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt @@ -2,30 +2,32 @@ package hep.dataforge.context import hep.dataforge.meta.Meta import hep.dataforge.names.Name -import mu.KotlinLogging + +import org.slf4j.LoggerFactory import kotlin.reflect.KClass -public class KLoggingManager : AbstractPlugin(), LogManager { +public class SlfLogManager : AbstractPlugin(), LogManager { override fun log(name: Name, tag: String, body: () -> String) { - val logger = KotlinLogging.logger("[${context.name}] $name") + val logger = LoggerFactory.getLogger("[${context.name}] $name") //KotlinLogging.logger("[${context.name}] $name") + val message = body.safe when (tag) { - LogManager.DEBUG -> logger.debug(body) - LogManager.INFO -> logger.info(body) - LogManager.WARNING -> logger.warn(body) - LogManager.ERROR -> logger.error(body) - else -> logger.trace(body) + LogManager.DEBUG -> logger.debug(message) + LogManager.INFO -> logger.info(message) + LogManager.WARNING -> logger.warn(message) + LogManager.ERROR -> logger.error(message) + else -> logger.trace(message) } } override val tag: PluginTag get() = Companion.tag - public companion object : PluginFactory { - override fun invoke(meta: Meta, context: Context): KLoggingManager = KLoggingManager() + public companion object : PluginFactory { + override fun invoke(meta: Meta, context: Context): SlfLogManager = SlfLogManager() override val tag: PluginTag = PluginTag(group = PluginTag.DATAFORGE_GROUP, name = "log.kotlinLogging") - override val type: KClass = KLoggingManager::class + override val type: KClass = SlfLogManager::class } } -internal actual val globalLogger: LogManager = KLoggingManager().apply { attach(Global) } +internal actual val globalLoggerFactory: PluginFactory = SlfLogManager diff --git a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt index 9caa3398..8d471225 100644 --- a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt +++ b/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt @@ -8,12 +8,8 @@ import kotlin.reflect.KClass public class NativeLogManager : AbstractPlugin(), LogManager { override fun log(name: Name, tag: String, body: () -> String) { - val text = try { - body() - } catch (t: Throwable){ - "Error while evaluating log string: ${t.message}" - } - println("[${context.name}] $name: $text") + val message: String = body.safe + println("[${context.name}] $name: $message") } override val tag: PluginTag get() = Companion.tag @@ -26,4 +22,4 @@ public class NativeLogManager : AbstractPlugin(), LogManager { } } -internal actual val globalLogger: LogManager = NativeLogManager().apply { attach(Global) } +internal actual val globalLoggerFactory: PluginFactory = NativeLogManager diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt index 5ee08ea5..b4374624 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt @@ -1,3 +1,5 @@ +@file:Suppress("UNUSED_VARIABLE") + package hep.dataforge.workspace import hep.dataforge.context.* From 3f0d088c484a05f1bc28b72f04d725154f7aff2c Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 3 Mar 2021 11:36:22 +0300 Subject: [PATCH 06/10] Change package name to space.kscience --- CHANGELOG.md | 1 + build.gradle.kts | 4 +- dataforge-context/api/dataforge-context.api | 352 ++--- .../dataforge/context/AbstractPlugin.kt | 8 +- .../kscience}/dataforge/context/Context.kt | 16 +- .../dataforge/context/ContextBuilder.kt | 16 +- .../kscience}/dataforge/context/Factory.kt | 4 +- .../kscience}/dataforge/context/Global.kt | 6 +- .../kscience}/dataforge/context/LogManager.kt | 8 +- .../kscience}/dataforge/context/Plugin.kt | 18 +- .../dataforge/context/PluginFactory.kt | 4 +- .../dataforge/context/PluginManager.kt | 6 +- .../kscience}/dataforge/context/PluginTag.kt | 8 +- .../kscience}/dataforge/context/resolve.kt | 12 +- .../dataforge/properties/ConfigProperty.kt | 18 +- .../dataforge/properties/Property.kt | 4 +- .../kscience}/dataforge/provider/Path.kt | 6 +- .../kscience}/dataforge/provider/Provider.kt | 4 +- .../dataforge/context/ContextTest.kt | 8 +- .../kscience}/dataforge/context/loggingJs.kt | 6 +- .../dataforge/properties/bindings.kt | 4 +- .../dataforge/context/ClassLoaderPlugin.kt | 2 +- .../kscience}/dataforge/context/loggingJvm.kt | 7 +- .../dataforge/descriptors/annotations.kt | 4 +- .../descriptors/reflectiveDescriptors.kt | 2 +- .../kscience}/dataforge/provider/dfType.kt | 12 +- .../dataforge/context/loggingNative.kt | 6 +- .../kscience}/dataforge/actions/Action.kt | 8 +- .../kscience}/dataforge/actions/MapAction.kt | 20 +- .../dataforge/actions/ReduceAction.kt | 18 +- .../dataforge/actions/SplitAction.kt | 20 +- .../dataforge/data/ActiveDataTree.kt | 6 +- .../kscience}/dataforge/data/CachingAction.kt | 10 +- .../dataforge/data/CoroutineMonitor.kt | 5 +- .../kscience}/dataforge/data/Data.kt | 12 +- .../kscience}/dataforge/data/DataSet.kt | 10 +- .../dataforge/data/DataSetBuilder.kt | 14 +- .../kscience}/dataforge/data/DataTree.kt | 6 +- .../kscience}/dataforge/data/Goal.kt | 4 +- .../data/GoalExecutionRestriction.kt | 2 +- .../kscience}/dataforge/data/GoalLogger.kt | 2 +- .../kscience}/dataforge/data/GroupRule.kt | 8 +- .../kscience}/dataforge/data/NamedData.kt | 8 +- .../dataforge/data/StaticDataTree.kt | 6 +- .../kscience}/dataforge/data/dataFilter.kt | 6 +- .../kscience}/dataforge/data/dataSetMeta.kt | 6 +- .../kscience}/dataforge/data/dataTransform.kt | 12 +- .../kscience}/dataforge/data/select.kt | 10 +- .../kscience}/dataforge/data/ActionsTest.kt | 6 +- .../dataforge/data/DataTreeBuilderTest.kt | 6 +- .../io/yaml/FrontMatterEnvelopeFormat.kt | 46 +- .../dataforge/io/yaml/YamlMetaFormat.kt | 36 +- .../dataforge/io/yaml/YamlMetaFormatTest.kt | 14 +- .../kscience}/dataforge/io/Binary.kt | 2 +- .../dataforge/io/BinaryMetaFormat.kt | 12 +- .../kscience}/dataforge/io/Consumer.kt | 4 +- .../kscience}/dataforge/io/Envelope.kt | 16 +- .../kscience}/dataforge/io/EnvelopeBuilder.kt | 4 +- .../kscience}/dataforge/io/EnvelopeFormat.kt | 14 +- .../kscience}/dataforge/io/EnvelopeParts.kt | 24 +- .../kscience}/dataforge/io/IOFormat.kt | 26 +- .../kscience}/dataforge/io/IOPlugin.kt | 20 +- .../kscience}/dataforge/io/JsonMetaFormat.kt | 17 +- .../kscience}/dataforge/io/MetaFormat.kt | 19 +- .../kscience}/dataforge/io/Responder.kt | 2 +- .../dataforge/io/TaggedEnvelopeFormat.kt | 22 +- .../dataforge/io/TaglessEnvelopeFormat.kt | 20 +- .../kscience}/dataforge/io/ioMisc.kt | 2 +- .../kscience}/dataforge/io/BinaryTest.kt | 2 +- .../dataforge/io/EnvelopeFormatTest.kt | 2 +- .../kscience}/dataforge/io/IOTest.kt | 4 +- .../kscience}/dataforge/io/MetaFormatTest.kt | 11 +- .../dataforge/io/MetaSerializerTest.kt | 12 +- .../kscience}/dataforge/io/MultipartTest.kt | 10 +- .../kscience}/dataforge/io/ioTestUtils.kt | 2 +- .../kscience}/dataforge/io/fileIO.kt | 10 +- .../kscience}/dataforge/io/streamsIO.kt | 2 +- .../hep.dataforge.io.MetaFormatFactory | 4 +- .../kscience}/dataforge/io/FileBinaryTest.kt | 10 +- .../dataforge/io/FileEnvelopeTest.kt | 8 +- dataforge-meta/api/dataforge-meta.api | 1166 +++++++++-------- .../kscience}/dataforge/meta/Config.kt | 10 +- .../kscience}/dataforge/meta/Configurable.kt | 6 +- .../kscience}/dataforge/meta/ItemDelegate.kt | 10 +- .../kscience}/dataforge/meta/ItemProvider.kt | 4 +- .../kscience}/dataforge/meta/JsonMeta.kt | 18 +- .../kscience}/dataforge/meta/Laminate.kt | 6 +- .../kscience}/dataforge/meta/Meta.kt | 6 +- .../kscience}/dataforge/meta/MetaBuilder.kt | 14 +- .../kscience}/dataforge/meta/MetaItem.kt | 4 +- .../dataforge/meta/MetaSerializer.kt | 11 +- .../dataforge/meta/MutableItemDelegate.kt | 10 +- .../dataforge/meta/MutableItemProvider.kt | 6 +- .../kscience}/dataforge/meta/MutableMeta.kt | 6 +- .../kscience}/dataforge/meta/Scheme.kt | 10 +- .../kscience}/dataforge/meta/SealedMeta.kt | 4 +- .../kscience}/dataforge/meta/Specification.kt | 6 +- .../kscience}/dataforge/meta/TypedMeta.kt | 8 +- .../dataforge/meta/descriptors/Described.kt | 2 +- .../meta/descriptors/DescriptorMeta.kt | 6 +- .../meta/descriptors/ItemDescriptor.kt | 10 +- .../meta/descriptors/descriptorExtensions.kt | 8 +- .../kscience}/dataforge/meta/mapMeta.kt | 12 +- .../meta/transformations/MetaConverter.kt | 8 +- .../transformations/MetaTransformation.kt | 8 +- .../kscience}/dataforge/misc/Named.kt | 8 +- .../kscience}/dataforge/misc/Type.kt | 2 +- .../kscience}/dataforge/misc/annotations.kt | 2 +- .../kscience}/dataforge/names/Name.kt | 25 +- .../dataforge/names/NameSerializer.kt | 37 + .../kscience}/dataforge/names/NameToken.kt | 26 +- .../kscience}/dataforge/names/nameMatcher.kt | 4 +- .../kscience}/dataforge/values/Value.kt | 2 +- .../dataforge/values/ValueSerializer.kt | 4 +- .../dataforge/values/exoticValues.kt | 2 +- .../dataforge/values/valueExtensions.kt | 6 +- .../kscience}/dataforge/meta/ConfigTest.kt | 2 +- .../kscience}/dataforge/meta/JsonMetaTest.kt | 4 +- .../dataforge/meta/MetaBuilderTest.kt | 4 +- .../dataforge/meta/MetaDelegateTest.kt | 4 +- .../dataforge/meta/MetaExtensionTest.kt | 2 +- .../kscience}/dataforge/meta/MetaTest.kt | 10 +- .../dataforge/meta/MutableMetaTest.kt | 2 +- .../kscience}/dataforge/meta/SchemeTest.kt | 2 +- .../dataforge/meta/SpecificationTest.kt | 2 +- .../meta/descriptors/DescriptorTest.kt | 8 +- .../dataforge/names/NameMatchTest.kt | 4 +- .../dataforge/names/NameSerializationTest.kt | 2 +- .../kscience}/dataforge/names/NameTest.kt | 2 +- .../kscience}/dataforge/meta/DynamicMeta.kt | 10 +- .../dataforge/meta/DynamicMetaTest.kt | 4 +- .../hep/dataforge/output/OutputManager.kt | 10 +- .../kotlin/hep/dataforge/output/Renderer.kt | 6 +- .../hep/dataforge/output/TextRenderer.kt | 12 +- .../kotlin/hep/dataforge/output/outputJS.kt | 2 +- .../kotlin/hep/dataforge/output/outputJVM.kt | 2 +- .../hep/dataforge/output/outputNative.kt | 2 +- .../kscience}/dataforge/scripting/Builders.kt | 12 +- .../dataforge/scripting/BuildersKtTest.kt | 12 +- .../kscience}/dataforge/tables/ColumnDef.kt | 4 +- .../dataforge/tables/ColumnHeader.kt | 14 +- .../dataforge/tables/ColumnScheme.kt | 12 +- .../kscience}/dataforge/tables/ColumnTable.kt | 2 +- .../kscience}/dataforge/tables/ListColumn.kt | 4 +- .../dataforge/tables/MutableColumnTable.kt | 2 +- .../dataforge/tables/MutableTable.kt | 6 +- .../kscience}/dataforge/tables/RowTable.kt | 4 +- .../kscience}/dataforge/tables/Table.kt | 2 +- .../dataforge/tables/TransformationColumn.kt | 4 +- .../kscience}/dataforge/tables/io/TextRows.kt | 12 +- .../dataforge/tables/io/textTableEnvelope.kt | 20 +- .../dataforge/tables/numericColumns.kt | 4 +- .../kscience}/dataforge/tables/CastColumn.kt | 4 +- .../dataforge/tables/io/TextRowsTest.kt | 16 +- .../dataforge/workspace/ContextGoalLogger.kt | 10 +- .../dataforge/workspace/SimpleWorkspace.kt | 12 +- .../kscience}/dataforge/workspace/Task.kt | 22 +- .../kscience}/dataforge/workspace/TaskData.kt | 10 +- .../dataforge/workspace/TaskResult.kt | 8 +- .../dataforge/workspace/Workspace.kt | 16 +- .../dataforge/workspace/WorkspaceBuilder.kt | 30 +- .../dataforge/workspace/envelopeData.kt | 10 +- .../dataforge/workspace/WorkspacePlugin.kt | 8 +- .../kscience}/dataforge/workspace/fileData.kt | 15 +- .../dataforge/workspace/taskBuilders.kt | 10 +- .../workspace/workspaceExtensions.kt | 4 +- .../workspace/DataPropagationTest.kt | 14 +- .../dataforge/workspace/FileDataTest.kt | 18 +- .../workspace/SimpleWorkspaceTest.kt | 14 +- 169 files changed, 1522 insertions(+), 1514 deletions(-) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/AbstractPlugin.kt (88%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/Context.kt (90%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/ContextBuilder.kt (82%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/Factory.kt (60%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/Global.kt (91%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/LogManager.kt (92%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/Plugin.kt (80%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/PluginFactory.kt (76%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/PluginManager.kt (97%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/PluginTag.kt (88%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/context/resolve.kt (91%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/properties/ConfigProperty.kt (59%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/properties/Property.kt (91%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/provider/Path.kt (94%) rename dataforge-context/src/commonMain/kotlin/{hep => space/kscience}/dataforge/provider/Provider.kt (96%) rename dataforge-context/src/commonTest/kotlin/{hep => space/kscience}/dataforge/context/ContextTest.kt (81%) rename dataforge-context/src/jsMain/kotlin/{hep => space/kscience}/dataforge/context/loggingJs.kt (89%) rename dataforge-context/src/jsMain/kotlin/{hep => space/kscience}/dataforge/properties/bindings.kt (87%) rename dataforge-context/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/context/ClassLoaderPlugin.kt (98%) rename dataforge-context/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/context/loggingJvm.kt (89%) rename dataforge-context/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/descriptors/annotations.kt (97%) rename dataforge-context/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/descriptors/reflectiveDescriptors.kt (97%) rename dataforge-context/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/provider/dfType.kt (74%) rename dataforge-context/src/nativeMain/kotlin/{hep => space/kscience}/dataforge/context/loggingNative.kt (85%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/actions/Action.kt (88%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/actions/MapAction.kt (85%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/actions/ReduceAction.kt (89%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/actions/SplitAction.kt (85%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/ActiveDataTree.kt (97%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/CachingAction.kt (85%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/CoroutineMonitor.kt (91%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/Data.kt (92%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/DataSet.kt (91%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/DataSetBuilder.kt (92%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/DataTree.kt (96%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/Goal.kt (97%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/GoalExecutionRestriction.kt (91%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/GoalLogger.kt (90%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/GroupRule.kt (90%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/NamedData.kt (80%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/StaticDataTree.kt (93%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/dataFilter.kt (94%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/dataSetMeta.kt (69%) rename dataforge-data/src/commonMain/kotlin/{hep => space/kscience}/dataforge/data/dataTransform.kt (95%) rename dataforge-data/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/data/select.kt (87%) rename dataforge-data/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/data/ActionsTest.kt (87%) rename dataforge-data/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/data/DataTreeBuilderTest.kt (93%) rename dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt (55%) rename dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/yaml/YamlMetaFormat.kt (79%) rename dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/yaml/YamlMetaFormatTest.kt (74%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/Binary.kt (98%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/BinaryMetaFormat.kt (92%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/Consumer.kt (61%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/Envelope.kt (88%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/EnvelopeBuilder.kt (95%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/EnvelopeFormat.kt (82%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/EnvelopeParts.kt (81%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/IOFormat.kt (84%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/IOPlugin.kt (81%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/JsonMetaFormat.kt (81%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/MetaFormat.kt (79%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/Responder.kt (87%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/TaggedEnvelopeFormat.kt (91%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/TaglessEnvelopeFormat.kt (94%) rename dataforge-io/src/commonMain/kotlin/{hep => space/kscience}/dataforge/io/ioMisc.kt (95%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/BinaryTest.kt (90%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/EnvelopeFormatTest.kt (97%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/IOTest.kt (77%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/MetaFormatTest.kt (92%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/MetaSerializerTest.kt (85%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/MultipartTest.kt (84%) rename dataforge-io/src/commonTest/kotlin/{hep => space/kscience}/dataforge/io/ioTestUtils.kt (89%) rename dataforge-io/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/io/fileIO.kt (97%) rename dataforge-io/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/io/streamsIO.kt (97%) rename dataforge-io/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/io/FileBinaryTest.kt (85%) rename dataforge-io/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/io/FileEnvelopeTest.kt (86%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Config.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Configurable.kt (80%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/ItemDelegate.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/ItemProvider.kt (97%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/JsonMeta.kt (92%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Laminate.kt (96%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Meta.kt (95%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MetaBuilder.kt (90%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MetaItem.kt (97%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MetaSerializer.kt (90%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MutableItemDelegate.kt (96%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MutableItemProvider.kt (97%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/MutableMeta.kt (95%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Scheme.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/SealedMeta.kt (88%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/Specification.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/TypedMeta.kt (88%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/descriptors/Described.kt (91%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/descriptors/DescriptorMeta.kt (89%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/descriptors/ItemDescriptor.kt (97%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/descriptors/descriptorExtensions.kt (63%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/mapMeta.kt (81%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/transformations/MetaConverter.kt (95%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/meta/transformations/MetaTransformation.kt (96%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/misc/Named.kt (88%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/misc/Type.kt (88%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/misc/annotations.kt (87%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/names/Name.kt (88%) create mode 100644 dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameSerializer.kt rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/names/NameToken.kt (51%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/names/nameMatcher.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/values/Value.kt (99%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/values/ValueSerializer.kt (94%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/values/exoticValues.kt (97%) rename dataforge-meta/src/commonMain/kotlin/{hep => space/kscience}/dataforge/values/valueExtensions.kt (87%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/ConfigTest.kt (87%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/JsonMetaTest.kt (92%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/MetaBuilderTest.kt (90%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/MetaDelegateTest.kt (92%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/MetaExtensionTest.kt (90%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/MetaTest.kt (85%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/MutableMetaTest.kt (91%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/SchemeTest.kt (92%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/SpecificationTest.kt (98%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/meta/descriptors/DescriptorTest.kt (84%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/names/NameMatchTest.kt (91%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/names/NameSerializationTest.kt (91%) rename dataforge-meta/src/commonTest/kotlin/{hep => space/kscience}/dataforge/names/NameTest.kt (96%) rename dataforge-meta/src/jsMain/kotlin/{hep => space/kscience}/dataforge/meta/DynamicMeta.kt (92%) rename dataforge-meta/src/jsTest/kotlin/{hep => space/kscience}/dataforge/meta/DynamicMetaTest.kt (93%) rename dataforge-scripting/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/scripting/Builders.kt (87%) rename dataforge-scripting/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/scripting/BuildersKtTest.kt (72%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/ColumnDef.kt (61%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/ColumnHeader.kt (73%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/ColumnScheme.kt (50%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/ColumnTable.kt (95%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/ListColumn.kt (92%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/MutableColumnTable.kt (95%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/MutableTable.kt (93%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/RowTable.kt (89%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/Table.kt (95%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/TransformationColumn.kt (95%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/io/TextRows.kt (94%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/io/textTableEnvelope.kt (68%) rename dataforge-tables/src/commonMain/kotlin/{hep => space/kscience}/dataforge/tables/numericColumns.kt (96%) rename dataforge-tables/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/tables/CastColumn.kt (93%) rename dataforge-tables/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/tables/io/TextRowsTest.kt (66%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/ContextGoalLogger.kt (60%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/SimpleWorkspace.kt (62%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/Task.kt (77%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/TaskData.kt (84%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/TaskResult.kt (84%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/Workspace.kt (81%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/WorkspaceBuilder.kt (79%) rename dataforge-workspace/src/commonMain/kotlin/{hep => space/kscience}/dataforge/workspace/envelopeData.kt (70%) rename dataforge-workspace/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/workspace/WorkspacePlugin.kt (70%) rename dataforge-workspace/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/workspace/fileData.kt (96%) rename dataforge-workspace/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/workspace/taskBuilders.kt (73%) rename dataforge-workspace/src/jvmMain/kotlin/{hep => space/kscience}/dataforge/workspace/workspaceExtensions.kt (63%) rename dataforge-workspace/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/workspace/DataPropagationTest.kt (84%) rename dataforge-workspace/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/workspace/FileDataTest.kt (85%) rename dataforge-workspace/src/jvmTest/kotlin/{hep => space/kscience}/dataforge/workspace/SimpleWorkspaceTest.kt (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a880a8ae..ff72a0f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Changed - Kotlin-logging moved from common to JVM and JS. Replaced by console for native. +- Package changed to `space.kscience` ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index 65be5b8d..a94095f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } allprojects { - group = "hep.dataforge" + group = "space.kscience" version = "0.4.0-dev-1" apply() @@ -28,5 +28,5 @@ ksciencePublish { } apiValidation{ - nonPublicMarkers.add("hep.dataforge.misc.DFExperimental") + nonPublicMarkers.add("space.kscience.dataforge.misc.DFExperimental") } \ No newline at end of file diff --git a/dataforge-context/api/dataforge-context.api b/dataforge-context/api/dataforge-context.api index 8ea82998..5674e74b 100644 --- a/dataforge-context/api/dataforge-context.api +++ b/dataforge-context/api/dataforge-context.api @@ -1,42 +1,42 @@ -public abstract class hep/dataforge/context/AbstractPlugin : hep/dataforge/context/Plugin { +public abstract class space/kscience/dataforge/context/AbstractPlugin : space/kscience/dataforge/context/Plugin { public fun ()V - public fun (Lhep/dataforge/meta/Meta;)V - public synthetic fun (Lhep/dataforge/meta/Meta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun attach (Lhep/dataforge/context/Context;)V + public fun (Lspace/kscience/dataforge/meta/Meta;)V + public synthetic fun (Lspace/kscience/dataforge/meta/Meta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun attach (Lspace/kscience/dataforge/context/Context;)V public fun content (Ljava/lang/String;)Ljava/util/Map; public final fun dependsOn ()Ljava/util/Map; public fun detach ()V - public fun getContext ()Lhep/dataforge/context/Context; + public fun getContext ()Lspace/kscience/dataforge/context/Context; public fun getDefaultChainTarget ()Ljava/lang/String; public fun getDefaultTarget ()Ljava/lang/String; - public fun getMeta ()Lhep/dataforge/meta/Meta; - public fun getName ()Lhep/dataforge/names/Name; - protected final fun require (Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun require$default (Lhep/dataforge/context/AbstractPlugin;Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public fun toMeta ()Lhep/dataforge/meta/Meta; + public fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun getName ()Lspace/kscience/dataforge/names/Name; + protected final fun require (Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun require$default (Lspace/kscience/dataforge/context/AbstractPlugin;Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/context/AbstractPluginKt { +public final class space/kscience/dataforge/context/AbstractPluginKt { public static final fun toMap (Ljava/util/Collection;)Ljava/util/Map; } -public final class hep/dataforge/context/ClassLoaderPlugin : hep/dataforge/context/AbstractPlugin { - public static final field Companion Lhep/dataforge/context/ClassLoaderPlugin$Companion; +public final class space/kscience/dataforge/context/ClassLoaderPlugin : space/kscience/dataforge/context/AbstractPlugin { + public static final field Companion Lspace/kscience/dataforge/context/ClassLoaderPlugin$Companion; public fun (Ljava/lang/ClassLoader;)V - public fun getTag ()Lhep/dataforge/context/PluginTag; + public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; public final fun services (Lkotlin/reflect/KClass;)Lkotlin/sequences/Sequence; } -public final class hep/dataforge/context/ClassLoaderPlugin$Companion { - public final fun getDEFAULT ()Lhep/dataforge/context/ClassLoaderPlugin; +public final class space/kscience/dataforge/context/ClassLoaderPlugin$Companion { + public final fun getDEFAULT ()Lspace/kscience/dataforge/context/ClassLoaderPlugin; } -public final class hep/dataforge/context/ClassLoaderPluginKt { - public static final fun getClassLoaderPlugin (Lhep/dataforge/context/Context;)Lhep/dataforge/context/ClassLoaderPlugin; +public final class space/kscience/dataforge/context/ClassLoaderPluginKt { + public static final fun getClassLoaderPlugin (Lspace/kscience/dataforge/context/Context;)Lspace/kscience/dataforge/context/ClassLoaderPlugin; } -public class hep/dataforge/context/Context : hep/dataforge/meta/MetaRepr, hep/dataforge/misc/Named, hep/dataforge/provider/Provider, kotlinx/coroutines/CoroutineScope { - public static final field Companion Lhep/dataforge/context/Context$Companion; +public class space/kscience/dataforge/context/Context : kotlinx/coroutines/CoroutineScope, space/kscience/dataforge/meta/MetaRepr, space/kscience/dataforge/misc/Named, space/kscience/dataforge/provider/Provider { + public static final field Companion Lspace/kscience/dataforge/context/Context$Companion; public static final field PROPERTY_TARGET Ljava/lang/String; public fun close ()V public fun content (Ljava/lang/String;)Ljava/util/Map; @@ -44,60 +44,60 @@ public class hep/dataforge/context/Context : hep/dataforge/meta/MetaRepr, hep/da public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; public fun getDefaultChainTarget ()Ljava/lang/String; public fun getDefaultTarget ()Ljava/lang/String; - public final fun getName ()Lhep/dataforge/names/Name; - public final fun getParent ()Lhep/dataforge/context/Context; - public final fun getPlugins ()Lhep/dataforge/context/PluginManager; - public fun toMeta ()Lhep/dataforge/meta/Meta; + public final fun getName ()Lspace/kscience/dataforge/names/Name; + public final fun getParent ()Lspace/kscience/dataforge/context/Context; + public final fun getPlugins ()Lspace/kscience/dataforge/context/PluginManager; + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/context/Context$Companion { +public final class space/kscience/dataforge/context/Context$Companion { } -public abstract interface class hep/dataforge/context/ContextAware { - public abstract fun getContext ()Lhep/dataforge/context/Context; +public abstract interface class space/kscience/dataforge/context/ContextAware { + public abstract fun getContext ()Lspace/kscience/dataforge/context/Context; } -public final class hep/dataforge/context/ContextBuilder { +public final class space/kscience/dataforge/context/ContextBuilder { public fun ()V - public fun (Lhep/dataforge/context/Context;Ljava/lang/String;)V - public synthetic fun (Lhep/dataforge/context/Context;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun build ()Lhep/dataforge/context/Context; + public fun (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;)V + public synthetic fun (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun build ()Lspace/kscience/dataforge/context/Context; public final fun getName ()Ljava/lang/String; - public final fun plugin (Lhep/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;)V - public final fun plugin (Lhep/dataforge/context/PluginTag;Lkotlin/jvm/functions/Function1;)V public final fun plugin (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun plugin$default (Lhep/dataforge/context/ContextBuilder;Lhep/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun plugin$default (Lhep/dataforge/context/ContextBuilder;Lhep/dataforge/context/PluginTag;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun plugin$default (Lhep/dataforge/context/ContextBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun plugin (Lspace/kscience/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;)V + public final fun plugin (Lspace/kscience/dataforge/context/PluginTag;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun plugin$default (Lspace/kscience/dataforge/context/ContextBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun plugin$default (Lspace/kscience/dataforge/context/ContextBuilder;Lspace/kscience/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun plugin$default (Lspace/kscience/dataforge/context/ContextBuilder;Lspace/kscience/dataforge/context/PluginTag;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V public final fun properties (Lkotlin/jvm/functions/Function1;)V public final fun setName (Ljava/lang/String;)V } -public final class hep/dataforge/context/ContextKt { - public static final fun Context (Ljava/lang/String;Lhep/dataforge/context/Context;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/context/Context; - public static synthetic fun Context$default (Ljava/lang/String;Lhep/dataforge/context/Context;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/context/Context; +public final class space/kscience/dataforge/context/ContextKt { + public static final fun Context (Ljava/lang/String;Lspace/kscience/dataforge/context/Context;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/context/Context; + public static synthetic fun Context$default (Ljava/lang/String;Lspace/kscience/dataforge/context/Context;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/context/Context; } -public abstract interface class hep/dataforge/context/Factory { - public abstract fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; +public abstract interface class space/kscience/dataforge/context/Factory { + public abstract fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Ljava/lang/Object; } -public final class hep/dataforge/context/Factory$DefaultImpls { - public static synthetic fun invoke$default (Lhep/dataforge/context/Factory;Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;ILjava/lang/Object;)Ljava/lang/Object; +public final class space/kscience/dataforge/context/Factory$DefaultImpls { + public static synthetic fun invoke$default (Lspace/kscience/dataforge/context/Factory;Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;ILjava/lang/Object;)Ljava/lang/Object; } -public final class hep/dataforge/context/Global : hep/dataforge/context/Context { - public static final field INSTANCE Lhep/dataforge/context/Global; +public final class space/kscience/dataforge/context/Global : space/kscience/dataforge/context/Context { + public static final field INSTANCE Lspace/kscience/dataforge/context/Global; public fun close ()V - public final fun context (Ljava/lang/String;Lhep/dataforge/context/Context;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/context/Context; - public static synthetic fun context$default (Lhep/dataforge/context/Global;Ljava/lang/String;Lhep/dataforge/context/Context;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/context/Context; - public final fun getContext (Ljava/lang/String;)Lhep/dataforge/context/Context; + public final fun context (Ljava/lang/String;Lspace/kscience/dataforge/context/Context;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/context/Context; + public static synthetic fun context$default (Lspace/kscience/dataforge/context/Global;Ljava/lang/String;Lspace/kscience/dataforge/context/Context;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/context/Context; + public final fun getContext (Ljava/lang/String;)Lspace/kscience/dataforge/context/Context; public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext; - public final fun getLogger ()Lhep/dataforge/context/LogManager; + public final fun getLogger ()Lspace/kscience/dataforge/context/LogManager; } -public abstract interface class hep/dataforge/context/LogManager : hep/dataforge/context/Logable, hep/dataforge/context/Plugin { - public static final field Companion Lhep/dataforge/context/LogManager$Companion; +public abstract interface class space/kscience/dataforge/context/LogManager : space/kscience/dataforge/context/Logable, space/kscience/dataforge/context/Plugin { + public static final field Companion Lspace/kscience/dataforge/context/LogManager$Companion; public static final field DEBUG Ljava/lang/String; public static final field ERROR Ljava/lang/String; public static final field INFO Ljava/lang/String; @@ -105,7 +105,7 @@ public abstract interface class hep/dataforge/context/LogManager : hep/dataforge public static final field WARNING Ljava/lang/String; } -public final class hep/dataforge/context/LogManager$Companion { +public final class space/kscience/dataforge/context/LogManager$Companion { public static final field DEBUG Ljava/lang/String; public static final field ERROR Ljava/lang/String; public static final field INFO Ljava/lang/String; @@ -113,176 +113,176 @@ public final class hep/dataforge/context/LogManager$Companion { public static final field WARNING Ljava/lang/String; } -public final class hep/dataforge/context/LogManager$DefaultImpls { - public static fun content (Lhep/dataforge/context/LogManager;Ljava/lang/String;)Ljava/util/Map; - public static fun getDefaultChainTarget (Lhep/dataforge/context/LogManager;)Ljava/lang/String; - public static fun getDefaultTarget (Lhep/dataforge/context/LogManager;)Ljava/lang/String; - public static fun getName (Lhep/dataforge/context/LogManager;)Lhep/dataforge/names/Name; - public static fun toMeta (Lhep/dataforge/context/LogManager;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/context/LogManager$DefaultImpls { + public static fun content (Lspace/kscience/dataforge/context/LogManager;Ljava/lang/String;)Ljava/util/Map; + public static fun getDefaultChainTarget (Lspace/kscience/dataforge/context/LogManager;)Ljava/lang/String; + public static fun getDefaultTarget (Lspace/kscience/dataforge/context/LogManager;)Ljava/lang/String; + public static fun getName (Lspace/kscience/dataforge/context/LogManager;)Lspace/kscience/dataforge/names/Name; + public static fun toMeta (Lspace/kscience/dataforge/context/LogManager;)Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/context/LogManagerKt { - public static final fun debug (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun debug$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V - public static final fun error (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static final fun error (Lhep/dataforge/context/Logable;Ljava/lang/Throwable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun error$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V - public static synthetic fun error$default (Lhep/dataforge/context/Logable;Ljava/lang/Throwable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V - public static final fun getLogger (Lhep/dataforge/context/Context;)Lhep/dataforge/context/LogManager; - public static final fun getLogger (Lhep/dataforge/context/ContextAware;)Lhep/dataforge/context/Logable; - public static final fun info (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun info$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V - public static final fun trace (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun trace$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V - public static final fun warn (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V - public static synthetic fun warn$default (Lhep/dataforge/context/Logable;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V +public final class space/kscience/dataforge/context/LogManagerKt { + public static final fun debug (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun debug$default (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun error (Lspace/kscience/dataforge/context/Logable;Ljava/lang/Throwable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static final fun error (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun error$default (Lspace/kscience/dataforge/context/Logable;Ljava/lang/Throwable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static synthetic fun error$default (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun getLogger (Lspace/kscience/dataforge/context/Context;)Lspace/kscience/dataforge/context/LogManager; + public static final fun getLogger (Lspace/kscience/dataforge/context/ContextAware;)Lspace/kscience/dataforge/context/Logable; + public static final fun info (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun info$default (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun trace (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun trace$default (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V + public static final fun warn (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)V + public static synthetic fun warn$default (Lspace/kscience/dataforge/context/Logable;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V } -public abstract interface class hep/dataforge/context/Logable { - public abstract fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V +public abstract interface class space/kscience/dataforge/context/Logable { + public abstract fun log (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V } -public abstract interface class hep/dataforge/context/Plugin : hep/dataforge/context/ContextAware, hep/dataforge/meta/MetaRepr, hep/dataforge/misc/Named, hep/dataforge/provider/Provider { - public static final field Companion Lhep/dataforge/context/Plugin$Companion; +public abstract interface class space/kscience/dataforge/context/Plugin : space/kscience/dataforge/context/ContextAware, space/kscience/dataforge/meta/MetaRepr, space/kscience/dataforge/misc/Named, space/kscience/dataforge/provider/Provider { + public static final field Companion Lspace/kscience/dataforge/context/Plugin$Companion; public static final field TARGET Ljava/lang/String; - public abstract fun attach (Lhep/dataforge/context/Context;)V + public abstract fun attach (Lspace/kscience/dataforge/context/Context;)V public abstract fun dependsOn ()Ljava/util/Map; public abstract fun detach ()V - public abstract fun getMeta ()Lhep/dataforge/meta/Meta; - public abstract fun getName ()Lhep/dataforge/names/Name; - public abstract fun getTag ()Lhep/dataforge/context/PluginTag; - public abstract fun toMeta ()Lhep/dataforge/meta/Meta; + public abstract fun getMeta ()Lspace/kscience/dataforge/meta/Meta; + public abstract fun getName ()Lspace/kscience/dataforge/names/Name; + public abstract fun getTag ()Lspace/kscience/dataforge/context/PluginTag; + public abstract fun toMeta ()Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/context/Plugin$Companion { +public final class space/kscience/dataforge/context/Plugin$Companion { public static final field TARGET Ljava/lang/String; } -public final class hep/dataforge/context/Plugin$DefaultImpls { - public static fun content (Lhep/dataforge/context/Plugin;Ljava/lang/String;)Ljava/util/Map; - public static fun getDefaultChainTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String; - public static fun getDefaultTarget (Lhep/dataforge/context/Plugin;)Ljava/lang/String; - public static fun getName (Lhep/dataforge/context/Plugin;)Lhep/dataforge/names/Name; - public static fun toMeta (Lhep/dataforge/context/Plugin;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/context/Plugin$DefaultImpls { + public static fun content (Lspace/kscience/dataforge/context/Plugin;Ljava/lang/String;)Ljava/util/Map; + public static fun getDefaultChainTarget (Lspace/kscience/dataforge/context/Plugin;)Ljava/lang/String; + public static fun getDefaultTarget (Lspace/kscience/dataforge/context/Plugin;)Ljava/lang/String; + public static fun getName (Lspace/kscience/dataforge/context/Plugin;)Lspace/kscience/dataforge/names/Name; + public static fun toMeta (Lspace/kscience/dataforge/context/Plugin;)Lspace/kscience/dataforge/meta/Meta; } -public abstract interface class hep/dataforge/context/PluginFactory : hep/dataforge/context/Factory { - public static final field Companion Lhep/dataforge/context/PluginFactory$Companion; +public abstract interface class space/kscience/dataforge/context/PluginFactory : space/kscience/dataforge/context/Factory { + public static final field Companion Lspace/kscience/dataforge/context/PluginFactory$Companion; public static final field TYPE Ljava/lang/String; - public abstract fun getTag ()Lhep/dataforge/context/PluginTag; + public abstract fun getTag ()Lspace/kscience/dataforge/context/PluginTag; public abstract fun getType ()Lkotlin/reflect/KClass; } -public final class hep/dataforge/context/PluginFactory$Companion { +public final class space/kscience/dataforge/context/PluginFactory$Companion { public static final field TYPE Ljava/lang/String; } -public final class hep/dataforge/context/PluginManager : hep/dataforge/context/ContextAware, java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker { - public fun (Lhep/dataforge/context/Context;)V - public final fun fetch (Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;Z)Lhep/dataforge/context/Plugin; - public final fun fetch (Lhep/dataforge/context/PluginFactory;ZLkotlin/jvm/functions/Function1;)Lhep/dataforge/context/Plugin; - public static synthetic fun fetch$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;ZILjava/lang/Object;)Lhep/dataforge/context/Plugin; - public static synthetic fun fetch$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginFactory;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/context/Plugin; - public final fun find (ZLkotlin/jvm/functions/Function1;)Lhep/dataforge/context/Plugin; - public static synthetic fun find$default (Lhep/dataforge/context/PluginManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/context/Plugin; - public final fun get (Lhep/dataforge/context/PluginTag;Z)Lhep/dataforge/context/Plugin; - public final fun get (Lkotlin/reflect/KClass;Lhep/dataforge/context/PluginTag;Z)Ljava/lang/Object; - public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Lhep/dataforge/context/Plugin; - public static synthetic fun get$default (Lhep/dataforge/context/PluginManager;Lkotlin/reflect/KClass;Lhep/dataforge/context/PluginTag;ZILjava/lang/Object;)Ljava/lang/Object; - public fun getContext ()Lhep/dataforge/context/Context; +public final class space/kscience/dataforge/context/PluginManager : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker, space/kscience/dataforge/context/ContextAware { + public fun (Lspace/kscience/dataforge/context/Context;)V + public final fun fetch (Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;Z)Lspace/kscience/dataforge/context/Plugin; + public final fun fetch (Lspace/kscience/dataforge/context/PluginFactory;ZLkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/context/Plugin; + public static synthetic fun fetch$default (Lspace/kscience/dataforge/context/PluginManager;Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;ZILjava/lang/Object;)Lspace/kscience/dataforge/context/Plugin; + public static synthetic fun fetch$default (Lspace/kscience/dataforge/context/PluginManager;Lspace/kscience/dataforge/context/PluginFactory;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/context/Plugin; + public final fun find (ZLkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/context/Plugin; + public static synthetic fun find$default (Lspace/kscience/dataforge/context/PluginManager;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/context/Plugin; + public final fun get (Lkotlin/reflect/KClass;Lspace/kscience/dataforge/context/PluginTag;Z)Ljava/lang/Object; + public final fun get (Lspace/kscience/dataforge/context/PluginTag;Z)Lspace/kscience/dataforge/context/Plugin; + public static synthetic fun get$default (Lspace/kscience/dataforge/context/PluginManager;Lkotlin/reflect/KClass;Lspace/kscience/dataforge/context/PluginTag;ZILjava/lang/Object;)Ljava/lang/Object; + public static synthetic fun get$default (Lspace/kscience/dataforge/context/PluginManager;Lspace/kscience/dataforge/context/PluginTag;ZILjava/lang/Object;)Lspace/kscience/dataforge/context/Plugin; + public fun getContext ()Lspace/kscience/dataforge/context/Context; public fun iterator ()Ljava/util/Iterator; public final fun list (Z)Ljava/util/Collection; - public final fun load (Lhep/dataforge/context/Plugin;)Lhep/dataforge/context/Plugin; - public final fun load (Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;)Lhep/dataforge/context/Plugin; - public final fun load (Lhep/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/context/Plugin; - public static synthetic fun load$default (Lhep/dataforge/context/PluginManager;Lhep/dataforge/context/PluginFactory;Lhep/dataforge/meta/Meta;ILjava/lang/Object;)Lhep/dataforge/context/Plugin; - public final fun remove (Lhep/dataforge/context/Plugin;)V + public final fun load (Lspace/kscience/dataforge/context/Plugin;)Lspace/kscience/dataforge/context/Plugin; + public final fun load (Lspace/kscience/dataforge/context/PluginFactory;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/context/Plugin; + public final fun load (Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/context/Plugin; + public static synthetic fun load$default (Lspace/kscience/dataforge/context/PluginManager;Lspace/kscience/dataforge/context/PluginFactory;Lspace/kscience/dataforge/meta/Meta;ILjava/lang/Object;)Lspace/kscience/dataforge/context/Plugin; + public final fun remove (Lspace/kscience/dataforge/context/Plugin;)V } -public final class hep/dataforge/context/PluginTag : hep/dataforge/meta/MetaRepr { - public static final field Companion Lhep/dataforge/context/PluginTag$Companion; +public final class space/kscience/dataforge/context/PluginTag : space/kscience/dataforge/meta/MetaRepr { + public static final field Companion Lspace/kscience/dataforge/context/PluginTag$Companion; public static final field DATAFORGE_GROUP Ljava/lang/String; public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; public final fun component3 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lhep/dataforge/context/PluginTag; - public static synthetic fun copy$default (Lhep/dataforge/context/PluginTag;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lhep/dataforge/context/PluginTag; + public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lspace/kscience/dataforge/context/PluginTag; + public static synthetic fun copy$default (Lspace/kscience/dataforge/context/PluginTag;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/dataforge/context/PluginTag; public fun equals (Ljava/lang/Object;)Z public final fun getGroup ()Ljava/lang/String; public final fun getName ()Ljava/lang/String; public final fun getVersion ()Ljava/lang/String; public fun hashCode ()I - public final fun matches (Lhep/dataforge/context/PluginTag;)Z - public fun toMeta ()Lhep/dataforge/meta/Meta; + public final fun matches (Lspace/kscience/dataforge/context/PluginTag;)Z + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/context/PluginTag$Companion { - public final fun fromString (Ljava/lang/String;)Lhep/dataforge/context/PluginTag; +public final class space/kscience/dataforge/context/PluginTag$Companion { + public final fun fromString (Ljava/lang/String;)Lspace/kscience/dataforge/context/PluginTag; } -public final class hep/dataforge/context/ResolveKt { - public static final fun gather (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;Z)Ljava/util/Map; - public static synthetic fun gather$default (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Ljava/util/Map; - public static synthetic fun gatherInSequence$default (Lhep/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Lkotlin/sequences/Sequence; +public final class space/kscience/dataforge/context/ResolveKt { + public static final fun gather (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;Z)Ljava/util/Map; + public static synthetic fun gather$default (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Ljava/util/Map; + public static synthetic fun gatherInSequence$default (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;Lkotlin/reflect/KClass;ZILjava/lang/Object;)Lkotlin/sequences/Sequence; public static final fun getValues (Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence; - public static final fun resolve (Lhep/dataforge/context/Context;Ljava/lang/String;Lhep/dataforge/names/Name;Lkotlin/reflect/KClass;)Ljava/lang/Object; + public static final fun resolve (Lspace/kscience/dataforge/context/Context;Ljava/lang/String;Lspace/kscience/dataforge/names/Name;Lkotlin/reflect/KClass;)Ljava/lang/Object; } -public final class hep/dataforge/context/SlfLogManager : hep/dataforge/context/AbstractPlugin, hep/dataforge/context/LogManager { - public static final field Companion Lhep/dataforge/context/SlfLogManager$Companion; +public final class space/kscience/dataforge/context/SlfLogManager : space/kscience/dataforge/context/AbstractPlugin, space/kscience/dataforge/context/LogManager { + public static final field Companion Lspace/kscience/dataforge/context/SlfLogManager$Companion; public fun ()V - public fun getTag ()Lhep/dataforge/context/PluginTag; - public fun log (Lhep/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V + public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; + public fun log (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V } -public final class hep/dataforge/context/SlfLogManager$Companion : hep/dataforge/context/PluginFactory { - public fun getTag ()Lhep/dataforge/context/PluginTag; +public final class space/kscience/dataforge/context/SlfLogManager$Companion : space/kscience/dataforge/context/PluginFactory { + public fun getTag ()Lspace/kscience/dataforge/context/PluginTag; public fun getType ()Lkotlin/reflect/KClass; - public fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Lhep/dataforge/context/SlfLogManager; - public synthetic fun invoke (Lhep/dataforge/meta/Meta;Lhep/dataforge/context/Context;)Ljava/lang/Object; + public synthetic fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Ljava/lang/Object; + public fun invoke (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/context/Context;)Lspace/kscience/dataforge/context/SlfLogManager; } -public abstract interface annotation class hep/dataforge/descriptors/Attribute : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/descriptors/Attribute : java/lang/annotation/Annotation { public abstract fun key ()Ljava/lang/String; public abstract fun value ()Ljava/lang/String; } -public abstract interface annotation class hep/dataforge/descriptors/Attributes : java/lang/annotation/Annotation { - public abstract fun attrs ()[Lhep/dataforge/descriptors/Attribute; +public abstract interface annotation class space/kscience/dataforge/descriptors/Attributes : java/lang/annotation/Annotation { + public abstract fun attrs ()[Lspace/kscience/dataforge/descriptors/Attribute; } -public abstract interface annotation class hep/dataforge/descriptors/ItemDef : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/descriptors/ItemDef : java/lang/annotation/Annotation { public abstract fun info ()Ljava/lang/String; public abstract fun multiple ()Z public abstract fun required ()Z } -public abstract interface annotation class hep/dataforge/descriptors/ValueDef : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/descriptors/ValueDef : java/lang/annotation/Annotation { public abstract fun allowed ()[Ljava/lang/String; public abstract fun def ()Ljava/lang/String; public abstract fun enumeration ()Ljava/lang/Class; - public abstract fun type ()[Lhep/dataforge/values/ValueType; + public abstract fun type ()[Lspace/kscience/dataforge/values/ValueType; } -public final class hep/dataforge/properties/Property$DefaultImpls { - public static synthetic fun onChange$default (Lhep/dataforge/properties/Property;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun removeChangeListener$default (Lhep/dataforge/properties/Property;Ljava/lang/Object;ILjava/lang/Object;)V +public final class space/kscience/dataforge/properties/Property$DefaultImpls { + public static synthetic fun onChange$default (Lspace/kscience/dataforge/properties/Property;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun removeChangeListener$default (Lspace/kscience/dataforge/properties/Property;Ljava/lang/Object;ILjava/lang/Object;)V } -public final class hep/dataforge/properties/PropertyKt { +public final class space/kscience/dataforge/properties/PropertyKt { } -public final class hep/dataforge/provider/DfTypeKt { +public final class space/kscience/dataforge/provider/DfTypeKt { public static final fun getDfType (Lkotlin/reflect/KClass;)Ljava/lang/String; } -public final class hep/dataforge/provider/Path : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker { - public static final field Companion Lhep/dataforge/provider/Path$Companion; +public final class space/kscience/dataforge/provider/Path : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker { + public static final field Companion Lspace/kscience/dataforge/provider/Path$Companion; public static final field PATH_SEGMENT_SEPARATOR Ljava/lang/String; - public static final synthetic fun box-impl (Ljava/util/List;)Lhep/dataforge/provider/Path; + public static final synthetic fun box-impl (Ljava/util/List;)Lspace/kscience/dataforge/provider/Path; public static fun constructor-impl (Ljava/util/List;)Ljava/util/List; public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (Ljava/util/List;Ljava/lang/Object;)Z @@ -297,57 +297,57 @@ public final class hep/dataforge/provider/Path : java/lang/Iterable, kotlin/jvm/ public final synthetic fun unbox-impl ()Ljava/util/List; } -public final class hep/dataforge/provider/Path$Companion { - public final fun parse-AnEnhig (Ljava/lang/String;)Ljava/util/List; +public final class space/kscience/dataforge/provider/Path$Companion { + public final fun parse-X5wN5Vs (Ljava/lang/String;)Ljava/util/List; } -public final class hep/dataforge/provider/PathKt { - public static final fun Path ([Lhep/dataforge/names/Name;)Ljava/util/List; +public final class space/kscience/dataforge/provider/PathKt { public static final fun Path ([Lkotlin/Pair;)Ljava/util/List; - public static final fun asPath (Lhep/dataforge/names/Name;Ljava/lang/String;)Ljava/util/List; - public static final fun asPath (Lhep/dataforge/provider/PathToken;)Ljava/util/List; - public static synthetic fun asPath$default (Lhep/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List; - public static final fun getHead-Ipm_iiw (Ljava/util/List;)Lhep/dataforge/provider/PathToken; - public static final fun getLength-Ipm_iiw (Ljava/util/List;)I - public static final fun getTail-Ipm_iiw (Ljava/util/List;)Ljava/util/List; - public static final fun plus-BlTXZnM (Ljava/util/List;Ljava/util/List;)Ljava/util/List; + public static final fun Path ([Lspace/kscience/dataforge/names/Name;)Ljava/util/List; + public static final fun asPath (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Ljava/util/List; + public static final fun asPath (Lspace/kscience/dataforge/provider/PathToken;)Ljava/util/List; + public static synthetic fun asPath$default (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List; + public static final fun getHead-LGjlSZY (Ljava/util/List;)Lspace/kscience/dataforge/provider/PathToken; + public static final fun getLength-LGjlSZY (Ljava/util/List;)I + public static final fun getTail-LGjlSZY (Ljava/util/List;)Ljava/util/List; + public static final fun plus-sn2Gq0g (Ljava/util/List;Ljava/util/List;)Ljava/util/List; } -public final class hep/dataforge/provider/PathToken { - public static final field Companion Lhep/dataforge/provider/PathToken$Companion; +public final class space/kscience/dataforge/provider/PathToken { + public static final field Companion Lspace/kscience/dataforge/provider/PathToken$Companion; public static final field TARGET_SEPARATOR Ljava/lang/String; - public fun (Lhep/dataforge/names/Name;Ljava/lang/String;)V - public synthetic fun (Lhep/dataforge/names/Name;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Lhep/dataforge/names/Name; + public fun (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)V + public synthetic fun (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Lspace/kscience/dataforge/names/Name; public final fun component2 ()Ljava/lang/String; - public final fun copy (Lhep/dataforge/names/Name;Ljava/lang/String;)Lhep/dataforge/provider/PathToken; - public static synthetic fun copy$default (Lhep/dataforge/provider/PathToken;Lhep/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Lhep/dataforge/provider/PathToken; + public final fun copy (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/dataforge/provider/PathToken; + public static synthetic fun copy$default (Lspace/kscience/dataforge/provider/PathToken;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/dataforge/provider/PathToken; public fun equals (Ljava/lang/Object;)Z - public final fun getName ()Lhep/dataforge/names/Name; + public final fun getName ()Lspace/kscience/dataforge/names/Name; public final fun getTarget ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/provider/PathToken$Companion { - public final fun parse (Ljava/lang/String;)Lhep/dataforge/provider/PathToken; +public final class space/kscience/dataforge/provider/PathToken$Companion { + public final fun parse (Ljava/lang/String;)Lspace/kscience/dataforge/provider/PathToken; } -public abstract interface class hep/dataforge/provider/Provider { +public abstract interface class space/kscience/dataforge/provider/Provider { public abstract fun content (Ljava/lang/String;)Ljava/util/Map; public abstract fun getDefaultChainTarget ()Ljava/lang/String; public abstract fun getDefaultTarget ()Ljava/lang/String; } -public final class hep/dataforge/provider/Provider$DefaultImpls { - public static fun content (Lhep/dataforge/provider/Provider;Ljava/lang/String;)Ljava/util/Map; - public static fun getDefaultChainTarget (Lhep/dataforge/provider/Provider;)Ljava/lang/String; - public static fun getDefaultTarget (Lhep/dataforge/provider/Provider;)Ljava/lang/String; +public final class space/kscience/dataforge/provider/Provider$DefaultImpls { + public static fun content (Lspace/kscience/dataforge/provider/Provider;Ljava/lang/String;)Ljava/util/Map; + public static fun getDefaultChainTarget (Lspace/kscience/dataforge/provider/Provider;)Ljava/lang/String; + public static fun getDefaultTarget (Lspace/kscience/dataforge/provider/Provider;)Ljava/lang/String; } -public final class hep/dataforge/provider/ProviderKt { - public static final fun provide-mzxrFLw (Lhep/dataforge/provider/Provider;Ljava/util/List;Ljava/lang/String;)Ljava/lang/Object; - public static synthetic fun provide-mzxrFLw$default (Lhep/dataforge/provider/Provider;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; - public static final fun top (Lhep/dataforge/provider/Provider;Ljava/lang/String;Lkotlin/reflect/KClass;)Ljava/util/Map; +public final class space/kscience/dataforge/provider/ProviderKt { + public static final fun provide-CSkoCSg (Lspace/kscience/dataforge/provider/Provider;Ljava/util/List;Ljava/lang/String;)Ljava/lang/Object; + public static synthetic fun provide-CSkoCSg$default (Lspace/kscience/dataforge/provider/Provider;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; + public static final fun top (Lspace/kscience/dataforge/provider/Provider;Ljava/lang/String;Lkotlin/reflect/KClass;)Ljava/util/Map; } diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/AbstractPlugin.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/AbstractPlugin.kt similarity index 88% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/AbstractPlugin.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/AbstractPlugin.kt index a7a310cb..6b03a20e 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/AbstractPlugin.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/AbstractPlugin.kt @@ -1,8 +1,8 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.misc.Named -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.names.Name import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KClass import kotlin.reflect.KProperty diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Context.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Context.kt similarity index 90% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Context.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Context.kt index b701d3d6..081d44d8 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Context.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Context.kt @@ -1,15 +1,15 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Laminate -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaRepr -import hep.dataforge.meta.itemSequence -import hep.dataforge.misc.Named -import hep.dataforge.names.Name -import hep.dataforge.provider.Provider import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob +import space.kscience.dataforge.meta.Laminate +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaRepr +import space.kscience.dataforge.meta.itemSequence +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.provider.Provider import kotlin.coroutines.CoroutineContext /** diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/ContextBuilder.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/ContextBuilder.kt similarity index 82% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/ContextBuilder.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/ContextBuilder.kt index f124d3d2..f367b5d4 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/ContextBuilder.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/ContextBuilder.kt @@ -1,15 +1,13 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.seal -import hep.dataforge.misc.DFBuilder -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.toName -import kotlin.collections.HashMap +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.seal +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.toName import kotlin.collections.component1 import kotlin.collections.component2 -import kotlin.collections.forEach import kotlin.collections.set /** diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Factory.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Factory.kt similarity index 60% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Factory.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Factory.kt index b8858a13..9639daaf 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Factory.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Factory.kt @@ -1,6 +1,6 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta public interface Factory { public operator fun invoke(meta: Meta = Meta.EMPTY, context: Context = Global): T diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Global.kt similarity index 91% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Global.kt index f288d65a..645b0805 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Global.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Global.kt @@ -1,9 +1,9 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.names.asName import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.SupervisorJob +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.asName import kotlin.coroutines.CoroutineContext import kotlin.native.concurrent.ThreadLocal diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/LogManager.kt similarity index 92% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/LogManager.kt index a96f4f40..2deda918 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/LogManager.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/LogManager.kt @@ -1,8 +1,8 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.misc.Named -import hep.dataforge.names.Name -import hep.dataforge.names.plus +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus public interface Logable { public fun log(name: Name, tag: String, body: () -> String) diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Plugin.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Plugin.kt similarity index 80% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Plugin.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Plugin.kt index 3d4aea3d..5929515e 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/Plugin.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/Plugin.kt @@ -1,13 +1,13 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.context.Plugin.Companion.TARGET -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaRepr -import hep.dataforge.misc.Named -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.provider.Provider +import space.kscience.dataforge.context.Plugin.Companion.TARGET +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaRepr +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.provider.Provider /** * The interface to define a Context plugin. A plugin stores all runtime features of a context. diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginFactory.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginFactory.kt similarity index 76% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginFactory.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginFactory.kt index 18e40fed..78784be5 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginFactory.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginFactory.kt @@ -1,6 +1,6 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.misc.Type +import space.kscience.dataforge.misc.Type import kotlin.reflect.KClass @Type(PluginFactory.TYPE) diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginManager.kt similarity index 97% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginManager.kt index 66d7e1f8..3e045bb5 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginManager.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginManager.kt @@ -1,7 +1,7 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder import kotlin.reflect.KClass diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginTag.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginTag.kt similarity index 88% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginTag.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginTag.kt index 1cd39929..146b61ed 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/PluginTag.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/PluginTag.kt @@ -1,7 +1,7 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaRepr +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaRepr /** * The tag which contains information about name, group and version of some @@ -43,7 +43,7 @@ public data class PluginTag( public companion object { - public const val DATAFORGE_GROUP: String = "hep.dataforge" + public const val DATAFORGE_GROUP: String = "dataforge" /** * Build new PluginTag from standard string representation diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/resolve.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/resolve.kt similarity index 91% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/context/resolve.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/resolve.kt index b41e11fd..b825da55 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/context/resolve.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/context/resolve.kt @@ -1,10 +1,10 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.provider.Provider -import hep.dataforge.provider.top +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.provider.Provider +import space.kscience.dataforge.provider.top import kotlin.reflect.KClass import kotlin.reflect.cast diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/ConfigProperty.kt similarity index 59% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/ConfigProperty.kt index 86c6bcde..a079241e 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/ConfigProperty.kt @@ -1,13 +1,13 @@ -package hep.dataforge.properties +package space.kscience.dataforge.properties -import hep.dataforge.meta.Config -import hep.dataforge.meta.get -import hep.dataforge.meta.set -import hep.dataforge.meta.transformations.MetaConverter -import hep.dataforge.meta.transformations.nullableItemToObject -import hep.dataforge.meta.transformations.nullableObjectToMetaItem -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.Config +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.set +import space.kscience.dataforge.meta.transformations.MetaConverter +import space.kscience.dataforge.meta.transformations.nullableItemToObject +import space.kscience.dataforge.meta.transformations.nullableObjectToMetaItem +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name @DFExperimental public class ConfigProperty( diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/Property.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/Property.kt similarity index 91% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/Property.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/Property.kt index 44e97ea9..a6419f0b 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/properties/Property.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/properties/Property.kt @@ -1,10 +1,10 @@ -package hep.dataforge.properties +package space.kscience.dataforge.properties -import hep.dataforge.misc.DFExperimental import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import space.kscience.dataforge.misc.DFExperimental @DFExperimental public interface Property { diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Path.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Path.kt similarity index 94% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Path.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Path.kt index 149a9ece..0746feba 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Path.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Path.kt @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hep.dataforge.provider +package space.kscience.dataforge.provider -import hep.dataforge.names.Name -import hep.dataforge.names.toName +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName /** * Path interface. diff --git a/dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Provider.kt b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Provider.kt similarity index 96% rename from dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Provider.kt rename to dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Provider.kt index 8d3ae30d..e1940958 100644 --- a/dataforge-context/src/commonMain/kotlin/hep/dataforge/provider/Provider.kt +++ b/dataforge-context/src/commonMain/kotlin/space/kscience/dataforge/provider/Provider.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hep.dataforge.provider +package space.kscience.dataforge.provider -import hep.dataforge.names.Name +import space.kscience.dataforge.names.Name import kotlin.reflect.KClass import kotlin.reflect.safeCast diff --git a/dataforge-context/src/commonTest/kotlin/hep/dataforge/context/ContextTest.kt b/dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextTest.kt similarity index 81% rename from dataforge-context/src/commonTest/kotlin/hep/dataforge/context/ContextTest.kt rename to dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextTest.kt index 3d15e8b3..4bc937aa 100644 --- a/dataforge-context/src/commonTest/kotlin/hep/dataforge/context/ContextTest.kt +++ b/dataforge-context/src/commonTest/kotlin/space/kscience/dataforge/context/ContextTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.names.Name -import hep.dataforge.names.appendLeft -import hep.dataforge.names.toName +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.appendLeft +import space.kscience.dataforge.names.toName import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt b/dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/context/loggingJs.kt similarity index 89% rename from dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt rename to dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/context/loggingJs.kt index 172edece..3c822b82 100644 --- a/dataforge-context/src/jsMain/kotlin/hep/dataforge/context/loggingJs.kt +++ b/dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/context/loggingJs.kt @@ -1,7 +1,7 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name import kotlin.reflect.KClass public class ConsoleLogManager : AbstractPlugin(), LogManager { diff --git a/dataforge-context/src/jsMain/kotlin/hep/dataforge/properties/bindings.kt b/dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/properties/bindings.kt similarity index 87% rename from dataforge-context/src/jsMain/kotlin/hep/dataforge/properties/bindings.kt rename to dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/properties/bindings.kt index 86296e39..b4451c97 100644 --- a/dataforge-context/src/jsMain/kotlin/hep/dataforge/properties/bindings.kt +++ b/dataforge-context/src/jsMain/kotlin/space/kscience/dataforge/properties/bindings.kt @@ -1,7 +1,7 @@ -package hep.dataforge.properties +package space.kscience.dataforge.properties -import hep.dataforge.misc.DFExperimental import org.w3c.dom.HTMLInputElement +import space.kscience.dataforge.misc.DFExperimental @DFExperimental public fun HTMLInputElement.bindValue(property: Property) { diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/ClassLoaderPlugin.kt b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/ClassLoaderPlugin.kt similarity index 98% rename from dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/ClassLoaderPlugin.kt rename to dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/ClassLoaderPlugin.kt index a1e0e6e6..b2c703e1 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/ClassLoaderPlugin.kt +++ b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/ClassLoaderPlugin.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hep.dataforge.context +package space.kscience.dataforge.context import java.util.* import kotlin.reflect.KClass diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/loggingJvm.kt similarity index 89% rename from dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt rename to dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/loggingJvm.kt index 4796bb24..9fa9226c 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/context/loggingJvm.kt +++ b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/context/loggingJvm.kt @@ -1,9 +1,8 @@ -package hep.dataforge.context - -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +package space.kscience.dataforge.context import org.slf4j.LoggerFactory +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name import kotlin.reflect.KClass public class SlfLogManager : AbstractPlugin(), LogManager { diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/annotations.kt b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/annotations.kt similarity index 97% rename from dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/annotations.kt rename to dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/annotations.kt index f88cee99..25daa096 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/annotations.kt +++ b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/annotations.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package hep.dataforge.descriptors +package space.kscience.dataforge.descriptors -import hep.dataforge.values.ValueType +import space.kscience.dataforge.values.ValueType import kotlin.reflect.KClass @MustBeDocumented diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/reflectiveDescriptors.kt b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/reflectiveDescriptors.kt similarity index 97% rename from dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/reflectiveDescriptors.kt rename to dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/reflectiveDescriptors.kt index 5df244dc..9de5e280 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/descriptors/reflectiveDescriptors.kt +++ b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/descriptors/reflectiveDescriptors.kt @@ -1,4 +1,4 @@ -package hep.dataforge.descriptors +package space.kscience.dataforge.descriptors //inline fun T.buildDescriptor(): NodeDescriptor = NodeDescriptor { diff --git a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/provider/dfType.kt b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/provider/dfType.kt similarity index 74% rename from dataforge-context/src/jvmMain/kotlin/hep/dataforge/provider/dfType.kt rename to dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/provider/dfType.kt index 6f7855a9..98591513 100644 --- a/dataforge-context/src/jvmMain/kotlin/hep/dataforge/provider/dfType.kt +++ b/dataforge-context/src/jvmMain/kotlin/space/kscience/dataforge/provider/dfType.kt @@ -1,10 +1,10 @@ -package hep.dataforge.provider +package space.kscience.dataforge.provider -import hep.dataforge.context.Context -import hep.dataforge.context.gather -import hep.dataforge.misc.DFExperimental -import hep.dataforge.misc.Type -import hep.dataforge.names.Name +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.gather +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation diff --git a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt b/dataforge-context/src/nativeMain/kotlin/space/kscience/dataforge/context/loggingNative.kt similarity index 85% rename from dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt rename to dataforge-context/src/nativeMain/kotlin/space/kscience/dataforge/context/loggingNative.kt index 8d471225..f890b238 100644 --- a/dataforge-context/src/nativeMain/kotlin/hep/dataforge/context/loggingNative.kt +++ b/dataforge-context/src/nativeMain/kotlin/space/kscience/dataforge/context/loggingNative.kt @@ -1,7 +1,7 @@ -package hep.dataforge.context +package space.kscience.dataforge.context -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name import kotlin.reflect.KClass diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/Action.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/Action.kt similarity index 88% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/Action.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/Action.kt index 85ec2977..50dc56c8 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/Action.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/Action.kt @@ -1,9 +1,9 @@ -package hep.dataforge.actions +package space.kscience.dataforge.actions -import hep.dataforge.data.DataSet -import hep.dataforge.meta.Meta -import hep.dataforge.misc.DFExperimental import kotlinx.coroutines.CoroutineScope +import space.kscience.dataforge.data.DataSet +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.DFExperimental /** * A simple data transformation on a data node. Actions should avoid doing actual dependency evaluation in [execute]. diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/MapAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt similarity index 85% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/MapAction.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt index 23731621..aa71ff44 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/MapAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/MapAction.kt @@ -1,18 +1,18 @@ -package hep.dataforge.actions +package space.kscience.dataforge.actions -import hep.dataforge.data.* -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.seal -import hep.dataforge.meta.toMutableMeta -import hep.dataforge.misc.DFBuilder -import hep.dataforge.misc.DFExperimental -import hep.dataforge.misc.DFInternal -import hep.dataforge.names.Name import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch +import space.kscience.dataforge.data.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.seal +import space.kscience.dataforge.meta.toMutableMeta +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFInternal +import space.kscience.dataforge.names.Name import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/ReduceAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt similarity index 89% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/ReduceAction.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt index 8e2781b5..2607804c 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/ReduceAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/ReduceAction.kt @@ -1,17 +1,17 @@ -package hep.dataforge.actions +package space.kscience.dataforge.actions -import hep.dataforge.data.* -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.misc.DFBuilder -import hep.dataforge.misc.DFExperimental -import hep.dataforge.misc.DFInternal -import hep.dataforge.names.Name -import hep.dataforge.names.toName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.fold +import space.kscience.dataforge.data.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFInternal +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/SplitAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt similarity index 85% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/SplitAction.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt index 37b8f734..50286a2a 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/actions/SplitAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/actions/SplitAction.kt @@ -1,18 +1,18 @@ -package hep.dataforge.actions +package space.kscience.dataforge.actions -import hep.dataforge.data.* -import hep.dataforge.meta.Laminate -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.toMutableMeta -import hep.dataforge.misc.DFExperimental -import hep.dataforge.misc.DFInternal -import hep.dataforge.names.Name -import hep.dataforge.names.toName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch +import space.kscience.dataforge.data.* +import space.kscience.dataforge.meta.Laminate +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.toMutableMeta +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFInternal +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.collections.set import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/ActiveDataTree.kt similarity index 97% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/ActiveDataTree.kt index 5d197982..3c9ee902 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ActiveDataTree.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/ActiveDataTree.kt @@ -1,13 +1,13 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.* -import hep.dataforge.names.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.* import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CachingAction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CachingAction.kt similarity index 85% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CachingAction.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CachingAction.kt index 7911cb1f..6685d29c 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CachingAction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CachingAction.kt @@ -1,13 +1,13 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.actions.Action -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name -import hep.dataforge.names.startsWith import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect +import space.kscience.dataforge.actions.Action +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.startsWith import kotlin.reflect.KType /** diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CoroutineMonitor.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CoroutineMonitor.kt similarity index 91% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CoroutineMonitor.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CoroutineMonitor.kt index 60bf5775..c8c1a78f 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/CoroutineMonitor.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/CoroutineMonitor.kt @@ -1,12 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.misc.DFExperimental import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job +import space.kscience.dataforge.misc.DFExperimental import kotlin.coroutines.CoroutineContext - /** * A monitor of goal state that could be accessed only form inside the goal */ diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Data.kt similarity index 92% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Data.kt index 6702de4d..955af3ef 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Data.kt @@ -1,11 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaRepr -import hep.dataforge.meta.isEmpty -import hep.dataforge.misc.DFInternal -import hep.dataforge.misc.Type import kotlinx.coroutines.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaRepr +import space.kscience.dataforge.meta.isEmpty +import space.kscience.dataforge.misc.DFInternal +import space.kscience.dataforge.misc.Type import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.reflect.KType diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSet.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSet.kt similarity index 91% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSet.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSet.kt index f2a4bf88..525d4c86 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSet.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSet.kt @@ -1,11 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.data.Data.Companion.TYPE_OF_NOTHING -import hep.dataforge.meta.Meta -import hep.dataforge.meta.set -import hep.dataforge.names.* import kotlinx.coroutines.* import kotlinx.coroutines.flow.* +import space.kscience.dataforge.data.Data.Companion.TYPE_OF_NOTHING +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.set +import space.kscience.dataforge.names.* import kotlin.reflect.KType public interface DataSet { diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSetBuilder.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSetBuilder.kt similarity index 92% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSetBuilder.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSetBuilder.kt index 95e9fd06..580e702b 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataSetBuilder.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataSetBuilder.kt @@ -1,14 +1,14 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.names.toName import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName import kotlin.reflect.KType public interface DataSetBuilder { diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataTree.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataTree.kt similarity index 96% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataTree.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataTree.kt index 5676eeed..13c8afbe 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/DataTree.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/DataTree.kt @@ -1,11 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.misc.Type -import hep.dataforge.names.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.* import kotlin.collections.component1 import kotlin.collections.component2 import kotlin.reflect.KType diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Goal.kt similarity index 97% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Goal.kt index 7763c3ce..e41c124a 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/Goal.kt @@ -1,7 +1,7 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.misc.DFExperimental import kotlinx.coroutines.* +import space.kscience.dataforge.misc.DFExperimental import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalExecutionRestriction.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalExecutionRestriction.kt similarity index 91% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalExecutionRestriction.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalExecutionRestriction.kt index 38e439d5..f8ce5a83 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalExecutionRestriction.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalExecutionRestriction.kt @@ -1,4 +1,4 @@ -package hep.dataforge.data +package space.kscience.dataforge.data import kotlin.coroutines.CoroutineContext diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalLogger.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalLogger.kt similarity index 90% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalLogger.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalLogger.kt index f0520578..f8b89b97 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GoalLogger.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GoalLogger.kt @@ -1,4 +1,4 @@ -package hep.dataforge.data +package space.kscience.dataforge.data import kotlin.coroutines.CoroutineContext diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GroupRule.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt similarity index 90% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GroupRule.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt index fcaa0658..90a85f30 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/GroupRule.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/GroupRule.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.get -import hep.dataforge.meta.string import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.string public interface GroupRule { public suspend fun gather(set: DataSet): Map> @@ -52,7 +52,7 @@ public interface GroupRule { scope.launch { set.updates.collect { name -> val data = set.getData(name) - val tagValue = data?.meta[key]?.string ?: defaultTagValue + val tagValue = data?.meta[key].string ?: defaultTagValue map.getOrPut(tagValue) { ActiveDataTree(set.dataType) }.emit(name, data) } } diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/NamedData.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/NamedData.kt similarity index 80% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/NamedData.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/NamedData.kt index aa5afcdc..59ae10a8 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/NamedData.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/NamedData.kt @@ -1,8 +1,8 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.isEmpty -import hep.dataforge.misc.Named -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.isEmpty +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.names.Name public interface NamedData : Named, Data { override val name: Name diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/StaticDataTree.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/StaticDataTree.kt similarity index 93% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/StaticDataTree.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/StaticDataTree.kt index 950cb1f1..f57af184 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/StaticDataTree.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/StaticDataTree.kt @@ -1,8 +1,9 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.names.* import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.collect +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.* import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -71,6 +72,7 @@ public suspend inline fun DataTree( noinline block: suspend DataSetBuilder.() -> Unit, ): DataTree = DataTree(typeOf(), block) +@OptIn(DFExperimental::class) public suspend fun DataSet.seal(): DataTree = DataTree(dataType){ populate(this@seal) } \ No newline at end of file diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataFilter.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataFilter.kt similarity index 94% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataFilter.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataFilter.kt index 8f38d100..2dd487e5 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataFilter.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataFilter.kt @@ -1,11 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.* import kotlin.reflect.KType diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataSetMeta.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataSetMeta.kt similarity index 69% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataSetMeta.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataSetMeta.kt index 5ca07aa5..b1508d29 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataSetMeta.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataSetMeta.kt @@ -1,7 +1,7 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder /** diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataTransform.kt b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataTransform.kt similarity index 95% rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataTransform.kt rename to dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataTransform.kt index 8b0c7787..a64d0790 100644 --- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/dataTransform.kt +++ b/dataforge-data/src/commonMain/kotlin/space/kscience/dataforge/data/dataTransform.kt @@ -1,11 +1,11 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.seal -import hep.dataforge.meta.toMutableMeta -import hep.dataforge.misc.DFInternal import kotlinx.coroutines.flow.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.seal +import space.kscience.dataforge.meta.toMutableMeta +import space.kscience.dataforge.misc.DFInternal import kotlin.contracts.InvocationKind import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext diff --git a/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/select.kt b/dataforge-data/src/jvmMain/kotlin/space/kscience/dataforge/data/select.kt similarity index 87% rename from dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/select.kt rename to dataforge-data/src/jvmMain/kotlin/space/kscience/dataforge/data/select.kt index 02672c37..b98331c2 100644 --- a/dataforge-data/src/jvmMain/kotlin/hep/dataforge/data/select.kt +++ b/dataforge-data/src/jvmMain/kotlin/space/kscience/dataforge/data/select.kt @@ -1,12 +1,12 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.matches -import hep.dataforge.names.toName import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.matches +import space.kscience.dataforge.names.toName import kotlin.reflect.KType import kotlin.reflect.full.isSubtypeOf import kotlin.reflect.typeOf diff --git a/dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/ActionsTest.kt b/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/ActionsTest.kt similarity index 87% rename from dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/ActionsTest.kt rename to dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/ActionsTest.kt index 0da9c2c2..4bbd9cd8 100644 --- a/dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/ActionsTest.kt +++ b/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/ActionsTest.kt @@ -1,9 +1,9 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.actions.Action -import hep.dataforge.actions.map import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.Test +import space.kscience.dataforge.actions.Action +import space.kscience.dataforge.actions.map import kotlin.test.assertEquals @Suppress("EXPERIMENTAL_API_USAGE") diff --git a/dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/DataTreeBuilderTest.kt b/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/DataTreeBuilderTest.kt similarity index 93% rename from dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/DataTreeBuilderTest.kt rename to dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/DataTreeBuilderTest.kt index 0225e9cf..186f1214 100644 --- a/dataforge-data/src/jvmTest/kotlin/hep/dataforge/data/DataTreeBuilderTest.kt +++ b/dataforge-data/src/jvmTest/kotlin/space/kscience/dataforge/data/DataTreeBuilderTest.kt @@ -1,8 +1,9 @@ -package hep.dataforge.data +package space.kscience.dataforge.data -import hep.dataforge.names.toName import kotlinx.coroutines.* import kotlinx.coroutines.flow.collect +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.toName import kotlin.test.Test import kotlin.test.assertEquals @@ -26,6 +27,7 @@ internal class DataTreeBuilderTest { } } + @OptIn(DFExperimental::class) @Test fun testDataUpdate() = runBlocking { val updateData: DataTree = DataTree { diff --git a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt similarity index 55% rename from dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt rename to dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt index 3dbdf635..93b9300d 100644 --- a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt +++ b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/FrontMatterEnvelopeFormat.kt @@ -1,15 +1,15 @@ -package hep.dataforge.io.yaml +package space.kscience.dataforge.io.yaml -import hep.dataforge.context.Context -import hep.dataforge.io.* -import hep.dataforge.io.IOFormat.Companion.META_KEY -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.meta.Meta -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output import io.ktor.utils.io.core.readBytes import io.ktor.utils.io.core.readUTF8Line +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.* +import space.kscience.dataforge.io.IOFormat.Companion.META_KEY +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.DFExperimental @DFExperimental public class FrontMatterEnvelopeFormat( @@ -23,11 +23,11 @@ public class FrontMatterEnvelopeFormat( do { line = input.readUTF8Line() ?: error("Input does not contain front matter separator") offset += line.encodeToByteArray().size.toUInt() - } while (!line.startsWith(SEPARATOR)) + } while (!line.startsWith(space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR)) val readMetaFormat = - metaTypeRegex.matchEntire(line)?.groupValues?.first() - ?.let { io.resolveMetaFormat(it) } ?: YamlMetaFormat + space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.metaTypeRegex.matchEntire(line)?.groupValues?.first() + ?.let { io.resolveMetaFormat(it) } ?: space.kscience.dataforge.io.yaml.YamlMetaFormat //TODO replace by preview val meta = Binary { @@ -35,7 +35,7 @@ public class FrontMatterEnvelopeFormat( line = input.readSafeUtf8Line() writeUtf8String(line + "\r\n") offset += line.encodeToByteArray().size.toUInt() - } while (!line.startsWith(SEPARATOR)) + } while (!line.startsWith(space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR)) }.read { readMetaFormat.readMeta(input) @@ -47,16 +47,16 @@ public class FrontMatterEnvelopeFormat( var line: String do { line = input.readSafeUtf8Line() //?: error("Input does not contain front matter separator") - } while (!line.startsWith(SEPARATOR)) + } while (!line.startsWith(space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR)) val readMetaFormat = - metaTypeRegex.matchEntire(line)?.groupValues?.first() - ?.let { io.resolveMetaFormat(it) } ?: YamlMetaFormat + space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.metaTypeRegex.matchEntire(line)?.groupValues?.first() + ?.let { io.resolveMetaFormat(it) } ?: space.kscience.dataforge.io.yaml.YamlMetaFormat val meta = Binary { do { writeUtf8String(input.readSafeUtf8Line() + "\r\n") - } while (!line.startsWith(SEPARATOR)) + } while (!line.startsWith(space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR)) }.read { readMetaFormat.readMeta(input) } @@ -72,9 +72,9 @@ public class FrontMatterEnvelopeFormat( formatMeta: Meta, ) { val metaFormat = metaFormatFactory(formatMeta, this@FrontMatterEnvelopeFormat.io.context) - output.writeRawString("${hep.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR}\r\n") + output.writeRawString("${space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR}\r\n") metaFormat.run { this.writeObject(output, envelope.meta) } - output.writeRawString("${hep.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR}\r\n") + output.writeRawString("${space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.SEPARATOR}\r\n") //Printing data envelope.data?.let { data -> output.writeBinary(data) @@ -92,32 +92,32 @@ public class FrontMatterEnvelopeFormat( private val metaTypeRegex = "---(\\w*)\\s*".toRegex() override fun invoke(meta: Meta, context: Context): EnvelopeFormat { - return FrontMatterEnvelopeFormat(context.io, meta) + return space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat(context.io, meta) } override fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? = binary.read { val line = readSafeUtf8Line() return@read if (line.startsWith("---")) { - invoke() + space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.invoke() } else { null } } - private val default by lazy { invoke() } + private val default by lazy { space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.invoke() } override fun readPartial(input: Input): PartialEnvelope = - default.readPartial(input) + space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.default.readPartial(input) override fun writeEnvelope( output: Output, envelope: Envelope, metaFormatFactory: MetaFormatFactory, formatMeta: Meta, - ): Unit = default.writeEnvelope(output, envelope, metaFormatFactory, formatMeta) + ): Unit = space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.default.writeEnvelope(output, envelope, metaFormatFactory, formatMeta) - override fun readObject(input: Input): Envelope = default.readObject(input) + override fun readObject(input: Input): Envelope = space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.Companion.default.readObject(input) } } \ No newline at end of file diff --git a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormat.kt similarity index 79% rename from dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt rename to dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormat.kt index ccf38835..37b5658b 100644 --- a/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/hep/dataforge/io/yaml/YamlMetaFormat.kt +++ b/dataforge-io/dataforge-io-yaml/src/commonMain/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormat.kt @@ -1,24 +1,24 @@ -package hep.dataforge.io.yaml +package space.kscience.dataforge.io.yaml -import hep.dataforge.context.Context -import hep.dataforge.io.IOFormat.Companion.META_KEY -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.io.MetaFormat -import hep.dataforge.io.MetaFormatFactory -import hep.dataforge.io.readUtf8String -import hep.dataforge.io.writeUtf8String -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.NameToken -import hep.dataforge.names.withIndex -import hep.dataforge.values.ListValue -import hep.dataforge.values.Null -import hep.dataforge.values.parseValue import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output import net.mamoe.yamlkt.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.IOFormat.Companion.META_KEY +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +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.* +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.misc.DFExperimental +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.parseValue public fun Meta.toYaml(): YamlMap { val map: Map = items.entries.associate { (key, item) -> @@ -100,7 +100,7 @@ public class YamlMetaFormat(private val meta: Meta) : MetaFormat { } override fun toMeta(): Meta = Meta { - NAME_KEY put FrontMatterEnvelopeFormat.name.toString() + NAME_KEY put space.kscience.dataforge.io.yaml.FrontMatterEnvelopeFormat.name.toString() META_KEY put meta } diff --git a/dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/hep/dataforge/io/yaml/YamlMetaFormatTest.kt b/dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormatTest.kt similarity index 74% rename from dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/hep/dataforge/io/yaml/YamlMetaFormatTest.kt rename to dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormatTest.kt index d63da939..756091ff 100644 --- a/dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/hep/dataforge/io/yaml/YamlMetaFormatTest.kt +++ b/dataforge-io/dataforge-io-yaml/src/commonTest/kotlin/space/kscience/dataforge/io/yaml/YamlMetaFormatTest.kt @@ -1,11 +1,11 @@ -package hep.dataforge.io.yaml +package space.kscience.dataforge.io.yaml -import hep.dataforge.io.parse -import hep.dataforge.io.toString -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.seal -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.io.parse +import space.kscience.dataforge.io.toString +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.seal +import space.kscience.dataforge.misc.DFExperimental import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Binary.kt similarity index 98% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Binary.kt index 6450279e..0a375ab1 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Binary.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Binary.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.core.* import kotlin.math.min diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/BinaryMetaFormat.kt similarity index 92% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/BinaryMetaFormat.kt index 04689744..96ac4522 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/BinaryMetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/BinaryMetaFormat.kt @@ -1,10 +1,10 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.meta.* -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.values.* import io.ktor.utils.io.core.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.values.* /** * A DataForge-specific simplified binary format for meta @@ -76,7 +76,7 @@ public object BinaryMetaFormat : MetaFormat, MetaFormatFactory { override fun writeMeta( output: Output, meta: Meta, - descriptor: hep.dataforge.meta.descriptors.NodeDescriptor?, + descriptor: space.kscience.dataforge.meta.descriptors.NodeDescriptor?, ) { output.writeChar('M') output.writeInt(meta.items.size) diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Consumer.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Consumer.kt similarity index 61% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Consumer.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Consumer.kt index 51ec6250..e9aa22e0 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Consumer.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Consumer.kt @@ -1,6 +1,6 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFExperimental /** * A fire-and-forget consumer of messages diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Envelope.kt similarity index 88% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Envelope.kt index cad2666f..e65bc61f 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Envelope.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Envelope.kt @@ -1,12 +1,12 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.meta.Laminate -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.string -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus +import space.kscience.dataforge.meta.Laminate +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus public interface Envelope { public val meta: Meta diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeBuilder.kt similarity index 95% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeBuilder.kt index 77d7df61..211b4f32 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeBuilder.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeBuilder.kt @@ -1,7 +1,7 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.meta.* import io.ktor.utils.io.core.Output +import space.kscience.dataforge.meta.* public class EnvelopeBuilder : Envelope { private val metaBuilder = MetaBuilder() diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeFormat.kt similarity index 82% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeFormat.kt index 55527be1..aa233384 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeFormat.kt @@ -1,13 +1,13 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.io.EnvelopeFormatFactory.Companion.ENVELOPE_FORMAT_TYPE -import hep.dataforge.meta.Meta -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.asName import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.EnvelopeFormatFactory.Companion.ENVELOPE_FORMAT_TYPE +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeParts.kt similarity index 81% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeParts.kt index 9aa68b59..fece9a41 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/EnvelopeParts.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeParts.kt @@ -1,16 +1,16 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.io.Envelope.Companion.ENVELOPE_NODE_KEY -import hep.dataforge.io.PartDescriptor.Companion.DEFAULT_MULTIPART_DATA_SEPARATOR -import hep.dataforge.io.PartDescriptor.Companion.MULTIPART_DATA_TYPE -import hep.dataforge.io.PartDescriptor.Companion.MULTIPART_KEY -import hep.dataforge.io.PartDescriptor.Companion.PARTS_KEY -import hep.dataforge.io.PartDescriptor.Companion.PART_FORMAT_KEY -import hep.dataforge.io.PartDescriptor.Companion.SEPARATOR_KEY -import hep.dataforge.meta.* -import hep.dataforge.names.asName -import hep.dataforge.names.plus -import hep.dataforge.names.toName +import space.kscience.dataforge.io.Envelope.Companion.ENVELOPE_NODE_KEY +import space.kscience.dataforge.io.PartDescriptor.Companion.DEFAULT_MULTIPART_DATA_SEPARATOR +import space.kscience.dataforge.io.PartDescriptor.Companion.MULTIPART_DATA_TYPE +import space.kscience.dataforge.io.PartDescriptor.Companion.MULTIPART_KEY +import space.kscience.dataforge.io.PartDescriptor.Companion.PARTS_KEY +import space.kscience.dataforge.io.PartDescriptor.Companion.PART_FORMAT_KEY +import space.kscience.dataforge.io.PartDescriptor.Companion.SEPARATOR_KEY +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName private class PartDescriptor : Scheme() { var offset by int(0) diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOFormat.kt similarity index 84% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOFormat.kt index 163e354a..be5f97ab 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOFormat.kt @@ -1,18 +1,18 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.context.Factory -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.io.IOFormatFactory.Companion.IO_FORMAT_TYPE -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaItemValue -import hep.dataforge.meta.MetaRepr -import hep.dataforge.misc.Named -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.Value import io.ktor.utils.io.core.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.Factory +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.io.IOFormatFactory.Companion.IO_FORMAT_TYPE +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaItemValue +import space.kscience.dataforge.meta.MetaRepr +import space.kscience.dataforge.misc.Named +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.Value import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOPlugin.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOPlugin.kt similarity index 81% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOPlugin.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOPlugin.kt index ad4341e1..4a723967 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/IOPlugin.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOPlugin.kt @@ -1,14 +1,14 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.* -import hep.dataforge.io.EnvelopeFormatFactory.Companion.ENVELOPE_FORMAT_TYPE -import hep.dataforge.io.IOFormat.Companion.META_KEY -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.io.IOFormatFactory.Companion.IO_FORMAT_TYPE -import hep.dataforge.io.MetaFormatFactory.Companion.META_FORMAT_TYPE -import hep.dataforge.meta.* -import hep.dataforge.names.Name -import hep.dataforge.names.toName +import space.kscience.dataforge.context.* +import space.kscience.dataforge.io.EnvelopeFormatFactory.Companion.ENVELOPE_FORMAT_TYPE +import space.kscience.dataforge.io.IOFormat.Companion.META_KEY +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.io.IOFormatFactory.Companion.IO_FORMAT_TYPE +import space.kscience.dataforge.io.MetaFormatFactory.Companion.META_FORMAT_TYPE +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.reflect.KClass public class IOPlugin(meta: Meta) : AbstractPlugin(meta) { diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/JsonMetaFormat.kt similarity index 81% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/JsonMetaFormat.kt index 667c2d60..ca5d52b0 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/JsonMetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/JsonMetaFormat.kt @@ -1,20 +1,19 @@ @file:Suppress("UNUSED_PARAMETER") -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.node -import hep.dataforge.meta.toJson -import hep.dataforge.meta.toMetaItem import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output - import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.node +import space.kscience.dataforge.meta.toJson +import space.kscience.dataforge.meta.toMetaItem import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/MetaFormat.kt similarity index 79% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/MetaFormat.kt index 673b63d2..75435649 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/MetaFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/MetaFormat.kt @@ -1,18 +1,17 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.io.MetaFormatFactory.Companion.META_FORMAT_TYPE -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.plus import io.ktor.utils.io.core.ByteReadPacket import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output import io.ktor.utils.io.core.use - +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.MetaFormatFactory.Companion.META_FORMAT_TYPE +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.plus import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Responder.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Responder.kt similarity index 87% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Responder.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Responder.kt index 2710ffa9..2a64966f 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Responder.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Responder.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io /** * An object that could respond to external messages asynchronously diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaggedEnvelopeFormat.kt similarity index 91% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaggedEnvelopeFormat.kt index 40824fd8..ad0d1aa4 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaggedEnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaggedEnvelopeFormat.kt @@ -1,16 +1,16 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.io.IOFormat.Companion.META_KEY -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.meta.Meta -import hep.dataforge.meta.enum -import hep.dataforge.meta.get -import hep.dataforge.meta.string -import hep.dataforge.names.Name -import hep.dataforge.names.plus -import hep.dataforge.names.toName import io.ktor.utils.io.core.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.IOFormat.Companion.META_KEY +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.enum +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.plus +import space.kscience.dataforge.names.toName /** * A streaming-friendly envelope format with a short binary tag. diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaglessEnvelopeFormat.kt similarity index 94% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaglessEnvelopeFormat.kt index 5de70105..30dce96b 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/TaglessEnvelopeFormat.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaglessEnvelopeFormat.kt @@ -1,15 +1,15 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Context -import hep.dataforge.io.IOFormat.Companion.META_KEY -import hep.dataforge.io.IOFormat.Companion.NAME_KEY -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.isEmpty -import hep.dataforge.meta.string -import hep.dataforge.names.Name -import hep.dataforge.names.asName import io.ktor.utils.io.core.* +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.io.IOFormat.Companion.META_KEY +import space.kscience.dataforge.io.IOFormat.Companion.NAME_KEY +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.isEmpty +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName import kotlin.collections.set /** diff --git a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/ioMisc.kt similarity index 95% rename from dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt rename to dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/ioMisc.kt index ade64e28..e0255530 100644 --- a/dataforge-io/src/commonMain/kotlin/hep/dataforge/io/ioMisc.kt +++ b/dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/ioMisc.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.charsets.Charsets import io.ktor.utils.io.charsets.decodeExactBytes diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/BinaryTest.kt similarity index 90% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/BinaryTest.kt index d613469a..530b1a4c 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/BinaryTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/BinaryTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.core.readInt import kotlin.test.Test diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/EnvelopeFormatTest.kt similarity index 97% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/EnvelopeFormatTest.kt index 74fe5a03..edadc7f8 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/EnvelopeFormatTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/EnvelopeFormatTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.core.readDouble import io.ktor.utils.io.core.writeDouble diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/IOTest.kt similarity index 77% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/IOTest.kt index b82c3f79..197d1c30 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/IOTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/IOTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.core.ByteReadPacket import io.ktor.utils.io.core.readBytes @@ -10,7 +10,7 @@ class IOTest { fun readBytes() { val bytes = ByteArray(8) { it.toByte() } val input = ByteReadPacket(bytes) - val first = input.readBytes(4) + @Suppress("UNUSED_VARIABLE") val first = input.readBytes(4) val second = input.readBytes(4) assertEquals(4.toByte(), second[0]) } diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaFormatTest.kt similarity index 92% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaFormatTest.kt index 5e970c35..a5860d31 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaFormatTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaFormatTest.kt @@ -1,11 +1,10 @@ -package hep.dataforge.io - -import hep.dataforge.meta.* -import hep.dataforge.meta.JsonMeta.Companion.JSON_ARRAY_KEY -import hep.dataforge.values.ListValue -import hep.dataforge.values.number +package space.kscience.dataforge.io import kotlinx.serialization.json.* +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.meta.JsonMeta.Companion.JSON_ARRAY_KEY +import space.kscience.dataforge.values.ListValue +import space.kscience.dataforge.values.number import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaSerializerTest.kt similarity index 85% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaSerializerTest.kt index bf53aed9..5abd6a5e 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MetaSerializerTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaSerializerTest.kt @@ -1,13 +1,13 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaSerializer -import hep.dataforge.meta.TypedMetaItem -import hep.dataforge.names.Name -import hep.dataforge.names.toName import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.cbor.Cbor import kotlinx.serialization.json.Json +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaSerializer +import space.kscience.dataforge.meta.TypedMetaItem +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MultipartTest.kt similarity index 84% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MultipartTest.kt index c26d30e9..8ffaef14 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/MultipartTest.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MultipartTest.kt @@ -1,9 +1,9 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Global -import hep.dataforge.meta.get -import hep.dataforge.meta.int -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.misc.DFExperimental import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/ioTestUtils.kt similarity index 89% rename from dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt rename to dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/ioTestUtils.kt index 377cb62a..e99dcbd5 100644 --- a/dataforge-io/src/commonTest/kotlin/hep/dataforge/io/ioTestUtils.kt +++ b/dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/ioTestUtils.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io import io.ktor.utils.io.core.ByteReadPacket import io.ktor.utils.io.core.use diff --git a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt b/dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/fileIO.kt similarity index 97% rename from dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt rename to dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/fileIO.kt index 16a6d0fc..454c81fe 100644 --- a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/fileIO.kt +++ b/dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/fileIO.kt @@ -1,11 +1,11 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.isEmpty -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.core.* import io.ktor.utils.io.streams.asOutput +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.isEmpty +import space.kscience.dataforge.misc.DFExperimental import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardOpenOption diff --git a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt b/dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/streamsIO.kt similarity index 97% rename from dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt rename to dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/streamsIO.kt index 5b7262ea..1c53c066 100644 --- a/dataforge-io/src/jvmMain/kotlin/hep/dataforge/io/streamsIO.kt +++ b/dataforge-io/src/jvmMain/kotlin/space/kscience/dataforge/io/streamsIO.kt @@ -1,4 +1,4 @@ -package hep.dataforge.io +package space.kscience.dataforge.io // //private class BlockingStreamInput(val source: InputStream) : AbstractInput() { diff --git a/dataforge-io/src/jvmMain/resources/META-INF/services/hep.dataforge.io.MetaFormatFactory b/dataforge-io/src/jvmMain/resources/META-INF/services/hep.dataforge.io.MetaFormatFactory index 41eb3ce0..6c4b7123 100644 --- a/dataforge-io/src/jvmMain/resources/META-INF/services/hep.dataforge.io.MetaFormatFactory +++ b/dataforge-io/src/jvmMain/resources/META-INF/services/hep.dataforge.io.MetaFormatFactory @@ -1,2 +1,2 @@ -hep.dataforge.io.BinaryMetaFormatFactory -hep.dataforge.io.JsonMetaFormatFactory \ No newline at end of file +space.kscience.dataforge.io.BinaryMetaFormatFactory +space.kscience.dataforge.io.JsonMetaFormatFactory \ No newline at end of file diff --git a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt b/dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileBinaryTest.kt similarity index 85% rename from dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt rename to dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileBinaryTest.kt index 8fe947d2..d03c1c1c 100644 --- a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileBinaryTest.kt +++ b/dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileBinaryTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Global -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.core.writeDouble +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.misc.DFExperimental import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertEquals @@ -13,7 +13,7 @@ class FileBinaryTest { "a" put "AAA" "b" put 22.2 } - dataType = "hep.dataforge.test" + dataType = "space.kscience.dataforge.test" dataID = "myData" // добавил только что data { writeDouble(16.7) @@ -35,7 +35,7 @@ class FileBinaryTest { "a" put "AAA" "b" put 22.2 } - dataType = "hep.dataforge.satellite" + dataType = "space.kscience.dataforge.satellite" dataID = "cellDepositTest" data = dataFile.asBinary() } diff --git a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt b/dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileEnvelopeTest.kt similarity index 86% rename from dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt rename to dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileEnvelopeTest.kt index d1ec8147..ee5ea41f 100644 --- a/dataforge-io/src/jvmTest/kotlin/hep/dataforge/io/FileEnvelopeTest.kt +++ b/dataforge-io/src/jvmTest/kotlin/space/kscience/dataforge/io/FileEnvelopeTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.io +package space.kscience.dataforge.io -import hep.dataforge.context.Global -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.core.writeDouble +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.misc.DFExperimental import java.nio.file.Files import kotlin.test.Test import kotlin.test.assertTrue @@ -15,7 +15,7 @@ class FileEnvelopeTest { "a" put "AAA" "b" put 22.2 } - dataType = "hep.dataforge.test" + dataType = "space.kscience.dataforge.test" dataID = "myData" // добавил только что data { writeDouble(16.7) diff --git a/dataforge-meta/api/dataforge-meta.api b/dataforge-meta/api/dataforge-meta.api index 4fcac8ce..b31a14c0 100644 --- a/dataforge-meta/api/dataforge-meta.api +++ b/dataforge-meta/api/dataforge-meta.api @@ -1,106 +1,106 @@ -public abstract class hep/dataforge/meta/AbstractMutableMeta : hep/dataforge/meta/AbstractTypedMeta, hep/dataforge/meta/MutableMeta { +public abstract class space/kscience/dataforge/meta/AbstractMutableMeta : space/kscience/dataforge/meta/AbstractTypedMeta, space/kscience/dataforge/meta/MutableMeta { public fun ()V protected final fun getChildren ()Ljava/util/Map; public fun getItems ()Ljava/util/Map; - protected fun replaceItem (Lhep/dataforge/names/NameToken;Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/TypedMetaItem;)V - public fun setItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)V - protected abstract fun wrapNode (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/MutableMeta; + protected fun replaceItem (Lspace/kscience/dataforge/names/NameToken;Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + public fun setItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + protected abstract fun wrapNode (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MutableMeta; } -public abstract class hep/dataforge/meta/AbstractTypedMeta : hep/dataforge/meta/MetaBase, hep/dataforge/meta/TypedMeta { +public abstract class space/kscience/dataforge/meta/AbstractTypedMeta : space/kscience/dataforge/meta/MetaBase, space/kscience/dataforge/meta/TypedMeta { public fun ()V - public fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; + public fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; } -public final class hep/dataforge/meta/Config : hep/dataforge/meta/AbstractMutableMeta, hep/dataforge/meta/ObservableItemProvider { - public static final field ConfigSerializer Lhep/dataforge/meta/Config$ConfigSerializer; +public final class space/kscience/dataforge/meta/Config : space/kscience/dataforge/meta/AbstractMutableMeta, space/kscience/dataforge/meta/ObservableItemProvider { + public static final field ConfigSerializer Lspace/kscience/dataforge/meta/Config$ConfigSerializer; public fun ()V - public synthetic fun empty$dataforge_meta ()Lhep/dataforge/meta/MutableMeta; + public synthetic fun empty$dataforge_meta ()Lspace/kscience/dataforge/meta/MutableMeta; public fun onChange (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V public fun removeListener (Ljava/lang/Object;)V - public synthetic fun wrapNode (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/MutableMeta; + public synthetic fun wrapNode (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MutableMeta; } -public final class hep/dataforge/meta/Config$ConfigSerializer : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/meta/Config; +public final class space/kscience/dataforge/meta/Config$ConfigSerializer : kotlinx/serialization/KSerializer { public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public final fun empty ()Lhep/dataforge/meta/Config; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/meta/Config; + public final fun empty ()Lspace/kscience/dataforge/meta/Config; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/meta/Config;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/meta/Config;)V public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/meta/ConfigKt { - public static final fun asConfig (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Config; - public static final fun get (Lhep/dataforge/meta/Config;Lhep/dataforge/names/NameToken;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun toConfig (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Config; +public final class space/kscience/dataforge/meta/ConfigKt { + public static final fun asConfig (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Config; + public static final fun get (Lspace/kscience/dataforge/meta/Config;Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun toConfig (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Config; } -public abstract interface class hep/dataforge/meta/Configurable { - public abstract fun getConfig ()Lhep/dataforge/meta/Config; +public abstract interface class space/kscience/dataforge/meta/Configurable { + public abstract fun getConfig ()Lspace/kscience/dataforge/meta/Config; } -public final class hep/dataforge/meta/ConfigurableKt { - public static final fun config (Lhep/dataforge/meta/Configurable;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun config$default (Lhep/dataforge/meta/Configurable;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun configure (Lhep/dataforge/meta/Configurable;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Configurable; - public static final fun configure (Lhep/dataforge/meta/Configurable;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/Configurable; +public final class space/kscience/dataforge/meta/ConfigurableKt { + public static final fun config (Lspace/kscience/dataforge/meta/Configurable;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun config$default (Lspace/kscience/dataforge/meta/Configurable;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun configure (Lspace/kscience/dataforge/meta/Configurable;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/Configurable; + public static final fun configure (Lspace/kscience/dataforge/meta/Configurable;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Configurable; } -public final class hep/dataforge/meta/ItemDelegateKt { - public static final fun boolean (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun boolean (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; - public static final fun boolean (Lhep/dataforge/meta/ItemProvider;ZLhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/ItemProvider;ZLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun convert (Lkotlin/properties/ReadOnlyProperty;Lhep/dataforge/meta/transformations/MetaConverter;)Lkotlin/properties/ReadOnlyProperty; - public static final fun convert (Lkotlin/properties/ReadOnlyProperty;Lhep/dataforge/meta/transformations/MetaConverter;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; +public final class space/kscience/dataforge/meta/ItemDelegateKt { + public static final fun boolean (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun boolean (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; + public static final fun boolean (Lspace/kscience/dataforge/meta/ItemProvider;ZLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/ItemProvider;ZLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; public static final fun convert (Lkotlin/properties/ReadOnlyProperty;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty; - public static final fun double (Lhep/dataforge/meta/ItemProvider;DLhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun double (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun double$default (Lhep/dataforge/meta/ItemProvider;DLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun double$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun float (Lhep/dataforge/meta/ItemProvider;FLhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun float (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun float$default (Lhep/dataforge/meta/ItemProvider;FLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun float$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun int (Lhep/dataforge/meta/ItemProvider;ILhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun int (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun int$default (Lhep/dataforge/meta/ItemProvider;ILhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun int$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun item (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun item$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun long (Lhep/dataforge/meta/ItemProvider;JLhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun long (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun long$default (Lhep/dataforge/meta/ItemProvider;JLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun long$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun node (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun node$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun number (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun number (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; - public static final fun number (Lhep/dataforge/meta/ItemProvider;Ljava/lang/Number;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/ItemProvider;Ljava/lang/Number;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun string (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static final fun string (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; - public static final fun string (Lhep/dataforge/meta/ItemProvider;Ljava/lang/String;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/ItemProvider;Ljava/lang/String;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; - public static final fun value (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; - public static synthetic fun value$default (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun convert (Lkotlin/properties/ReadOnlyProperty;Lspace/kscience/dataforge/meta/transformations/MetaConverter;)Lkotlin/properties/ReadOnlyProperty; + public static final fun convert (Lkotlin/properties/ReadOnlyProperty;Lspace/kscience/dataforge/meta/transformations/MetaConverter;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; + public static final fun double (Lspace/kscience/dataforge/meta/ItemProvider;DLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun double (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun double$default (Lspace/kscience/dataforge/meta/ItemProvider;DLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun double$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun float (Lspace/kscience/dataforge/meta/ItemProvider;FLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun float (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun float$default (Lspace/kscience/dataforge/meta/ItemProvider;FLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun float$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun int (Lspace/kscience/dataforge/meta/ItemProvider;ILspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun int (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun int$default (Lspace/kscience/dataforge/meta/ItemProvider;ILspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun int$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun item (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun item$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun long (Lspace/kscience/dataforge/meta/ItemProvider;JLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun long (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun long$default (Lspace/kscience/dataforge/meta/ItemProvider;JLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun long$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun node (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun node$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun number (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun number (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun number (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun string (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun string (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static final fun string (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; + public static final fun value (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadOnlyProperty; + public static synthetic fun value$default (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty; } -public final class hep/dataforge/meta/ItemListener { +public final class space/kscience/dataforge/meta/ItemListener { public fun (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V public synthetic fun (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/Object; public final fun component2 ()Lkotlin/jvm/functions/Function3; - public final fun copy (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Lhep/dataforge/meta/ItemListener; - public static synthetic fun copy$default (Lhep/dataforge/meta/ItemListener;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lhep/dataforge/meta/ItemListener; + public final fun copy (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Lspace/kscience/dataforge/meta/ItemListener; + public static synthetic fun copy$default (Lspace/kscience/dataforge/meta/ItemListener;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/ItemListener; public fun equals (Ljava/lang/Object;)Z public final fun getAction ()Lkotlin/jvm/functions/Function3; public final fun getOwner ()Ljava/lang/Object; @@ -108,559 +108,559 @@ public final class hep/dataforge/meta/ItemListener { public fun toString ()Ljava/lang/String; } -public abstract interface class hep/dataforge/meta/ItemProvider { - public static final field Companion Lhep/dataforge/meta/ItemProvider$Companion; - public abstract fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; +public abstract interface class space/kscience/dataforge/meta/ItemProvider { + public static final field Companion Lspace/kscience/dataforge/meta/ItemProvider$Companion; + public abstract fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; } -public final class hep/dataforge/meta/ItemProvider$Companion { - public final fun getEMPTY ()Lhep/dataforge/meta/ItemProvider; +public final class space/kscience/dataforge/meta/ItemProvider$Companion { + public final fun getEMPTY ()Lspace/kscience/dataforge/meta/ItemProvider; } -public final class hep/dataforge/meta/ItemProviderKt { - public static final fun get (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun get (Lhep/dataforge/meta/ItemProvider;Ljava/lang/String;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun getChild (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/ItemProvider; - public static final fun getChild (Lhep/dataforge/meta/ItemProvider;Ljava/lang/String;)Lhep/dataforge/meta/ItemProvider; - public static final fun getIndexed (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/names/Name;)Ljava/util/Map; - public static final fun getIndexed (Lhep/dataforge/meta/ItemProvider;Ljava/lang/String;)Ljava/util/Map; - public static final fun getRootItem (Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun getRootNode (Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/Meta; - public static final fun withDefault (Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/ItemProvider; +public final class space/kscience/dataforge/meta/ItemProviderKt { + public static final fun get (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/String;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun get (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun getChild (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/String;)Lspace/kscience/dataforge/meta/ItemProvider; + public static final fun getChild (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/ItemProvider; + public static final fun getIndexed (Lspace/kscience/dataforge/meta/ItemProvider;Ljava/lang/String;)Ljava/util/Map; + public static final fun getIndexed (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/names/Name;)Ljava/util/Map; + public static final fun getRootItem (Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun getRootNode (Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/Meta; + public static final fun withDefault (Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/ItemProvider; } -public final class hep/dataforge/meta/JsonMeta : hep/dataforge/meta/MetaBase { - public static final field Companion Lhep/dataforge/meta/JsonMeta$Companion; +public final class space/kscience/dataforge/meta/JsonMeta : space/kscience/dataforge/meta/MetaBase { + public static final field Companion Lspace/kscience/dataforge/meta/JsonMeta$Companion; public static final field JSON_ARRAY_KEY Ljava/lang/String; - public fun (Lkotlinx/serialization/json/JsonObject;Lhep/dataforge/meta/descriptors/NodeDescriptor;)V - public synthetic fun (Lkotlinx/serialization/json/JsonObject;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lkotlinx/serialization/json/JsonObject;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)V + public synthetic fun (Lkotlinx/serialization/json/JsonObject;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun getItems ()Ljava/util/Map; } -public final class hep/dataforge/meta/JsonMeta$Companion { +public final class space/kscience/dataforge/meta/JsonMeta$Companion { } -public final class hep/dataforge/meta/JsonMetaKt { - public static final fun toJson (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lkotlinx/serialization/json/JsonObject; - public static final fun toJson (Lhep/dataforge/values/Value;Lhep/dataforge/meta/descriptors/ValueDescriptor;)Lkotlinx/serialization/json/JsonElement; - public static synthetic fun toJson$default (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonObject; - public static synthetic fun toJson$default (Lhep/dataforge/values/Value;Lhep/dataforge/meta/descriptors/ValueDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonElement; - public static final fun toMeta (Lkotlinx/serialization/json/JsonObject;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lhep/dataforge/meta/JsonMeta; - public static synthetic fun toMeta$default (Lkotlinx/serialization/json/JsonObject;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lhep/dataforge/meta/JsonMeta; - public static final fun toMetaItem (Lkotlinx/serialization/json/JsonElement;Lhep/dataforge/meta/descriptors/ItemDescriptor;)Lhep/dataforge/meta/TypedMetaItem; - public static synthetic fun toMetaItem$default (Lkotlinx/serialization/json/JsonElement;Lhep/dataforge/meta/descriptors/ItemDescriptor;ILjava/lang/Object;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun toValue (Lkotlinx/serialization/json/JsonPrimitive;Lhep/dataforge/meta/descriptors/ValueDescriptor;)Lhep/dataforge/values/Value; +public final class space/kscience/dataforge/meta/JsonMetaKt { + public static final fun toJson (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Lkotlinx/serialization/json/JsonObject; + public static final fun toJson (Lspace/kscience/dataforge/values/Value;Lspace/kscience/dataforge/meta/descriptors/ValueDescriptor;)Lkotlinx/serialization/json/JsonElement; + public static synthetic fun toJson$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonObject; + public static synthetic fun toJson$default (Lspace/kscience/dataforge/values/Value;Lspace/kscience/dataforge/meta/descriptors/ValueDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonElement; + public static final fun toMeta (Lkotlinx/serialization/json/JsonObject;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Lspace/kscience/dataforge/meta/JsonMeta; + public static synthetic fun toMeta$default (Lkotlinx/serialization/json/JsonObject;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/JsonMeta; + public static final fun toMetaItem (Lkotlinx/serialization/json/JsonElement;Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static synthetic fun toMetaItem$default (Lkotlinx/serialization/json/JsonElement;Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun toValue (Lkotlinx/serialization/json/JsonPrimitive;Lspace/kscience/dataforge/meta/descriptors/ValueDescriptor;)Lspace/kscience/dataforge/values/Value; } -public final class hep/dataforge/meta/Laminate : hep/dataforge/meta/MetaBase { - public static final field Companion Lhep/dataforge/meta/Laminate$Companion; +public final class space/kscience/dataforge/meta/Laminate : space/kscience/dataforge/meta/MetaBase { + public static final field Companion Lspace/kscience/dataforge/meta/Laminate$Companion; public fun (Ljava/util/List;)V public fun getItems ()Ljava/util/Map; public final fun getLayers ()Ljava/util/List; - public final fun merge ()Lhep/dataforge/meta/SealedMeta; + public final fun merge ()Lspace/kscience/dataforge/meta/SealedMeta; } -public final class hep/dataforge/meta/Laminate$Companion { +public final class space/kscience/dataforge/meta/Laminate$Companion { public final fun getMergeRule ()Lkotlin/jvm/functions/Function1; public final fun getReplaceRule ()Lkotlin/jvm/functions/Function1; } -public final class hep/dataforge/meta/LaminateKt { - public static final fun Laminate ([Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Laminate; - public static final fun getFirst (Lhep/dataforge/meta/Laminate;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun withBottom (Lhep/dataforge/meta/Laminate;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Laminate; - public static final fun withTop (Lhep/dataforge/meta/Laminate;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Laminate; +public final class space/kscience/dataforge/meta/LaminateKt { + public static final fun Laminate ([Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Laminate; + public static final fun getFirst (Lspace/kscience/dataforge/meta/Laminate;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun withBottom (Lspace/kscience/dataforge/meta/Laminate;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Laminate; + public static final fun withTop (Lspace/kscience/dataforge/meta/Laminate;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Laminate; } -public final class hep/dataforge/meta/MapMetaKt { - public static final fun toMap (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Ljava/util/Map; - public static synthetic fun toMap$default (Lhep/dataforge/meta/Meta;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Ljava/util/Map; - public static synthetic fun toMeta$default (Ljava/util/Map;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/meta/MapMetaKt { + public static final fun toMap (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Ljava/util/Map; + public static synthetic fun toMap$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Ljava/util/Map; + public static synthetic fun toMeta$default (Ljava/util/Map;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta; } -public abstract interface class hep/dataforge/meta/Meta : hep/dataforge/meta/ItemProvider, hep/dataforge/meta/MetaRepr { - public static final field Companion Lhep/dataforge/meta/Meta$Companion; +public abstract interface class space/kscience/dataforge/meta/Meta : space/kscience/dataforge/meta/ItemProvider, space/kscience/dataforge/meta/MetaRepr { + public static final field Companion Lspace/kscience/dataforge/meta/Meta$Companion; public static final field TYPE Ljava/lang/String; public static final field VALUE_KEY Ljava/lang/String; public abstract fun equals (Ljava/lang/Object;)Z - public abstract fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; + public abstract fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; public abstract fun getItems ()Ljava/util/Map; public abstract fun hashCode ()I - public abstract fun toMeta ()Lhep/dataforge/meta/Meta; + public abstract fun toMeta ()Lspace/kscience/dataforge/meta/Meta; public abstract fun toString ()Ljava/lang/String; } -public final class hep/dataforge/meta/Meta$Companion { +public final class space/kscience/dataforge/meta/Meta$Companion { public static final field TYPE Ljava/lang/String; public static final field VALUE_KEY Ljava/lang/String; - public final fun getEMPTY ()Lhep/dataforge/meta/Meta; + public final fun getEMPTY ()Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/meta/Meta$DefaultImpls { - public static fun getItem (Lhep/dataforge/meta/Meta;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static fun toMeta (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/meta/Meta$DefaultImpls { + public static fun getItem (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static fun toMeta (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Meta; } -public abstract class hep/dataforge/meta/MetaBase : hep/dataforge/meta/Meta { +public abstract class space/kscience/dataforge/meta/MetaBase : space/kscience/dataforge/meta/Meta { public fun ()V public fun equals (Ljava/lang/Object;)Z - public fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; + public fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; public fun hashCode ()I - public fun toMeta ()Lhep/dataforge/meta/Meta; + public fun toMeta ()Lspace/kscience/dataforge/meta/Meta; public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/meta/MetaBuilder : hep/dataforge/meta/AbstractMutableMeta { +public final class space/kscience/dataforge/meta/MetaBuilder : space/kscience/dataforge/meta/AbstractMutableMeta { public fun ()V - public synthetic fun empty$dataforge_meta ()Lhep/dataforge/meta/MutableMeta; - public final fun put (Lhep/dataforge/names/Name;Lhep/dataforge/meta/Meta;)V - public final fun put (Lhep/dataforge/names/Name;Lhep/dataforge/meta/MetaRepr;)V - public final fun put (Lhep/dataforge/names/Name;Lhep/dataforge/values/Value;)V - public final fun put (Lhep/dataforge/names/Name;Ljava/lang/Boolean;)V - public final fun put (Lhep/dataforge/names/Name;Ljava/lang/Enum;)V - public final fun put (Lhep/dataforge/names/Name;Ljava/lang/Number;)V - public final fun put (Lhep/dataforge/names/Name;Ljava/lang/String;)V - public final fun put (Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V - public final fun put (Ljava/lang/String;Lhep/dataforge/meta/Meta;)V - public final fun put (Ljava/lang/String;Lhep/dataforge/meta/MetaRepr;)V - public final fun put (Ljava/lang/String;Lhep/dataforge/meta/TypedMetaItem;)V - public final fun put (Ljava/lang/String;Lhep/dataforge/values/Value;)V + public synthetic fun empty$dataforge_meta ()Lspace/kscience/dataforge/meta/MutableMeta; public final fun put (Ljava/lang/String;Ljava/lang/Boolean;)V public final fun put (Ljava/lang/String;Ljava/lang/Enum;)V public final fun put (Ljava/lang/String;Ljava/lang/Number;)V public final fun put (Ljava/lang/String;Ljava/lang/String;)V public final fun put (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public final fun put (Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V + public final fun put (Ljava/lang/String;Lspace/kscience/dataforge/meta/MetaRepr;)V + public final fun put (Ljava/lang/String;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + public final fun put (Ljava/lang/String;Lspace/kscience/dataforge/values/Value;)V public final fun put (Ljava/lang/String;[D)V - public final fun putMetas (Lhep/dataforge/names/Name;Ljava/lang/Iterable;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Ljava/lang/Enum;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Ljava/lang/Number;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/MetaRepr;)V + public final fun put (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/values/Value;)V public final fun putMetas (Ljava/lang/String;Ljava/lang/Iterable;)V + public final fun putMetas (Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;)V public final fun putNumbers (Ljava/lang/String;Ljava/lang/Iterable;)V public final fun putStrings (Ljava/lang/String;Ljava/lang/Iterable;)V - public final fun putValues (Lhep/dataforge/names/Name;Ljava/lang/Iterable;)V public final fun putValues (Ljava/lang/String;Ljava/lang/Iterable;)V - public synthetic fun wrapNode (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/MutableMeta; + public final fun putValues (Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;)V + public synthetic fun wrapNode (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MutableMeta; } -public final class hep/dataforge/meta/MetaBuilderKt { - public static final fun Meta (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/MetaBuilder; - public static final fun toMutableMeta (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/MetaBuilder; +public final class space/kscience/dataforge/meta/MetaBuilderKt { + public static final fun Meta (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/MetaBuilder; + public static final fun toMutableMeta (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MetaBuilder; } -public final class hep/dataforge/meta/MetaItemKt { - public static final fun asMetaItem (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/MetaItemNode; - public static final fun asMetaItem (Lhep/dataforge/values/Value;)Lhep/dataforge/meta/MetaItemValue; - public static final fun getBoolean (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Boolean; - public static final fun getDouble (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Double; - public static final fun getFloat (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Float; - public static final fun getInt (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Integer; - public static final fun getLong (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Long; - public static final fun getNode (Lhep/dataforge/meta/TypedMetaItem;)Lhep/dataforge/meta/Meta; - public static final fun getNumber (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Number; - public static final fun getShort (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Short; - public static final fun getString (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/String; - public static final fun getStringList (Lhep/dataforge/meta/TypedMetaItem;)Ljava/util/List; - public static final fun getValue (Lhep/dataforge/meta/TypedMetaItem;)Lhep/dataforge/values/Value; +public final class space/kscience/dataforge/meta/MetaItemKt { + public static final fun asMetaItem (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MetaItemNode; + public static final fun asMetaItem (Lspace/kscience/dataforge/values/Value;)Lspace/kscience/dataforge/meta/MetaItemValue; + public static final fun getBoolean (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Boolean; + public static final fun getDouble (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Double; + public static final fun getFloat (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Float; + public static final fun getInt (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Integer; + public static final fun getLong (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Long; + public static final fun getNode (Lspace/kscience/dataforge/meta/TypedMetaItem;)Lspace/kscience/dataforge/meta/Meta; + public static final fun getNumber (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Number; + public static final fun getShort (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Short; + public static final fun getString (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/String; + public static final fun getStringList (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/util/List; + public static final fun getValue (Lspace/kscience/dataforge/meta/TypedMetaItem;)Lspace/kscience/dataforge/values/Value; } -public final class hep/dataforge/meta/MetaItemNode : hep/dataforge/meta/TypedMetaItem { - public static final field Companion Lhep/dataforge/meta/MetaItemNode$Companion; - public fun (Lhep/dataforge/meta/Meta;)V +public final class space/kscience/dataforge/meta/MetaItemNode : space/kscience/dataforge/meta/TypedMetaItem { + public static final field Companion Lspace/kscience/dataforge/meta/MetaItemNode$Companion; + public fun (Lspace/kscience/dataforge/meta/Meta;)V public fun equals (Ljava/lang/Object;)Z - public final fun getNode ()Lhep/dataforge/meta/Meta; + public final fun getNode ()Lspace/kscience/dataforge/meta/Meta; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/meta/MetaItemNode$Companion { +public final class space/kscience/dataforge/meta/MetaItemNode$Companion { public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/meta/MetaItemSerializer : kotlinx/serialization/KSerializer { - public static final field INSTANCE Lhep/dataforge/meta/MetaItemSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/meta/TypedMetaItem; +public final class space/kscience/dataforge/meta/MetaItemSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/meta/MetaItemSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/meta/TypedMetaItem; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/meta/TypedMetaItem;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/meta/TypedMetaItem;)V } -public final class hep/dataforge/meta/MetaItemValue : hep/dataforge/meta/TypedMetaItem { - public static final field Companion Lhep/dataforge/meta/MetaItemValue$Companion; - public fun (Lhep/dataforge/values/Value;)V +public final class space/kscience/dataforge/meta/MetaItemValue : space/kscience/dataforge/meta/TypedMetaItem { + public static final field Companion Lspace/kscience/dataforge/meta/MetaItemValue$Companion; + public fun (Lspace/kscience/dataforge/values/Value;)V public fun equals (Ljava/lang/Object;)Z - public final fun getValue ()Lhep/dataforge/values/Value; + public final fun getValue ()Lspace/kscience/dataforge/values/Value; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/meta/MetaItemValue$Companion { +public final class space/kscience/dataforge/meta/MetaItemValue$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/meta/MetaKt { - public static final fun get (Lhep/dataforge/meta/Meta;Lhep/dataforge/names/NameToken;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun isEmpty (Lhep/dataforge/meta/Meta;)Z - public static final fun itemSequence (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; - public static final fun iterator (Lhep/dataforge/meta/Meta;)Ljava/util/Iterator; - public static final fun valueSequence (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; +public final class space/kscience/dataforge/meta/MetaKt { + public static final fun get (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun isEmpty (Lspace/kscience/dataforge/meta/Meta;)Z + public static final fun itemSequence (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; + public static final fun iterator (Lspace/kscience/dataforge/meta/Meta;)Ljava/util/Iterator; + public static final fun valueSequence (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; } -public abstract interface class hep/dataforge/meta/MetaRepr { - public abstract fun toMeta ()Lhep/dataforge/meta/Meta; +public abstract interface class space/kscience/dataforge/meta/MetaRepr { + public abstract fun toMeta ()Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/meta/MetaSerializer : kotlinx/serialization/KSerializer { - public static final field INSTANCE Lhep/dataforge/meta/MetaSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/meta/MetaSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/meta/MetaSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/meta/Meta; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/meta/Meta;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/meta/Meta;)V } -public final class hep/dataforge/meta/MutableItemDelegateKt { - public static final fun boolean (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun boolean (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; - public static final fun boolean (Lhep/dataforge/meta/MutableItemProvider;ZLhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun boolean$default (Lhep/dataforge/meta/MutableItemProvider;ZLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun convert (Lkotlin/properties/ReadWriteProperty;Lhep/dataforge/meta/transformations/MetaConverter;)Lkotlin/properties/ReadWriteProperty; - public static final fun convert (Lkotlin/properties/ReadWriteProperty;Lhep/dataforge/meta/transformations/MetaConverter;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; +public final class space/kscience/dataforge/meta/MutableItemDelegateKt { + public static final fun boolean (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun boolean (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; + public static final fun boolean (Lspace/kscience/dataforge/meta/MutableItemProvider;ZLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun boolean$default (Lspace/kscience/dataforge/meta/MutableItemProvider;ZLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; public static final fun convert (Lkotlin/properties/ReadWriteProperty;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadWriteProperty; - public static final fun double (Lhep/dataforge/meta/MutableItemProvider;DLhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun double (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun double$default (Lhep/dataforge/meta/MutableItemProvider;DLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun double$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun doubleArray (Lhep/dataforge/meta/MutableItemProvider;[DLhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun doubleArray$default (Lhep/dataforge/meta/MutableItemProvider;[DLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun float (Lhep/dataforge/meta/MutableItemProvider;FLhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun float (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun float$default (Lhep/dataforge/meta/MutableItemProvider;FLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun float$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun int (Lhep/dataforge/meta/MutableItemProvider;ILhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun int (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun int$default (Lhep/dataforge/meta/MutableItemProvider;ILhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun int$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun item (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun item$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun listValue (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun listValue$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun long (Lhep/dataforge/meta/MutableItemProvider;JLhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun long (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun long$default (Lhep/dataforge/meta/MutableItemProvider;JLhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun long$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun node (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun node$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun number (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun number (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; - public static final fun number (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/Number;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun number$default (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/Number;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun numberList (Lhep/dataforge/meta/MutableItemProvider;[Ljava/lang/Number;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun numberList$default (Lhep/dataforge/meta/MutableItemProvider;[Ljava/lang/Number;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun string (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun string (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; - public static final fun string (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun string$default (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun stringList (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun stringList (Lhep/dataforge/meta/MutableItemProvider;[Ljava/lang/String;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun stringList$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun stringList$default (Lhep/dataforge/meta/MutableItemProvider;[Ljava/lang/String;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun value (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static final fun value (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun value$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun value$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun convert (Lkotlin/properties/ReadWriteProperty;Lspace/kscience/dataforge/meta/transformations/MetaConverter;)Lkotlin/properties/ReadWriteProperty; + public static final fun convert (Lkotlin/properties/ReadWriteProperty;Lspace/kscience/dataforge/meta/transformations/MetaConverter;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; + public static final fun double (Lspace/kscience/dataforge/meta/MutableItemProvider;DLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun double (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun double$default (Lspace/kscience/dataforge/meta/MutableItemProvider;DLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun double$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun doubleArray (Lspace/kscience/dataforge/meta/MutableItemProvider;[DLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun doubleArray$default (Lspace/kscience/dataforge/meta/MutableItemProvider;[DLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun float (Lspace/kscience/dataforge/meta/MutableItemProvider;FLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun float (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun float$default (Lspace/kscience/dataforge/meta/MutableItemProvider;FLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun float$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun int (Lspace/kscience/dataforge/meta/MutableItemProvider;ILspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun int (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun int$default (Lspace/kscience/dataforge/meta/MutableItemProvider;ILspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun int$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun item (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun item$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun listValue (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun listValue$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun long (Lspace/kscience/dataforge/meta/MutableItemProvider;JLspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun long (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun long$default (Lspace/kscience/dataforge/meta/MutableItemProvider;JLspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun long$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun node (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun node$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun number (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun number (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun number (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun number$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun numberList (Lspace/kscience/dataforge/meta/MutableItemProvider;[Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun numberList$default (Lspace/kscience/dataforge/meta/MutableItemProvider;[Ljava/lang/Number;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun string (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun string (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun string (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun string$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun stringList (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun stringList (Lspace/kscience/dataforge/meta/MutableItemProvider;[Ljava/lang/String;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun stringList$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun stringList$default (Lspace/kscience/dataforge/meta/MutableItemProvider;[Ljava/lang/String;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun value (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun value (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun value$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun value$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; } -public abstract interface class hep/dataforge/meta/MutableItemProvider : hep/dataforge/meta/ItemProvider { - public abstract fun setItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)V +public abstract interface class space/kscience/dataforge/meta/MutableItemProvider : space/kscience/dataforge/meta/ItemProvider { + public abstract fun setItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)V } -public final class hep/dataforge/meta/MutableItemProviderKt { - public static final fun editChild (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/MutableItemProvider; - public static final fun getChild (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/MutableItemProvider; - public static final fun getChild (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;)Lhep/dataforge/meta/MutableItemProvider; - public static final fun remove (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;)V - public static final fun remove (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lhep/dataforge/meta/Meta;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Lhep/dataforge/values/Value;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Iterable;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Object;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/NameToken;Ljava/lang/Object;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lhep/dataforge/meta/Meta;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lhep/dataforge/meta/TypedMetaItem;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Iterable;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Object;)V - public static final fun set (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V - public static final fun setIndexed (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)V - public static synthetic fun setIndexed$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V - public static final fun setIndexedItems (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)V - public static synthetic fun setIndexedItems$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V - public static final fun update (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/Meta;)V - public static final fun withDefault (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/MutableItemProvider; +public final class space/kscience/dataforge/meta/MutableItemProviderKt { + public static final fun editChild (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/MutableItemProvider; + public static final fun getChild (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;)Lspace/kscience/dataforge/meta/MutableItemProvider; + public static final fun getChild (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/MutableItemProvider; + public static final fun remove (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;)V + public static final fun remove (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Iterable;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Object;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Object;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/values/Value;)V + public static final fun set (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/NameToken;Ljava/lang/Object;)V + public static final fun setIndexed (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)V + public static synthetic fun setIndexed$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V + public static final fun setIndexedItems (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)V + public static synthetic fun setIndexedItems$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V + public static final fun update (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/Meta;)V + public static final fun withDefault (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/MutableItemProvider; } -public abstract interface class hep/dataforge/meta/MutableMeta : hep/dataforge/meta/MutableItemProvider, hep/dataforge/meta/TypedMeta { +public abstract interface class space/kscience/dataforge/meta/MutableMeta : space/kscience/dataforge/meta/MutableItemProvider, space/kscience/dataforge/meta/TypedMeta { public abstract fun getItems ()Ljava/util/Map; } -public final class hep/dataforge/meta/MutableMeta$DefaultImpls { - public static fun getItem (Lhep/dataforge/meta/MutableMeta;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static fun toMeta (Lhep/dataforge/meta/MutableMeta;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/meta/MutableMeta$DefaultImpls { + public static fun getItem (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static fun toMeta (Lspace/kscience/dataforge/meta/MutableMeta;)Lspace/kscience/dataforge/meta/Meta; } -public final class hep/dataforge/meta/MutableMetaKt { - public static final fun append (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/names/Name;Ljava/lang/Object;)V - public static final fun append (Lhep/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Object;)V +public final class space/kscience/dataforge/meta/MutableMetaKt { + public static final fun append (Lspace/kscience/dataforge/meta/MutableItemProvider;Ljava/lang/String;Ljava/lang/Object;)V + public static final fun append (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Object;)V } -public abstract interface class hep/dataforge/meta/ObservableItemProvider : hep/dataforge/meta/ItemProvider { +public abstract interface class space/kscience/dataforge/meta/ObservableItemProvider : space/kscience/dataforge/meta/ItemProvider { public abstract fun onChange (Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)V public abstract fun removeListener (Ljava/lang/Object;)V } -public abstract interface class hep/dataforge/meta/ReadOnlySpecification { - public abstract fun empty ()Lhep/dataforge/meta/ItemProvider; - public abstract fun invoke (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/ItemProvider; - public abstract fun read (Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/ItemProvider; +public abstract interface class space/kscience/dataforge/meta/ReadOnlySpecification { + public abstract fun empty ()Lspace/kscience/dataforge/meta/ItemProvider; + public abstract fun invoke (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/ItemProvider; + public abstract fun read (Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/ItemProvider; } -public final class hep/dataforge/meta/ReadOnlySpecification$DefaultImpls { - public static fun invoke (Lhep/dataforge/meta/ReadOnlySpecification;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/ItemProvider; +public final class space/kscience/dataforge/meta/ReadOnlySpecification$DefaultImpls { + public static fun invoke (Lspace/kscience/dataforge/meta/ReadOnlySpecification;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/ItemProvider; } -public class hep/dataforge/meta/Scheme : hep/dataforge/meta/MetaRepr, hep/dataforge/meta/MutableItemProvider, hep/dataforge/meta/descriptors/Described { +public class space/kscience/dataforge/meta/Scheme : space/kscience/dataforge/meta/MetaRepr, space/kscience/dataforge/meta/MutableItemProvider, space/kscience/dataforge/meta/descriptors/Described { public fun ()V - public fun getDefaultLayer ()Lhep/dataforge/meta/Meta; - public synthetic fun getDescriptor ()Lhep/dataforge/meta/descriptors/ItemDescriptor; - public final fun getDescriptor ()Lhep/dataforge/meta/descriptors/NodeDescriptor; - public fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public final fun setDescriptor (Lhep/dataforge/meta/descriptors/NodeDescriptor;)V - public fun setItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)V - public fun toMeta ()Lhep/dataforge/meta/Laminate; - public synthetic fun toMeta ()Lhep/dataforge/meta/Meta; - public fun validateItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)Z + public fun getDefaultLayer ()Lspace/kscience/dataforge/meta/Meta; + public synthetic fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor; + public fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public final fun setDescriptor (Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)V + public fun setItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)V + public fun toMeta ()Lspace/kscience/dataforge/meta/Laminate; + public synthetic fun toMeta ()Lspace/kscience/dataforge/meta/Meta; + public fun validateItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z } -public final class hep/dataforge/meta/SchemeKt { - public static final fun invoke (Lhep/dataforge/meta/Scheme;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/Scheme; - public static final fun isEmpty (Lhep/dataforge/meta/Scheme;)Z - public static final fun retarget (Lhep/dataforge/meta/Scheme;Lhep/dataforge/meta/MutableItemProvider;)Lhep/dataforge/meta/Scheme; - public static final fun wrap (Lhep/dataforge/meta/Specification;Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lhep/dataforge/meta/Scheme; - public static synthetic fun wrap$default (Lhep/dataforge/meta/Specification;Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;Lhep/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lhep/dataforge/meta/Scheme; +public final class space/kscience/dataforge/meta/SchemeKt { + public static final fun invoke (Lspace/kscience/dataforge/meta/Scheme;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/Scheme; + public static final fun isEmpty (Lspace/kscience/dataforge/meta/Scheme;)Z + public static final fun retarget (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/MutableItemProvider;)Lspace/kscience/dataforge/meta/Scheme; + public static final fun wrap (Lspace/kscience/dataforge/meta/Specification;Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Lspace/kscience/dataforge/meta/Scheme; + public static synthetic fun wrap$default (Lspace/kscience/dataforge/meta/Specification;Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Scheme; } -public class hep/dataforge/meta/SchemeSpec : hep/dataforge/meta/Specification, hep/dataforge/meta/descriptors/Described { +public class space/kscience/dataforge/meta/SchemeSpec : space/kscience/dataforge/meta/Specification, space/kscience/dataforge/meta/descriptors/Described { public fun (Lkotlin/jvm/functions/Function0;)V - public synthetic fun empty ()Lhep/dataforge/meta/ItemProvider; - public fun empty ()Lhep/dataforge/meta/Scheme; - public synthetic fun getDescriptor ()Lhep/dataforge/meta/descriptors/ItemDescriptor; - public fun getDescriptor ()Lhep/dataforge/meta/descriptors/NodeDescriptor; - public synthetic fun invoke (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/ItemProvider; - public final fun invoke (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/Scheme; - public synthetic fun read (Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/ItemProvider; - public fun read (Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/Scheme; - public synthetic fun write (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/MutableItemProvider; - public fun write (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/Scheme; + public synthetic fun empty ()Lspace/kscience/dataforge/meta/ItemProvider; + public fun empty ()Lspace/kscience/dataforge/meta/Scheme; + public synthetic fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor; + public synthetic fun invoke (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/ItemProvider; + public final fun invoke (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/Scheme; + public synthetic fun read (Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/ItemProvider; + public fun read (Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/Scheme; + public synthetic fun write (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/MutableItemProvider; + public fun write (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/Scheme; } -public final class hep/dataforge/meta/SealedMeta : hep/dataforge/meta/AbstractTypedMeta { +public final class space/kscience/dataforge/meta/SealedMeta : space/kscience/dataforge/meta/AbstractTypedMeta { public fun getItems ()Ljava/util/Map; } -public final class hep/dataforge/meta/SealedMetaKt { - public static final fun seal (Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/SealedMeta; - public static final fun seal (Lhep/dataforge/meta/TypedMetaItem;)Lhep/dataforge/meta/TypedMetaItem; +public final class space/kscience/dataforge/meta/SealedMetaKt { + public static final fun seal (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/SealedMeta; + public static final fun seal (Lspace/kscience/dataforge/meta/TypedMetaItem;)Lspace/kscience/dataforge/meta/TypedMetaItem; } -public abstract interface class hep/dataforge/meta/Specification : hep/dataforge/meta/ReadOnlySpecification { - public abstract fun write (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;)Lhep/dataforge/meta/MutableItemProvider; +public abstract interface class space/kscience/dataforge/meta/Specification : space/kscience/dataforge/meta/ReadOnlySpecification { + public abstract fun write (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;)Lspace/kscience/dataforge/meta/MutableItemProvider; } -public final class hep/dataforge/meta/Specification$DefaultImpls { - public static fun invoke (Lhep/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/MutableItemProvider; - public static synthetic fun write$default (Lhep/dataforge/meta/Specification;Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/ItemProvider;ILjava/lang/Object;)Lhep/dataforge/meta/MutableItemProvider; +public final class space/kscience/dataforge/meta/Specification$DefaultImpls { + public static fun invoke (Lspace/kscience/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/MutableItemProvider; + public static synthetic fun write$default (Lspace/kscience/dataforge/meta/Specification;Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/ItemProvider;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/MutableItemProvider; } -public final class hep/dataforge/meta/SpecificationKt { - public static final fun spec (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/Specification;Lhep/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun spec$default (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/Specification;Lhep/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun update (Lhep/dataforge/meta/Configurable;Lhep/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)V - public static final fun update (Lhep/dataforge/meta/MutableItemProvider;Lhep/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)V - public static final fun withSpec (Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/Specification;)Lhep/dataforge/meta/MutableItemProvider; +public final class space/kscience/dataforge/meta/SpecificationKt { + public static final fun spec (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/Specification;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun spec$default (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/Specification;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static final fun update (Lspace/kscience/dataforge/meta/Configurable;Lspace/kscience/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)V + public static final fun update (Lspace/kscience/dataforge/meta/MutableItemProvider;Lspace/kscience/dataforge/meta/Specification;Lkotlin/jvm/functions/Function1;)V + public static final fun withSpec (Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/Specification;)Lspace/kscience/dataforge/meta/MutableItemProvider; } -public abstract interface class hep/dataforge/meta/TypedMeta : hep/dataforge/meta/Meta { - public abstract fun getItem (Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; +public abstract interface class space/kscience/dataforge/meta/TypedMeta : space/kscience/dataforge/meta/Meta { + public abstract fun getItem (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; public abstract fun getItems ()Ljava/util/Map; } -public final class hep/dataforge/meta/TypedMeta$DefaultImpls { - public static fun getItem (Lhep/dataforge/meta/TypedMeta;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static fun toMeta (Lhep/dataforge/meta/TypedMeta;)Lhep/dataforge/meta/Meta; +public final class space/kscience/dataforge/meta/TypedMeta$DefaultImpls { + public static fun getItem (Lspace/kscience/dataforge/meta/TypedMeta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static fun toMeta (Lspace/kscience/dataforge/meta/TypedMeta;)Lspace/kscience/dataforge/meta/Meta; } -public abstract class hep/dataforge/meta/TypedMetaItem { - public static final field Companion Lhep/dataforge/meta/TypedMetaItem$Companion; +public abstract class space/kscience/dataforge/meta/TypedMetaItem { + public static final field Companion Lspace/kscience/dataforge/meta/TypedMetaItem$Companion; public abstract fun equals (Ljava/lang/Object;)Z public abstract fun hashCode ()I } -public final class hep/dataforge/meta/TypedMetaItem$Companion { - public final fun of (Ljava/lang/Object;)Lhep/dataforge/meta/TypedMetaItem; +public final class space/kscience/dataforge/meta/TypedMetaItem$Companion { + public final fun of (Ljava/lang/Object;)Lspace/kscience/dataforge/meta/TypedMetaItem; public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/meta/TypedMetaKt { - public static final fun get (Lhep/dataforge/meta/TypedMeta;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun get (Lhep/dataforge/meta/TypedMeta;Lhep/dataforge/names/NameToken;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun get (Lhep/dataforge/meta/TypedMeta;Ljava/lang/String;)Lhep/dataforge/meta/TypedMetaItem; +public final class space/kscience/dataforge/meta/TypedMetaKt { + public static final fun get (Lspace/kscience/dataforge/meta/TypedMeta;Ljava/lang/String;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun get (Lspace/kscience/dataforge/meta/TypedMeta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun get (Lspace/kscience/dataforge/meta/TypedMeta;Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/dataforge/meta/TypedMetaItem; } -public abstract interface class hep/dataforge/meta/descriptors/Described { - public static final field Companion Lhep/dataforge/meta/descriptors/Described$Companion; - public abstract fun getDescriptor ()Lhep/dataforge/meta/descriptors/ItemDescriptor; +public abstract interface class space/kscience/dataforge/meta/descriptors/Described { + public static final field Companion Lspace/kscience/dataforge/meta/descriptors/Described$Companion; + public abstract fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; } -public final class hep/dataforge/meta/descriptors/Described$Companion { +public final class space/kscience/dataforge/meta/descriptors/Described$Companion { } -public final class hep/dataforge/meta/descriptors/DescriptorMetaKt { - public static final fun defaultItem (Lhep/dataforge/meta/descriptors/ItemDescriptor;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun defaultMeta (Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lhep/dataforge/meta/Laminate; +public final class space/kscience/dataforge/meta/descriptors/DescriptorMetaKt { + public static final fun defaultItem (Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun defaultMeta (Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Lspace/kscience/dataforge/meta/Laminate; } -public abstract class hep/dataforge/meta/descriptors/ItemDescriptor : hep/dataforge/meta/Configurable { - public static final field Companion Lhep/dataforge/meta/descriptors/ItemDescriptor$Companion; +public abstract class space/kscience/dataforge/meta/descriptors/ItemDescriptor : space/kscience/dataforge/meta/Configurable { + public static final field Companion Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor$Companion; public static final field DEFAULT_INDEX_KEY Ljava/lang/String; - public synthetic fun (Lhep/dataforge/meta/Config;Lkotlin/jvm/internal/DefaultConstructorMarker;)V - public abstract fun copy ()Lhep/dataforge/meta/descriptors/ItemDescriptor; - public final fun getAttributes ()Lhep/dataforge/meta/Config; - public final fun getConfig ()Lhep/dataforge/meta/Config; + public synthetic fun (Lspace/kscience/dataforge/meta/Config;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public abstract fun copy ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public final fun getAttributes ()Lspace/kscience/dataforge/meta/Config; + public final fun getConfig ()Lspace/kscience/dataforge/meta/Config; public final fun getIndexKey ()Ljava/lang/String; public final fun getInfo ()Ljava/lang/String; public final fun getMultiple ()Z public abstract fun getRequired ()Z - public final fun setAttributes (Lhep/dataforge/meta/Config;)V + public final fun setAttributes (Lspace/kscience/dataforge/meta/Config;)V public final fun setIndexKey (Ljava/lang/String;)V public final fun setInfo (Ljava/lang/String;)V public final fun setMultiple (Z)V public abstract fun setRequired (Z)V } -public final class hep/dataforge/meta/descriptors/ItemDescriptor$Companion { +public final class space/kscience/dataforge/meta/descriptors/ItemDescriptor$Companion { } -public final class hep/dataforge/meta/descriptors/ItemDescriptorKt { - public static final fun NodeDescriptor (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/descriptors/NodeDescriptor; - public static final fun attributes (Lhep/dataforge/meta/descriptors/ItemDescriptor;Lkotlin/jvm/functions/Function1;)V - public static final fun get (Lhep/dataforge/meta/descriptors/ItemDescriptor;Lhep/dataforge/names/Name;)Lhep/dataforge/meta/descriptors/ItemDescriptor; - public static final fun get (Lhep/dataforge/meta/descriptors/ItemDescriptor;Ljava/lang/String;)Lhep/dataforge/meta/descriptors/ItemDescriptor; - public static final fun plus (Lhep/dataforge/meta/descriptors/NodeDescriptor;Lhep/dataforge/meta/descriptors/NodeDescriptor;)Lhep/dataforge/meta/descriptors/NodeDescriptor; - public static final fun validateItem (Lhep/dataforge/meta/descriptors/ItemDescriptor;Lhep/dataforge/meta/TypedMetaItem;)Z +public final class space/kscience/dataforge/meta/descriptors/ItemDescriptorKt { + public static final fun NodeDescriptor (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor; + public static final fun attributes (Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;Lkotlin/jvm/functions/Function1;)V + public static final fun get (Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;Ljava/lang/String;)Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public static final fun get (Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public static final fun plus (Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor;)Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor; + public static final fun validateItem (Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z } -public final class hep/dataforge/meta/descriptors/NodeDescriptor : hep/dataforge/meta/descriptors/ItemDescriptor { - public static final field Companion Lhep/dataforge/meta/descriptors/NodeDescriptor$Companion; +public final class space/kscience/dataforge/meta/descriptors/NodeDescriptor : space/kscience/dataforge/meta/descriptors/ItemDescriptor { + public static final field Companion Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor$Companion; public fun ()V - public fun (Lhep/dataforge/meta/Config;)V - public synthetic fun (Lhep/dataforge/meta/Config;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public synthetic fun copy ()Lhep/dataforge/meta/descriptors/ItemDescriptor; - public fun copy ()Lhep/dataforge/meta/descriptors/NodeDescriptor; - public final fun getDefault ()Lhep/dataforge/meta/Config; + public fun (Lspace/kscience/dataforge/meta/Config;)V + public synthetic fun (Lspace/kscience/dataforge/meta/Config;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun copy ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public fun copy ()Lspace/kscience/dataforge/meta/descriptors/NodeDescriptor; + public final fun getDefault ()Lspace/kscience/dataforge/meta/Config; public final fun getItems ()Ljava/util/Map; public final fun getNodes ()Ljava/util/Map; public fun getRequired ()Z public final fun getValues ()Ljava/util/Map; - public final fun item (Lhep/dataforge/names/Name;Lhep/dataforge/meta/descriptors/ItemDescriptor;)V - public final fun item (Ljava/lang/String;Lhep/dataforge/meta/descriptors/ItemDescriptor;)V - public final fun node (Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V + public final fun item (Ljava/lang/String;Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;)V + public final fun item (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor;)V public final fun node (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V - public final fun setDefault (Lhep/dataforge/meta/Config;)V + public final fun node (Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V + public final fun setDefault (Lspace/kscience/dataforge/meta/Config;)V public fun setRequired (Z)V - public final fun value (Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V public final fun value (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V + public final fun value (Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V } -public final class hep/dataforge/meta/descriptors/NodeDescriptor$Companion { +public final class space/kscience/dataforge/meta/descriptors/NodeDescriptor$Companion { } -public final class hep/dataforge/meta/descriptors/ValueDescriptor : hep/dataforge/meta/descriptors/ItemDescriptor { +public final class space/kscience/dataforge/meta/descriptors/ValueDescriptor : space/kscience/dataforge/meta/descriptors/ItemDescriptor { public fun ()V - public fun (Lhep/dataforge/meta/Config;)V - public synthetic fun (Lhep/dataforge/meta/Config;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lspace/kscience/dataforge/meta/Config;)V + public synthetic fun (Lspace/kscience/dataforge/meta/Config;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun allow ([Ljava/lang/Object;)V - public synthetic fun copy ()Lhep/dataforge/meta/descriptors/ItemDescriptor; - public fun copy ()Lhep/dataforge/meta/descriptors/ValueDescriptor; + public synthetic fun copy ()Lspace/kscience/dataforge/meta/descriptors/ItemDescriptor; + public fun copy ()Lspace/kscience/dataforge/meta/descriptors/ValueDescriptor; public final fun default (Ljava/lang/Object;)V public final fun getAllowedValues ()Ljava/util/List; - public final fun getDefault ()Lhep/dataforge/values/Value; + public final fun getDefault ()Lspace/kscience/dataforge/values/Value; public fun getRequired ()Z public final fun getType ()Ljava/util/List; - public final fun isAllowedValue (Lhep/dataforge/values/Value;)Z + public final fun isAllowedValue (Lspace/kscience/dataforge/values/Value;)Z public final fun setAllowedValues (Ljava/util/List;)V - public final fun setDefault (Lhep/dataforge/values/Value;)V + public final fun setDefault (Lspace/kscience/dataforge/values/Value;)V public fun setRequired (Z)V public final fun setType (Ljava/util/List;)V - public final fun type ([Lhep/dataforge/values/ValueType;)V + public final fun type ([Lspace/kscience/dataforge/values/ValueType;)V } -public final class hep/dataforge/meta/transformations/KeepTransformationRule : hep/dataforge/meta/transformations/TransformationRule { +public final class space/kscience/dataforge/meta/transformations/KeepTransformationRule : space/kscience/dataforge/meta/transformations/TransformationRule { public fun (Lkotlin/jvm/functions/Function1;)V public final fun component1 ()Lkotlin/jvm/functions/Function1; - public final fun copy (Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/transformations/KeepTransformationRule; - public static synthetic fun copy$default (Lhep/dataforge/meta/transformations/KeepTransformationRule;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/meta/transformations/KeepTransformationRule; + public final fun copy (Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/transformations/KeepTransformationRule; + public static synthetic fun copy$default (Lspace/kscience/dataforge/meta/transformations/KeepTransformationRule;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/transformations/KeepTransformationRule; public fun equals (Ljava/lang/Object;)Z public final fun getSelector ()Lkotlin/jvm/functions/Function1; public fun hashCode ()I - public fun matches (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)Z - public fun selectItems (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; + public fun matches (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z + public fun selectItems (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; public fun toString ()Ljava/lang/String; - public fun transformItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/MutableMeta;)V + public fun transformItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/MutableMeta;)V } -public abstract interface class hep/dataforge/meta/transformations/MetaConverter { - public static final field Companion Lhep/dataforge/meta/transformations/MetaConverter$Companion; - public abstract fun itemToObject (Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Object; - public abstract fun objectToMetaItem (Ljava/lang/Object;)Lhep/dataforge/meta/TypedMetaItem; +public abstract interface class space/kscience/dataforge/meta/transformations/MetaConverter { + public static final field Companion Lspace/kscience/dataforge/meta/transformations/MetaConverter$Companion; + public abstract fun itemToObject (Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Object; + public abstract fun objectToMetaItem (Ljava/lang/Object;)Lspace/kscience/dataforge/meta/TypedMetaItem; } -public final class hep/dataforge/meta/transformations/MetaConverter$Companion { - public final fun getBoolean ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getDouble ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getFloat ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getInt ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getItem ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getLong ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getMeta ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getNumber ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getString ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun getValue ()Lhep/dataforge/meta/transformations/MetaConverter; - public final fun valueList (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lhep/dataforge/meta/transformations/MetaConverter; - public static synthetic fun valueList$default (Lhep/dataforge/meta/transformations/MetaConverter$Companion;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lhep/dataforge/meta/transformations/MetaConverter; +public final class space/kscience/dataforge/meta/transformations/MetaConverter$Companion { + public final fun getBoolean ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getDouble ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getFloat ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getInt ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getItem ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getLong ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getMeta ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getNumber ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getString ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun getValue ()Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public final fun valueList (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lspace/kscience/dataforge/meta/transformations/MetaConverter; + public static synthetic fun valueList$default (Lspace/kscience/dataforge/meta/transformations/MetaConverter$Companion;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/transformations/MetaConverter; } -public final class hep/dataforge/meta/transformations/MetaConverterKt { - public static final fun metaToObject (Lhep/dataforge/meta/transformations/MetaConverter;Lhep/dataforge/meta/Meta;)Ljava/lang/Object; - public static final fun nullableItemToObject (Lhep/dataforge/meta/transformations/MetaConverter;Lhep/dataforge/meta/TypedMetaItem;)Ljava/lang/Object; - public static final fun nullableObjectToMetaItem (Lhep/dataforge/meta/transformations/MetaConverter;Ljava/lang/Object;)Lhep/dataforge/meta/TypedMetaItem; - public static final fun valueToObject (Lhep/dataforge/meta/transformations/MetaConverter;Lhep/dataforge/values/Value;)Ljava/lang/Object; +public final class space/kscience/dataforge/meta/transformations/MetaConverterKt { + public static final fun metaToObject (Lspace/kscience/dataforge/meta/transformations/MetaConverter;Lspace/kscience/dataforge/meta/Meta;)Ljava/lang/Object; + public static final fun nullableItemToObject (Lspace/kscience/dataforge/meta/transformations/MetaConverter;Lspace/kscience/dataforge/meta/TypedMetaItem;)Ljava/lang/Object; + public static final fun nullableObjectToMetaItem (Lspace/kscience/dataforge/meta/transformations/MetaConverter;Ljava/lang/Object;)Lspace/kscience/dataforge/meta/TypedMetaItem; + public static final fun valueToObject (Lspace/kscience/dataforge/meta/transformations/MetaConverter;Lspace/kscience/dataforge/values/Value;)Ljava/lang/Object; } -public final class hep/dataforge/meta/transformations/MetaTransformation { - public static final field Companion Lhep/dataforge/meta/transformations/MetaTransformation$Companion; - public static final fun apply-impl (Ljava/util/Collection;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Meta; - public static final fun bind-impl (Ljava/util/Collection;Lhep/dataforge/meta/Config;Lhep/dataforge/meta/MutableMeta;)V - public static final synthetic fun box-impl (Ljava/util/Collection;)Lhep/dataforge/meta/transformations/MetaTransformation; +public final class space/kscience/dataforge/meta/transformations/MetaTransformation { + public static final field Companion Lspace/kscience/dataforge/meta/transformations/MetaTransformation$Companion; + public static final fun apply-impl (Ljava/util/Collection;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Meta; + public static final fun bind-impl (Ljava/util/Collection;Lspace/kscience/dataforge/meta/Config;Lspace/kscience/dataforge/meta/MutableMeta;)V + public static final synthetic fun box-impl (Ljava/util/Collection;)Lspace/kscience/dataforge/meta/transformations/MetaTransformation; public static fun constructor-impl (Ljava/util/Collection;)Ljava/util/Collection; public fun equals (Ljava/lang/Object;)Z public static fun equals-impl (Ljava/util/Collection;Ljava/lang/Object;)Z public static final fun equals-impl0 (Ljava/util/Collection;Ljava/util/Collection;)Z - public static final fun generate-impl (Ljava/util/Collection;Lhep/dataforge/meta/Meta;)Lhep/dataforge/meta/Meta; + public static final fun generate-impl (Ljava/util/Collection;Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/Meta; public final fun getTransformations ()Ljava/util/Collection; public fun hashCode ()I public static fun hashCode-impl (Ljava/util/Collection;)I @@ -669,90 +669,90 @@ public final class hep/dataforge/meta/transformations/MetaTransformation { public final synthetic fun unbox-impl ()Ljava/util/Collection; } -public final class hep/dataforge/meta/transformations/MetaTransformation$Companion { - public final fun make-edBMxVg (Lkotlin/jvm/functions/Function1;)Ljava/util/Collection; +public final class space/kscience/dataforge/meta/transformations/MetaTransformation$Companion { + public final fun make-XNaMui4 (Lkotlin/jvm/functions/Function1;)Ljava/util/Collection; } -public final class hep/dataforge/meta/transformations/MetaTransformationBuilder { +public final class space/kscience/dataforge/meta/transformations/MetaTransformationBuilder { public fun ()V - public final fun build-S5KKvQA ()Ljava/util/Collection; - public final fun keep (Lhep/dataforge/names/Name;)V + public final fun build-050menU ()Ljava/util/Collection; public final fun keep (Ljava/lang/String;)V public final fun keep (Lkotlin/jvm/functions/Function1;)V - public final fun move (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V - public static synthetic fun move$default (Lhep/dataforge/meta/transformations/MetaTransformationBuilder;Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public final fun keep (Lspace/kscience/dataforge/names/Name;)V + public final fun move (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;)V + public static synthetic fun move$default (Lspace/kscience/dataforge/meta/transformations/MetaTransformationBuilder;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class hep/dataforge/meta/transformations/RegexItemTransformationRule : hep/dataforge/meta/transformations/TransformationRule { +public final class space/kscience/dataforge/meta/transformations/RegexItemTransformationRule : space/kscience/dataforge/meta/transformations/TransformationRule { public fun (Lkotlin/text/Regex;Lkotlin/jvm/functions/Function4;)V public final fun component1 ()Lkotlin/text/Regex; public final fun component2 ()Lkotlin/jvm/functions/Function4; - public final fun copy (Lkotlin/text/Regex;Lkotlin/jvm/functions/Function4;)Lhep/dataforge/meta/transformations/RegexItemTransformationRule; - public static synthetic fun copy$default (Lhep/dataforge/meta/transformations/RegexItemTransformationRule;Lkotlin/text/Regex;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)Lhep/dataforge/meta/transformations/RegexItemTransformationRule; + public final fun copy (Lkotlin/text/Regex;Lkotlin/jvm/functions/Function4;)Lspace/kscience/dataforge/meta/transformations/RegexItemTransformationRule; + public static synthetic fun copy$default (Lspace/kscience/dataforge/meta/transformations/RegexItemTransformationRule;Lkotlin/text/Regex;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/transformations/RegexItemTransformationRule; public fun equals (Ljava/lang/Object;)Z public final fun getFrom ()Lkotlin/text/Regex; public final fun getTransform ()Lkotlin/jvm/functions/Function4; public fun hashCode ()I - public fun matches (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)Z - public fun selectItems (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; + public fun matches (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z + public fun selectItems (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; public fun toString ()Ljava/lang/String; - public fun transformItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/MutableMeta;)V + public fun transformItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/MutableMeta;)V } -public final class hep/dataforge/meta/transformations/SingleItemTransformationRule : hep/dataforge/meta/transformations/TransformationRule { - public fun (Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function3;)V - public final fun component1 ()Lhep/dataforge/names/Name; +public final class space/kscience/dataforge/meta/transformations/SingleItemTransformationRule : space/kscience/dataforge/meta/transformations/TransformationRule { + public fun (Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function3;)V + public final fun component1 ()Lspace/kscience/dataforge/names/Name; public final fun component2 ()Lkotlin/jvm/functions/Function3; - public final fun copy (Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function3;)Lhep/dataforge/meta/transformations/SingleItemTransformationRule; - public static synthetic fun copy$default (Lhep/dataforge/meta/transformations/SingleItemTransformationRule;Lhep/dataforge/names/Name;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lhep/dataforge/meta/transformations/SingleItemTransformationRule; + public final fun copy (Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function3;)Lspace/kscience/dataforge/meta/transformations/SingleItemTransformationRule; + public static synthetic fun copy$default (Lspace/kscience/dataforge/meta/transformations/SingleItemTransformationRule;Lspace/kscience/dataforge/names/Name;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/transformations/SingleItemTransformationRule; public fun equals (Ljava/lang/Object;)Z - public final fun getFrom ()Lhep/dataforge/names/Name; + public final fun getFrom ()Lspace/kscience/dataforge/names/Name; public final fun getTransform ()Lkotlin/jvm/functions/Function3; public fun hashCode ()I - public fun matches (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)Z - public fun selectItems (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; + public fun matches (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z + public fun selectItems (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; public fun toString ()Ljava/lang/String; - public fun transformItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/MutableMeta;)V + public fun transformItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/MutableMeta;)V } -public abstract interface class hep/dataforge/meta/transformations/TransformationRule { - public abstract fun matches (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;)Z - public abstract fun selectItems (Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; - public abstract fun transformItem (Lhep/dataforge/names/Name;Lhep/dataforge/meta/TypedMetaItem;Lhep/dataforge/meta/MutableMeta;)V +public abstract interface class space/kscience/dataforge/meta/transformations/TransformationRule { + public abstract fun matches (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;)Z + public abstract fun selectItems (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; + public abstract fun transformItem (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/TypedMetaItem;Lspace/kscience/dataforge/meta/MutableMeta;)V } -public final class hep/dataforge/meta/transformations/TransformationRule$DefaultImpls { - public static fun selectItems (Lhep/dataforge/meta/transformations/TransformationRule;Lhep/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; +public final class space/kscience/dataforge/meta/transformations/TransformationRule$DefaultImpls { + public static fun selectItems (Lspace/kscience/dataforge/meta/transformations/TransformationRule;Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; } -public abstract interface annotation class hep/dataforge/misc/DFBuilder : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/misc/DFBuilder : java/lang/annotation/Annotation { } -public abstract interface annotation class hep/dataforge/misc/DFExperimental : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/misc/DFExperimental : java/lang/annotation/Annotation { } -public abstract interface annotation class hep/dataforge/misc/DFInternal : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/misc/DFInternal : java/lang/annotation/Annotation { } -public abstract interface class hep/dataforge/misc/Named { - public static final field Companion Lhep/dataforge/misc/Named$Companion; - public abstract fun getName ()Lhep/dataforge/names/Name; +public abstract interface class space/kscience/dataforge/misc/Named { + public static final field Companion Lspace/kscience/dataforge/misc/Named$Companion; + public abstract fun getName ()Lspace/kscience/dataforge/names/Name; } -public final class hep/dataforge/misc/Named$Companion { - public final fun nameOf (Ljava/lang/Object;)Lhep/dataforge/names/Name; +public final class space/kscience/dataforge/misc/Named$Companion { + public final fun nameOf (Ljava/lang/Object;)Lspace/kscience/dataforge/names/Name; } -public final class hep/dataforge/misc/NamedKt { - public static final fun isAnonymous (Lhep/dataforge/misc/Named;)Z +public final class space/kscience/dataforge/misc/NamedKt { + public static final fun isAnonymous (Lspace/kscience/dataforge/misc/Named;)Z } -public abstract interface annotation class hep/dataforge/misc/Type : java/lang/annotation/Annotation { +public abstract interface annotation class space/kscience/dataforge/misc/Type : java/lang/annotation/Annotation { public abstract fun id ()Ljava/lang/String; } -public final class hep/dataforge/names/Name { - public static final field Companion Lhep/dataforge/names/Name$Companion; +public final class space/kscience/dataforge/names/Name { + public static final field Companion Lspace/kscience/dataforge/names/Name$Companion; public static final field NAME_SEPARATOR Ljava/lang/String; public fun (Ljava/util/List;)V public fun equals (Ljava/lang/Object;)Z @@ -761,58 +761,62 @@ public final class hep/dataforge/names/Name { public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/names/Name$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/names/Name; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public final fun getEMPTY ()Lhep/dataforge/names/Name; - public final fun getMATCH_ALL_TOKEN ()Lhep/dataforge/names/NameToken; - public final fun getMATCH_ANY_TOKEN ()Lhep/dataforge/names/NameToken; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/names/Name;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class space/kscience/dataforge/names/Name$Companion { + public final fun getEMPTY ()Lspace/kscience/dataforge/names/Name; + public final fun getMATCH_ALL_TOKEN ()Lspace/kscience/dataforge/names/NameToken; + public final fun getMATCH_ANY_TOKEN ()Lspace/kscience/dataforge/names/NameToken; public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/names/NameKt { - public static final fun appendLeft (Lhep/dataforge/names/Name;Ljava/lang/String;)Lhep/dataforge/names/Name; - public static final fun asName (Lhep/dataforge/names/NameToken;)Lhep/dataforge/names/Name; - public static final fun asName (Ljava/lang/String;)Lhep/dataforge/names/Name; - public static final fun cutFirst (Lhep/dataforge/names/Name;)Lhep/dataforge/names/Name; - public static final fun cutLast (Lhep/dataforge/names/Name;)Lhep/dataforge/names/Name; - public static final fun endsWith (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;)Z - public static final fun endsWith (Lhep/dataforge/names/Name;Lhep/dataforge/names/NameToken;)Z - public static final fun firstOrNull (Lhep/dataforge/names/Name;)Lhep/dataforge/names/NameToken; - public static final fun get (Lhep/dataforge/names/Name;I)Lhep/dataforge/names/NameToken; +public final class space/kscience/dataforge/names/NameKt { + public static final fun appendLeft (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/dataforge/names/Name; + public static final fun asName (Ljava/lang/String;)Lspace/kscience/dataforge/names/Name; + public static final fun asName (Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/dataforge/names/Name; + public static final fun cutFirst (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/Name; + public static final fun cutLast (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/Name; + public static final fun endsWith (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;)Z + public static final fun endsWith (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/NameToken;)Z + public static final fun firstOrNull (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/NameToken; public static final fun get (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object; public static final fun get (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object; + public static final fun get (Lspace/kscience/dataforge/names/Name;I)Lspace/kscience/dataforge/names/NameToken; public static synthetic fun get$default (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object; - public static final fun getLength (Lhep/dataforge/names/Name;)I - public static final fun isEmpty (Lhep/dataforge/names/Name;)Z - public static final fun lastOrNull (Lhep/dataforge/names/Name;)Lhep/dataforge/names/NameToken; - public static final fun plus (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;)Lhep/dataforge/names/Name; - public static final fun plus (Lhep/dataforge/names/Name;Lhep/dataforge/names/NameToken;)Lhep/dataforge/names/Name; - public static final fun plus (Lhep/dataforge/names/Name;Ljava/lang/String;)Lhep/dataforge/names/Name; - public static final fun plus (Lhep/dataforge/names/NameToken;Lhep/dataforge/names/Name;)Lhep/dataforge/names/Name; - public static final fun removeHeadOrNull (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;)Lhep/dataforge/names/Name; + public static final fun getLength (Lspace/kscience/dataforge/names/Name;)I + public static final fun isEmpty (Lspace/kscience/dataforge/names/Name;)Z + public static final fun lastOrNull (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/NameToken; + public static final fun plus (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/dataforge/names/Name; + public static final fun plus (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/Name; + public static final fun plus (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/dataforge/names/Name; + public static final fun plus (Lspace/kscience/dataforge/names/NameToken;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/Name; + public static final fun removeHeadOrNull (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/names/Name; public static final fun set (Ljava/util/Map;Ljava/lang/String;Ljava/lang/Object;)V - public static final fun startsWith (Lhep/dataforge/names/Name;Lhep/dataforge/names/Name;)Z - public static final fun startsWith (Lhep/dataforge/names/Name;Lhep/dataforge/names/NameToken;)Z - public static final fun toName (Ljava/lang/String;)Lhep/dataforge/names/Name; - public static final fun withIndex (Lhep/dataforge/names/Name;Ljava/lang/String;)Lhep/dataforge/names/Name; + public static final fun startsWith (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;)Z + public static final fun startsWith (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/NameToken;)Z + public static final fun toName (Ljava/lang/String;)Lspace/kscience/dataforge/names/Name; + public static final fun withIndex (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Lspace/kscience/dataforge/names/Name; } -public final class hep/dataforge/names/NameMatcherKt { - public static final fun matches (Lhep/dataforge/names/Name;Ljava/lang/String;)Z +public final class space/kscience/dataforge/names/NameMatcherKt { + public static final fun matches (Lspace/kscience/dataforge/names/Name;Ljava/lang/String;)Z } -public final class hep/dataforge/names/NameToken { - public static final field Companion Lhep/dataforge/names/NameToken$Companion; +public final class space/kscience/dataforge/names/NameSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/names/NameSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/names/Name; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/names/Name;)V +} + +public final class space/kscience/dataforge/names/NameToken { + public static final field Companion Lspace/kscience/dataforge/names/NameToken$Companion; public fun (Ljava/lang/String;Ljava/lang/String;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String; - public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lhep/dataforge/names/NameToken; - public static synthetic fun copy$default (Lhep/dataforge/names/NameToken;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lhep/dataforge/names/NameToken; + public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lspace/kscience/dataforge/names/NameToken; + public static synthetic fun copy$default (Lspace/kscience/dataforge/names/NameToken;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lspace/kscience/dataforge/names/NameToken; public fun equals (Ljava/lang/Object;)Z public final fun getBody ()Ljava/lang/String; public final fun getIndex ()Ljava/lang/String; @@ -820,25 +824,29 @@ public final class hep/dataforge/names/NameToken { public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/names/NameToken$Companion : kotlinx/serialization/KSerializer { - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/names/NameToken; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/names/NameToken;)V - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V +public final class space/kscience/dataforge/names/NameToken$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/names/NameTokenKt { - public static final fun hasIndex (Lhep/dataforge/names/NameToken;)Z - public static final fun withIndex (Lhep/dataforge/names/NameToken;Ljava/lang/String;)Lhep/dataforge/names/NameToken; +public final class space/kscience/dataforge/names/NameTokenKt { + public static final fun hasIndex (Lspace/kscience/dataforge/names/NameToken;)Z + public static final fun withIndex (Lspace/kscience/dataforge/names/NameToken;Ljava/lang/String;)Lspace/kscience/dataforge/names/NameToken; } -public final class hep/dataforge/values/DoubleArrayValue : hep/dataforge/values/Value, java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker { +public final class space/kscience/dataforge/names/NameTokenSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/names/NameTokenSerializer; + public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/names/NameToken; + public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/names/NameToken;)V +} + +public final class space/kscience/dataforge/values/DoubleArrayValue : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker, space/kscience/dataforge/values/Value { public fun ([D)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public synthetic fun getValue ()Ljava/lang/Object; public fun getValue ()[D public fun hashCode ()I @@ -846,49 +854,49 @@ public final class hep/dataforge/values/DoubleArrayValue : hep/dataforge/values/ public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/EnumValue : hep/dataforge/values/Value { +public final class space/kscience/dataforge/values/EnumValue : space/kscience/dataforge/values/Value { public fun (Ljava/lang/Enum;)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Enum; public synthetic fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/ExoticValuesKt { - public static final fun asValue ([D)Lhep/dataforge/values/Value; - public static final fun lazyParseValue (Ljava/lang/String;)Lhep/dataforge/values/LazyParsedValue; +public final class space/kscience/dataforge/values/ExoticValuesKt { + public static final fun asValue ([D)Lspace/kscience/dataforge/values/Value; + public static final fun lazyParseValue (Ljava/lang/String;)Lspace/kscience/dataforge/values/LazyParsedValue; } -public final class hep/dataforge/values/False : hep/dataforge/values/Value { - public static final field INSTANCE Lhep/dataforge/values/False; +public final class space/kscience/dataforge/values/False : space/kscience/dataforge/values/Value { + public static final field INSTANCE Lspace/kscience/dataforge/values/False; public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/LazyParsedValue : hep/dataforge/values/Value { +public final class space/kscience/dataforge/values/LazyParsedValue : space/kscience/dataforge/values/Value { public fun (Ljava/lang/String;)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; public final fun getString ()Ljava/lang/String; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/ListValue : hep/dataforge/values/Value, java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker { - public static final field Companion Lhep/dataforge/values/ListValue$Companion; +public final class space/kscience/dataforge/values/ListValue : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker, space/kscience/dataforge/values/Value { + public static final field Companion Lspace/kscience/dataforge/values/ListValue$Companion; public fun (Ljava/util/List;)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public synthetic fun getValue ()Ljava/lang/Object; public fun getValue ()Ljava/util/List; public fun hashCode ()I @@ -896,136 +904,136 @@ public final class hep/dataforge/values/ListValue : hep/dataforge/values/Value, public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/ListValue$Companion { - public final fun getEMPTY ()Lhep/dataforge/values/ListValue; +public final class space/kscience/dataforge/values/ListValue$Companion { + public final fun getEMPTY ()Lspace/kscience/dataforge/values/ListValue; } -public final class hep/dataforge/values/Null : hep/dataforge/values/Value { - public static final field INSTANCE Lhep/dataforge/values/Null; +public final class space/kscience/dataforge/values/Null : space/kscience/dataforge/values/Value { + public static final field INSTANCE Lspace/kscience/dataforge/values/Null; public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/NumberValue : hep/dataforge/values/Value { +public final class space/kscience/dataforge/values/NumberValue : space/kscience/dataforge/values/Value { public fun (Ljava/lang/Number;)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; public final fun getNumber ()Ljava/lang/Number; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/StringValue : hep/dataforge/values/Value { +public final class space/kscience/dataforge/values/StringValue : space/kscience/dataforge/values/Value { public fun (Ljava/lang/String;)V public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; public final fun getString ()Ljava/lang/String; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/True : hep/dataforge/values/Value { - public static final field INSTANCE Lhep/dataforge/values/True; +public final class space/kscience/dataforge/values/True : space/kscience/dataforge/values/Value { + public static final field INSTANCE Lspace/kscience/dataforge/values/True; public fun equals (Ljava/lang/Object;)Z public fun getList ()Ljava/util/List; - public fun getType ()Lhep/dataforge/values/ValueType; + public fun getType ()Lspace/kscience/dataforge/values/ValueType; public fun getValue ()Ljava/lang/Object; public fun hashCode ()I public fun toString ()Ljava/lang/String; } -public abstract interface class hep/dataforge/values/Value { - public static final field Companion Lhep/dataforge/values/Value$Companion; +public abstract interface class space/kscience/dataforge/values/Value { + public static final field Companion Lspace/kscience/dataforge/values/Value$Companion; public static final field TYPE Ljava/lang/String; public abstract fun equals (Ljava/lang/Object;)Z public abstract fun getList ()Ljava/util/List; - public abstract fun getType ()Lhep/dataforge/values/ValueType; + public abstract fun getType ()Lspace/kscience/dataforge/values/ValueType; public abstract fun getValue ()Ljava/lang/Object; public abstract fun hashCode ()I public abstract fun toString ()Ljava/lang/String; } -public final class hep/dataforge/values/Value$Companion { +public final class space/kscience/dataforge/values/Value$Companion { public static final field TYPE Ljava/lang/String; - public final fun of (Ljava/lang/Object;)Lhep/dataforge/values/Value; + public final fun of (Ljava/lang/Object;)Lspace/kscience/dataforge/values/Value; } -public final class hep/dataforge/values/Value$DefaultImpls { - public static fun getList (Lhep/dataforge/values/Value;)Ljava/util/List; +public final class space/kscience/dataforge/values/Value$DefaultImpls { + public static fun getList (Lspace/kscience/dataforge/values/Value;)Ljava/util/List; } -public final class hep/dataforge/values/ValueExtensionsKt { - public static final fun getBoolean (Lhep/dataforge/values/Value;)Z - public static final fun getDouble (Lhep/dataforge/values/Value;)D - public static final fun getDoubleArray (Lhep/dataforge/values/Value;)[D - public static final fun getFloat (Lhep/dataforge/values/Value;)F - public static final fun getInt (Lhep/dataforge/values/Value;)I - public static final fun getLong (Lhep/dataforge/values/Value;)J - public static final fun getShort (Lhep/dataforge/values/Value;)S - public static final fun getStringList (Lhep/dataforge/values/Value;)Ljava/util/List; - public static final fun isList (Lhep/dataforge/values/Value;)Z - public static final fun isNull (Lhep/dataforge/values/Value;)Z - public static final fun toMeta (Lhep/dataforge/values/Value;)Lhep/dataforge/meta/MetaBuilder; +public final class space/kscience/dataforge/values/ValueExtensionsKt { + public static final fun getBoolean (Lspace/kscience/dataforge/values/Value;)Z + public static final fun getDouble (Lspace/kscience/dataforge/values/Value;)D + public static final fun getDoubleArray (Lspace/kscience/dataforge/values/Value;)[D + public static final fun getFloat (Lspace/kscience/dataforge/values/Value;)F + public static final fun getInt (Lspace/kscience/dataforge/values/Value;)I + public static final fun getLong (Lspace/kscience/dataforge/values/Value;)J + public static final fun getShort (Lspace/kscience/dataforge/values/Value;)S + public static final fun getStringList (Lspace/kscience/dataforge/values/Value;)Ljava/util/List; + public static final fun isList (Lspace/kscience/dataforge/values/Value;)Z + public static final fun isNull (Lspace/kscience/dataforge/values/Value;)Z + public static final fun toMeta (Lspace/kscience/dataforge/values/Value;)Lspace/kscience/dataforge/meta/MetaBuilder; } -public final class hep/dataforge/values/ValueKt { - public static final fun asValue (Ljava/lang/Enum;)Lhep/dataforge/values/Value; - public static final fun asValue (Ljava/lang/Iterable;)Lhep/dataforge/values/Value; - public static final fun asValue (Ljava/lang/Number;)Lhep/dataforge/values/Value; - public static final fun asValue (Ljava/lang/String;)Lhep/dataforge/values/Value; - public static final fun asValue (Z)Lhep/dataforge/values/Value; - public static final fun asValue ([B)Lhep/dataforge/values/Value; - public static final fun asValue ([F)Lhep/dataforge/values/Value; - public static final fun asValue ([I)Lhep/dataforge/values/Value; - public static final fun asValue ([J)Lhep/dataforge/values/Value; - public static final fun asValue ([S)Lhep/dataforge/values/Value; - public static final fun getNumber (Lhep/dataforge/values/Value;)Ljava/lang/Number; - public static final fun getNumberOrNull (Lhep/dataforge/values/Value;)Ljava/lang/Number; - public static final fun getString (Lhep/dataforge/values/Value;)Ljava/lang/String; - public static final fun parseValue (Ljava/lang/String;)Lhep/dataforge/values/Value; +public final class space/kscience/dataforge/values/ValueKt { + public static final fun asValue (Ljava/lang/Enum;)Lspace/kscience/dataforge/values/Value; + public static final fun asValue (Ljava/lang/Iterable;)Lspace/kscience/dataforge/values/Value; + public static final fun asValue (Ljava/lang/Number;)Lspace/kscience/dataforge/values/Value; + public static final fun asValue (Ljava/lang/String;)Lspace/kscience/dataforge/values/Value; + public static final fun asValue (Z)Lspace/kscience/dataforge/values/Value; + public static final fun asValue ([B)Lspace/kscience/dataforge/values/Value; + public static final fun asValue ([F)Lspace/kscience/dataforge/values/Value; + public static final fun asValue ([I)Lspace/kscience/dataforge/values/Value; + public static final fun asValue ([J)Lspace/kscience/dataforge/values/Value; + public static final fun asValue ([S)Lspace/kscience/dataforge/values/Value; + public static final fun getNumber (Lspace/kscience/dataforge/values/Value;)Ljava/lang/Number; + public static final fun getNumberOrNull (Lspace/kscience/dataforge/values/Value;)Ljava/lang/Number; + public static final fun getString (Lspace/kscience/dataforge/values/Value;)Ljava/lang/String; + public static final fun parseValue (Ljava/lang/String;)Lspace/kscience/dataforge/values/Value; } -public final class hep/dataforge/values/ValueSerializer : kotlinx/serialization/KSerializer { - public static final field INSTANCE Lhep/dataforge/values/ValueSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/values/Value; +public final class space/kscience/dataforge/values/ValueSerializer : kotlinx/serialization/KSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/values/ValueSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/values/Value; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/values/Value;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/values/Value;)V } -public final class hep/dataforge/values/ValueType : java/lang/Enum { - public static final field BOOLEAN Lhep/dataforge/values/ValueType; - public static final field Companion Lhep/dataforge/values/ValueType$Companion; - public static final field LIST Lhep/dataforge/values/ValueType; - public static final field NULL Lhep/dataforge/values/ValueType; - public static final field NUMBER Lhep/dataforge/values/ValueType; - public static final field STRING Lhep/dataforge/values/ValueType; - public static fun valueOf (Ljava/lang/String;)Lhep/dataforge/values/ValueType; - public static fun values ()[Lhep/dataforge/values/ValueType; +public final class space/kscience/dataforge/values/ValueType : java/lang/Enum { + public static final field BOOLEAN Lspace/kscience/dataforge/values/ValueType; + public static final field Companion Lspace/kscience/dataforge/values/ValueType$Companion; + public static final field LIST Lspace/kscience/dataforge/values/ValueType; + public static final field NULL Lspace/kscience/dataforge/values/ValueType; + public static final field NUMBER Lspace/kscience/dataforge/values/ValueType; + public static final field STRING Lspace/kscience/dataforge/values/ValueType; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/dataforge/values/ValueType; + public static fun values ()[Lspace/kscience/dataforge/values/ValueType; } -public final class hep/dataforge/values/ValueType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lhep/dataforge/values/ValueType$$serializer; +public final class space/kscience/dataforge/values/ValueType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { + public static final field INSTANCE Lspace/kscience/dataforge/values/ValueType$$serializer; public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lhep/dataforge/values/ValueType; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; + public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/values/ValueType; public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lhep/dataforge/values/ValueType;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V + public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/values/ValueType;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } -public final class hep/dataforge/values/ValueType$Companion { +public final class space/kscience/dataforge/values/ValueType$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Config.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Config.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Config.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Config.kt index 530fe9aa..a69b9a22 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Config.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Config.kt @@ -1,14 +1,14 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.asName -import hep.dataforge.names.plus import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder +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 kotlin.collections.set import kotlin.jvm.Synchronized diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Configurable.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Configurable.kt similarity index 80% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Configurable.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Configurable.kt index 429ac360..3f4b154e 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Configurable.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Configurable.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.misc.DFBuilder -import hep.dataforge.names.Name +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.names.Name import kotlin.properties.ReadWriteProperty /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemDelegate.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemDelegate.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemDelegate.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemDelegate.kt index 775bb243..81340807 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemDelegate.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemDelegate.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.transformations.MetaConverter -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.Value +import space.kscience.dataforge.meta.transformations.MetaConverter +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.Value import kotlin.properties.ReadOnlyProperty /* Meta delegates */ diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemProvider.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemProvider.kt similarity index 97% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemProvider.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemProvider.kt index a0f8a538..1201e9da 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/ItemProvider.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/ItemProvider.kt @@ -1,6 +1,6 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.* +import space.kscience.dataforge.names.* public fun interface ItemProvider { //getItem used instead of get in order to provide extension freedom diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/JsonMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/JsonMeta.kt similarity index 92% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/JsonMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/JsonMeta.kt index c0628520..3e708314 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/JsonMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/JsonMeta.kt @@ -1,16 +1,16 @@ @file:Suppress("UNUSED_PARAMETER") -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.JsonMeta.Companion.JSON_ARRAY_KEY -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.meta.descriptors.ItemDescriptor.Companion.DEFAULT_INDEX_KEY -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.meta.descriptors.ValueDescriptor -import hep.dataforge.names.NameToken -import hep.dataforge.names.withIndex -import hep.dataforge.values.* import kotlinx.serialization.json.* +import space.kscience.dataforge.meta.JsonMeta.Companion.JSON_ARRAY_KEY +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.meta.descriptors.ItemDescriptor.Companion.DEFAULT_INDEX_KEY +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.meta.descriptors.ValueDescriptor +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.withIndex +import space.kscience.dataforge.values.* /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Laminate.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Laminate.kt similarity index 96% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Laminate.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Laminate.kt index a51e9cf5..044c5699 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Laminate.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Laminate.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken /** * A meta laminate consisting of multiple immutable meta layers. For mutable front layer, use [Scheme]. diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Meta.kt similarity index 95% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Meta.kt index 4d5225d2..46ff1d9b 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Meta.kt @@ -1,8 +1,8 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.* -import hep.dataforge.values.Value import kotlinx.serialization.Serializable +import space.kscience.dataforge.names.* +import space.kscience.dataforge.values.Value /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaBuilder.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaBuilder.kt similarity index 90% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaBuilder.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaBuilder.kt index 4fe5de9b..2f32e187 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaBuilder.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaBuilder.kt @@ -1,11 +1,11 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.misc.DFBuilder -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.EnumValue -import hep.dataforge.values.Value -import hep.dataforge.values.asValue +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.values.EnumValue +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.asValue import kotlin.jvm.JvmName /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaItem.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaItem.kt similarity index 97% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaItem.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaItem.kt index d63238f9..bf43119c 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaItem.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaItem.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.values.* import kotlinx.serialization.Serializable +import space.kscience.dataforge.values.* /** * A member of the meta tree. Could be represented as one of following: diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaSerializer.kt similarity index 90% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaSerializer.kt index ed24b234..3285dc65 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MetaSerializer.kt @@ -1,7 +1,5 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.NameToken -import hep.dataforge.values.ValueSerializer import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.KSerializer @@ -11,6 +9,9 @@ import kotlinx.serialization.encoding.* import kotlinx.serialization.json.JsonDecoder import kotlinx.serialization.json.JsonEncoder import kotlinx.serialization.json.JsonObject +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.NameTokenSerializer +import space.kscience.dataforge.values.ValueSerializer public object MetaItemSerializer : KSerializer { @@ -29,7 +30,7 @@ public object MetaItemSerializer : KSerializer { val item = if (isNode) { decodeSerializableElement(descriptor,1, MetaSerializer).asMetaItem() } else { - decodeSerializableElement(descriptor,1,ValueSerializer).asMetaItem() + decodeSerializableElement(descriptor,1, ValueSerializer).asMetaItem() } require(decodeElementIndex(descriptor) == CompositeDecoder.DECODE_DONE){"Serialized MetaItem contains additional fields"} return item @@ -53,7 +54,7 @@ public object MetaItemSerializer : KSerializer { public object MetaSerializer : KSerializer { private val mapSerializer: KSerializer>> = MapSerializer( - NameToken, + NameTokenSerializer, MetaItemSerializer//MetaItem.serializer(MetaSerializer) ) diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemDelegate.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemDelegate.kt similarity index 96% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemDelegate.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemDelegate.kt index e9190b20..075e9a04 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemDelegate.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemDelegate.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.transformations.MetaConverter -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.values.* +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 diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemProvider.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemProvider.kt similarity index 97% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemProvider.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemProvider.kt index c06c57d8..46a47ad5 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableItemProvider.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableItemProvider.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.* -import hep.dataforge.values.Value +import space.kscience.dataforge.names.* +import space.kscience.dataforge.values.Value public interface MutableItemProvider : ItemProvider { public fun setItem(name: Name, item: MetaItem?) diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableMeta.kt similarity index 95% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableMeta.kt index 4524f11e..b54c6534 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MutableMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/MutableMeta.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.* public interface MutableMeta> : TypedMeta, MutableItemProvider { override val items: Map> diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Scheme.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Scheme.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Scheme.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Scheme.kt index 1f1b3b4d..319401ac 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Scheme.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Scheme.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.descriptors.* -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.asName +import space.kscience.dataforge.meta.descriptors.* +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.asName /** * A base for delegate-based or descriptor-based scheme. [Scheme] has an empty constructor to simplify usage from [Specification]. diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/SealedMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/SealedMeta.kt similarity index 88% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/SealedMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/SealedMeta.kt index 2e559796..4d258e72 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/SealedMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/SealedMeta.kt @@ -1,6 +1,6 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.NameToken +import space.kscience.dataforge.names.NameToken /** * The meta implementation which is guaranteed to be immutable. diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Specification.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Specification.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Specification.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Specification.kt index e6edd22e..865b2f31 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Specification.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/Specification.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.Name -import hep.dataforge.names.asName +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/TypedMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/TypedMeta.kt similarity index 88% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/TypedMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/TypedMeta.kt index 786054c1..9d064e11 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/TypedMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/TypedMeta.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.Name -import hep.dataforge.names.NameToken -import hep.dataforge.names.toName import kotlinx.serialization.json.Json +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.names.toName /** * A meta node that ensures that all of its descendants has at least the same type diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/Described.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/Described.kt similarity index 91% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/Described.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/Described.kt index 4af17dfb..73c4ad7c 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/Described.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/Described.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta.descriptors +package space.kscience.dataforge.meta.descriptors /** * An object which provides its descriptor diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/DescriptorMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorMeta.kt similarity index 89% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/DescriptorMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorMeta.kt index 6181bfbb..6d44012b 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/DescriptorMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorMeta.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta.descriptors +package space.kscience.dataforge.meta.descriptors -import hep.dataforge.meta.* -import hep.dataforge.names.NameToken +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.names.NameToken /** * A [Meta] that is constructed from [NodeDescriptor] diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/ItemDescriptor.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/ItemDescriptor.kt similarity index 97% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/ItemDescriptor.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/ItemDescriptor.kt index 33343fe1..d2decefe 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/ItemDescriptor.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/ItemDescriptor.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta.descriptors +package space.kscience.dataforge.meta.descriptors -import hep.dataforge.meta.* -import hep.dataforge.misc.DFBuilder -import hep.dataforge.names.* -import hep.dataforge.values.* +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.names.* +import space.kscience.dataforge.values.* /** * A common parent for [ValueDescriptor] and [NodeDescriptor]. Describes a single [TypedMetaItem] or a group of same-name-siblings. diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/descriptorExtensions.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/descriptorExtensions.kt similarity index 63% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/descriptorExtensions.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/descriptorExtensions.kt index f05af69e..24a09df9 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/descriptors/descriptorExtensions.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/descriptors/descriptorExtensions.kt @@ -1,8 +1,8 @@ -package hep.dataforge.meta.descriptors +package space.kscience.dataforge.meta.descriptors -import hep.dataforge.names.Name -import hep.dataforge.values.ValueType -import hep.dataforge.values.asValue +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.values.ValueType +import space.kscience.dataforge.values.asValue public inline fun > NodeDescriptor.enum( key: Name, diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/mapMeta.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/mapMeta.kt similarity index 81% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/mapMeta.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/mapMeta.kt index 371a67a0..c6cd2a4e 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/mapMeta.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/mapMeta.kt @@ -1,10 +1,10 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.toName -import hep.dataforge.values.ListValue -import hep.dataforge.values.Value +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.values.ListValue +import space.kscience.dataforge.values.Value /** * Convert meta to map of maps diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaConverter.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaConverter.kt similarity index 95% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaConverter.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaConverter.kt index 9d1c08d8..be7f054c 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaConverter.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaConverter.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta.transformations +package space.kscience.dataforge.meta.transformations -import hep.dataforge.meta.* -import hep.dataforge.values.* +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.values.* /** * A converter of generic object to and from [TypedMetaItem] @@ -105,7 +105,7 @@ public interface MetaConverter { override fun objectToMetaItem(obj: E): MetaItem = MetaItemValue(obj.asValue()) } - public fun valueList(writer: (T) -> Value = {Value.of(it)}, reader: (Value) -> T): MetaConverter> = + public fun valueList(writer: (T) -> Value = { Value.of(it)}, reader: (Value) -> T): MetaConverter> = object : MetaConverter> { override fun itemToObject(item: MetaItem): List = item.value?.list?.map(reader) ?: error("The item is not a value list") diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaTransformation.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaTransformation.kt similarity index 96% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaTransformation.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaTransformation.kt index 0e41b016..908ca6b7 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/transformations/MetaTransformation.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/meta/transformations/MetaTransformation.kt @@ -1,8 +1,8 @@ -package hep.dataforge.meta.transformations +package space.kscience.dataforge.meta.transformations -import hep.dataforge.meta.* -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name /** * A transformation for meta item or a group of items diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Named.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Named.kt similarity index 88% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Named.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Named.kt index 466f5ee0..7b00c2fa 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Named.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Named.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hep.dataforge.misc +package space.kscience.dataforge.misc -import hep.dataforge.names.Name -import hep.dataforge.names.asName -import hep.dataforge.names.isEmpty +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.asName +import space.kscience.dataforge.names.isEmpty /** * Any object that have name diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Type.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Type.kt similarity index 88% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Type.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Type.kt index 6f6410b5..3deaa63e 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/Type.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/Type.kt @@ -1,4 +1,4 @@ -package hep.dataforge.misc +package space.kscience.dataforge.misc /** * A text label for internal DataForge type classification. Alternative for mime container type. diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/annotations.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/annotations.kt similarity index 87% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/annotations.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/annotations.kt index 7b271a4b..3c9d6ac3 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/misc/annotations.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/misc/annotations.kt @@ -1,4 +1,4 @@ -package hep.dataforge.misc +package space.kscience.dataforge.misc /** * General marker for dataforge builders diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/Name.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/Name.kt similarity index 88% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/Name.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/Name.kt index 3bb24ab1..7d7a214d 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/Name.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/Name.kt @@ -1,13 +1,7 @@ -package hep.dataforge.names +package space.kscience.dataforge.names -import hep.dataforge.misc.DFExperimental -import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable -import kotlinx.serialization.descriptors.PrimitiveKind -import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor -import kotlinx.serialization.descriptors.SerialDescriptor -import kotlinx.serialization.encoding.Decoder -import kotlinx.serialization.encoding.Encoder +import space.kscience.dataforge.misc.DFExperimental /** @@ -15,7 +9,7 @@ import kotlinx.serialization.encoding.Encoder * The name is a dot separated list of strings like `token1.token2.token3`. * Each token could contain additional index in square brackets. */ -@Serializable(Name.Companion::class) +@Serializable(NameSerializer::class) public class Name(public val tokens: List) { //TODO to be transformed into inline class after they are supported with serialization @@ -37,7 +31,7 @@ public class Name(public val tokens: List) { } } - public companion object : KSerializer { + public companion object { public const val NAME_SEPARATOR: String = "." /** @@ -53,17 +47,6 @@ public class Name(public val tokens: List) { public val MATCH_ALL_TOKEN: NameToken = NameToken("**") public val EMPTY: Name = Name(emptyList()) - - override val descriptor: SerialDescriptor = - PrimitiveSerialDescriptor("hep.dataforge.names.Name", PrimitiveKind.STRING) - - override fun deserialize(decoder: Decoder): Name { - return decoder.decodeString().toName() - } - - override fun serialize(encoder: Encoder, value: Name) { - encoder.encodeString(value.toString()) - } } } diff --git a/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameSerializer.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameSerializer.kt new file mode 100644 index 00000000..9d6b9988 --- /dev/null +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameSerializer.kt @@ -0,0 +1,37 @@ +package space.kscience.dataforge.names + +import kotlinx.serialization.KSerializer +import kotlinx.serialization.descriptors.PrimitiveKind +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder + +public object NameSerializer : KSerializer { + override val descriptor: SerialDescriptor = + PrimitiveSerialDescriptor("space.kscience.dataforge.names.Name", PrimitiveKind.STRING) + + override fun deserialize(decoder: Decoder): Name { + return decoder.decodeString().toName() + } + + override fun serialize(encoder: Encoder, value: Name) { + encoder.encodeString(value.toString()) + } +} + +public object NameTokenSerializer: KSerializer { + override val descriptor: SerialDescriptor = + PrimitiveSerialDescriptor("space.kscience.dataforge.names.NameToken", PrimitiveKind.STRING) + + override fun deserialize(decoder: Decoder): NameToken { + return decoder.decodeString().toName().firstOrNull()!! + } + + override fun serialize( + encoder: Encoder, + value: NameToken, + ) { + encoder.encodeString(value.toString()) + } +} \ No newline at end of file diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/NameToken.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameToken.kt similarity index 51% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/NameToken.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameToken.kt index d010ac5a..25d8c28b 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/NameToken.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/NameToken.kt @@ -1,19 +1,13 @@ -package hep.dataforge.names +package space.kscience.dataforge.names -import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable -import kotlinx.serialization.descriptors.PrimitiveKind -import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor -import kotlinx.serialization.descriptors.SerialDescriptor -import kotlinx.serialization.encoding.Decoder -import kotlinx.serialization.encoding.Encoder /** * A single name token. Body is not allowed to be empty. * Following symbols are prohibited in name tokens: `{}.:\`. * A name token could have appendix in square brackets called *index* */ -@Serializable(NameToken.Companion::class) +@Serializable(NameTokenSerializer::class) public data class NameToken(val body: String, val index: String? = null) { init { @@ -31,22 +25,6 @@ public data class NameToken(val body: String, val index: String? = null) { } else { body.escape() } - - public companion object : KSerializer { - override val descriptor: SerialDescriptor = - PrimitiveSerialDescriptor("hep.dataforge.names.NameToken", PrimitiveKind.STRING) - - override fun deserialize(decoder: Decoder): NameToken { - return decoder.decodeString().toName().firstOrNull()!! - } - - override fun serialize( - encoder: Encoder, - value: NameToken, - ) { - encoder.encodeString(value.toString()) - } - } } /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/nameMatcher.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/nameMatcher.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/nameMatcher.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/nameMatcher.kt index 5b786917..7abcdc4f 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/names/nameMatcher.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/names/nameMatcher.kt @@ -1,6 +1,6 @@ -package hep.dataforge.names +package space.kscience.dataforge.names -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFExperimental /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/Value.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/Value.kt similarity index 99% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/Value.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/Value.kt index 73b1318c..3c708a2d 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/Value.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/Value.kt @@ -1,4 +1,4 @@ -package hep.dataforge.values +package space.kscience.dataforge.values import kotlinx.serialization.Serializable diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/ValueSerializer.kt similarity index 94% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/ValueSerializer.kt index d46dd4be..8064beb8 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/ValueSerializer.kt @@ -1,4 +1,4 @@ -package hep.dataforge.values +package space.kscience.dataforge.values import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.ListSerializer @@ -12,7 +12,7 @@ public object ValueSerializer : KSerializer { private val listSerializer by lazy { ListSerializer(ValueSerializer) } override val descriptor: SerialDescriptor = - buildClassSerialDescriptor("hep.dataforge.values.Value") { + buildClassSerialDescriptor("space.kscience.dataforge.values.Value") { element("isList") element("valueType") element("value") diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/exoticValues.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/exoticValues.kt similarity index 97% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/exoticValues.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/exoticValues.kt index b04524dc..d3fc66b5 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/exoticValues.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/exoticValues.kt @@ -1,4 +1,4 @@ -package hep.dataforge.values +package space.kscience.dataforge.values /** diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/valueExtensions.kt b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/valueExtensions.kt similarity index 87% rename from dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/valueExtensions.kt rename to dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/valueExtensions.kt index 9347642b..785730d9 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/valueExtensions.kt +++ b/dataforge-meta/src/commonMain/kotlin/space/kscience/dataforge/values/valueExtensions.kt @@ -1,7 +1,7 @@ -package hep.dataforge.values +package space.kscience.dataforge.values -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder /** * Check if value is null diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/ConfigTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/ConfigTest.kt similarity index 87% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/ConfigTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/ConfigTest.kt index 5e6341aa..3ea8d7d3 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/ConfigTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/ConfigTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/JsonMetaTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/JsonMetaTest.kt similarity index 92% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/JsonMetaTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/JsonMetaTest.kt index 2a1329a7..6863a1a0 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/JsonMetaTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/JsonMetaTest.kt @@ -1,7 +1,7 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.meta.descriptors.NodeDescriptor import kotlinx.serialization.json.* +import space.kscience.dataforge.meta.descriptors.NodeDescriptor import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaBuilderTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaBuilderTest.kt similarity index 90% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaBuilderTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaBuilderTest.kt index ca5898e6..50914147 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaBuilderTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaBuilderTest.kt @@ -1,6 +1,6 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.values.asValue +import space.kscience.dataforge.values.asValue import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaDelegateTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaDelegateTest.kt similarity index 92% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaDelegateTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaDelegateTest.kt index c460c602..ce5ad197 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaDelegateTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaDelegateTest.kt @@ -1,6 +1,6 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.values.asValue +import space.kscience.dataforge.values.asValue import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaExtensionTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaExtensionTest.kt similarity index 90% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaExtensionTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaExtensionTest.kt index 0f4c19be..def0468c 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaExtensionTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaExtensionTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta import kotlin.test.Test diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaTest.kt similarity index 85% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaTest.kt index 89786ea1..f3971b66 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MetaTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MetaTest.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.misc.DFExperimental -import hep.dataforge.values.NumberValue -import hep.dataforge.values.True -import hep.dataforge.values.Value +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 kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MutableMetaTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MutableMetaTest.kt similarity index 91% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MutableMetaTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MutableMetaTest.kt index ba44edec..55a0a6de 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/MutableMetaTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/MutableMetaTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SchemeTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SchemeTest.kt similarity index 92% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SchemeTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SchemeTest.kt index 2dfd746c..c9d80119 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SchemeTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SchemeTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SpecificationTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SpecificationTest.kt similarity index 98% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SpecificationTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SpecificationTest.kt index cd8b2f82..66e749be 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/SpecificationTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/SpecificationTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/descriptors/DescriptorTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorTest.kt similarity index 84% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/descriptors/DescriptorTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorTest.kt index 6d2c3ca5..7263ead6 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/meta/descriptors/DescriptorTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/meta/descriptors/DescriptorTest.kt @@ -1,8 +1,8 @@ -package hep.dataforge.meta.descriptors +package space.kscience.dataforge.meta.descriptors -import hep.dataforge.meta.boolean -import hep.dataforge.meta.get -import hep.dataforge.values.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 diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameMatchTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameMatchTest.kt similarity index 91% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameMatchTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameMatchTest.kt index 1ff4381f..00131068 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameMatchTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameMatchTest.kt @@ -1,6 +1,6 @@ -package hep.dataforge.names +package space.kscience.dataforge.names -import hep.dataforge.misc.DFExperimental +import space.kscience.dataforge.misc.DFExperimental import kotlin.test.Test import kotlin.test.assertFails import kotlin.test.assertFalse diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameSerializationTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameSerializationTest.kt similarity index 91% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameSerializationTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameSerializationTest.kt index 7449be2f..1fe130cf 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameSerializationTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameSerializationTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.names +package space.kscience.dataforge.names import kotlinx.serialization.json.Json import kotlin.test.Test diff --git a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameTest.kt b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameTest.kt similarity index 96% rename from dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameTest.kt rename to dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameTest.kt index bcd75154..1ca681bd 100644 --- a/dataforge-meta/src/commonTest/kotlin/hep/dataforge/names/NameTest.kt +++ b/dataforge-meta/src/commonTest/kotlin/space/kscience/dataforge/names/NameTest.kt @@ -1,4 +1,4 @@ -package hep.dataforge.names +package space.kscience.dataforge.names import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-meta/src/jsMain/kotlin/hep/dataforge/meta/DynamicMeta.kt b/dataforge-meta/src/jsMain/kotlin/space/kscience/dataforge/meta/DynamicMeta.kt similarity index 92% rename from dataforge-meta/src/jsMain/kotlin/hep/dataforge/meta/DynamicMeta.kt rename to dataforge-meta/src/jsMain/kotlin/space/kscience/dataforge/meta/DynamicMeta.kt index b75d487d..6568d9cb 100644 --- a/dataforge-meta/src/jsMain/kotlin/hep/dataforge/meta/DynamicMeta.kt +++ b/dataforge-meta/src/jsMain/kotlin/space/kscience/dataforge/meta/DynamicMeta.kt @@ -1,9 +1,9 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.names.NameToken -import hep.dataforge.values.Null -import hep.dataforge.values.Value -import hep.dataforge.values.isList +import space.kscience.dataforge.names.NameToken +import space.kscience.dataforge.values.Null +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.isList //TODO add Meta wrapper for dynamic diff --git a/dataforge-meta/src/jsTest/kotlin/hep/dataforge/meta/DynamicMetaTest.kt b/dataforge-meta/src/jsTest/kotlin/space/kscience/dataforge/meta/DynamicMetaTest.kt similarity index 93% rename from dataforge-meta/src/jsTest/kotlin/hep/dataforge/meta/DynamicMetaTest.kt rename to dataforge-meta/src/jsTest/kotlin/space/kscience/dataforge/meta/DynamicMetaTest.kt index 1fabf061..2c9c3e23 100644 --- a/dataforge-meta/src/jsTest/kotlin/hep/dataforge/meta/DynamicMetaTest.kt +++ b/dataforge-meta/src/jsTest/kotlin/space/kscience/dataforge/meta/DynamicMetaTest.kt @@ -1,6 +1,6 @@ -package hep.dataforge.meta +package space.kscience.dataforge.meta -import hep.dataforge.values.int +import space.kscience.dataforge.values.int import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/OutputManager.kt b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/OutputManager.kt index e606c9b7..c8580403 100644 --- a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/OutputManager.kt +++ b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/OutputManager.kt @@ -1,9 +1,9 @@ -package hep.dataforge.output +package space.kscience.dataforge.output -import hep.dataforge.context.* -import hep.dataforge.context.PluginTag.Companion.DATAFORGE_GROUP -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.context.* +import space.kscience.dataforge.context.PluginTag.Companion.DATAFORGE_GROUP +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlin.reflect.KClass diff --git a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/Renderer.kt b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/Renderer.kt index ebcb03ba..f6caaeb3 100644 --- a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/Renderer.kt +++ b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/Renderer.kt @@ -1,7 +1,7 @@ -package hep.dataforge.output +package space.kscience.dataforge.output -import hep.dataforge.context.ContextAware -import hep.dataforge.meta.Meta +import space.kscience.dataforge.context.ContextAware +import space.kscience.dataforge.meta.Meta /** * A generic way to render any object in the output. diff --git a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/TextRenderer.kt b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/TextRenderer.kt index 235cdab2..8b33241b 100644 --- a/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/TextRenderer.kt +++ b/dataforge-output/src/commonMain/kotlin/hep/dataforge/output/TextRenderer.kt @@ -1,10 +1,10 @@ -package hep.dataforge.output +package space.kscience.dataforge.output -import hep.dataforge.context.Context -import hep.dataforge.meta.Meta -import hep.dataforge.output.TextFormat.Companion.TEXT_RENDERER_TYPE -import hep.dataforge.provider.Type -import hep.dataforge.provider.top +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.output.TextFormat.Companion.TEXT_RENDERER_TYPE +import space.kscience.dataforge.provider.Type +import space.kscience.dataforge.provider.top import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlin.reflect.KClass diff --git a/dataforge-output/src/jsMain/kotlin/hep/dataforge/output/outputJS.kt b/dataforge-output/src/jsMain/kotlin/hep/dataforge/output/outputJS.kt index be973122..453d7351 100644 --- a/dataforge-output/src/jsMain/kotlin/hep/dataforge/output/outputJS.kt +++ b/dataforge-output/src/jsMain/kotlin/hep/dataforge/output/outputJS.kt @@ -1,4 +1,4 @@ -package hep.dataforge.output +package space.kscience.dataforge.output import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/dataforge-output/src/jvmMain/kotlin/hep/dataforge/output/outputJVM.kt b/dataforge-output/src/jvmMain/kotlin/hep/dataforge/output/outputJVM.kt index 24c789fd..d9ba0b2f 100644 --- a/dataforge-output/src/jvmMain/kotlin/hep/dataforge/output/outputJVM.kt +++ b/dataforge-output/src/jvmMain/kotlin/hep/dataforge/output/outputJVM.kt @@ -1,4 +1,4 @@ -package hep.dataforge.output +package space.kscience.dataforge.output import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/dataforge-output/src/nativeMain/kotlin/hep/dataforge/output/outputNative.kt b/dataforge-output/src/nativeMain/kotlin/hep/dataforge/output/outputNative.kt index 32eb85f5..2d59ae4e 100644 --- a/dataforge-output/src/nativeMain/kotlin/hep/dataforge/output/outputNative.kt +++ b/dataforge-output/src/nativeMain/kotlin/hep/dataforge/output/outputNative.kt @@ -1,4 +1,4 @@ -package hep.dataforge.output +package space.kscience.dataforge.output import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt b/dataforge-scripting/src/jvmMain/kotlin/space/kscience/dataforge/scripting/Builders.kt similarity index 87% rename from dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt rename to dataforge-scripting/src/jvmMain/kotlin/space/kscience/dataforge/scripting/Builders.kt index 7628293b..28f05216 100644 --- a/dataforge-scripting/src/jvmMain/kotlin/hep/dataforge/scripting/Builders.kt +++ b/dataforge-scripting/src/jvmMain/kotlin/space/kscience/dataforge/scripting/Builders.kt @@ -1,8 +1,8 @@ -package hep.dataforge.scripting +package space.kscience.dataforge.scripting -import hep.dataforge.context.* -import hep.dataforge.workspace.Workspace -import hep.dataforge.workspace.WorkspaceBuilder +import space.kscience.dataforge.context.* +import space.kscience.dataforge.workspace.Workspace +import space.kscience.dataforge.workspace.WorkspaceBuilder import java.io.File import kotlin.script.experimental.api.* import kotlin.script.experimental.host.toScriptSource @@ -20,8 +20,8 @@ public object Builders { // baseClass(Any::class) implicitReceivers(WorkspaceBuilder::class) defaultImports( - "hep.dataforge.meta.*", - "hep.dataforge.workspace.*" + "space.kscience.dataforge.meta.*", + "space.kscience.dataforge.workspace.*" ) jvm { dependenciesFromCurrentContext(wholeClasspath = true) diff --git a/dataforge-scripting/src/jvmTest/kotlin/hep/dataforge/scripting/BuildersKtTest.kt b/dataforge-scripting/src/jvmTest/kotlin/space/kscience/dataforge/scripting/BuildersKtTest.kt similarity index 72% rename from dataforge-scripting/src/jvmTest/kotlin/hep/dataforge/scripting/BuildersKtTest.kt rename to dataforge-scripting/src/jvmTest/kotlin/space/kscience/dataforge/scripting/BuildersKtTest.kt index cd0985a7..8059b070 100644 --- a/dataforge-scripting/src/jvmTest/kotlin/hep/dataforge/scripting/BuildersKtTest.kt +++ b/dataforge-scripting/src/jvmTest/kotlin/space/kscience/dataforge/scripting/BuildersKtTest.kt @@ -1,11 +1,11 @@ -package hep.dataforge.scripting +package space.kscience.dataforge.scripting -import hep.dataforge.context.Global -import hep.dataforge.meta.get -import hep.dataforge.meta.int -import hep.dataforge.workspace.WorkspaceBuilder +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.workspace.WorkspaceBuilder -import hep.dataforge.workspace.target +import space.kscience.dataforge.workspace.target import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnDef.kt similarity index 61% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnDef.kt index a309443e..68723922 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnDef.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnDef.kt @@ -1,6 +1,6 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KType public data class ColumnDef( diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnHeader.kt similarity index 73% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnHeader.kt index 95241682..e0a3e30e 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnHeader.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnHeader.kt @@ -1,11 +1,11 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta -import hep.dataforge.meta.get -import hep.dataforge.meta.int -import hep.dataforge.meta.string -import hep.dataforge.values.Value -import hep.dataforge.values.ValueType +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.get +import space.kscience.dataforge.meta.int +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.ValueType import kotlin.reflect.KType public typealias TableHeader = List> diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnScheme.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnScheme.kt similarity index 50% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnScheme.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnScheme.kt index 17968a82..fc2e4196 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnScheme.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnScheme.kt @@ -1,10 +1,10 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Scheme -import hep.dataforge.meta.SchemeSpec -import hep.dataforge.meta.enum -import hep.dataforge.meta.string -import hep.dataforge.values.ValueType +import space.kscience.dataforge.meta.Scheme +import space.kscience.dataforge.meta.SchemeSpec +import space.kscience.dataforge.meta.enum +import space.kscience.dataforge.meta.string +import space.kscience.dataforge.values.ValueType public open class ColumnScheme : Scheme() { public var title: String? by string() diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnTable.kt similarity index 95% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnTable.kt index c9c8ac97..38a9d58e 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ColumnTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ColumnTable.kt @@ -1,4 +1,4 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables /** * @param T bottom type for all columns in the table diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ListColumn.kt similarity index 92% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ListColumn.kt index 165ff6de..b720fe1f 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/ListColumn.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/ListColumn.kt @@ -1,6 +1,6 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableColumnTable.kt similarity index 95% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableColumnTable.kt index 01882902..50632709 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableColumnTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableColumnTable.kt @@ -1,4 +1,4 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables /** * Mutable table with a fixed size, but dynamic columns diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableTable.kt similarity index 93% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableTable.kt index 8fca7705..494bf4f2 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/MutableTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/MutableTable.kt @@ -1,7 +1,7 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta -import hep.dataforge.values.Value +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.values.Value import kotlin.properties.PropertyDelegateProvider import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KType diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/RowTable.kt similarity index 89% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/RowTable.kt index 6b7b1261..9244a8a4 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/RowTable.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/RowTable.kt @@ -1,7 +1,7 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta import kotlinx.coroutines.flow.toList +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KType public inline class MapRow(private val values: Map) : Row { diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/Table.kt similarity index 95% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/Table.kt index bd0410e1..2fa199ec 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/Table.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/Table.kt @@ -1,4 +1,4 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/TransformationColumn.kt similarity index 95% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/TransformationColumn.kt index a0f78eea..5a1e83be 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/TransformationColumn.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/TransformationColumn.kt @@ -1,6 +1,6 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/TextRows.kt similarity index 94% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/TextRows.kt index 2bb99e8e..90732c89 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/TextRows.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/TextRows.kt @@ -1,13 +1,13 @@ -package hep.dataforge.tables.io +package space.kscience.dataforge.tables.io -import hep.dataforge.io.Binary -import hep.dataforge.io.readSafeUtf8Line -import hep.dataforge.io.writeUtf8String -import hep.dataforge.tables.* -import hep.dataforge.values.* import io.ktor.utils.io.core.Output import io.ktor.utils.io.core.readBytes import kotlinx.coroutines.flow.* +import space.kscience.dataforge.io.Binary +import space.kscience.dataforge.io.readSafeUtf8Line +import space.kscience.dataforge.io.writeUtf8String +import space.kscience.dataforge.tables.* +import space.kscience.dataforge.values.* /** * Read a lin as a fixed width [Row] diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/textTableEnvelope.kt similarity index 68% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/textTableEnvelope.kt index 6d6c790b..d8bb8f8d 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/io/textTableEnvelope.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/io/textTableEnvelope.kt @@ -1,14 +1,14 @@ -package hep.dataforge.tables.io +package space.kscience.dataforge.tables.io -import hep.dataforge.io.Binary -import hep.dataforge.io.Envelope -import hep.dataforge.io.asBinary -import hep.dataforge.io.buildByteArray -import hep.dataforge.meta.* -import hep.dataforge.misc.DFExperimental -import hep.dataforge.tables.SimpleColumnHeader -import hep.dataforge.tables.Table -import hep.dataforge.values.Value +import space.kscience.dataforge.io.Binary +import space.kscience.dataforge.io.Envelope +import space.kscience.dataforge.io.asBinary +import space.kscience.dataforge.io.buildByteArray +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.tables.SimpleColumnHeader +import space.kscience.dataforge.tables.Table +import space.kscience.dataforge.values.Value import kotlin.reflect.typeOf diff --git a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/numericColumns.kt similarity index 96% rename from dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt rename to dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/numericColumns.kt index 05d26d49..c46fdcc6 100644 --- a/dataforge-tables/src/commonMain/kotlin/hep/dataforge/tables/numericColumns.kt +++ b/dataforge-tables/src/commonMain/kotlin/space/kscience/dataforge/tables/numericColumns.kt @@ -1,6 +1,6 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt b/dataforge-tables/src/jvmMain/kotlin/space/kscience/dataforge/tables/CastColumn.kt similarity index 93% rename from dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt rename to dataforge-tables/src/jvmMain/kotlin/space/kscience/dataforge/tables/CastColumn.kt index b9e62e96..b533b46f 100644 --- a/dataforge-tables/src/jvmMain/kotlin/hep/dataforge/tables/CastColumn.kt +++ b/dataforge-tables/src/jvmMain/kotlin/space/kscience/dataforge/tables/CastColumn.kt @@ -1,6 +1,6 @@ -package hep.dataforge.tables +package space.kscience.dataforge.tables -import hep.dataforge.meta.Meta +import space.kscience.dataforge.meta.Meta import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty import kotlin.reflect.KType diff --git a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt b/dataforge-tables/src/jvmTest/kotlin/space/kscience/dataforge/tables/io/TextRowsTest.kt similarity index 66% rename from dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt rename to dataforge-tables/src/jvmTest/kotlin/space/kscience/dataforge/tables/io/TextRowsTest.kt index 71f3c266..55b55cdf 100644 --- a/dataforge-tables/src/jvmTest/kotlin/hep/dataforge/tables/io/TextRowsTest.kt +++ b/dataforge-tables/src/jvmTest/kotlin/space/kscience/dataforge/tables/io/TextRowsTest.kt @@ -1,14 +1,14 @@ -package hep.dataforge.tables.io +package space.kscience.dataforge.tables.io -import hep.dataforge.io.toByteArray -import hep.dataforge.misc.DFExperimental -import hep.dataforge.tables.Table -import hep.dataforge.tables.row -import hep.dataforge.values.Value -import hep.dataforge.values.int -import hep.dataforge.values.string import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking +import space.kscience.dataforge.io.toByteArray +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.tables.Table +import space.kscience.dataforge.tables.row +import space.kscience.dataforge.values.Value +import space.kscience.dataforge.values.int +import space.kscience.dataforge.values.string import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/ContextGoalLogger.kt similarity index 60% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/ContextGoalLogger.kt index 5f144798..22273878 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/ContextGoalLogger.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/ContextGoalLogger.kt @@ -1,10 +1,10 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.Context -import hep.dataforge.context.info -import hep.dataforge.context.logger -import hep.dataforge.data.GoalLogger import kotlinx.coroutines.launch +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.info +import space.kscience.dataforge.context.logger +import space.kscience.dataforge.data.GoalLogger public class ContextGoalLogger(public val context: Context) : GoalLogger { override fun emit(vararg tags: String, message: suspend () -> String) { diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/SimpleWorkspace.kt similarity index 62% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/SimpleWorkspace.kt index ab8d0465..7e881a8f 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/SimpleWorkspace.kt @@ -1,10 +1,10 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.Context -import hep.dataforge.context.gather -import hep.dataforge.data.DataSet -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.gather +import space.kscience.dataforge.data.DataSet +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name /** diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Task.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Task.kt similarity index 77% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Task.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Task.kt index 6e6c590e..ac14c473 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Task.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Task.kt @@ -1,16 +1,16 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.DataSetBuilder -import hep.dataforge.data.DataTree -import hep.dataforge.data.GoalExecutionRestriction -import hep.dataforge.meta.Meta -import hep.dataforge.meta.descriptors.Described -import hep.dataforge.meta.descriptors.ItemDescriptor -import hep.dataforge.misc.DFInternal -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.workspace.Task.Companion.TYPE import kotlinx.coroutines.withContext +import space.kscience.dataforge.data.DataSetBuilder +import space.kscience.dataforge.data.DataTree +import space.kscience.dataforge.data.GoalExecutionRestriction +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.descriptors.Described +import space.kscience.dataforge.meta.descriptors.ItemDescriptor +import space.kscience.dataforge.misc.DFInternal +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.workspace.Task.Companion.TYPE import kotlin.reflect.KType import kotlin.reflect.typeOf diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskData.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskData.kt similarity index 84% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskData.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskData.kt index f317b00a..ff501600 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskData.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskData.kt @@ -1,9 +1,9 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.Data -import hep.dataforge.data.NamedData -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.data.Data +import space.kscience.dataforge.data.NamedData +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name /** * A [Workspace]-locked [NamedData], that serves as a computation model. diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskResult.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskResult.kt similarity index 84% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskResult.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskResult.kt index c8adcd9a..d0097e55 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskResult.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/TaskResult.kt @@ -1,10 +1,10 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.DataSet -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import space.kscience.dataforge.data.DataSet +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name /** * A result of a [Task] diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Workspace.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Workspace.kt similarity index 81% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Workspace.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Workspace.kt index af5ee317..16af8969 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/Workspace.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/Workspace.kt @@ -1,12 +1,12 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.ContextAware -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.misc.Type -import hep.dataforge.names.Name -import hep.dataforge.names.toName -import hep.dataforge.provider.Provider +import space.kscience.dataforge.context.ContextAware +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.misc.Type +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName +import space.kscience.dataforge.provider.Provider @Type(Workspace.TYPE) diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/WorkspaceBuilder.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/WorkspaceBuilder.kt similarity index 79% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/WorkspaceBuilder.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/WorkspaceBuilder.kt index cd3e6d92..5d475cd8 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/WorkspaceBuilder.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/WorkspaceBuilder.kt @@ -1,19 +1,19 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.Context -import hep.dataforge.context.ContextBuilder -import hep.dataforge.context.Global -import hep.dataforge.data.ActiveDataTree -import hep.dataforge.data.DataSet -import hep.dataforge.data.DataSetBuilder -import hep.dataforge.data.DataTree -import hep.dataforge.meta.Meta -import hep.dataforge.meta.MetaBuilder -import hep.dataforge.meta.descriptors.NodeDescriptor -import hep.dataforge.misc.DFBuilder -import hep.dataforge.misc.DFExperimental -import hep.dataforge.names.Name -import hep.dataforge.names.toName +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.ContextBuilder +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.data.ActiveDataTree +import space.kscience.dataforge.data.DataSet +import space.kscience.dataforge.data.DataSetBuilder +import space.kscience.dataforge.data.DataTree +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.meta.MetaBuilder +import space.kscience.dataforge.meta.descriptors.NodeDescriptor +import space.kscience.dataforge.misc.DFBuilder +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.Name +import space.kscience.dataforge.names.toName import kotlin.properties.PropertyDelegateProvider import kotlin.properties.ReadOnlyProperty diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/envelopeData.kt b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/envelopeData.kt similarity index 70% rename from dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/envelopeData.kt rename to dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/envelopeData.kt index cebba975..55c98352 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/envelopeData.kt +++ b/dataforge-workspace/src/commonMain/kotlin/space/kscience/dataforge/workspace/envelopeData.kt @@ -1,9 +1,9 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.Data -import hep.dataforge.data.await -import hep.dataforge.io.* -import hep.dataforge.misc.DFInternal +import space.kscience.dataforge.data.Data +import space.kscience.dataforge.data.await +import space.kscience.dataforge.io.* +import space.kscience.dataforge.misc.DFInternal /** * Convert an [Envelope] to a data via given format. The actual parsing is done lazily. diff --git a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/WorkspacePlugin.kt b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/WorkspacePlugin.kt similarity index 70% rename from dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/WorkspacePlugin.kt rename to dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/WorkspacePlugin.kt index b30d141b..927a35ce 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/WorkspacePlugin.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/WorkspacePlugin.kt @@ -1,13 +1,13 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.AbstractPlugin -import hep.dataforge.names.Name +import space.kscience.dataforge.context.AbstractPlugin +import space.kscience.dataforge.names.Name /** * An abstract plugin with some additional boilerplate to effectively work with workspace context */ public abstract class WorkspacePlugin : AbstractPlugin(), TaskContainer { - private val tasks = HashMap>() + private val tasks = HashMap>() override fun content(target: String): Map { return when (target) { diff --git a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/fileData.kt similarity index 96% rename from dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt rename to dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/fileData.kt index fb621fbf..210d56ef 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/fileData.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/fileData.kt @@ -1,14 +1,13 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -//import jdk.nio.zipfs.ZipFileSystemProvider -import hep.dataforge.data.* -import hep.dataforge.io.* -import hep.dataforge.meta.* -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.streams.asOutput import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext +import space.kscience.dataforge.data.* +import space.kscience.dataforge.io.* +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental import java.nio.file.FileSystem import java.nio.file.Files import java.nio.file.Path @@ -27,11 +26,13 @@ public interface FileFormatResolver { public operator fun invoke(path: Path, meta: Meta): IOFormat } + @PublishedApi internal inline fun IOPlugin.formatResolver(): FileFormatResolver = object : FileFormatResolver { override val type: KType = typeOf() + @OptIn(DFExperimental::class) override fun invoke(path: Path, meta: Meta): IOFormat = resolveIOFormat() ?: error("Can't resolve IO format for ${T::class}") } @@ -56,7 +57,7 @@ public fun IOPlugin.readDataFile( path: Path, formatResolver: FileFormatResolver, ): Data { - val envelope = readEnvelopeFile(path, true) ?: error("Can't read data from $path") + val envelope = readEnvelopeFile(path, true) val format = formatResolver(path, envelope.meta) return envelope.toData(format) } diff --git a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/taskBuilders.kt b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/taskBuilders.kt similarity index 73% rename from dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/taskBuilders.kt rename to dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/taskBuilders.kt index fce1a372..d5ab5313 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/taskBuilders.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/taskBuilders.kt @@ -1,9 +1,9 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.DataSet -import hep.dataforge.data.select -import hep.dataforge.meta.Meta -import hep.dataforge.names.Name +import space.kscience.dataforge.data.DataSet +import space.kscience.dataforge.data.select +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.Name public suspend inline fun TaskResultBuilder.from( task: Name, diff --git a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/workspaceExtensions.kt b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/workspaceExtensions.kt similarity index 63% rename from dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/workspaceExtensions.kt rename to dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/workspaceExtensions.kt index 00f213f5..543b0da1 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/hep/dataforge/workspace/workspaceExtensions.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/workspaceExtensions.kt @@ -1,7 +1,7 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.data.DataSetBuilder import kotlinx.coroutines.runBlocking +import space.kscience.dataforge.data.DataSetBuilder public fun WorkspaceBuilder.data(builder: suspend DataSetBuilder.() -> Unit): Unit = runBlocking { buildData(builder) diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/DataPropagationTest.kt b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/DataPropagationTest.kt similarity index 84% rename from dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/DataPropagationTest.kt rename to dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/DataPropagationTest.kt index 3b70ed5e..da938a21 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/DataPropagationTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/DataPropagationTest.kt @@ -1,13 +1,13 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.Context -import hep.dataforge.context.PluginFactory -import hep.dataforge.context.PluginTag -import hep.dataforge.data.* -import hep.dataforge.meta.Meta -import hep.dataforge.names.toName import kotlinx.coroutines.flow.single import kotlinx.coroutines.runBlocking +import space.kscience.dataforge.context.Context +import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.context.PluginTag +import space.kscience.dataforge.data.* +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.names.toName import kotlin.reflect.KClass import kotlin.test.Test import kotlin.test.assertEquals diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt similarity index 85% rename from dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt rename to dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt index 19e029d5..2b78d238 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/FileDataTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt @@ -1,16 +1,16 @@ -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.Global -import hep.dataforge.data.* -import hep.dataforge.io.IOFormat -import hep.dataforge.io.io -import hep.dataforge.io.readUtf8String -import hep.dataforge.io.writeUtf8String -import hep.dataforge.meta.Meta -import hep.dataforge.misc.DFExperimental import io.ktor.utils.io.core.Input import io.ktor.utils.io.core.Output import kotlinx.coroutines.runBlocking +import space.kscience.dataforge.context.Global +import space.kscience.dataforge.data.* +import space.kscience.dataforge.io.IOFormat +import space.kscience.dataforge.io.io +import space.kscience.dataforge.io.readUtf8String +import space.kscience.dataforge.io.writeUtf8String +import space.kscience.dataforge.meta.Meta +import space.kscience.dataforge.misc.DFExperimental import java.nio.file.Files import java.nio.file.Path import kotlin.reflect.KType diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/SimpleWorkspaceTest.kt similarity index 94% rename from dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt rename to dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/SimpleWorkspaceTest.kt index b4374624..16ae6da6 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/SimpleWorkspaceTest.kt @@ -1,16 +1,17 @@ @file:Suppress("UNUSED_VARIABLE") -package hep.dataforge.workspace +package space.kscience.dataforge.workspace -import hep.dataforge.context.* -import hep.dataforge.data.* -import hep.dataforge.meta.* -import hep.dataforge.names.get -import hep.dataforge.names.plus import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.single import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.Timeout +import space.kscience.dataforge.context.* +import space.kscience.dataforge.data.* +import space.kscience.dataforge.meta.* +import space.kscience.dataforge.misc.DFExperimental +import space.kscience.dataforge.names.get +import space.kscience.dataforge.names.plus import kotlin.reflect.KClass import kotlin.test.Test import kotlin.test.assertEquals @@ -32,6 +33,7 @@ public fun Workspace.runBlocking(task: String, block: MetaBuilder.() -> Unit = { } +@DFExperimental class SimpleWorkspaceTest { val testPlugin = object : WorkspacePlugin() { override val tag: PluginTag = PluginTag("test") From 64100dcfe40e12a51cffdea5a518d73a64f6b91d Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 3 Mar 2021 22:41:33 +0300 Subject: [PATCH 07/10] readme update --- README.md | 4 +--- docs/templates/ARTIFACT-TEMPLATE.md | 9 +++------ docs/templates/README-TEMPLATE.md | 2 -- settings.gradle.kts | 6 +----- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 10b32c35..1b559341 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ ![Gradle build](https://github.com/mipt-npm/dataforge-core/workflows/Gradle%20build/badge.svg) -[ ![Download](https://api.bintray.com/packages/mipt-npm/dataforge/dataforge-meta/images/download.svg) ](https://bintray.com/mipt-npm/dataforge/dataforge-meta/_latestVersion) -
* ### [dataforge-context](dataforge-context) @@ -49,7 +47,7 @@ > **Maturity**: EXPERIMENTAL
-* ### [dataforge-io-yaml](dataforge-io-yaml) +* ### [dataforge-io-yaml](dataforge-io/dataforge-io-yaml) > YAML meta converters and Front Matter envelope format > > **Maturity**: PROTOTYPE diff --git a/docs/templates/ARTIFACT-TEMPLATE.md b/docs/templates/ARTIFACT-TEMPLATE.md index 410c6cad..6b921b05 100644 --- a/docs/templates/ARTIFACT-TEMPLATE.md +++ b/docs/templates/ARTIFACT-TEMPLATE.md @@ -2,16 +2,14 @@ > > This module artifact: `${group}:${name}:${version}`. > -> Bintray release version: [ ![Download](https://api.bintray.com/packages/mipt-npm/dataforge/${name}/images/download.svg) ](https://bintray.com/mipt-npm/kscience/${name}/_latestVersion) > -> Bintray development version: [ ![Download](https://api.bintray.com/packages/mipt-npm/dev/${name}/images/download.svg) ](https://bintray.com/mipt-npm/dev/${name}/_latestVersion) +> [![Maven Central](https://img.shields.io/maven-central/v/space.kscience/${name}.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22space.kscience%22%20AND%20a:%22${name}%22) > > **Gradle:** > > ```gradle > repositories { -> maven { url 'https://dl.bintray.com/mipt-npm/dataforge' } -> maven { url 'https://dl.bintray.com/mipt-npm/dev' } +> maven { url 'https://repo.kotlin.link' } > } > > dependencies { @@ -22,8 +20,7 @@ > > ```kotlin > repositories { -> maven("https://dl.bintray.com/mipt-npm/kscience") -> maven("https://dl.bintray.com/mipt-npm/dev") +> maven("https://https://repo.kotlin.link") > } > > dependencies { diff --git a/docs/templates/README-TEMPLATE.md b/docs/templates/README-TEMPLATE.md index e0d7bb23..a28f0db3 100644 --- a/docs/templates/README-TEMPLATE.md +++ b/docs/templates/README-TEMPLATE.md @@ -3,6 +3,4 @@ ![Gradle build](https://github.com/mipt-npm/dataforge-core/workflows/Gradle%20build/badge.svg) -[ ![Download](https://api.bintray.com/packages/mipt-npm/dataforge/dataforge-meta/images/download.svg) ](https://bintray.com/mipt-npm/dataforge/dataforge-meta/_latestVersion) - $modules diff --git a/settings.gradle.kts b/settings.gradle.kts index 8746a320..fe8819b5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,13 +4,9 @@ pluginManagement { jcenter() gradlePluginPortal() maven("https://dl.bintray.com/kotlin/kotlin-eap") - maven("https://dl.bintray.com/kotlin/kotlin-dev") - maven("https://dl.bintray.com/mipt-npm/dataforge") - maven("https://dl.bintray.com/mipt-npm/kscience") - maven("https://dl.bintray.com/mipt-npm/dev") } - val toolsVersion = "0.8.3" + val toolsVersion = "0.8.4" val kotlinVersion = "1.4.30" plugins { From 18bfde99785dc294fafa9a8da694ad0b8d1f7690 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 5 Mar 2021 19:27:13 +0300 Subject: [PATCH 08/10] Fix deploy to space --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a94095f5..dcb7aea0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ allprojects { subprojects { apply(plugin = "ru.mipt.npm.gradle.publish") - repositories{ + repositories { maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/dev") } @@ -24,9 +24,9 @@ readme { ksciencePublish { bintrayRepo = "dataforge" githubProject = "dataforge-core" - spaceRepo = "https://maven.jetbrains.space/mipt-npm/p/df/maven" + spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven" } -apiValidation{ +apiValidation { nonPublicMarkers.add("space.kscience.dataforge.misc.DFExperimental") } \ No newline at end of file From 6bdcd0f37d02fc7653c9cbf2780b7b42215bfc25 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 7 Mar 2021 09:46:01 +0300 Subject: [PATCH 09/10] Use slf4j API instead of logback --- CHANGELOG.md | 1 + build.gradle.kts | 4 +--- dataforge-context/build.gradle.kts | 2 +- gradle.properties | 4 +--- settings.gradle.kts | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff72a0f5..e2e195e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Added - LogManager plugin +- dataforge-context API dependency on SLF4j ### Changed - Kotlin-logging moved from common to JVM and JS. Replaced by console for native. diff --git a/build.gradle.kts b/build.gradle.kts index dcb7aea0..5363ed99 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,9 +4,7 @@ plugins { allprojects { group = "space.kscience" - version = "0.4.0-dev-1" - - apply() + version = "0.4.0-dev-2" } subprojects { diff --git a/dataforge-context/build.gradle.kts b/dataforge-context/build.gradle.kts index abbaf290..d090e9de 100644 --- a/dataforge-context/build.gradle.kts +++ b/dataforge-context/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { jvmMain { dependencies { api(kotlin("reflect")) - implementation("ch.qos.logback:logback-classic:1.2.3") + api("org.slf4j:slf4j-api:1.7.30") } } jsMain { diff --git a/gradle.properties b/gradle.properties index 9b6d2aef..db27b7de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,4 @@ kotlin.parallel.tasks.in.project=true kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false -kotlin.mpp.stability.nowarn=true - -bintrayPublish=true \ No newline at end of file +kotlin.mpp.stability.nowarn=true \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index fe8819b5..8483876d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { } val toolsVersion = "0.8.4" - val kotlinVersion = "1.4.30" + val kotlinVersion = "1.4.31" plugins { id("ru.mipt.npm.gradle.project") version toolsVersion From bdef0d918550501468f5871dbd376aaccefddccd Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 7 Mar 2021 15:05:36 +0300 Subject: [PATCH 10/10] Publishing settings --- .github/workflows/build.yml | 33 ++++++++++++---- .github/workflows/publish.yml | 71 ++++++++++++++++++++++------------- build.gradle.kts | 8 ++-- settings.gradle.kts | 2 +- 4 files changed, 74 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a362884..25f2cfd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,16 +4,33 @@ on: [ push ] jobs: build: - - runs-on: ubuntu-latest - + strategy: + matrix: + os: [ macOS-latest, windows-latest ] + runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v2 + - name: Checkout the repo + uses: actions/checkout@v2 - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build + - name: Add msys to path + if: matrix.os == 'windows-latest' + run: SETX PATH "%PATH%;C:\msys64\mingw64\bin" + - name: Cache gradle + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Cache konan + uses: actions/cache@v2 + with: + path: ~/.konan + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Build + run: ./gradlew build --no-daemon --stacktrace diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0fbf9c1e..165912e2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,40 +1,57 @@ -name: Bintray Publish +name: Gradle publish on: + workflow_dispatch: release: types: - created jobs: - build-on-windows: - runs-on: windows-latest + publish: + environment: + name: publish + strategy: + matrix: + os: [macOS-latest, windows-latest] + runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v2 + - name: Checkout the repo + uses: actions/checkout@v2 - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Gradle clean - run: ./gradlew clean - - name: Gradle build - run: ./gradlew build - - name: Run release task - run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }} - build-on-macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Add msys to path + if: matrix.os == 'windows-latest' + run: SETX PATH "%PATH%;C:\msys64\mingw64\bin" + - name: Cache gradle + uses: actions/cache@v2 with: - java-version: 11 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Gradle clean - run: ./gradlew clean - - name: Gradle build - run: ./gradlew build - - name: Run release task - run: ./gradlew release -PbintrayUser=${{ secrets.BINTRAY_USER }} -PbintrayApiKey=${{ secrets.BINTRAY_KEY }} + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Cache konan + uses: actions/cache@v2 + with: + path: ~/.konan + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Publish Windows Artifacts + if: matrix.os == 'windows-latest' + run: > + ./gradlew release --no-daemon + -Ppublishing.github.user=${{ secrets.PUBLISHING_GITHUB_USER }} + -Ppublishing.github.token=${{ secrets.PUBLISHING_GITHUB_TOKEN }} + -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }} + -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }} + - name: Publish Mac Artifacts + if: matrix.os == 'macOS-latest' + run: > + ./gradlew release --no-daemon + -Ppublication.platform=macosX64 + -Ppublishing.github.user=${{ secrets.PUBLISHING_GITHUB_USER }} + -Ppublishing.github.token=${{ secrets.PUBLISHING_GITHUB_TOKEN }} + -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }} + -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 5363ed99..27f40ae9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ allprojects { } subprojects { - apply(plugin = "ru.mipt.npm.gradle.publish") + apply(plugin = "maven-publish") repositories { maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/dev") @@ -20,9 +20,9 @@ readme { } ksciencePublish { - bintrayRepo = "dataforge" - githubProject = "dataforge-core" - spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven" + github("dataforge-core") + space("https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven") + sonatype() } apiValidation { diff --git a/settings.gradle.kts b/settings.gradle.kts index 8483876d..f4120248 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { maven("https://dl.bintray.com/kotlin/kotlin-eap") } - val toolsVersion = "0.8.4" + val toolsVersion = "0.9.0" val kotlinVersion = "1.4.31" plugins {