Automated commit of generated code

Author: github-actions[bot]

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl.kt

@@ -20,8 +20,8 @@ public interface ColumnsForAggregateSelectionDsl<out T> : ColumnsSelectionDsl<T>
     public infix fun <C> ColumnSet<C>.into(name: String): ColumnSet<C> =
         ConfiguredAggregateColumn.withPath(this, pathOf(name))
 
-    public infix fun <C> SingleColumn<C>.into(name: String): SingleColumn<C> =
-        ConfiguredAggregateColumn.withPath(this, pathOf(name))
+    override infix fun <C> SingleColumn<C>.into(newName: String): SingleColumn<C> =
+        ConfiguredAggregateColumn.withPath(this, pathOf(newName))
 
     public infix fun <C> ColumnSet<C>.into(path: ColumnPath): ColumnSet<C> =
         ConfiguredAggregateColumn.withPath(this, path)

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

@@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
 import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
 import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
+import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
 import org.jetbrains.kotlinx.dataframe.columns.renamedReference
 import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
 import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
@@ -23,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
 import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns
 import org.jetbrains.kotlinx.dataframe.impl.api.renameImpl
 import org.jetbrains.kotlinx.dataframe.impl.columnName
+import org.jetbrains.kotlinx.dataframe.impl.columns.renamedColumn
 import org.jetbrains.kotlinx.dataframe.impl.toCamelCaseByDelimiters
 import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
 import kotlin.reflect.KProperty
@@ -641,6 +643,10 @@ public interface RenameColumnsSelectionDsl {
          */
         interface KPropertyReceiver
 
+        /**
+         */
+        interface SingleColumnReceiver
+
         /**
          */
         interface ColumnReferenceParam
@@ -922,6 +928,34 @@ public interface RenameColumnsSelectionDsl {
     public infix fun <C> KProperty<C>.named(nameOf: KProperty<*>): ColumnReference<C> =
         toColumnAccessor().named(nameOf.columnName)
 
+    /**
+     * ## Rename: `named` / `into`
+     * Renaming a column in the [ColumnsSelectionDsl][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl] is done by calling the `infix` functions
+     * [named][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.named] or [into][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.into]. They behave exactly the same,
+     * so it's up to contextual preference which one to use. Any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi] can be
+     * used to specify the column to rename and which name should be used instead.
+     *
+     * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.RenameColumnsSelectionDsl.Grammar]
+     *
+     * #### For Example:
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { name  `[named][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.named]` "Full Name" }`
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  {  `[expr][org.jetbrains.kotlinx.dataframe.api.expr]`  { 0 }  `[into][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.into]` "zeroes" }`
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { "colA"  `[named][kotlin.String.named]` Type::colB }`
+     *
+     * #### Example for this overload:
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { col(0)  `[named][SingleColumn.named]` "columnB" }`
+     *
+     * @receiver The [SingleColumn] referencing the column to rename.
+     * @param [newName] A [String] used to specify the new name of the column.
+     * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column.
+     */
+    @Interpretable("Named1")
+    public infix fun <C> SingleColumn<C>.named(newName: String): SingleColumn<C> = renamedColumn(newName)
+
     // endregion
 
     // region into
@@ -1184,6 +1218,34 @@ public interface RenameColumnsSelectionDsl {
     @AccessApiOverload
     public infix fun <C> KProperty<C>.into(nameOf: KProperty<*>): ColumnReference<C> = named(nameOf)
 
+    /**
+     * ## Rename: `named` / `into`
+     * Renaming a column in the [ColumnsSelectionDsl][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl] is done by calling the `infix` functions
+     * [named][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.named] or [into][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.into]. They behave exactly the same,
+     * so it's up to contextual preference which one to use. Any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi] can be
+     * used to specify the column to rename and which name should be used instead.
+     *
+     * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.RenameColumnsSelectionDsl.Grammar]
+     *
+     * #### For Example:
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { name  `[named][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.named]` "Full Name" }`
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  {  `[expr][org.jetbrains.kotlinx.dataframe.api.expr]`  { 0 }  `[into][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.into]` "zeroes" }`
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { "colA"  `[named][kotlin.String.named]` Type::colB }`
+     *
+     * #### Example for this overload:
+     *
+     * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]`  { col(0)  `[into][SingleColumn.into]` "columnB" }`
+     *
+     * @receiver The [SingleColumn] referencing the column to rename.
+     * @param [newName] A [String] used to specify the new name of the column.
+     * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column.
+     */
+    @Interpretable("Named1")
+    public infix fun <C> SingleColumn<C>.into(newName: String): SingleColumn<C> = named(newName)
+
     // endregion
 }
 

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/RenamedSingleColumn.kt

@@ -0,0 +1,15 @@
+package org.jetbrains.kotlinx.dataframe.impl.columns
+
+import org.jetbrains.kotlinx.dataframe.columns.ColumnResolutionContext
+import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
+import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
+
+internal class RenamedSingleColumn<C>(val source: SingleColumn<C>, val name: String) : SingleColumn<C> {
+
+    override fun resolveSingle(context: ColumnResolutionContext): ColumnWithPath<C>? =
+        source.resolveSingle(context)?.let {
+            it.data.rename(name).addPath(it.path)
+        }
+}
+
+internal fun <C> SingleColumn<C>.renamedColumn(newName: String): SingleColumn<C> = RenamedSingleColumn(this, newName)

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

@@ -156,6 +156,40 @@ class RenameTests : ColumnsSelectionDslTests() {
             df.select { col("age") into col("age2") },
         ).shouldAllBeEqual()
     }
+
+    @Test
+    fun `col by index named`() {
+        val df = dataFrameOf(
+            "col0" to columnOf(1, 4),
+            "col1" to columnOf(2, 5),
+            "col2" to columnOf(3, 6),
+        )
+
+        listOf(
+            df.select { col(0) and (col(1) named "renamed") and col(2) },
+            df.select { col(0) and (col(1) into "renamed") and col(2) },
+            df.select { col(0) and (col<Int>(1) named "renamed") and col(2) },
+            df.select { col(0) and (col<Int>(1) into "renamed") and col(2) },
+        ).shouldAllBeEqual()
+
+        val result = df.select { col(0) and (col(1) named "renamed") and col(2) }
+        result.columnNames() shouldBe listOf("col0", "renamed", "col2")
+        result["renamed"].toList() shouldBe listOf(2, 5)
+    }
+
+    @Test
+    fun `col by index named with convert`() {
+        val df = dataFrameOf(
+            "a" to columnOf(1, 4),
+            "b" to columnOf(2, 5),
+            "c" to columnOf(3, 6),
+        )
+
+        val result = df.convert { col<Int>(0) named "newA" }.with { it * 10 }
+
+        result.columnNames() shouldBe listOf("newA", "b", "c")
+        result["newA"].toList() shouldBe listOf(10, 40)
+    }
 }
 
 class RenameToCamelCaseTests {