diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt index af21c349f5..f4addacf8a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt @@ -241,12 +241,14 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") + @Interpretable("SingleColumnNestedColUntyped") public fun SingleColumn>.col(name: String): SingleColumn<*> = col(name) /** * @include [ColNameDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ + @Interpretable("SingleColumnNestedCol") public fun SingleColumn>.col(name: String): SingleColumn = this.ensureIsColumnGroup().transformSingle { val child = it.getCol(name)?.cast() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt index c1982d727f..9367a8e6ad 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt @@ -171,9 +171,11 @@ public class GroupClause(internal val df: DataFrame, internal val colum * where that column should be grouped. * All selected columns will be moved under the groups defined by this expression. */ +@Refine @JvmName("intoString") @OverloadResolutionByLambdaReturnType @OptIn(ExperimentalTypeInference::class) +@Interpretable("IntoStringLambda") public fun GroupClause.into(column: ColumnsSelectionDsl.(ColumnWithPath) -> String): DataFrame = df.move(columns).under { column(it).toColumnAccessor() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt index 30858d25f0..48e44fd628 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt @@ -282,6 +282,8 @@ public fun RenameClause.into(vararg newNames: KProperty<*>): DataFr * and returns the new column name. * @return A new [DataFrame] with the columns renamed. */ +@Refine +@Interpretable("RenameIntoLambda") public fun RenameClause.into(transform: (ColumnWithPath) -> String): DataFrame = renameImpl(transform)