Skip to content

Hide mapToColumn in CS DSL in favor of expr #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2025
Merged

Hide mapToColumn in CS DSL in favor of expr #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/expr.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
import org.jetbrains.kotlinx.dataframe.documentation.ColumnExpression
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
import kotlin.reflect.typeOf

// region ColumnsSelectionDsl

Expand Down Expand Up @@ -65,6 +66,6 @@ public inline fun <T, reified R> ColumnsSelectionDsl<T>.expr(
name: String = "",
infer: Infer = Infer.Nulls,
noinline expression: AddExpression<T, R>,
): DataColumn<R> = mapToColumn(name, infer, expression)
): DataColumn<R> = mapToColumn(name, typeOf<R>(), infer, expression)

// endregion
14 changes: 13 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columnName
import org.jetbrains.kotlinx.dataframe.impl.columns.createComputedColumnReference
import org.jetbrains.kotlinx.dataframe.impl.columns.newColumn
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
import org.jetbrains.kotlinx.dataframe.util.UNIFIED_SIMILAR_CS_API
import kotlin.reflect.KProperty
import kotlin.reflect.KType
import kotlin.reflect.typeOf
Expand Down Expand Up @@ -70,6 +71,16 @@ public inline fun <T, R> DataColumn<T>.mapIndexed(

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(
name: String,
infer: Infer = Infer.Nulls,
noinline body: AddExpression<T, R>,
): DataColumn<R> = mapToColumn(name, typeOf<R>(), infer, body)

@Deprecated(
UNIFIED_SIMILAR_CS_API,
replaceWith = ReplaceWith("expr(name, infer, body)", "org.jetbrains.kotlinx.dataframe.api.Infer"),
)
public inline fun <T, reified R> ColumnsContainer<T>.mapToColumn(
name: String,
infer: Infer = Infer.Nulls,
Expand All @@ -92,7 +103,8 @@ public inline fun <T, reified R> ColumnsContainer<T>.mapToColumn(
noinline body: AddExpression<T, R>,
): DataColumn<R> = mapToColumn(column, typeOf<R>(), infer, body)

public fun <T, R> ColumnsContainer<T>.mapToColumn(
@PublishedApi
internal fun <T, R> ColumnsContainer<T>.mapToColumn(
name: String,
type: KType,
infer: Infer = Infer.Nulls,
Expand Down
1 change: 1 addition & 0 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ internal const val GENERATE_CODE_REPLACE2 =

internal const val GENERATE_INTERFACES = "This function is just here for binary compatibility. $MESSAGE_1_1"

internal const val UNIFIED_SIMILAR_CS_API = "Deprecated duplicated functionality. $MESSAGE_1_1"
// endregion

// region keep across releases
Expand Down