Merge branch 'master' into insert_kdocs

Author: AndreiKingsley

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.Selector
 import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
 import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
 import org.jetbrains.kotlinx.dataframe.annotations.Refine
+import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
 import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
 import org.jetbrains.kotlinx.dataframe.impl.columnName
@@ -25,7 +26,7 @@ import kotlin.reflect.typeOf
 
 @Deprecated(DEPRECATED_ACCESS_API)
 @AccessApiOverload
-public inline fun <C, reified R> ColumnReference<C>.map(
+internal inline fun <C, reified R> ColumnReference<C>.map(
     infer: Infer = Infer.Nulls,
     noinline transform: (C) -> R,
 ): ColumnReference<R> = createComputedColumnReference(name(), typeOf<R>(), infer) { transform(this@map()) }
@@ -69,6 +70,13 @@ public inline fun <T, R> DataColumn<T>.mapIndexed(
 
 // region DataFrame
 
+/**
+ * Note: When this method is applied to a **[ColumnGroup]**,
+ * its behavior differs from [DataColumn.map].
+ * To apply `map` as if on a regular [DataColumn] (i.e., a column of [DataRow]s
+ * whose values correspond to values in columns of the group),
+ * call [ColumnGroup.asDataColumn] first.
+ */
 public inline fun <T, R> DataFrame<T>.map(transform: RowExpression<T, R>): List<R> = rows().map { transform(it, it) }
 
 public inline fun <T, reified R> DataFrame<T>.mapToColumn(

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlinx.dataframe.api
 
 import io.kotest.matchers.shouldBe
+import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.junit.Test
 
 class MapTests {
@@ -18,4 +19,19 @@ class MapTests {
         }
         df["b"][1] shouldBe 5
     }
+
+    @Test
+    fun `ColumnGroup map`() {
+        val group = dataFrameOf("x", "y")(1, 10, 2, 20, 3, 30).asColumnGroup("g")
+        val sums = group.asDataFrame().map { row -> row["x"] as Int + row["y"] as Int }
+        sums shouldBe listOf(11, 22, 33)
+    }
+
+    @Test
+    fun `ColumnGroup asDataColumn map`() {
+        val group = dataFrameOf("x", "y")(1, 10, 2, 20, 3, 30).asColumnGroup("g")
+        val col: DataColumn<Int> = group.asDataColumn().map { it["x"] as Int + it["y"] as Int }
+        col.name() shouldBe "g"
+        col.toList() shouldBe listOf(11, 22, 33)
+    }
 }

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.Selector
 import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
 import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
 import org.jetbrains.kotlinx.dataframe.annotations.Refine
+import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
 import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
 import org.jetbrains.kotlinx.dataframe.impl.columnName
@@ -25,7 +26,7 @@ import kotlin.reflect.typeOf
 
 @Deprecated(DEPRECATED_ACCESS_API)
 @AccessApiOverload
-public inline fun <C, reified R> ColumnReference<C>.map(
+internal inline fun <C, reified R> ColumnReference<C>.map(
     infer: Infer = Infer.Nulls,
     noinline transform: (C) -> R,
 ): ColumnReference<R> = createComputedColumnReference(name(), typeOf<R>(), infer) { transform(this@map()) }
@@ -69,6 +70,13 @@ public inline fun <T, R> DataColumn<T>.mapIndexed(
 
 // region DataFrame
 
+/**
+ * Note: When this method is applied to a **[ColumnGroup]**,
+ * its behavior differs from [DataColumn.map].
+ * To apply `map` as if on a regular [DataColumn] (i.e., a column of [DataRow]s
+ * whose values correspond to values in columns of the group),
+ * call [ColumnGroup.asDataColumn] first.
+ */
 public inline fun <T, R> DataFrame<T>.map(transform: RowExpression<T, R>): List<R> = rows().map { transform(it, it) }
 
 public inline fun <T, reified R> DataFrame<T>.mapToColumn(

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlinx.dataframe.api
 
 import io.kotest.matchers.shouldBe
+import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.junit.Test
 
 class MapTests {
@@ -18,4 +19,19 @@ class MapTests {
         }
         df["b"][1] shouldBe 5
     }
+
+    @Test
+    fun `ColumnGroup map`() {
+        val group = dataFrameOf("x", "y")(1, 10, 2, 20, 3, 30).asColumnGroup("g")
+        val sums = group.asDataFrame().map { row -> row["x"] as Int + row["y"] as Int }
+        sums shouldBe listOf(11, 22, 33)
+    }
+
+    @Test
+    fun `ColumnGroup asDataColumn map`() {
+        val group = dataFrameOf("x", "y")(1, 10, 2, 20, 3, 30).asColumnGroup("g")
+        val col: DataColumn<Int> = group.asDataColumn().map { it["x"] as Int + it["y"] as Int }
+        col.name() shouldBe "g"
+        col.toList() shouldBe listOf(11, 22, 33)
+    }
 }

dataframe-json/build.gradle.kts

@@ -26,7 +26,8 @@ dependencies {
     implementation(libs.serialization.json)
     implementation(libs.sl4j)
 
-    testImplementation(libs.kotlin.test)
+    // Use Kotlin test integration for JUnit 5 to satisfy variant 'kotlin-test-framework-junit5'
+    testImplementation(libs.kotlin.test.junit5)
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.junit.jupiter.engine)
     testImplementation(libs.junit.jupiter.params)

docs/StardustDocs/topics/concepts/DataColumn.md

@@ -27,7 +27,9 @@ Currently, it uses [`List`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.
 
 #### ColumnGroup
 
-Container for nested columns. Is used to create column hierarchy. 
+Container for nested columns. Used to create column hierarchy.
+
+You can create column groups using the group operation or by splitting inward — see [group](group.md) and [split](split.md) for details.
 
 #### FrameColumn
 

gradle/libs.versions.toml

@@ -161,6 +161,7 @@ kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", ve
 kotlin-compiler-embeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-compiler-internal-test-framework = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-internal-test-framework", version.ref = "kotlin" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit5 = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
 kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
 kotlin-annotations-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-annotations-jvm", version.ref = "kotlin" }
 kotlin-jupyter-test-kit = { group = "org.jetbrains.kotlinx", name = "kotlin-jupyter-test-kit", version.ref = "kotlinJupyter" }