diff --git a/core/api/core.api b/core/api/core.api index d1a60df947..f17f3181aa 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -878,11 +878,16 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsCol } public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl { + public fun colsAtAnyDepth (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static synthetic fun colsAtAnyDepth$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static synthetic fun colsAtAnyDepth$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1018,11 +1023,16 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsS } public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl { + public fun colsInGroups (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; + public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; + public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; + public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; + public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public fun colsInGroups (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static synthetic fun colsInGroups$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static synthetic fun colsInGroups$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; @@ -3939,13 +3949,17 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SimplifyColu } public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl { + public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; + public fun single (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun single (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static synthetic fun single$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static synthetic fun single$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; + public fun singleCol (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun singleCol (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun singleCol (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; + public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public fun singleCol (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static synthetic fun singleCol$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static synthetic fun singleCol$default (Lorg/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt index 16ff0c3e72..6f58c938ec 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.FrameColumn import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -43,15 +44,11 @@ public interface ColumnsContainer : ColumnsScope { public fun getColumnOrNull(index: Int): AnyCol? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getColumnOrNull(column: ColumnReference): DataColumn? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getColumnOrNull(column: KProperty): DataColumn? @@ -67,58 +64,40 @@ public interface ColumnsContainer : ColumnsScope { public operator fun get(columnPath: ColumnPath): AnyCol = getColumn(columnPath) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn): DataColumn = getColumn(column.name()).cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn>): ColumnGroup = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn>): FrameColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference): DataColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference>): ColumnGroup = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference>): FrameColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty): DataColumn = get(column.columnName).cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty>): ColumnGroup = get(column.columnName).asColumnGroup().cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty>): FrameColumn = get(column.columnName).asAnyFrameColumn().castFrameColumn() diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt index 2e4acb596c..26a5d88451 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.headPlusIterable import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrame import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrameOf import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KType /** @@ -121,9 +122,7 @@ public interface DataFrame : */ public operator fun DataFrame.get(columns: ColumnsSelector): List> = this.get(columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun DataFrame.get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame = select { (listOf(first) + other).toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt index ef8513529c..c365541a77 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.owner import org.jetbrains.kotlinx.dataframe.impl.toIterable +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -28,27 +29,19 @@ public interface DataRow { public operator fun get(expression: RowExpression): R = expression(this, this) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference): R - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(columns: List>): List = columns.map { get(it) } - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(property: KProperty): R = get(property.columnName) as R - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataRow = owner.get(first, *other)[index] @@ -83,9 +76,7 @@ public interface DataRow { public fun getOrNull(name: String): Any? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getValueOrNull(column: ColumnReference): R? @@ -95,9 +86,7 @@ public interface DataRow { public operator fun String.get(vararg path: String): ColumnPath = ColumnPath(listOf(this) + path) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnReference.invoke(): R = get(this) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt index 6b8e5e9e64..d288915a76 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.FrameColumn import org.jetbrains.kotlinx.dataframe.impl.columns.getColumn +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Column Selection DSL][ColumnSelectionDsl] */ @@ -86,9 +87,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [DataColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.invoke(): DataColumn = this@ColumnSelectionDsl[this] @@ -99,9 +98,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.invoke(): ColumnGroup = this@ColumnSelectionDsl[this] @@ -112,9 +109,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [FrameColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.invoke(): FrameColumn = this@ColumnSelectionDsl[this] @@ -149,9 +144,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty): DataColumn = invoke()[column] @@ -171,9 +164,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty>): ColumnGroup = invoke()[column] @@ -194,9 +185,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty>): FrameColumn = invoke()[column] @@ -215,9 +204,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [DataColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty): DataColumn = invoke().asColumnGroup()[column] @@ -235,9 +222,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty>): ColumnGroup = invoke().asColumnGroup()[column] @@ -256,9 +241,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @throws [IllegalArgumentException] if the column is not found. * @return The [FrameColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty>): FrameColumn = invoke().asColumnGroup()[column] diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt index 94432e08ab..a73b464e3a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt @@ -8,6 +8,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Columns Selection DSL][ColumnsSelectionDsl] */ @@ -136,17 +137,17 @@ public interface ColumnsSelectionDsl : // SingleColumn> *      * * ### Definitions: - * `columnGroupReference: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroupReference: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * `colSelector: `[`ColumnSelector`][org.jetbrains.kotlinx.dataframe.ColumnSelector] * * `colsSelector: `[`ColumnsSelector`][org.jetbrains.kotlinx.dataframe.ColumnsSelector] * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * - * `columnNoAccessor: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnNoAccessor: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * `columnOrSet: `[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]` | `[`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef] * @@ -216,9 +217,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `| `[**`cols`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`[`**`<`**[`T`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnTypeDef]**`>`**`]`**`(`**[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]**`,`**` .. | `[`index`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexDef]**`,`**` .. | `[`indexRange`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexRangeDef]**`)`** * - * `| `[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * `| `[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * - * `| `[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * `| `[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * * `| `[**colsOf**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]**`<`**[`T`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnTypeDef]**`>`**` [ `**`(`**[`kType`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.KTypeDef]**`)`**` ] [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` * @@ -230,7 +231,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `| `[**`expr`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.expr]**`(`**`[`[`name`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.NameDef]**`,`**`][`[`infer`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.InferDef]`]`**`) { `**[`expression`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnExpressionDef]**` }`** * - * `| (`[**`first`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`| `[**`last`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.last]`| `[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * `| (`[**`first`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`|`[**`last`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.last]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * + * `| `[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`()` * * `| `[**`nameContains`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]**`(`**[`text`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.TextDef]`[`**`, `**[`ignoreCase`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IgnoreCaseDef]`] | `[`regex`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.RegexDef]**`)`** * @@ -278,9 +281,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * *     `| `__`.`__[**`cols`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]**`(`**[`index`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexDef]**`,`**` .. | `[`indexRange`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexRangeDef]**`)`** * - *     `| `__`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| `__`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * - *     `| `__`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| `__`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * *     `| `__`.`__[**`colsOf`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]**`<`**[`T`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnTypeDef]**`>`**` [ `**`(`**[`kType`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.KTypeDef]**`)`**` ] [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` * @@ -300,7 +303,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * *     `| `__`.`__[**`filter`**][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]**` { `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`** * - *     `| (`__`.`__[**`first`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`| `__`.`__[**`last`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.last]`| `__`.`__[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| (`__`.`__[**`first`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`|`__`.`__[**`last`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.last]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * + *     `| `__`.`__[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`()` * *     `| `__`.name`__`(`[**`Starts`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`|`[**`Ends`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameEndsWith]`)`**`With`**__`(`__[`text`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.TextDef]`[`**`, `**[`ignoreCase`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IgnoreCaseDef]`]`**`)`** * @@ -348,9 +353,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * *     `| `__`.`__[**`cols`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`[`**`<`**[`T`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnTypeDef]**`>`**`]`**`(`**[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]**`,`**` .. | `[`index`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexDef]**`,`**` .. | `[`indexRange`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IndexRangeDef]**`)`** * - *     `| `__`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| `__`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * - *     `| `__`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| `__`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * *     `| `__`.colsName`__`(`[**`Starts`**][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`|`[**`Ends`**][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameEndsWith]`)`**`With`**__`(`__[`text`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.TextDef]`[`**`, `**[`ignoreCase`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.IgnoreCaseDef]`]`**`)`** * @@ -368,7 +373,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * *     `| `__`.`__[**`except`**][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]**`(`**[`columnNoAccessor`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnNoAccessorDef]**`,`**` ..`**`)`** * - *     `| (`__`.`__[**`firstCol`**][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`| `__`.`__[**`lastCol`**][org.jetbrains.kotlinx.dataframe.api.LastColumnsSelectionDsl.lastCol]`| `__`.`__[**`singleCol`**][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.singleCol]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     `| (`__`.`__[**`firstCol`**][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`|`__`.`__[**`lastCol`**][org.jetbrains.kotlinx.dataframe.api.LastColumnsSelectionDsl.lastCol]`) [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * + *     `| `__`.`__[**`singleCol`**][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.singleCol]`()` * *     `| `__`.`__[**`select`**][org.jetbrains.kotlinx.dataframe.api.SelectColumnsSelectionDsl.select]**` { `**[`colsSelector`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnsSelectorDef]**` }`** * @@ -492,9 +499,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the columns selected by [selector]. * @see [SingleColumn.except] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.invoke(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt index 23eafc5070..23eca777a0 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths import org.jetbrains.kotlinx.dataframe.ncol import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun DataFrame.getColumnsWithPaths(selector: ColumnsSelector): List> = @@ -87,23 +88,17 @@ public fun DataFrame.properties(): ColumnsScope = this public fun ColumnsContainer.getColumn(name: String): AnyCol = getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference>): FrameColumn = getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference>): ColumnGroup = getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference): DataColumn = getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'") @@ -125,16 +120,12 @@ public fun ColumnsContainer.getColumnGroup(index: Int): ColumnGroup<*> = public fun ColumnsContainer.getColumnGroup(name: String): ColumnGroup<*> = getColumn(name).asColumnGroup() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroup(column: KProperty<*>): ColumnGroup<*> = getColumnGroup(column.columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroup(column: ColumnReference>): ColumnGroup = getColumn(column) @@ -149,9 +140,7 @@ public fun ColumnsContainer.getColumnGroup(column: ColumnSelector ColumnsContainer.getColumnGroupOrNull(name: String): ColumnGroup<*>? = getColumnOrNull(name)?.asColumnGroup() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? = getColumnGroupOrNull(column.columnName) @@ -160,27 +149,19 @@ public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): C // region containsColumn -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer<*>.containsColumn(column: ColumnReference): Boolean = getColumnOrNull(column) != null -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt index d9d4e8e2a3..44e3c075e3 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.indices import org.jetbrains.kotlinx.dataframe.ncol import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KProperty import kotlin.reflect.KType @@ -62,23 +63,17 @@ public fun AnyRow.namedValues(): List> = public fun AnyRow.getValue(columnName: String): T = get(columnName) as T -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValue(column: ColumnReference): T = get(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValue(column: KProperty): T = get(column) public fun AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T? -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull(column.columnName) @@ -88,23 +83,17 @@ public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull< public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column) public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt index 1f07876a10..acf6f43da7 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.NaN import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.get import org.jetbrains.kotlinx.dataframe.typeClass +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract import kotlin.reflect.KProperty @@ -260,9 +261,7 @@ public fun DataFrame.fillNulls(vararg columns: String): Update = * * @param [columns] The [KProperties][KProperty] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNulls(vararg columns: KProperty): Update = fillNulls { columns.toColumnSet() } @@ -297,9 +296,7 @@ public fun DataFrame.fillNulls(vararg columns: KProperty): Update DataFrame.fillNulls(vararg columns: ColumnReference): Update = fillNulls { columns.toColumnSet() } @@ -593,9 +590,7 @@ public fun DataFrame.fillNaNs(vararg columns: String): Update = * * @param [columns] The [KProperties][KProperty] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNaNs(vararg columns: KProperty): Update = fillNaNs { columns.toColumnSet() } @@ -628,9 +623,7 @@ public fun DataFrame.fillNaNs(vararg columns: KProperty): Update DataFrame.fillNaNs(vararg columns: ColumnReference): Update = fillNaNs { columns.toColumnSet() } @@ -870,9 +863,7 @@ public fun DataFrame.fillNA(vararg columns: String): Update = fi * * @param [columns] The [KProperties][KProperty] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNA(vararg columns: KProperty): Update = fillNA { columns.toColumnSet() } @@ -905,9 +896,7 @@ public fun DataFrame.fillNA(vararg columns: KProperty): Update DataFrame.fillNA(vararg columns: ColumnReference): Update = fillNA { columns.toColumnSet() } @@ -1023,9 +1012,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false): DataFrame< * If `false`, rows are dropped if any of the selected cells is `null`. * @param columns The [KProperties][KProperty] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNulls(vararg columns: KProperty<*>, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -1087,9 +1074,7 @@ public fun DataFrame.dropNulls(vararg columns: String, whereAllNull: Bool * If `false`, rows are dropped if any of the selected cells is `null`. * @param columns The [Column References][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNulls(vararg columns: AnyColumnReference, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -1190,9 +1175,7 @@ public fun DataFrame.dropNA(whereAllNA: Boolean = false, columns: Columns * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * @param columns The [KProperties][KProperty] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNA(vararg columns: KProperty<*>, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -1252,9 +1235,7 @@ public fun DataFrame.dropNA(vararg columns: String, whereAllNA: Boolean = * If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA]. * @param columns The [Column References][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNA(vararg columns: AnyColumnReference, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -1374,9 +1355,7 @@ public fun DataFrame.dropNaNs(whereAllNaN: Boolean = false, columns: Colu * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. * @param columns The [KProperties][KProperty] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNaNs(vararg columns: KProperty<*>, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } @@ -1436,9 +1415,7 @@ public fun DataFrame.dropNaNs(vararg columns: String, whereAllNaN: Boolea * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. * @param columns The [Column References][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] used to select the columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to drop rows in. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNaNs(vararg columns: AnyColumnReference, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt index 94b7b5710c..21143891fa 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.exceptions.DuplicateColumnNamesException import org.jetbrains.kotlinx.dataframe.exceptions.UnequalColumnSizesException import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.columns.resolveSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /* @@ -132,9 +133,7 @@ public inline fun DataFrame.add( noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(name, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.add( property: KProperty, @@ -142,9 +141,7 @@ public inline fun DataFrame.add( noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(property, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.add( column: ColumnAccessor, @@ -198,61 +195,45 @@ public class AddDsl( add(this, Infer.Nulls, expression) // TODO: use path instead of name - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun ColumnAccessor.from(noinline expression: RowExpression): Boolean = name().from(expression) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(noinline expression: RowExpression): Boolean = add(name, Infer.Nulls, expression) public infix fun String.from(column: AnyColumnReference): Boolean = add(column.rename(this)) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun ColumnAccessor.from(column: ColumnReference): Boolean = name() from column - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(column: ColumnReference): Boolean = name from column @Interpretable("Into") public infix fun AnyColumnReference.into(name: String): Boolean = add(rename(name)) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(column: ColumnAccessor): Boolean = into(column.name()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(column: KProperty): Boolean = into(column.name) @Interpretable("AddDslStringInvoke") public operator fun String.invoke(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun AnyColumnGroupAccessor.from(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun group(column: AnyColumnGroupAccessor, body: AddDsl.() -> Unit): Unit = group(column.name(), body) @@ -267,9 +248,7 @@ public class AddDsl( public infix fun AddGroup.into(groupName: String): Unit = group(groupName, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun AddGroup.into(column: AnyColumnGroupAccessor): Unit = into(column.name()) } @@ -290,9 +269,7 @@ public inline fun GroupBy.add( noinline expression: RowExpression, ): GroupBy = updateGroups { add(name, infer, expression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.add( column: ColumnAccessor, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt index e9e4c2175d..4a177e8e81 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt @@ -7,6 +7,7 @@ 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.ColumnAccessor +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API // region DataColumn @@ -16,9 +17,7 @@ public fun AnyCol.addId(columnName: String = "id"): AnyFrame = toDataFrame().add // region DataFrame -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.addId(column: ColumnAccessor): DataFrame = insert(column) { index() }.at(0) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt index 8fb9f5f38a..1c60ea538a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.owner +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -76,11 +77,11 @@ public interface AllColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -427,9 +428,7 @@ public interface AllColumnsSelectionDsl { * @see [ColumnsSelectionDsl.allExcept] * @see [ColumnsSelectionDsl.cols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols() @@ -1834,9 +1833,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsAfter(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -1899,9 +1896,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -1963,9 +1958,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: String): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -2027,9 +2020,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -2092,9 +2083,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -3750,9 +3739,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsFrom(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -3815,9 +3802,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -3879,9 +3864,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: String): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -3943,9 +3926,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -4008,9 +3989,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -5665,9 +5644,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsBefore(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -5730,9 +5707,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -5794,9 +5769,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: String): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -5858,9 +5831,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -5923,9 +5894,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -7581,9 +7550,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsUpTo(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsUpTo(column) @@ -7646,9 +7613,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsUpTo(column) @@ -7710,9 +7675,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: String): ColumnSet<*> = columnGroup(this).allColsUpTo(column) @@ -7774,9 +7737,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsUpTo(column) @@ -7839,9 +7800,7 @@ public interface AllColumnsSelectionDsl { * @param [column] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index 48a366690e..c1c49bf613 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT_REPLACE import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT_REPLACE_VARARG +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.EXCEPT_REPLACE import org.jetbrains.kotlinx.dataframe.util.EXCEPT_REPLACE_VARARG import kotlin.reflect.KProperty @@ -48,7 +49,7 @@ public interface AllExceptColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -56,11 +57,11 @@ public interface AllExceptColumnsSelectionDsl { * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `columnNoAccessor: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnNoAccessor: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -763,9 +764,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allFrom * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnSet.except(other: KProperty): ColumnSet = except(column(other)) @@ -871,9 +870,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allFrom * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnSet.except(vararg others: KProperty): ColumnSet = except(others.toColumnSet()) @@ -1503,9 +1500,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsSelectionDsl<*>.allExcept(vararg others: KProperty<*>): ColumnSet<*> = asSingleColumn().allColsExceptInternal(others.toColumnSet()) @@ -1947,9 +1942,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = allColsExceptInternal(others.toColumnSet()) @@ -2383,9 +2376,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.except(vararg others: KProperty<*>): SingleColumn> = exceptInternal(others.toColumnSet()) @@ -2823,9 +2814,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3037,9 +3026,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(selector: ColumnsSelector): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @@ -3164,9 +3151,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3275,9 +3260,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3384,9 +3367,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3495,9 +3476,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3604,9 +3583,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -3715,9 +3692,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -4050,9 +4025,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -4495,9 +4468,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -4713,9 +4684,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsExcept(selector: ColumnsSelector): ColumnSet<*> = columnGroup(this).allColsExcept(selector) @@ -4840,9 +4809,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: String): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -4949,9 +4916,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -5058,9 +5023,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt index f1565f0ace..df2ef89b3a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnListImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -37,11 +38,11 @@ public interface AndColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -307,9 +308,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnsResolver.and(other: KProperty): ColumnSet = this and other.toColumnAccessor() @@ -479,9 +478,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.and(other: KProperty): ColumnSet<*> = toColumnAccessor() and other @@ -555,9 +552,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: ColumnsResolver): ColumnSet = toColumnAccessor() and other @@ -591,9 +586,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: () -> ColumnsResolver): ColumnSet = toColumnAccessor() and other() @@ -628,9 +621,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: String): ColumnSet<*> = toColumnAccessor() and other @@ -664,9 +655,7 @@ public interface AndColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left * and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: KProperty): ColumnSet = toColumnAccessor() and other.toColumnAccessor() diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt index bc642eac29..038df7d083 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.util.COL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.IDENTITY_FUNCTION import kotlin.reflect.KProperty @@ -43,11 +44,11 @@ public interface ColColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -344,9 +345,7 @@ public interface ColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.col(col: ColumnAccessor): SingleColumn = this.ensureIsColumnGroup().transformSingle { @@ -403,9 +402,7 @@ public interface ColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.col(col: ColumnAccessor): ColumnAccessor = this.ensureIsColumnGroup().column(col.path()) @@ -458,9 +455,7 @@ public interface ColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -513,9 +508,7 @@ public interface ColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -568,9 +561,7 @@ public interface ColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -1109,9 +1100,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(name: String): ColumnAccessor<*> = col(name) @@ -1165,9 +1154,7 @@ public interface ColColumnsSelectionDsl { * @param [name] The name of the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(name) @@ -1811,9 +1798,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor<*> = col(path) @@ -1867,9 +1852,7 @@ public interface ColColumnsSelectionDsl { * @param [path] The path to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(path) @@ -2082,9 +2065,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun col(property: KProperty): SingleColumn = column(property) @@ -2136,9 +2117,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.col(property: KProperty): SingleColumn = col(property.name) @@ -2190,9 +2169,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.col(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().column(property) @@ -2245,9 +2222,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -2300,9 +2275,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -2355,9 +2328,7 @@ public interface ColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the column. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -2904,9 +2875,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(index: Int): SingleColumn<*> = col(index) @@ -2961,9 +2930,7 @@ public interface ColColumnsSelectionDsl { * @throws [IndexOutOfBoundsException] if the index is out of bounds. * @param [C] The type of the column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(index: Int): SingleColumn = columnGroup(this).col(index) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt index 0dedb68b9a..dc21251cf2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -43,11 +44,11 @@ public interface ColGroupColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -297,9 +298,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = colGroup.ensureIsColumnGroup() @@ -354,9 +353,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(colGroup: ColumnAccessor>): SingleColumn> = this.ensureIsColumnGroup().transformSingle { @@ -418,9 +415,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -475,9 +470,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -532,9 +525,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -589,9 +580,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -1150,9 +1139,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = colGroup(name) @@ -1208,9 +1195,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [name] The name of the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(name).ensureIsColumnGroup() @@ -1880,9 +1865,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = colGroup(path) @@ -1938,9 +1921,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [path] The path to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(path).ensureIsColumnGroup() @@ -2163,9 +2144,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(property: KProperty>): SingleColumn> = columnGroup(property).ensureIsColumnGroup() @@ -2220,9 +2199,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(property: KProperty): SingleColumn> = columnGroup(property).ensureIsColumnGroup() @@ -2279,9 +2256,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(property: KProperty>): SingleColumn> = colGroup(property.name) @@ -2336,9 +2311,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(property: KProperty): SingleColumn> = colGroup(property.name) @@ -2395,9 +2368,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2452,9 +2423,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(property: KProperty): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2511,9 +2480,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2568,9 +2535,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2627,9 +2592,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2684,9 +2647,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2743,9 +2704,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -2800,9 +2759,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -3370,9 +3327,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(index: Int): SingleColumn> = colGroup(index) @@ -3429,9 +3384,7 @@ public interface ColGroupColumnsSelectionDsl { * @throws [IndexOutOfBoundsException] if the index is out of bounds. * @param [C] The type of the column group. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(index: Int): SingleColumn> = columnGroup(this).colGroup(index) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt index f20fa7b6b7..88e08600d3 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt @@ -40,7 +40,7 @@ public interface ColGroupsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt index a1ead46143..deb80cbb1a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.impl.headPlusArray +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -42,11 +43,11 @@ public interface ColsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -1011,9 +1012,7 @@ public interface ColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.frameCols] * @see [ColumnsSelectionDsl.colGroups] * @see [ColumnsSelectionDsl.allCols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).cols(predicate) @@ -1062,9 +1061,7 @@ public interface ColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.frameCols] * @see [ColumnsSelectionDsl.colGroups] * @see [ColumnsSelectionDsl.allCols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = cols(predicate) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index c6514f0f4b..fec3ae1d8f 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.atAnyDepthImpl +import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH +import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -41,11 +44,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] - * - *      - * - * `condition: `[`ColumnFilter`][org.jetbrains.kotlinx.dataframe.ColumnFilter] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -57,7 +56,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * *      * - * [**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * [**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * * * @@ -71,7 +70,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef] * - *     __`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * * * @@ -85,7 +84,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * [`columnGroup`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef] * - *     __`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`colsAtAnyDepth`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`()` * * * @@ -108,8 +107,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][ColumnGroup]) * * This function can also be followed by another [ColumnSet] filter function like * [colsOf][ColumnsSelectionDsl.colsOf], [single][ColumnsSelectionDsl.single], or [valueCols][ColumnsSelectionDsl.valueCols]. @@ -117,7 +115,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][ColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.firstCol]`() }` * *      * @@ -129,7 +127,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` * *      * @@ -143,17 +141,17 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[colsOf][ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }` + * [cols][ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()` + * [first][ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()` * - * [all][ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]`()` + * [all][ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] @@ -167,8 +165,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -176,7 +173,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -188,7 +185,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -202,30 +199,89 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ @Interpretable("ColsAtAnyDepth0") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = colsAtAnyDepthInternal(predicate) /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) + * + * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like + * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.Grammar] + * #### For example: + * `// Depth-first search to a column containing the value "Alice"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` + * + *      + * + * `// The columns at any depth excluding the top-level` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsAtAnyDepth]`() }` + * + *      + * + * `// All value- and frame columns at any depth` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * + *      + * + * `// All value columns at any depth nested under a column group named "myColGroup"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { myColGroup.`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.SingleColumn.colsAtAnyDepth]`().`[valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * + * #### Converting from deprecated syntax: + * + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * + * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` + * + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * + * @see [DataFrame.flatten] + * @see [ColumnsSelectionDsl.simplify] + */ + @Interpretable("ColsAtAnyDepth0") + public fun ColumnSet<*>.colsAtAnyDepth(): ColumnSet<*> = colsAtAnyDepthInternal { true } + + /** + * ## Cols At Any Depth + * + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -233,7 +289,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -245,7 +301,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -255,36 +311,40 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Examples for this overload: * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` * * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ @Interpretable("ColsAtAnyDepth1") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = asSingleColumn().colsAtAnyDepthInternal(predicate) /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -292,7 +352,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -304,7 +364,64 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * + *      + * + * `// All value columns at any depth nested under a column group named "myColGroup"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { myColGroup.`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.SingleColumn.colsAtAnyDepth]`().`[valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` + * + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` + * + * #### Converting from deprecated syntax: + * + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * + * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` + * + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * + * @see [DataFrame.flatten] + * @see [ColumnsSelectionDsl.simplify] + */ + @Interpretable("ColsAtAnyDepth1") + public fun ColumnsSelectionDsl<*>.colsAtAnyDepth(): ColumnSet<*> = asSingleColumn().colsAtAnyDepthInternal { true } + + /** + * ## Cols At Any Depth + * + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) + * + * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like + * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.Grammar] + * #### For example: + * `// Depth-first search to a column containing the value "Alice"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` + * + *      + * + * `// The columns at any depth excluding the top-level` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsAtAnyDepth]`() }` + * + *      + * + * `// All value- and frame columns at any depth` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -318,30 +435,90 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ @Interpretable("ColsAtAnyDepth2") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = ensureIsColumnGroup().colsAtAnyDepthInternal(predicate) /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) + * + * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like + * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.Grammar] + * #### For example: + * `// Depth-first search to a column containing the value "Alice"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` + * + *      + * + * `// The columns at any depth excluding the top-level` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsAtAnyDepth]`() }` + * + *      + * + * `// All value- and frame columns at any depth` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * + *      + * + * `// All value columns at any depth nested under a column group named "myColGroup"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { myColGroup.`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.SingleColumn.colsAtAnyDepth]`().`[valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { myColGroup.`[colsAtAnyDepth][SingleColumn.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * + * #### Converting from deprecated syntax: + * + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * + * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` + * + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * + * @see [DataFrame.flatten] + * @see [ColumnsSelectionDsl.simplify] + */ + @Interpretable("ColsAtAnyDepth2") + public fun SingleColumn>.colsAtAnyDepth(): ColumnSet<*> = + ensureIsColumnGroup().colsAtAnyDepthInternal { true } + + /** + * ## Cols At Any Depth + * + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -349,7 +526,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -361,7 +538,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -375,29 +552,33 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -405,7 +586,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -417,7 +598,61 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * + *      + * + * `// All value columns at any depth nested under a column group named "myColGroup"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { myColGroup.`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.SingleColumn.colsAtAnyDepth]`().`[valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsAtAnyDepth][String.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * + * #### Converting from deprecated syntax: + * + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * + * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` + * + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * + * @see [DataFrame.flatten] + * @see [ColumnsSelectionDsl.simplify] + */ + public fun String.colsAtAnyDepth(): ColumnSet<*> = columnGroup(this).colsAtAnyDepth { true } + + /** + * ## Cols At Any Depth + * + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) + * + * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like + * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.Grammar] + * #### For example: + * `// Depth-first search to a column containing the value "Alice"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` + * + *      + * + * `// The columns at any depth excluding the top-level` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsAtAnyDepth]`() }` + * + *      + * + * `// All value- and frame columns at any depth` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -431,24 +666,22 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) @@ -456,8 +689,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { /** * ## Cols At Any Depth * - * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) * * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. @@ -465,7 +697,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` * *      * @@ -477,7 +709,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `// All value- and frame columns at any depth` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` * *      * @@ -491,24 +723,79 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }` + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` * - * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` * * @see [DataFrame.flatten] * @see [ColumnsSelectionDsl.simplify] */ + @Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)")) public fun ColumnPath.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) + /** + * ## Cols At Any Depth + * + * Returns all columns in [this] at any depth (so also inside [Column Groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]) + * + * This function can also be followed by another [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] filter function like + * [colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf], [single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single], or [valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]. + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.Grammar] + * #### For example: + * `// Depth-first search to a column containing the value "Alice"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][org.jetbrains.kotlinx.dataframe.DataColumn.values]`() }.`[first][org.jetbrains.kotlinx.dataframe.api.FirstColumnsSelectionDsl.firstCol]`() }` + * + *      + * + * `// The columns at any depth excluding the top-level` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsAtAnyDepth]`() }` + * + *      + * + * `// All value- and frame columns at any depth` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]` } }` + * + *      + * + * `// All value columns at any depth nested under a column group named "myColGroup"` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { myColGroup.`[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.columns.SingleColumn.colsAtAnyDepth]`().`[valueCols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.valueCols]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { "pathTo"["myGroupCol"].`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * + * #### Converting from deprecated syntax: + * + * `dfs { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][org.jetbrains.kotlinx.dataframe.DataColumn.isColumnGroup]`() }` + * + * `dfsOf { condition } -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[colsOf][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsOf]` { condition }` + * + * [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]` { condition }` + * + * [first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]` { condition }.`[first][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.first]`()` + * + * [all][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColsAtAnyDepthColumnsSelectionDsl.colsAtAnyDepth]`()` + * + * @see [DataFrame.flatten] + * @see [ColumnsSelectionDsl.simplify] + */ + public fun ColumnPath.colsAtAnyDepth(): ColumnSet<*> = columnGroup(this).colsAtAnyDepth { true } + // endregion } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt index 03ae57d6f2..bf42f4a4a9 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.transform +import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS +import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -39,11 +42,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] - * - *      - * - * `condition: `[`ColumnFilter`][org.jetbrains.kotlinx.dataframe.ColumnFilter] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -55,7 +54,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * [**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * [**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * * * @@ -69,7 +68,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef] * - *     __`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * * * @@ -83,7 +82,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * [`columnGroup`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef] * - *     __`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`colsInGroups`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`()` * * * @@ -108,7 +107,7 @@ public interface ColsInGroupsColumnsSelectionDsl { /** * ## Cols in Groups * - * [colsInGroups][colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -130,7 +129,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][DataColumn.name]` } }` + * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnsSelectionDsl.colsInGroups]`().`[nameContains][ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -138,7 +137,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][DataColumn.name]` }.`[colsInGroups][ColumnSet.colsInGroups]`() }` + * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[nameContains][ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][ColumnSet.colsInGroups]`() }` * *      * @@ -149,8 +148,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet] containing the cols. */ private interface ColsInGroupsDocs { @@ -161,7 +159,7 @@ public interface ColsInGroupsColumnsSelectionDsl { /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -183,7 +181,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -191,7 +189,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -204,16 +202,68 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = transform { it.flatMap { it.cols().filter { predicate(it) } } } /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of + * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are + * "one level deeper". + * + * NOTE: This function should not be confused with [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols], which operates on all + * columns directly in [this], or with [colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth], which operates on all + * columns in [this] at any depth. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.Grammar] + * + * #### For example: + * + * To get only the columns inside all column groups in a [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame], instead of having to write: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { colGroupA.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() `[and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and]` colGroupB.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() ... }` + * + * you can use: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`() }` + * + * and + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` + * + *      + * + * Similarly, you can take the columns inside all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]: + * + *      + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * + *      + * + * + * #### Examples of this overload: + * + * `df.`[select][DataFrame.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[DataRow][DataRow]`>().`[colsInGroups][ColumnSet.colsInGroups]`() }` + * + * @see [ColumnsSelectionDsl.cols] + * @see [ColumnsSelectionDsl.colGroups] + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. + */ + public fun ColumnSet<*>.colsInGroups(): TransformableColumnSet<*> = transform { it.flatMap { it.cols() } } + + /** + * ## Cols in Groups + * + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -235,7 +285,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -243,7 +293,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -256,16 +306,20 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = asSingleColumn().colsInGroups(predicate) /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -287,7 +341,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -295,7 +349,55 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * + *      + * + * + * #### Examples of this overload: + * + * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnSet.colsInGroups]`() }` + * + * @see [ColumnsSelectionDsl.cols] + * @see [ColumnsSelectionDsl.colGroups] + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. + */ + public fun ColumnsSelectionDsl<*>.colsInGroups(): TransformableColumnSet<*> = asSingleColumn().colsInGroups() + + /** + * ## Cols in Groups + * + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of + * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are + * "one level deeper". + * + * NOTE: This function should not be confused with [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols], which operates on all + * columns directly in [this], or with [colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth], which operates on all + * columns in [this] at any depth. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.Grammar] + * + * #### For example: + * + * To get only the columns inside all column groups in a [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame], instead of having to write: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { colGroupA.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() `[and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and]` colGroupB.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() ... }` + * + * you can use: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`() }` + * + * and + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` + * + *      + * + * Similarly, you can take the columns inside all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]: + * + *      + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -308,16 +410,69 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = ensureIsColumnGroup().allColumnsInternal().colsInGroups(predicate) /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of + * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are + * "one level deeper". + * + * NOTE: This function should not be confused with [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols], which operates on all + * columns directly in [this], or with [colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth], which operates on all + * columns in [this] at any depth. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.Grammar] + * + * #### For example: + * + * To get only the columns inside all column groups in a [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame], instead of having to write: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { colGroupA.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() `[and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and]` colGroupB.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() ... }` + * + * you can use: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`() }` + * + * and + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` + * + *      + * + * Similarly, you can take the columns inside all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]: + * + *      + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * + *      + * + * + * #### Examples of this overload: + * + * `df.`[select][DataFrame.select]` { myColumnGroup.`[colsInGroups][SingleColumn.colsInGroups]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` + * + * @see [ColumnsSelectionDsl.cols] + * @see [ColumnsSelectionDsl.colGroups] + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. + */ + public fun SingleColumn>.colsInGroups(): TransformableColumnSet<*> = + ensureIsColumnGroup().allColumnsInternal().colsInGroups() + + /** + * ## Cols in Groups + * + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -339,7 +494,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -347,7 +502,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -358,16 +513,20 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -389,7 +548,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -397,7 +556,55 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * + *      + * + * + * #### Examples of this overload: + * + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsInGroups][String.colsInGroups]`() }` + * + * @see [ColumnsSelectionDsl.cols] + * @see [ColumnsSelectionDsl.colGroups] + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. + */ + public fun String.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups() + + /** + * ## Cols in Groups + * + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of + * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are + * "one level deeper". + * + * NOTE: This function should not be confused with [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols], which operates on all + * columns directly in [this], or with [colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth], which operates on all + * columns in [this] at any depth. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.Grammar] + * + * #### For example: + * + * To get only the columns inside all column groups in a [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame], instead of having to write: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { colGroupA.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() `[and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and]` colGroupB.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() ... }` + * + * you can use: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`() }` + * + * and + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` + * + *      + * + * Similarly, you can take the columns inside all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]: + * + *      + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -410,12 +617,9 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) @@ -423,7 +627,7 @@ public interface ColsInGroupsColumnsSelectionDsl { /** * ## Cols in Groups * - * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are * "one level deeper". * @@ -445,7 +649,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` * *      * @@ -453,7 +657,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * *      * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][org.jetbrains.kotlinx.dataframe.DataColumn.name]` }.`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` * *      * @@ -464,11 +668,63 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols] * @see [ColumnsSelectionDsl.colGroups] - * @param [predicate] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) + + /** + * ## Cols in Groups + * + * [colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.colsInGroups] is a function that returns all columns at the top-levels of + * all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in [this]. This is useful if you want to select all columns that are + * "one level deeper". + * + * NOTE: This function should not be confused with [cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols], which operates on all + * columns directly in [this], or with [colsAtAnyDepth][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsAtAnyDepth], which operates on all + * columns in [this] at any depth. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColsInGroupsColumnsSelectionDsl.Grammar] + * + * #### For example: + * + * To get only the columns inside all column groups in a [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame], instead of having to write: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { colGroupA.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() `[and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and]` colGroupB.`[cols][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.cols]`() ... }` + * + * you can use: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`() }` + * + * and + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colsInGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colsInGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("user") }` + * + *      + * + * Similarly, you can take the columns inside all [column groups][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] in a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]: + * + *      + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[colGroups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]`().`[nameContains][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][org.jetbrains.kotlinx.dataframe.columns.ColumnSet.colsInGroups]`() }` + * + *      + * + * + * #### Examples of this overload: + * + * `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[colsInGroups][ColumnPath.colsInGroups]`() }` + * + * @see [ColumnsSelectionDsl.cols] + * @see [ColumnsSelectionDsl.colGroups] + * @return A [TransformableColumnSet][org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet] containing the cols. + */ + public fun ColumnPath.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups() } // endregion diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt index 86e67b8a5c..c49096e9ac 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.columns.size import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -45,11 +46,11 @@ public interface ColsOfColumnsSelectionDsl { * *      * - * `columnGroupReference: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroupReference: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -271,9 +272,7 @@ public interface ColsOfColumnsSelectionDsl { * @param [filter] an optional filter function that takes a column of type [C] and returns `true` if the column should be included. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the columns of given type that were included by [filter]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsOf(type: KType, filter: ColumnFilter = { true }): ColumnSet<*> = columnGroup(this).colsOf(type, filter) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt index a14095ebfc..c2d825554e 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.documentation.AccessApi import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.headPlusArray +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -40,7 +41,7 @@ public interface ColsOfKindColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -348,9 +349,7 @@ public interface ColsOfKindColumnsSelectionDsl { * @see [ColumnsSelectionDsl.colGroups] * @see [ColumnsSelectionDsl.cols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsOfKind( kind: ColumnKind, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt index b4dd7b1f55..efd601b143 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -36,7 +37,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -316,9 +317,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameStartsWith] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameContains( text: CharSequence, @@ -578,9 +577,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameStartsWith] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameContains(regex: Regex): TransformableColumnSet<*> = columnGroup(this).colsNameContains(regex) @@ -814,9 +811,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameEndsWith] * @see [nameContains] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameStartsWith( prefix: CharSequence, @@ -1052,9 +1047,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameStartsWith] * @see [nameContains] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameEndsWith( suffix: CharSequence, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt index 0b4ec58294..907d5aca02 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -30,7 +31,7 @@ public interface ColumnRangeColumnsSelectionDsl { *      * * ### Definitions: - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -111,9 +112,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @see [ColumnsSelectionDsl.allUpTo] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun String.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -169,9 +168,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @see [ColumnsSelectionDsl.allUpTo] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: String): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -200,9 +197,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @see [ColumnsSelectionDsl.allUpTo] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -231,9 +226,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @see [ColumnsSelectionDsl.allUpTo] * */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: AnyColumnReference): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt index cf95bebba6..57daad5ef2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.forceResolve import org.jetbrains.kotlinx.dataframe.impl.columns.unbox import org.jetbrains.kotlinx.dataframe.size import org.jetbrains.kotlinx.dataframe.util.DATAFRAME_OF_WITH_VALUES +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.random.Random import kotlin.random.nextInt import kotlin.reflect.KProperty @@ -49,9 +50,7 @@ public fun column(name: String): ColumnAccessor = ColumnAccessorImpl(name public fun column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(property.name) @@ -61,9 +60,7 @@ public fun ColumnGroupReference.column(name: String): ColumnAccessor = Co public fun ColumnGroupReference.column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -101,9 +98,7 @@ public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) @JvmName("valueColumnTyped") public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueColumn(property: KProperty): ColumnAccessor = column(property.name) @@ -124,9 +119,7 @@ public fun ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.valueColumn(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -151,15 +144,11 @@ public fun columnGroup(path: ColumnPath): ColumnAccessor = column(path) public fun columnGroup(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("columnGroupDataRowKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun columnGroup(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun columnGroup(property: KProperty): ColumnAccessor> = column(property.name) @@ -182,16 +171,12 @@ public fun ColumnGroupReference.columnGroup(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("columnGroupDataRowKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.columnGroup(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.columnGroup(property: KProperty): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) @@ -216,15 +201,11 @@ public fun frameColumn(path: ColumnPath): ColumnAccessor = column(path public fun frameColumn(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property.name) @@ -247,16 +228,12 @@ public fun ColumnGroupReference.frameColumn(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt index c8ae03ac93..7da093d464 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt @@ -44,6 +44,7 @@ import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_REPLACE import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.TO_URL import org.jetbrains.kotlinx.dataframe.util.TO_URL_REPLACE import java.math.BigDecimal @@ -325,9 +326,7 @@ internal interface ConvertDocs { @Interpretable("Convert0") public fun DataFrame.convert(columns: ColumnsSelector): Convert = Convert(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.convert(vararg columns: KProperty): Convert = convert { columns.toColumnSet() } @@ -376,16 +375,12 @@ public fun DataFrame.convert(vararg columns: KProperty): Convert DataFrame.convert(vararg columns: String): Convert = convert { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.convert(vararg columns: ColumnReference): Convert = convert { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.convert( firstCol: ColumnReference, @@ -394,9 +389,7 @@ public inline fun DataFrame.convert( noinline expression: RowValueExpression, ): DataFrame = convert(*headPlusArray(firstCol, cols)).with(infer, expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.convert( firstCol: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt index 9bc6de7d28..d4df7e426e 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.corrImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -16,21 +17,20 @@ internal fun AnyCol.isSuitableForCorr() = isSubtypeOf() || type() == typ public data class Corr(internal val df: DataFrame, internal val columns: ColumnsSelector) -public fun DataFrame.corr(): DataFrame = corr { colsAtAnyDepth { it.isSuitableForCorr() } }.withItself() +public fun DataFrame.corr(): DataFrame = + corr { + colsAtAnyDepth().filter { it.isSuitableForCorr() } + }.withItself() public fun DataFrame.corr(columns: ColumnsSelector): Corr = Corr(this, columns) public fun DataFrame.corr(vararg columns: String): Corr = corr { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.corr(vararg columns: KProperty): Corr = corr { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.corr(vararg columns: ColumnReference): Corr = corr { columns.toColumnSet() } @@ -38,16 +38,12 @@ public fun Corr.with(otherColumns: ColumnsSelector): DataF public fun Corr.with(vararg otherColumns: String): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Corr.with(vararg otherColumns: KProperty): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Corr.with(vararg otherColumns: ColumnReference): DataFrame = with { otherColumns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt index 404cbeb4ca..b6c2a79279 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -20,16 +21,12 @@ public fun DataFrame.countDistinct(columns: ColumnsSelector): In public fun DataFrame.countDistinct(vararg columns: String): Int = countDistinct { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.countDistinct(vararg columns: KProperty): Int = countDistinct { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.countDistinct(vararg columns: AnyColumnReference): Int = countDistinct { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt index abe466fc92..4c80ebd0a2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt @@ -8,6 +8,7 @@ import org.jetbrains.kotlinx.dataframe.api.Select.SelectSelectingOptions import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.math.cumSumImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -271,9 +272,7 @@ public fun DataFrame.cumSum(vararg columns: String, skipNA: Boolean = def * @see See `cumSum` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.cumSum( vararg columns: ColumnReference, @@ -302,9 +301,7 @@ public fun DataFrame.cumSum( * @see See `cumSum` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.cumSum( vararg columns: KProperty, @@ -336,7 +333,7 @@ public fun DataFrame.cumSum( public fun DataFrame.cumSum(skipNA: Boolean = defaultCumSumSkipNA): DataFrame = cumSum(skipNA) { // TODO keep at any depth? - colsAtAnyDepth { it.isNumber() }.cast() + colsAtAnyDepth().filter { it.isNumber() }.cast() } // endregion @@ -417,9 +414,7 @@ public fun GroupBy.cumSum(vararg columns: String, skipNA: Boolean = * @see See `cumSum` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.cumSum( vararg columns: ColumnReference, @@ -448,9 +443,7 @@ public fun GroupBy.cumSum( * @see See `cumSum` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.cumSum( vararg columns: KProperty, @@ -482,7 +475,7 @@ public fun GroupBy.cumSum( public fun GroupBy.cumSum(skipNA: Boolean = defaultCumSumSkipNA): GroupBy = cumSum(skipNA) { // TODO keep at any depth? - colsAtAnyDepth { it.isNumber() }.cast() + colsAtAnyDepth().filter { it.isNumber() }.cast() } // endregion diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt index 492df1f1a6..b373c5e3ab 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.describeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataSchema @@ -109,7 +110,7 @@ public fun DataColumn.describe(): DataFrame = describe */ public fun DataFrame.describe(): DataFrame = describe { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } /** @@ -286,9 +287,7 @@ public fun DataFrame.describe(vararg columns: String): DataFrame DataFrame.describe(vararg columns: ColumnReference): DataFrame = describe { columns.toColumnSet() } @@ -342,9 +341,7 @@ public fun DataFrame.describe(vararg columns: ColumnReferenc * @param [columns] The [KProperties][KProperty] that specifies which * columns of this [DataFrame] should be described. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.describe(vararg columns: KProperty): DataFrame = describe { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt index 1fc6dc9a7c..f2e8cf7f93 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.exceptions.DuplicateColumnNamesException import org.jetbrains.kotlinx.dataframe.impl.columns.DistinctColumnSet import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -71,9 +72,7 @@ public fun DataFrame.distinct(columns: ColumnsSelector): DataFra * @see See `distinct` on the documentation website. * . */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinct(vararg columns: KProperty<*>): DataFrame = distinct { @@ -115,9 +114,7 @@ public fun DataFrame.distinct(vararg columns: String): DataFrame = dis * @see See `distinct` on the documentation website. * . */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFrame = distinct { columns.toColumnSet() } @@ -138,9 +135,7 @@ public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFr * @see See `distinct` on the documentation website. * . */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinctBy(vararg columns: KProperty<*>): DataFrame = distinctBy { columns.toColumnSet() } @@ -179,9 +174,7 @@ public fun DataFrame.distinctBy(vararg columns: String): DataFrame = d * @see See `distinct` on the documentation website. * . */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinctBy(vararg columns: AnyColumnReference): DataFrame = distinctBy { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt index 8a4cfcc1d8..60bcb8fb8b 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -94,7 +95,7 @@ public interface DropColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -377,9 +378,7 @@ public interface DropColumnsSelectionDsl { * @param [n] The number of columns to drop. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the first [n] columns. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropCols(n: Int): ColumnSet<*> = columnGroup(this).dropCols(n) @@ -615,9 +614,7 @@ public interface DropColumnsSelectionDsl { * @param [n] The number of columns to drop. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the last [n] columns. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropLastCols(n: Int): ColumnSet<*> = columnGroup(this).dropLastCols(n) @@ -847,9 +844,7 @@ public interface DropColumnsSelectionDsl { * @param [predicate] The [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] to control which columns to drop. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the first columns adhering to the [predicate]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropColsWhile(predicate) @@ -1082,9 +1077,7 @@ public interface DropColumnsSelectionDsl { * @param [predicate] The [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] to control which columns to drop. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the last columns adhering to the [predicate]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropLastColsWhile(predicate) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt index 0f36cd226b..8c59bba5af 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt @@ -11,9 +11,12 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.explodeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty -private val defaultExplodeColumns: ColumnsSelector<*, *> = { colsAtAnyDepth { it.isList() || it.isFrameColumn() } } +private val defaultExplodeColumns: ColumnsSelector<*, *> = { + colsAtAnyDepth().filter { it.isList() || it.isFrameColumn() } +} // region explode DataFrame @Refine @@ -26,16 +29,12 @@ public fun DataFrame.explode( public fun DataFrame.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } @@ -52,16 +51,12 @@ public fun DataRow.explode( public fun DataRow.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataRow.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataRow.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt index c377f389c6..0180fb4196 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.columns.asColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.getTrueIndices import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -41,15 +42,11 @@ public fun DataFrame.filterBy(column: ColumnSelector): DataFr public fun DataFrame.filterBy(column: String): DataFrame = filterBy { column.toColumnOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.filterBy(column: ColumnReference): DataFrame = filterBy { column } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.filterBy(column: KProperty): DataFrame = filterBy { column.toColumnAccessor() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt index 7b2c37a031..d1b64c705b 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -109,7 +110,7 @@ public interface FirstColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -371,9 +372,7 @@ public interface FirstColumnsSelectionDsl { * @throws [NoSuchElementException] if no column adheres to the given [condition]. * @see [ColumnsSelectionDsl.last] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.firstCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).firstCol(condition) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt index 8b8d83dba6..13f368c2e3 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt @@ -8,6 +8,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.flattenImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -127,9 +128,7 @@ public fun DataFrame.flatten( * @see See `flatten` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.flatten( vararg columns: ColumnReference, @@ -161,9 +160,7 @@ public fun DataFrame.flatten( * @see See `flatten` on the documentation website. * */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.flatten( vararg columns: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt index 8bdf1b1997..d21d4d4fa2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration import org.jetbrains.kotlinx.dataframe.io.toHtml import org.jetbrains.kotlinx.dataframe.io.toStandaloneHtml +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -27,16 +28,12 @@ public fun DataFrame.format(columns: ColumnsSelector): FormatCla public fun DataFrame.format(vararg columns: String): FormatClause = format { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.format(vararg columns: ColumnReference): FormatClause = format { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.format(vararg columns: KProperty): FormatClause = format { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt index 4b6a0ac441..e859c6074a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -44,11 +45,11 @@ public interface FrameColColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -295,9 +296,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = frameCol.ensureIsFrameColumn() @@ -351,9 +350,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol( frameCol: ColumnAccessor>, @@ -416,9 +413,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.frameCol( frameCol: ColumnAccessor>, @@ -473,9 +468,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -529,9 +522,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -585,9 +576,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -2114,9 +2103,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() @@ -2170,9 +2157,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() @@ -2228,9 +2213,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) @@ -2284,9 +2267,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) @@ -2340,9 +2321,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") @@ -2398,9 +2377,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.frameCol(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2456,9 +2433,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2512,9 +2487,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2570,9 +2543,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2626,9 +2597,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2684,9 +2653,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -2740,9 +2707,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -3301,9 +3266,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(index: Int): SingleColumn> = frameCol(index) @@ -3359,9 +3322,7 @@ public interface FrameColColumnsSelectionDsl { * @throws [IndexOutOfBoundsException] if the index is out of bounds. * @param [C] The type of the frame column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(index: Int): SingleColumn> = columnGroup(this).frameCol(index) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt index 38ce7377f5..68f684e69d 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.FrameColumn import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.documentation.AccessApi import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -41,7 +42,7 @@ public interface FrameColsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -325,9 +326,7 @@ public interface FrameColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.colGroups] * @see [ColumnsSelectionDsl.cols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCols( filter: Predicate> = { true }, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt index bfe9b3c090..b1ee62e0ba 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.gatherImpl import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -31,16 +32,12 @@ public fun DataFrame.gather(selector: ColumnsSelector): Gather DataFrame.gather(vararg columns: String): Gather = gather { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.gather(vararg columns: ColumnReference): Gather = gather { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.gather(vararg columns: KProperty): Gather = gather { columns.toColumnSet() } @@ -131,18 +128,14 @@ public class Gather( public fun Gather.into(keyColumn: String, valueColumn: String): DataFrame = gatherImpl(keyColumn, valueColumn) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.into( keyColumn: ColumnAccessor, valueColumn: ColumnAccessor, ): DataFrame = into(keyColumn.name(), valueColumn.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.into(keyColumn: KProperty, valueColumn: KProperty): DataFrame = into(keyColumn.columnName, valueColumn.columnName) @@ -155,16 +148,12 @@ public fun Gather.into(keyColumn: KProperty, valueCo @Interpretable("GatherKeysInto") public fun Gather.keysInto(keyColumn: String): DataFrame = gatherImpl(keyColumn, null) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.keysInto(keyColumn: ColumnAccessor): DataFrame = keysInto(keyColumn.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.keysInto(keyColumn: KProperty): DataFrame = keysInto(keyColumn.columnName) @@ -177,16 +166,12 @@ public fun Gather.keysInto(keyColumn: KProperty): Da @Interpretable("GatherValuesInto") public fun Gather.valuesInto(valueColumn: String): DataFrame = gatherImpl(null, valueColumn) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.valuesInto(valueColumn: ColumnAccessor): DataFrame = valuesInto(valueColumn.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.valuesInto(valueColumn: KProperty): DataFrame = valuesInto(valueColumn.columnName) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt index e1d6e183ff..5666c41107 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KProperty @@ -231,16 +232,12 @@ public fun DataFrame.group(columns: ColumnsSelector): GroupClaus */ public fun DataFrame.group(vararg columns: String): GroupClause = group { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.group(vararg columns: AnyColumnReference): GroupClause = group { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.group(vararg columns: KProperty<*>): GroupClause = group { columns.toColumnSet() } @@ -379,15 +376,11 @@ public fun GroupClause.into( @Interpretable("Into0") public fun GroupClause.into(column: String): DataFrame = into(columnGroup().named(column)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupClause.into(column: AnyColumnGroupAccessor): DataFrame = df.move(columns).under(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupClause.into(column: KProperty<*>): DataFrame = into(column.columnName) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt index 9f1a0f568b..cea5bdc489 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotImpl import org.jetbrains.kotlinx.dataframe.impl.api.getPivotColumnPaths import org.jetbrains.kotlinx.dataframe.impl.api.groupByImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -34,17 +35,13 @@ import kotlin.reflect.KProperty public fun DataFrame.groupBy(moveToTop: Boolean = true, cols: ColumnsSelector): GroupBy = groupByImpl(moveToTop, cols) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.groupBy(vararg cols: KProperty<*>): GroupBy = groupBy { cols.toColumnSet() } public fun DataFrame.groupBy(vararg cols: String): GroupBy = groupBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: Boolean = true): GroupBy = groupBy(moveToTop) { cols.toColumnSet() } @@ -56,17 +53,13 @@ public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: public fun Pivot.groupBy(moveToTop: Boolean = true, columns: ColumnsSelector): PivotGroupBy = (this as PivotImpl).toGroupedPivot(moveToTop, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.groupBy(vararg columns: AnyColumnReference): PivotGroupBy = groupBy { columns.toColumnSet() } public fun Pivot.groupBy(vararg columns: String): PivotGroupBy = groupBy { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.groupBy(vararg columns: KProperty<*>): PivotGroupBy = groupBy { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt index e9a45d5bb1..81bc7095a4 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.implodeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -25,16 +26,12 @@ public fun DataFrame.implode(dropNA: Boolean = false, columns: Columns public fun DataFrame.implode(vararg columns: String, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.implode(vararg columns: ColumnReference, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.implode(vararg columns: KProperty, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt index 91a73ba6ad..20679be29e 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.TypeSuggestion import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnGuessingType import org.jetbrains.kotlinx.dataframe.type +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun AnyCol.inferType(): DataColumn<*> = @@ -21,23 +22,22 @@ public fun AnyCol.inferType(): DataColumn<*> = // region DataFrame -public fun DataFrame.inferType(): DataFrame = inferType { colsAtAnyDepth { !it.isColumnGroup() } } +public fun DataFrame.inferType(): DataFrame = + inferType { + colsAtAnyDepth().filter { !it.isColumnGroup() } + } public fun DataFrame.inferType(columns: ColumnsSelector): DataFrame = replace(columns).with { it.inferType() } public fun DataFrame.inferType(vararg columns: String): DataFrame = inferType { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.inferType(vararg columns: ColumnReference<*>): DataFrame = inferType { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.inferType(vararg columns: KProperty<*>): DataFrame = inferType { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt index 5e59d47485..5cb7742e16 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.removeAt +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -28,9 +29,7 @@ public inline fun DataFrame.insert( noinline expression: RowExpression, ): InsertClause = insert(mapToColumn(name, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.insert( column: ColumnAccessor, @@ -38,9 +37,7 @@ public inline fun DataFrame.insert( noinline expression: RowExpression, ): InsertClause = insert(column.name(), infer, expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.insert( column: KProperty, @@ -65,15 +62,11 @@ public fun InsertClause.under(column: ColumnSelector): DataFrame public fun InsertClause.under(columnPath: ColumnPath): DataFrame = df.insertImpl(columnPath + column.name, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.under(column: ColumnAccessor<*>): DataFrame = under(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.under(column: KProperty<*>): DataFrame = under(column.columnName) @@ -91,15 +84,11 @@ public fun InsertClause.after(column: ColumnSelector): DataFrame public fun InsertClause.after(column: String): DataFrame = df.add(this.column).move(this.column).after(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.after(column: ColumnAccessor<*>): DataFrame = after(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.after(column: KProperty<*>): DataFrame = after(column.columnName) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt index cc90c83c24..285becb5f6 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.impl.aggregation.internal import org.jetbrains.kotlinx.dataframe.impl.aggregation.withExpr import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -22,15 +23,11 @@ import kotlin.reflect.typeOf @Interpretable("GroupByInto") public fun GroupBy.into(column: String): DataFrame = toDataFrame(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.into(column: ColumnAccessor): DataFrame = toDataFrame(column.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.into(column: KProperty): DataFrame = toDataFrame(column.columnName) @@ -40,9 +37,7 @@ public inline fun GroupBy.into( ): DataFrame = into(pathOf(columnName ?: groups.name()), expression, typeOf()) // @Hide -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.into( column: ColumnAccessor, @@ -65,9 +60,7 @@ internal fun GroupBy.into( internal().withExpr(type, path, expression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.into( column: KProperty, @@ -92,18 +85,14 @@ public inline fun ReducedGroupBy.into( } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ReducedGroupBy.into( column: ColumnAccessor, noinline expression: RowExpression, ): DataFrame = into(column.name(), expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ReducedGroupBy.into( column: KProperty, @@ -114,15 +103,11 @@ public inline fun ReducedGroupBy.into( @Interpretable("GroupByReduceInto") public fun ReducedGroupBy.into(columnName: String): DataFrame = into(columnName) { this } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.into(column: ColumnAccessor): DataFrame = into(column) { this } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.into(column: KProperty): DataFrame = into(column) { this } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt index 00bdb52d91..43c6c7dcba 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver import org.jetbrains.kotlinx.dataframe.impl.api.extractJoinColumns import org.jetbrains.kotlinx.dataframe.impl.api.joinImpl import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnListImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty @Refine @@ -112,23 +113,17 @@ public interface JoinDsl : ColumnsSelectionDsl { public infix fun String.match(other: String): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.match(other: KProperty): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.match(other: KProperty): ColumnMatch = ColumnMatch(this, other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.match(other: ColumnReference): ColumnMatch = ColumnMatch(toColumnAccessor(), other) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt index a43b4139d9..02f1c27362 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -106,7 +107,7 @@ public interface LastColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -362,9 +363,7 @@ public interface LastColumnsSelectionDsl { * @throws [NoSuchElementException] if no column adheres to the given [condition]. * @see [ColumnsSelectionDsl.first] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.lastCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).lastCol(condition) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt index d191e78411..539271a2e9 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt @@ -15,15 +15,14 @@ import org.jetbrains.kotlinx.dataframe.columns.FrameColumn 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 kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf // region ColumnReference -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnReference.map( infer: Infer = Infer.Nulls, @@ -77,9 +76,7 @@ public inline fun ColumnsContainer.mapToColumn( noinline body: AddExpression, ): DataColumn = mapToColumn(name, typeOf(), infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnsContainer.mapToColumn( column: ColumnReference, @@ -87,9 +84,7 @@ public inline fun ColumnsContainer.mapToColumn( noinline body: AddExpression, ): DataColumn = mapToColumn(column, typeOf(), infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnsContainer.mapToColumn( column: KProperty, @@ -104,9 +99,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = newColumn(type, name, infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.mapToColumn( column: ColumnReference, @@ -115,9 +108,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = mapToColumn(column.name(), type, infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.mapToColumn( column: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt index 12a665f89f..511376b9de 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MAX_NO_SKIPNAN import org.jetbrains.kotlinx.dataframe.util.ROW_MAX import org.jetbrains.kotlinx.dataframe.util.ROW_MAX_OR_NULL @@ -88,18 +89,14 @@ public fun ?> DataFrame.maxFor( public fun DataFrame.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxFor( vararg columns: KProperty, @@ -114,18 +111,14 @@ public fun ?> DataFrame.max( public fun DataFrame.max(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.max( vararg columns: KProperty, @@ -140,18 +133,14 @@ public fun ?> DataFrame.maxOrNull( public fun DataFrame.maxOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = maxOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = maxOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxOrNull( vararg columns: KProperty, @@ -176,18 +165,14 @@ public inline fun ?> DataFrame.maxBy( public fun DataFrame.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxBy( column: KProperty, @@ -202,18 +187,14 @@ public inline fun ?> DataFrame.maxByOrNull public fun DataFrame.maxByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = maxByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.max(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxByOrNull( column: KProperty, @@ -239,18 +220,14 @@ public fun ?> Grouped.maxFor( public fun Grouped.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.maxFor( vararg columns: KProperty, @@ -271,9 +248,7 @@ public fun Grouped.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.max( vararg columns: ColumnReference, @@ -281,9 +256,7 @@ public fun ?> Grouped.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.max( vararg columns: KProperty, @@ -305,9 +278,7 @@ public inline fun ?> GroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.maxBy( column: ColumnReference, @@ -317,9 +288,7 @@ public inline fun ?> GroupBy.maxBy( public fun GroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.maxBy( column: KProperty, @@ -345,9 +314,7 @@ public fun Pivot.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.maxFor( vararg columns: ColumnReference, @@ -355,9 +322,7 @@ public fun ?> Pivot.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.maxFor( vararg columns: KProperty, @@ -375,18 +340,14 @@ public fun ?> Pivot.max( skipNaN: Boolean = skipNaNDefault, ): DataRow = max(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = max(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.max( vararg columns: KProperty, @@ -403,9 +364,7 @@ public inline fun ?> Pivot.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.maxBy( column: ColumnReference, @@ -415,9 +374,7 @@ public inline fun ?> Pivot.maxBy( public fun Pivot.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.maxBy( column: KProperty, @@ -443,9 +400,7 @@ public fun PivotGroupBy.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.maxFor( vararg columns: ColumnReference, @@ -453,9 +408,7 @@ public fun ?> PivotGroupBy.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.maxFor( vararg columns: KProperty, @@ -476,9 +429,7 @@ public fun ?> PivotGroupBy.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.max( vararg columns: KProperty, @@ -495,9 +446,7 @@ public inline fun ?> PivotGroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.maxBy( column: ColumnReference, @@ -507,9 +456,7 @@ public inline fun ?> PivotGroupBy.maxBy( public fun PivotGroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.maxBy( column: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt index 2171b592c8..1229b960aa 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.columns.toNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MEAN_NO_SKIPNAN import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -75,18 +76,14 @@ public fun DataFrame.meanFor( public fun DataFrame.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.meanFor( vararg columns: KProperty, @@ -101,18 +98,14 @@ public fun DataFrame.mean( public fun DataFrame.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Double = mean(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): Double = mean(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.mean( vararg columns: KProperty, @@ -142,18 +135,14 @@ public fun Grouped.meanFor( public fun Grouped.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.meanFor( vararg columns: KProperty, @@ -174,9 +163,7 @@ public fun Grouped.mean( skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.mean( vararg columns: ColumnReference, @@ -184,9 +171,7 @@ public fun Grouped.mean( skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.mean( vararg columns: KProperty, @@ -221,9 +206,7 @@ public fun Pivot.meanFor( separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.meanFor( vararg columns: ColumnReference, @@ -231,9 +214,7 @@ public fun Pivot.meanFor( separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.meanFor( vararg columns: KProperty, @@ -270,9 +251,7 @@ public fun PivotGroupBy.meanFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.meanFor( vararg columns: ColumnReference, @@ -280,9 +259,7 @@ public fun PivotGroupBy.meanFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.meanFor( vararg columns: KProperty, @@ -298,18 +275,14 @@ public fun PivotGroupBy.mean( public fun PivotGroupBy.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = mean(skipNaN) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.mean( vararg columns: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt index 798f69f858..0bf290dc49 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.ROW_MEDIAN import org.jetbrains.kotlinx.dataframe.util.ROW_MEDIAN_OR_NULL import kotlin.experimental.ExperimentalTypeInference @@ -145,18 +146,14 @@ public fun ?> DataFrame.medianFor( public fun DataFrame.medianFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianFor( vararg columns: KProperty, @@ -196,23 +193,17 @@ public fun DataFrame.median(vararg columns: String, skipNaN: Boolean = sk public fun DataFrame.medianOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Any? = Aggregators.medianCommon?>(skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.median(vararg columns: ColumnReference): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianOrNull(vararg columns: ColumnReference): C? = medianOrNull { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.median( vararg columns: ColumnReference, @@ -221,9 +212,7 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.medianOrNull( vararg columns: ColumnReference, @@ -231,23 +220,17 @@ public fun DataFrame.medianOrNull( ): Double? where C : Comparable?, C : Number? = medianOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.median(vararg columns: KProperty): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianOrNull(vararg columns: KProperty): C? = medianOrNull { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.median( vararg columns: KProperty, @@ -256,9 +239,7 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.medianOrNull( vararg columns: KProperty, @@ -302,18 +283,14 @@ public inline fun ?> DataFrame.medianBy( public fun DataFrame.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianBy( column: KProperty, @@ -328,18 +305,14 @@ public inline fun ?> DataFrame.medianByOrN public fun DataFrame.medianByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = medianByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.medianCommon(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianByOrNull( column: KProperty, @@ -363,18 +336,14 @@ public fun ?> Grouped.medianFor( public fun Grouped.medianFor(vararg columns: String): DataFrame = medianFor { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.medianFor( vararg columns: KProperty, @@ -395,9 +364,7 @@ public fun Grouped.median( skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.median( vararg columns: ColumnReference, @@ -405,9 +372,7 @@ public fun ?> Grouped.median( skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.median( vararg columns: KProperty, @@ -429,9 +394,7 @@ public inline fun ?> GroupBy.medianB crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.medianBy( column: ColumnReference, @@ -441,9 +404,7 @@ public inline fun ?> GroupBy.medianB public fun GroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.medianBy( column: KProperty, @@ -469,9 +430,7 @@ public fun Pivot.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.medianFor( vararg columns: ColumnReference, @@ -479,9 +438,7 @@ public fun ?> Pivot.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.medianFor( vararg columns: KProperty, @@ -497,18 +454,14 @@ public fun ?> Pivot.median( public fun Pivot.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = median(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = median(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.median( vararg columns: KProperty, @@ -525,9 +478,7 @@ public inline fun ?> Pivot.medianBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.medianBy( column: ColumnReference, @@ -537,9 +488,7 @@ public inline fun ?> Pivot.medianBy( public fun Pivot.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.medianBy( column: KProperty, @@ -564,9 +513,7 @@ public fun PivotGroupBy.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.medianFor( vararg columns: ColumnReference, @@ -574,9 +521,7 @@ public fun ?> PivotGroupBy.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.medianFor( vararg columns: KProperty, @@ -592,18 +537,14 @@ public fun ?> PivotGroupBy.median( public fun PivotGroupBy.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = median(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.median( vararg columns: KProperty, @@ -620,9 +561,7 @@ public inline fun ?> PivotGroupBy.medianBy crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.medianBy( column: ColumnReference, @@ -632,9 +571,7 @@ public inline fun ?> PivotGroupBy.medianBy public fun PivotGroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.medianBy( column: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt index a4235f3c9c..cda1d830cc 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl import org.jetbrains.kotlinx.dataframe.impl.api.withRowCellImpl import org.jetbrains.kotlinx.dataframe.impl.nameGenerator +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -24,16 +25,12 @@ public fun DataFrame.merge(selector: ColumnsSelector): Merge DataFrame.merge(vararg columns: String): Merge> = merge { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.merge(vararg columns: ColumnReference): Merge> = merge { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.merge(vararg columns: KProperty): Merge> = merge { columns.toColumnSet() } @@ -78,15 +75,11 @@ public fun MergeWithTransform.into(columnName: String): DataF @Interpretable("MergeInto0") public fun Merge.into(columnName: String): DataFrame = into(pathOf(columnName)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Merge.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun MergeWithTransform.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt index 6bcfbd31b7..96a22b9f05 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MIN_NO_SKIPNAN import org.jetbrains.kotlinx.dataframe.util.ROW_MIN import org.jetbrains.kotlinx.dataframe.util.ROW_MIN_OR_NULL @@ -88,18 +89,14 @@ public fun ?> DataFrame.minFor( public fun DataFrame.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minFor( vararg columns: KProperty, @@ -114,18 +111,14 @@ public fun ?> DataFrame.min( public fun DataFrame.min(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.min( vararg columns: KProperty, @@ -140,18 +133,14 @@ public fun ?> DataFrame.minOrNull( public fun DataFrame.minOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = minOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = minOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minOrNull( vararg columns: KProperty, @@ -176,18 +165,14 @@ public inline fun ?> DataFrame.minBy( public fun DataFrame.minBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minBy( column: KProperty, @@ -202,18 +187,14 @@ public inline fun ?> DataFrame.minByOrNull public fun DataFrame.minByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = minByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.min(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minByOrNull( column: KProperty, @@ -239,18 +220,14 @@ public fun ?> Grouped.minFor( public fun Grouped.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.minFor( vararg columns: KProperty, @@ -271,9 +248,7 @@ public fun Grouped.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.min( vararg columns: ColumnReference, @@ -281,9 +256,7 @@ public fun ?> Grouped.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.min( vararg columns: KProperty, @@ -305,9 +278,7 @@ public inline fun ?> GroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.minBy( column: ColumnReference, @@ -317,9 +288,7 @@ public inline fun ?> GroupBy.minBy( public fun GroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.minBy( column: KProperty, @@ -345,9 +314,7 @@ public fun Pivot.minFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.minFor( vararg columns: ColumnReference, @@ -355,9 +322,7 @@ public fun ?> Pivot.minFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.minFor( vararg columns: KProperty, @@ -375,18 +340,14 @@ public fun ?> Pivot.min( skipNaN: Boolean = skipNaNDefault, ): DataRow = min(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = min(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.min( vararg columns: KProperty, @@ -403,9 +364,7 @@ public inline fun ?> Pivot.minBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.minBy( column: ColumnReference, @@ -415,9 +374,7 @@ public inline fun ?> Pivot.minBy( public fun Pivot.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.minBy( column: KProperty, @@ -443,9 +400,7 @@ public fun PivotGroupBy.minFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.minFor( vararg columns: ColumnReference, @@ -453,9 +408,7 @@ public fun ?> PivotGroupBy.minFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.minFor( vararg columns: KProperty, @@ -476,9 +429,7 @@ public fun ?> PivotGroupBy.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.min( vararg columns: KProperty, @@ -495,9 +446,7 @@ public inline fun ?> PivotGroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.minBy( column: ColumnReference, @@ -507,9 +456,7 @@ public inline fun ?> PivotGroupBy.minBy( public fun PivotGroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.minBy( column: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index 4e8279873f..0fba00a7f6 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.afterOrBefore import org.jetbrains.kotlinx.dataframe.impl.api.moveImpl import org.jetbrains.kotlinx.dataframe.impl.api.moveTo import org.jetbrains.kotlinx.dataframe.ncol +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_LEFT import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_LEFT_REPLACE import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_RIGHT @@ -237,16 +238,12 @@ public fun DataFrame.move(columns: ColumnsSelector): MoveClause< */ public fun DataFrame.move(vararg columns: String): MoveClause = move { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.move(vararg columns: ColumnReference): MoveClause = move { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.move(vararg columns: KProperty): MoveClause = move { columns.toColumnSet() } @@ -409,16 +406,12 @@ public fun DataFrame.moveTo(newColumnIndex: Int, columns: ColumnsSelector public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: String): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: AnyColumnReference): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: KProperty<*>): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } @@ -588,9 +581,7 @@ public fun DataFrame.moveToStart(vararg columns: String): DataFrame = public fun DataFrame.moveToLeft(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } @@ -600,9 +591,7 @@ public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): Dat public fun DataFrame.moveToLeft(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToStart(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } @@ -772,9 +761,7 @@ public fun DataFrame.moveToEnd(vararg columns: String): DataFrame = mo public fun DataFrame.moveToRight(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } @@ -784,9 +771,7 @@ public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataF public fun DataFrame.moveToRight(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToEnd(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } @@ -932,9 +917,7 @@ public fun MoveClause.intoIndexed( @Interpretable("MoveUnder0") public fun MoveClause.under(column: String): DataFrame = pathOf(column).let { path -> under { path } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.under(column: AnyColumnGroupAccessor): DataFrame = column.path().let { path -> under { path } } @@ -1113,15 +1096,11 @@ public fun MoveClause.after(column: ColumnSelector): DataFram */ public fun MoveClause.after(column: String): DataFrame = after { column.toColumnAccessor() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.after(column: AnyColumnReference): DataFrame = after { column } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.after(column: KProperty<*>): DataFrame = after { column.toColumnAccessor() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt index 368554b023..f478aed38a 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.parseImpl import org.jetbrains.kotlinx.dataframe.impl.api.tryParseImpl import org.jetbrains.kotlinx.dataframe.impl.io.FastDoubleParser import org.jetbrains.kotlinx.dataframe.typeClass +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS_COPY import java.time.format.DateTimeFormatter @@ -37,16 +38,12 @@ public fun DataFrame.parse(options: ParserOptions? = null, columns: Colum public fun DataFrame.parse(vararg columns: String, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.parse(vararg columns: ColumnReference, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.parse(vararg columns: KProperty, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } @@ -224,7 +221,7 @@ public fun DataColumn.tryParse(options: ParserOptions? = null): DataCol public fun DataFrame.parse(options: ParserOptions? = null): DataFrame = parse(options) { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } /** diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt index 082d913f9d..0371994f4d 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.ROW_PERCENTILE import org.jetbrains.kotlinx.dataframe.util.ROW_PERCENTILE_OR_NULL import kotlin.experimental.ExperimentalTypeInference @@ -163,9 +164,7 @@ public fun DataFrame.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileFor( percentile: Double, @@ -173,9 +172,7 @@ public fun ?> DataFrame.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileFor( percentile: Double, @@ -230,27 +227,21 @@ public fun DataFrame.percentileOrNull( ): Any? = Aggregators.percentileCommon?>(percentile, skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentile( percentile: Double, vararg columns: ColumnReference, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: ColumnReference, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentile( percentile: Double, @@ -260,9 +251,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentileOrNull( percentile: Double, @@ -272,27 +261,21 @@ public fun DataFrame.percentileOrNull( where C : Comparable?, C : Number? = percentileOrNull(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentile( percentile: Double, vararg columns: KProperty, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: KProperty, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentile( percentile: Double, @@ -302,9 +285,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentileOrNull( percentile: Double, @@ -358,9 +339,7 @@ public fun DataFrame.percentileBy( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileBy( percentile: Double, @@ -368,9 +347,7 @@ public inline fun ?> DataFrame.percentileB skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileBy( percentile: Double, @@ -390,9 +367,7 @@ public fun DataFrame.percentileByOrNull( skipNaN: Boolean = skipNaNDefault, ): DataRow? = percentileByOrNull(percentile, column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, @@ -400,9 +375,7 @@ public inline fun ?> DataFrame.percentileB skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.percentileCommon(percentile, skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, @@ -429,9 +402,7 @@ public fun ?> Grouped.percentileFor( public fun Grouped.percentileFor(percentile: Double, vararg columns: String): DataFrame = percentileFor(percentile) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentileFor( percentile: Double, @@ -439,9 +410,7 @@ public fun ?> Grouped.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentileFor( percentile: Double, @@ -465,9 +434,7 @@ public fun Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentile( percentile: Double, @@ -476,9 +443,7 @@ public fun ?> Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentile( percentile: Double, @@ -503,9 +468,7 @@ public inline fun ?> GroupBy.percent crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.percentileBy( percentile: Double, @@ -519,9 +482,7 @@ public fun GroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.percentileBy( percentile: Double, @@ -553,9 +514,7 @@ public fun Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentileFor( percentile: Double, @@ -564,9 +523,7 @@ public fun ?> Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentileFor( percentile: Double, @@ -587,9 +544,7 @@ public fun Pivot.percentile( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentile( percentile: Double, @@ -597,9 +552,7 @@ public fun ?> Pivot.percentile( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentile( percentile: Double, @@ -619,9 +572,7 @@ public inline fun ?> Pivot.percentileBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.percentileBy( percentile: Double, @@ -635,9 +586,7 @@ public fun Pivot.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivot = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.percentileBy( percentile: Double, @@ -668,9 +617,7 @@ public fun PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentileFor( percentile: Double, @@ -679,9 +626,7 @@ public fun ?> PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentileFor( percentile: Double, @@ -702,9 +647,7 @@ public fun PivotGroupBy.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentile( percentile: Double, @@ -712,9 +655,7 @@ public fun ?> PivotGroupBy.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentile( percentile: Double, @@ -734,9 +675,7 @@ public inline fun ?> PivotGroupBy.percenti crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, @@ -750,9 +689,7 @@ public fun PivotGroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivotGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index 7e27603d93..acfc2145ea 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotGroupByImpl import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotImpl import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotInAggregateImpl import org.jetbrains.kotlinx.dataframe.impl.api.PivotChainColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public interface PivotDsl : ColumnsSelectionDsl { @@ -29,34 +30,24 @@ public interface PivotDsl : ColumnsSelectionDsl { public infix fun String.then(other: String): ColumnSet = toColumnAccessor() then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: ColumnsResolver): ColumnSet = toColumnAccessor() then other - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnsResolver.then(other: KProperty): ColumnSet = this then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: KProperty): ColumnSet = toColumnAccessor() then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: String): ColumnSet = toColumnAccessor() then other.toColumnOf() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.then(other: KProperty): ColumnSet = toColumnOf() then other.toColumnAccessor() } @@ -71,16 +62,12 @@ public fun DataFrame.pivot(inward: Boolean? = null, columns: PivotColumns public fun DataFrame.pivot(vararg columns: String, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivot(vararg columns: AnyColumnReference, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivot(vararg columns: KProperty<*>, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } @@ -95,16 +82,12 @@ public fun DataFrame.pivotMatches(inward: Boolean = true, columns: Column public fun DataFrame.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -119,16 +102,12 @@ public fun DataFrame.pivotCounts(inward: Boolean = true, columns: Columns public fun DataFrame.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -144,9 +123,7 @@ public fun DataFrame.pivotCounts(vararg columns: KProperty<*>, inward: Bo public fun GroupBy<*, G>.pivot(inward: Boolean = true, columns: ColumnsSelector): PivotGroupBy = PivotGroupByImpl(this, columns, inward) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -154,9 +131,7 @@ public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: B public fun GroupBy<*, G>.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -171,16 +146,12 @@ public fun GroupBy<*, G>.pivotMatches(inward: Boolean = true, columns: Colum public fun GroupBy<*, G>.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -195,16 +166,12 @@ public fun GroupBy<*, G>.pivotCounts(inward: Boolean = true, columns: Column public fun GroupBy<*, G>.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -225,18 +192,14 @@ public fun AggregateGroupedDsl.pivot( public fun AggregateGroupedDsl.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivot( vararg columns: AnyColumnReference, inward: Boolean = true, ): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -253,18 +216,14 @@ public fun AggregateGroupedDsl.pivotMatches( public fun AggregateGroupedDsl.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotMatches( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -281,18 +240,14 @@ public fun AggregateGroupedDsl.pivotCounts( public fun AggregateGroupedDsl.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotCounts( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt index 6fd529af41..9e97d8f2d2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MINUS import org.jetbrains.kotlinx.dataframe.util.MINUS_REPLACE import kotlin.reflect.KProperty @@ -124,9 +125,7 @@ public fun DataFrame.remove(vararg columns: String): DataFrame = remov * * @param [columns] The [Column Accessors][ColumnReference] used to remove the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFrame = remove { columns.toColumnSet() } @@ -152,9 +151,7 @@ public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFram * * @param [columns] The [KProperties][KProperty] used to remove the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.remove(vararg columns: KProperty<*>): DataFrame = remove { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt index da77e0a12e..a8b536db19 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.renameImpl import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.toCamelCaseByDelimiters +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -29,16 +30,12 @@ public fun DataFrame.rename(vararg mappings: Pair): DataF @Interpretable("Rename") public fun DataFrame.rename(columns: ColumnsSelector): RenameClause = RenameClause(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.rename(vararg cols: ColumnReference): RenameClause = rename { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.rename(vararg cols: KProperty): RenameClause = rename { cols.toColumnSet() } @@ -89,9 +86,7 @@ public fun DataFrame.renameToCamelCase(): DataFrame = it.renameToCamelCase() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun RenameClause.into(vararg newColumns: ColumnReference<*>): DataFrame = into(*newColumns.map { it.name() }.toTypedArray()) @@ -100,9 +95,7 @@ public fun RenameClause.into(vararg newColumns: ColumnReference<*>) @Interpretable("RenameInto") public fun RenameClause.into(vararg newNames: String): DataFrame = renameImpl(newNames) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun RenameClause.into(vararg newNames: KProperty<*>): DataFrame = into(*newNames.map { it.name }.toTypedArray()) @@ -209,7 +202,7 @@ public interface RenameColumnsSelectionDsl { *      * * ### Definitions: - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -379,9 +372,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.named(nameOf: ColumnReference<*>): ColumnReference = named(nameOf.name) @@ -410,9 +401,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.named(nameOf: KProperty<*>): ColumnReference = named(nameOf.columnName) @@ -468,9 +457,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.named(nameOf: ColumnReference<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.name) @@ -500,9 +487,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.named(nameOf: KProperty<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.columnName) @@ -532,9 +517,7 @@ public interface RenameColumnsSelectionDsl { * @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. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(newName: String): ColumnReference = toColumnAccessor().named(newName) @@ -563,9 +546,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(nameOf: ColumnReference<*>): ColumnReference = toColumnAccessor().named(nameOf.name) @@ -595,9 +576,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(nameOf: KProperty<*>): ColumnReference = toColumnAccessor().named(nameOf.columnName) @@ -659,9 +638,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) @@ -690,9 +667,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) @@ -748,9 +723,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.into(nameOf: ColumnReference<*>): ColumnReference<*> = named(nameOf) @@ -779,9 +752,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.into(nameOf: KProperty<*>): ColumnReference<*> = named(nameOf) @@ -810,9 +781,7 @@ public interface RenameColumnsSelectionDsl { * @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. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(newName: String): ColumnReference = named(newName) @@ -841,9 +810,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [ColumnReference] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) @@ -872,9 +839,7 @@ public interface RenameColumnsSelectionDsl { * @param [nameOf] A [KProperty] used to specify the new name of the column. * @return A [ColumnReference][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] to the renamed column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt index 34eaa57245..8b0014cf7d 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.reorderImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -26,16 +27,12 @@ public data class Reorder( @Interpretable("Reorder") public fun DataFrame.reorder(selector: ColumnsSelector): Reorder = Reorder(this, selector, false) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.reorder(vararg columns: ColumnReference): Reorder = reorder { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.reorder(vararg columns: KProperty): Reorder = reorder { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt index 9749c196bb..f55e825481 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.get import org.jetbrains.kotlinx.dataframe.impl.api.ColumnToInsert import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun DataFrame.replace(columns: ColumnsSelector): ReplaceClause = @@ -20,23 +21,19 @@ public fun DataFrame.replace(columns: ColumnsSelector): ReplaceC public fun DataFrame.replace(vararg columns: String): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.replace(vararg columns: ColumnReference): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.replace(vararg columns: KProperty): ReplaceClause = replace { columns.toColumnSet() } public fun DataFrame.replaceAll( vararg valuePairs: Pair, - columns: ColumnsSelector = { colsAtAnyDepth { !it.isColumnGroup() } }, + columns: ColumnsSelector = { colsAtAnyDepth().filter { !it.isColumnGroup() } }, ): DataFrame { val map = valuePairs.toMap() return update(columns).with { map[it] ?: it } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt index 27c68a4762..67a90d71a8 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.changePath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -174,9 +175,7 @@ public fun DataFrame.select(columns: ColumnsSelector): DataFrame * * @param [columns] The [KProperties][KProperty] used to select the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.select(vararg columns: KProperty<*>): DataFrame = select { columns.toColumnSet() } @@ -226,9 +225,7 @@ public fun DataFrame.select(vararg columns: String): DataFrame = selec * * @param [columns] The [Column Accessors][ColumnReference] used to select the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.select(vararg columns: AnyColumnReference): DataFrame = select { columns.toColumnSet() } @@ -259,7 +256,7 @@ public interface SelectColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -431,9 +428,7 @@ public interface SelectColumnsSelectionDsl { * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the columns selected by [selector]. * @see [SingleColumn.except] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.select(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index f363f792ea..4d08c98d05 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -19,6 +19,11 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API +import org.jetbrains.kotlinx.dataframe.util.SINGLE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_COL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_PLAIN_REPLACE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_SET_REPLACE import kotlin.reflect.KProperty // region DataColumn @@ -71,11 +76,7 @@ public interface SingleColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] - * - *      - * - * `condition: `[`ColumnFilter`][org.jetbrains.kotlinx.dataframe.ColumnFilter] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -87,7 +88,7 @@ public interface SingleColumnsSelectionDsl { * *      * - * [**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + * [**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`()` * * * @@ -101,7 +102,7 @@ public interface SingleColumnsSelectionDsl { * * [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef] * - *     __`.`__[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`single`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`()` * * * @@ -115,7 +116,7 @@ public interface SingleColumnsSelectionDsl { * * [`columnGroup`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef] * - *     __`.`__[**`singleCol`**][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.singleCol]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]` + *     __`.`__[**`singleCol`**][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.singleCol]`()` * * * @@ -139,9 +140,9 @@ public interface SingleColumnsSelectionDsl { /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -151,18 +152,17 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][DataFrame.select]` { `[single][ColumnsSelectionDsl.single]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][DataFrame.select]` { `[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[single][ColumnsSelectionDsl.single]`() }` * - * `df.`[select][DataFrame.select]` { "myColumnGroup".`[singleCol][String.singleCol]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][String.singleCol]`() }` * * #### Examples for this overload: * * * - * @param [condition] The optional [ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ private interface CommonSingleDocs { @@ -172,9 +172,9 @@ public interface SingleColumnsSelectionDsl { /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -184,9 +184,9 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * @@ -194,20 +194,55 @@ public interface SingleColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>().`[single][ColumnSet.single]`() }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ @Interpretable("Single0") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_SET_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet.single(condition: ColumnFilter = { true }): TransformableSingleColumn = singleInternal(condition) /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. + * + * This function operates solely on columns at the top-level. + * + * NOTE: For [column groups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl], `single` is named `singleCol` instead to avoid confusion. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.Grammar] + * + * #### Examples: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[String][String]`>().nameStartsWith("year").`[single][ColumnSet.single]`() }` + * + * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>().`[single][ColumnSet.single]`() }` + * + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. + */ + @Interpretable("Single0") + public fun ColumnSet.single(): TransformableSingleColumn = singleInternal { true } + + /** + * ## Single (Col) + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -217,28 +252,32 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * * `df.`[select][DataFrame.select]` { `[single][ColumnsSelectionDsl.single]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("year") } }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ @Interpretable("Single1") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_PLAIN_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.single(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = asSingleColumn().singleCol(condition) /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -248,28 +287,91 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { nameStartsWith("year").`[single][ColumnsSelectionDsl.single]`() }` + * + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. + */ + @Interpretable("Single1") + public fun ColumnsSelectionDsl<*>.single(): TransformableSingleColumn<*> = asSingleColumn().singleCol { true } + + /** + * ## Single (Col) + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. + * + * This function operates solely on columns at the top-level. + * + * NOTE: For [column groups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl], `single` is named `singleCol` instead to avoid confusion. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.Grammar] + * + * #### Examples: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * * `df.`[select][DataFrame.select]` { myColumnGroup.`[singleCol][SingleColumn.singleCol]`() }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ @Interpretable("Single2") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_COL_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = this.ensureIsColumnGroup().asColumnSet().single(condition) /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. + * + * This function operates solely on columns at the top-level. + * + * NOTE: For [column groups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl], `single` is named `singleCol` instead to avoid confusion. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.Grammar] + * + * #### Examples: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { myColumnGroup.`[singleCol][SingleColumn.singleCol]`() }` + * + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. + */ + @Interpretable("Single2") + public fun SingleColumn>.singleCol(): TransformableSingleColumn<*> = + this.ensureIsColumnGroup().asColumnSet().single() + + /** + * ## Single (Col) + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -279,27 +381,59 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * * `df.`[select][DataFrame.select]` { "myColumnGroup".`[singleCol][String.singleCol]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("year") } }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_COL_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).singleCol(condition) /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. + * + * This function operates solely on columns at the top-level. + * + * NOTE: For [column groups][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl], `single` is named `singleCol` instead to avoid confusion. + * + * ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.SingleColumnsSelectionDsl.Grammar] + * + * #### Examples: + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` + * + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` + * + * #### Examples for this overload: + * + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("year").`[singleCol][String.singleCol]`() }` + * + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. + */ + public fun String.singleCol(): TransformableSingleColumn<*> = columnGroup(this).singleCol() + + /** + * ## Single (Col) + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -309,9 +443,9 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * @@ -319,23 +453,20 @@ public interface SingleColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[singleCol][KProperty.singleCol]`() }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).singleCol(condition) /** * ## Single (Col) - * Returns the single column from [this] that adheres to the optional given [condition]. - * If no column adheres to the given [condition], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -345,18 +476,17 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `[nameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.nameStartsWith]`("order").`[single][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.single]`() }` * - * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[singleCol][kotlin.String.singleCol]` { it.`[name][org.jetbrains.kotlinx.dataframe.columns.ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][org.jetbrains.kotlinx.dataframe.api.ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][kotlin.String.singleCol]`() }` * * #### Examples for this overload: * * `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[singleCol][ColumnPath.singleCol]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("year") } }` * - * @param [condition] The optional [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column that adheres to the given [condition]. - * @throws [NoSuchElementException] if no column adheres to the given [condition]. - * @throws [IllegalArgumentException] if more than one column adheres to the given [condition]. + * @return A [SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn] containing the single column. + * @throws [NoSuchElementException] if there are no columns in [this]. + * @throws [IllegalArgumentException] if there is more than one column in [this]. */ public fun ColumnPath.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).singleCol(condition) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt index 49dc7b3ba6..bb23c66576 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow import org.jetbrains.kotlinx.dataframe.type +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public interface SortDsl : ColumnsSelectionDsl { @@ -32,9 +33,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.desc(): SingleColumn?> = invoke>().desc() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.desc(): SingleColumn = toColumnAccessor().desc() @@ -47,9 +46,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.nullsLast(flag: Boolean = true): SingleColumn?> = invoke>().nullsLast(flag) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.nullsLast(flag: Boolean = true): SingleColumn = toColumnAccessor().nullsLast(flag) } @@ -161,17 +158,13 @@ public fun > C.sortWith(comparator: (T, T) -> Int): C = sor public fun DataFrame.sortBy(columns: SortColumnsSelector): DataFrame = sortByImpl(UnresolvedColumnsPolicy.Fail, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortBy(vararg cols: ColumnReference<*>): DataFrame = sortBy { cols.toColumnSet() } public fun DataFrame.sortBy(vararg cols: String): DataFrame = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortBy(vararg cols: KProperty?>): DataFrame = sortBy { cols.toColumnSet() } @@ -188,18 +181,14 @@ public fun DataFrame.sortByDesc(columns: SortColumnsSelector): D return sortByImpl { set.desc() } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortByDesc(vararg columns: KProperty?>): DataFrame = sortByDesc { columns.toColumnSet() } public fun DataFrame.sortByDesc(vararg columns: String): DataFrame = sortByDesc { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): DataFrame = sortByDesc { columns.toColumnSet() } @@ -210,15 +199,11 @@ public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): Data public fun GroupBy.sortBy(vararg cols: String): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortBy(vararg cols: ColumnReference<*>): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortBy(vararg cols: KProperty?>): GroupBy = sortBy { cols.toColumnSet() } @@ -227,16 +212,12 @@ public fun GroupBy.sortBy(selector: SortColumnsSelector): public fun GroupBy.sortByDesc(vararg cols: String): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortByDesc(vararg cols: ColumnReference<*>): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortByDesc(vararg cols: KProperty?>): GroupBy = sortByDesc { cols.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt index 0397daedb0..7ccb400ef2 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.withRowCellImpl import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.getListType +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.SPLIT_STR import kotlin.reflect.KProperty import kotlin.reflect.KType @@ -30,15 +31,11 @@ public fun DataFrame.split(columns: ColumnsSelector): Split DataFrame.split(vararg columns: String): Split = split { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.split(vararg columns: ColumnReference): Split = split { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.split(vararg columns: KProperty): Split = split { columns.toColumnSet() } @@ -203,18 +200,14 @@ internal fun Split.toDataFrame(): DataFrame = // region into -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.into( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = into(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.into( firstName: KProperty<*>, @@ -258,9 +251,7 @@ public fun Split>.into( public fun Split>.into(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.into(firstCol, secondCol) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Split>.into( firstCol: ColumnAccessor, @@ -290,18 +281,14 @@ public fun SplitWithTransform.inward( extraNamesGenerator: ColumnNamesGenerator? = null, ): DataFrame = inward(names.toList(), extraNamesGenerator) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.inward( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = inward(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.inward( firstName: KProperty<*>, @@ -322,9 +309,7 @@ public fun , R> Split.inward( public fun Split>.inward(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.inward(firstCol, secondCol) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Split>.inward( firstCol: ColumnAccessor, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt index de398ff70e..38966ec8d6 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.numberColumns import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -90,9 +91,7 @@ public fun DataFrame.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.stdFor( vararg columns: KProperty, @@ -106,17 +105,13 @@ public fun DataFrame.std( columns: ColumnsSelector, ): Double = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.std(vararg columns: ColumnReference): Double = std { columns.toColumnSet() } public fun DataFrame.std(vararg columns: String): Double = std { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.std(vararg columns: KProperty): Double = std { columns.toColumnSet() } @@ -148,9 +143,7 @@ public fun Grouped.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.stdFor( vararg columns: ColumnReference, @@ -158,9 +151,7 @@ public fun Grouped.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.stdFor( vararg columns: KProperty, @@ -177,9 +168,7 @@ public fun Grouped.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, name, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.std( vararg columns: ColumnReference, @@ -195,9 +184,7 @@ public fun Grouped.std( ddof: Int = ddofDefault, ): DataFrame = std(name, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.std( vararg columns: KProperty, @@ -246,9 +233,7 @@ public fun Pivot.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.stdFor( vararg columns: KProperty, @@ -275,9 +260,7 @@ public fun Pivot.std( ddof: Int = ddofDefault, ): DataRow = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.std( vararg columns: KProperty, @@ -315,9 +298,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.stdFor( vararg columns: ColumnReference, @@ -326,9 +307,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.stdFor( vararg columns: KProperty, @@ -343,9 +322,7 @@ public fun PivotGroupBy.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.std( vararg columns: ColumnReference, @@ -359,9 +336,7 @@ public fun PivotGroupBy.std( ddof: Int = ddofDefault, ): DataFrame = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.std( vararg columns: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt index 95041a9158..2b7f3724de 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.columns.toNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.SUM_NO_SKIPNAN import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KClass @@ -140,18 +141,14 @@ public fun DataFrame.sumFor( public fun DataFrame.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sumFor(skipNaN) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sumFor( vararg columns: KProperty, @@ -177,23 +174,17 @@ public fun DataFrame.sum( ): C & Any = Aggregators.sum(skipNaN).aggregateAll(this, columns) as (C & Any) @JvmName("sumShort") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum( vararg columns: ColumnReference, @@ -204,23 +195,17 @@ public fun DataFrame.sum(vararg columns: String, skipNaN: Boolean = skipN sum(skipNaN) { columns.toColumnsSetOf() } @JvmName("sumShort") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum( skipNaN: Boolean = skipNaNDefault, @@ -263,18 +248,14 @@ public fun Grouped.sumFor( public fun Grouped.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sumFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sumFor( vararg columns: KProperty, @@ -295,9 +276,7 @@ public fun Grouped.sum( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sum( vararg columns: ColumnReference, @@ -305,9 +284,7 @@ public fun Grouped.sum( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sum( vararg columns: KProperty, @@ -342,9 +319,7 @@ public fun Pivot.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sumFor( vararg columns: ColumnReference, @@ -352,9 +327,7 @@ public fun Pivot.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sumFor( vararg columns: KProperty, @@ -370,18 +343,14 @@ public fun Pivot.sum( public fun Pivot.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sum(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sum(vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toColumnSet() } @@ -410,9 +379,7 @@ public fun PivotGroupBy.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sumFor( vararg columns: ColumnReference, @@ -420,9 +387,7 @@ public fun PivotGroupBy.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sumFor( vararg columns: KProperty, @@ -438,18 +403,14 @@ public fun PivotGroupBy.sum( public fun PivotGroupBy.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sum( vararg columns: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt index 27bbcaa99e..a2fd925cbb 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -87,7 +88,7 @@ public interface TakeColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -372,9 +373,7 @@ public interface TakeColumnsSelectionDsl { * @param [n] The number of columns to take. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the first [n] columns. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeCols(n: Int): ColumnSet<*> = columnGroup(this).takeCols(n) @@ -612,9 +611,7 @@ public interface TakeColumnsSelectionDsl { * @param [n] The number of columns to take. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the last [n] columns. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeLastCols(n: Int): ColumnSet<*> = columnGroup(this).takeLastCols(n) @@ -846,9 +843,7 @@ public interface TakeColumnsSelectionDsl { * @param [predicate] The [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] to control which columns to take. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the first columns adhering to the [predicate]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeColsWhile(predicate) @@ -1081,9 +1076,7 @@ public interface TakeColumnsSelectionDsl { * @param [predicate] The [ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter] to control which columns to take. * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the last columns adhering to the [predicate]. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeLastColsWhile(predicate) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt index 5c45944a7e..3752dccd4d 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnGuessingType import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KCallable import kotlin.reflect.KClass import kotlin.reflect.KProperty @@ -196,9 +197,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { @Interpretable("ToDataFrameFrom0") public inline infix fun String.from(noinline expression: (T) -> R): Unit = add(this, expression) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(noinline expression: (T) -> R): Unit = add(columnName, expression) @@ -206,9 +205,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { public inline infix fun String.from(inferType: InferType): Unit = add(DataColumn.createByInference(this, source.map { inferType.expression(it) })) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(inferType: InferType): Unit = add(DataColumn.createByInference(columnName, source.map { inferType.expression(it) })) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt index 967b6914dc..6d7cdf7243 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.asValues import org.jetbrains.kotlinx.dataframe.impl.columns.forceResolve import org.jetbrains.kotlinx.dataframe.impl.owner import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -263,9 +264,7 @@ public inline fun Iterable.toValueColumn(name: String = ""): Valu public inline fun Iterable.toValueColumn(column: ColumnAccessor): ValueColumn = toValueColumn(column.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Iterable.toValueColumn(column: KProperty): ValueColumn = toValueColumn(column.columnName) @@ -370,9 +369,7 @@ public inline fun Iterable<*>.toColumnOf(name: String = ""): DataCol public inline fun Iterable.toColumn(ref: ColumnReference): DataColumn = DataColumn.createByType(ref.name(), asList()).forceResolve() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Iterable.toColumn(property: KProperty): DataColumn = DataColumn.createByType(property.columnName, asList()).forceResolve() @@ -407,9 +404,7 @@ public fun DataFrame.asGroupBy(groupedColumnName: String): GroupBy return asGroupBy { groups.cast() } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.asGroupBy(groupedColumn: ColumnReference>): GroupBy { val groups = getFrameColumn(groupedColumn.name()).castFrameColumn() diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt index 97fe1313c8..e0b9f17520 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Interpretable import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.unfoldImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KCallable import kotlin.reflect.KProperty @@ -26,14 +27,10 @@ public fun DataFrame.unfold( public fun DataFrame.unfold(vararg columns: String): DataFrame = unfold { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.unfold(vararg columns: AnyColumnReference): DataFrame = unfold { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.unfold(vararg columns: KProperty<*>): DataFrame = unfold { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt index a1b324f013..ca706b8b69 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.removeAt +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -161,16 +162,12 @@ public fun DataFrame.ungroup(columns: ColumnsSelector): DataFram */ public fun DataFrame.ungroup(vararg columns: String): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.ungroup(vararg columns: AnyColumnReference): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.ungroup(vararg columns: KProperty<*>): DataFrame = ungroup { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt index 86bdbcf1ce..092ab29951 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.updateImpl import org.jetbrains.kotlinx.dataframe.impl.api.updateWithValuePerColumnImpl import org.jetbrains.kotlinx.dataframe.impl.headPlusArray import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -299,9 +300,7 @@ public fun DataFrame.update(vararg columns: String): Update = up * into `df.`[update][org.jetbrains.kotlinx.dataframe.api.update]`(...) { ... }` * @param [columns] The [KProperties][KProperty] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update(vararg columns: KProperty): Update = update { columns.toColumnSet() } @@ -336,9 +335,7 @@ public fun DataFrame.update(vararg columns: KProperty): Update DataFrame.update(vararg columns: ColumnReference): Update = update { columns.toColumnSet() } @@ -691,9 +688,7 @@ public fun Update.notNull(expression: UpdateExpression): * @param [columns] The [Column References][org.jetbrains.kotlinx.dataframe.columns.ColumnReference] of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. * @param [expression] The [Row Value Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowValueExpression.WithExample] to update the rows with. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update( firstCol: ColumnReference, @@ -734,9 +729,7 @@ public fun DataFrame.update( * @param [columns] The [KProperties][KProperty] corresponding to columns of this [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame] to update. * @param [expression] The [Row Value Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenRow.RowValueExpression.WithExample] to update the rows with. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update( firstCol: KProperty, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt index 067d84c9a3..d92a5a1062 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -44,11 +45,11 @@ public interface ValueColColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -295,9 +296,7 @@ public interface ValueColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueCol(valueCol: ColumnAccessor): ColumnAccessor = valueCol.ensureIsValueColumn() @@ -513,9 +512,7 @@ public interface ValueColColumnsSelectionDsl { * @param [col] The [ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor] pointing to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(valueCol: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(valueCol.path()).ensureIsValueColumn() @@ -1116,9 +1113,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(name: String): ColumnAccessor<*> = valueCol(name) @@ -1173,9 +1168,7 @@ public interface ValueColColumnsSelectionDsl { * @param [name] The name of the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(name).ensureIsValueColumn() @@ -1832,9 +1825,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor<*> = valueCol(path) @@ -1889,9 +1880,7 @@ public interface ValueColColumnsSelectionDsl { * @param [path] The path to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(path).ensureIsValueColumn() @@ -2108,9 +2097,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueCol(property: KProperty): SingleColumn = valueColumn(property).ensureIsValueColumn() @@ -2163,9 +2150,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.valueCol(property: KProperty): SingleColumn = valueCol(property.name) @@ -2219,9 +2204,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.valueCol(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -2275,9 +2258,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -2331,9 +2312,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -2387,9 +2366,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property] The [KProperty] reference to the value column. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -2889,9 +2866,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(index: Int): SingleColumn<*> = valueCol(index) @@ -2947,9 +2922,7 @@ public interface ValueColColumnsSelectionDsl { * @throws [IndexOutOfBoundsException] if the index is out of bounds. * @param [C] The type of the value column. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(index: Int): SingleColumn = columnGroup(this).valueCol(index) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt index b8a18de671..23ab2ade1c 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.columns.ValueColumn import org.jetbrains.kotlinx.dataframe.documentation.AccessApi import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -41,7 +42,7 @@ public interface ValueColsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * *      * @@ -324,9 +325,7 @@ public interface ValueColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.colGroups] * @see [ColumnsSelectionDsl.cols] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCols(filter: Predicate> = { true }): TransformableColumnSet<*> = columnGroup(this).valueCols(filter) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt index 7beaa73272..be49a1a580 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Interpretable import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.nameGenerator +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.full.withNullability import kotlin.reflect.typeOf @@ -83,9 +84,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.valueCounts( vararg columns: AnyColumnReference, @@ -95,9 +94,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.valueCounts( vararg columns: KProperty<*>, diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt index ba91641b01..85c6bebfb6 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.columnValues import org.jetbrains.kotlinx.dataframe.impl.aggregation.internal import org.jetbrains.kotlinx.dataframe.impl.aggregation.remainingColumnsSelector import org.jetbrains.kotlinx.dataframe.impl.valuesImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -29,9 +30,7 @@ public fun DataFrame.valuesNotNull(byRow: Boolean = false): Sequence // region GroupBy -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.values( vararg columns: AnyColumnReference, @@ -60,18 +59,14 @@ public fun Grouped.values(dropNA: Boolean = false, distinct: Boolean = fa public fun ReducedGroupBy.values(): DataFrame = values(groupBy.remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.values(vararg columns: AnyColumnReference): DataFrame = values { columns.toColumnSet() } public fun ReducedGroupBy.values(vararg columns: String): DataFrame = values { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.values(vararg columns: KProperty<*>): DataFrame = values { columns.toColumnSet() } @@ -90,9 +85,7 @@ public fun Pivot.values( columns: ColumnsForAggregateSelector, ): DataRow = delegate { values(dropNA, distinct, separate, columns) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.values( vararg columns: AnyColumnReference, @@ -108,9 +101,7 @@ public fun Pivot.values( separate: Boolean = false, ): DataRow = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.values( vararg columns: KProperty<*>, @@ -135,9 +126,7 @@ public fun Pivot.values( public fun ReducedPivot.values(separate: Boolean = false): DataRow = pivot.delegate { reduce(reducer).values(separate = separate) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivot.values(vararg columns: AnyColumnReference, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } @@ -145,9 +134,7 @@ public fun ReducedPivot.values(vararg columns: AnyColumnReference, separa public fun ReducedPivot.values(vararg columns: String, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivot.values(vararg columns: KProperty<*>, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } @@ -167,9 +154,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate, remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.values( vararg columns: AnyColumnReference, @@ -185,9 +170,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.values( vararg columns: KProperty<*>, @@ -210,9 +193,7 @@ public fun PivotGroupBy.values( public fun ReducedPivotGroupBy.values(separate: Boolean = false): DataFrame = values(separate, pivot.remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivotGroupBy.values( vararg columns: AnyColumnReference, @@ -222,9 +203,7 @@ public fun ReducedPivotGroupBy.values( public fun ReducedPivotGroupBy.values(vararg columns: String, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivotGroupBy.values(vararg columns: KProperty<*>, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt index 324099f771..2b74374283 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.transform +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -36,7 +37,7 @@ public interface WithoutNullsColumnsSelectionDsl { * *      * - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] * * * @@ -261,9 +262,7 @@ public interface WithoutNullsColumnsSelectionDsl { * * @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing only columns that do not contain `null`s and are thus non-nullable. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsWithoutNulls(): ColumnSet = columnGroup(this).colsWithoutNulls() diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt index 4a99a5a15b..21d932046c 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.xsImpl @Interpretable("DataFrameXs") public fun DataFrame.xs(vararg keyValues: Any?): DataFrame = xs(*keyValues) { - colsAtAnyDepth { !it.isColumnGroup() }.take(keyValues.size) + colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } @Refine @@ -28,7 +28,7 @@ public fun DataFrame.xs(vararg keyValues: C, keyColumns: ColumnsSelect @Interpretable("GroupByXs") public fun GroupBy.xs(vararg keyValues: Any?): GroupBy = xs(*keyValues) { - colsAtAnyDepth { !it.isColumnGroup() }.take(keyValues.size) + colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } @Refine diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt index 3e8336f8d4..8c251a5ed8 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.columns import org.jetbrains.kotlinx.dataframe.AnyBaseCol import org.jetbrains.kotlinx.dataframe.AnyCol import org.jetbrains.kotlinx.dataframe.AnyRow +import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt index 5d150f979a..eab8acff76 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt @@ -107,7 +107,9 @@ internal fun aggregateGroupBy( if (!removeColumns) removedNode.data.wasRemoved = false - val columnsToInsert = groupedFrame.getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }.map { + val columnsToInsert = groupedFrame.getColumnsWithPaths { + colsAtAnyDepth().filter { !it.isColumnGroup() } + }.map { ColumnToInsert(insertPath + it.path, it, removedNode) } val src = if (removeColumns) removed.df else df diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt index c4fb2d78f5..bbdd412851 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt @@ -26,7 +26,9 @@ internal fun Corr.corrImpl(otherColumns: ColumnsSelector): // extract nested number columns from ColumnGroups if (it.isColumnGroup()) { val groupPath = it.path - df.getColumnsWithPaths { groupPath.colsAtAnyDepth { it.isSuitableForCorr() } }.map { it.cast() } + df.getColumnsWithPaths { + groupPath.colsAtAnyDepth().filter { it.isSuitableForCorr() } + }.map { it.cast() } } else { listOf(it) } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt index f353ab48e5..399d74bd62 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt @@ -67,10 +67,10 @@ internal fun DataFrame.joinImpl( val rightCol = rightJoinColumns[i] if (leftCol.isColumnGroup() && rightCol.isColumnGroup()) { val leftColumns = getColumnsWithPaths { - leftCol.colsAtAnyDepth { !it.isColumnGroup() } + leftCol.colsAtAnyDepth().filter { !it.isColumnGroup() } } val rightColumns = other.getColumnsWithPaths { - rightCol.colsAtAnyDepth { !it.isColumnGroup() } + rightCol.colsAtAnyDepth().filter { !it.isColumnGroup() } } val leftPrefixLength = leftCol.path.size @@ -112,7 +112,7 @@ internal fun DataFrame.joinImpl( // group row indices by key from right data frame val groupedRight = when (joinType) { - JoinType.Exclude -> rightJoinKeyToIndex.associate { it.first to emptyList() } + JoinType.Exclude -> rightJoinKeyToIndex.associate { it.first to emptyList() } else -> rightJoinKeyToIndex.groupBy({ it.first }) { it.second } } @@ -145,14 +145,14 @@ internal fun DataFrame.joinImpl( outputRowsCount += rightUnmatchedCount } - val leftColumns = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val leftColumns = getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } val rightJoinColumnPaths = allRightJoinColumns.associate { it.path to it.data } val newRightColumns = if (addNewColumns) { other.getColumnsWithPaths { - colsAtAnyDepth { + colsAtAnyDepth().filter { !it.isColumnGroup() && !rightJoinColumnPaths.contains(it.path) } } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt index e0a19d9eff..04fb4d4ea0 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt @@ -681,7 +681,7 @@ internal fun DataFrame.parseImpl(options: ParserOptions?, columns: Column col.isFrameColumn() -> { col.map { it.parseImpl(options) { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } } } diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt index 44b4520c2c..2674e6c5bd 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt @@ -283,7 +283,7 @@ public fun AnyFrame.toStaticHtml( val id = "static_df_${nextTableId()}" // Retrieve all columns, including nested ones - val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val flattenedCols = getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } // Get a grid of columns for the header, as well as the side borders for each cell val colGrid = getColumnsHeaderGrid() diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt index 2c8921e3e0..7cb3fa01ff 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt +++ b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt @@ -7,119 +7,119 @@ package org.jetbrains.kotlinx.dataframe.util * Level.ERROR -> Remove */ -// region WARNING in 0.15, ERROR in 0.16 +// region WARNING in 0.15, ERROR in 1.0 -private const val MESSAGE_0_16 = "Will be ERROR in 0.16." +private const val MESSAGE_1_0 = "Will be ERROR in 1.0." -internal const val DF_READ_NO_CSV = "This function is deprecated and should be replaced with `readCsv`. $MESSAGE_0_16" +internal const val DF_READ_NO_CSV = "This function is deprecated and should be replaced with `readCsv`. $MESSAGE_1_0" internal const val DF_READ_NO_CSV_REPLACE = "this.readCsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val CREATE_FRAME_COLUMN = - "Removed from public API as this can likely better be solved by `DataFrame.chunked()`. Replaced by internal df.chunkedImpl(). $MESSAGE_0_16" + "Removed from public API as this can likely better be solved by `DataFrame.chunked()`. Replaced by internal df.chunkedImpl(). $MESSAGE_1_0" internal const val CREATE_FRAME_COLUMN_REPLACE = "df.chunkedImpl(startIndices, name)" internal const val CHUNKED_IMPL_IMPORT = "org.jetbrains.kotlinx.dataframe.impl.api.chunkedImpl" internal const val CREATE_WITH_TYPE_INFERENCE = - "This function is deprecated and should be replaced by `createByInference()`. $MESSAGE_0_16" + "This function is deprecated and should be replaced by `createByInference()`. $MESSAGE_1_0" internal const val CREATE_WITH_TYPE_INFERENCE_REPLACE = "createByInference(name, values, TypeSuggestion.Infer, nullable)" internal const val CREATE_BY_INFERENCE_IMPORT = "org.jetbrains.kotlinx.dataframe.DataColumn.Companion.createByInference" internal const val TYPE_SUGGESTION_IMPORT = "org.jetbrains.kotlinx.dataframe.columns.TypeSuggestion" -internal const val CREATE = "This function is deprecated and should be replaced by `createByType()`. $MESSAGE_0_16" +internal const val CREATE = "This function is deprecated and should be replaced by `createByType()`. $MESSAGE_1_0" internal const val CREATE_REPLACE = "createByType(name, values, type, infer)" internal const val CREATE_INLINE_REPLACE = "createByType(name, values, infer)" internal const val CREATE_BY_TYPE_IMPORT = "org.jetbrains.kotlinx.dataframe.DataColumn.Companion.createByType" -internal const val GUESS_VALUE_TYPE = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val GUESS_VALUE_TYPE = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val CREATE_COLUMN = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val CREATE_COLUMN = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val GUESS_COLUMN_TYPE = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val GUESS_COLUMN_TYPE = "This function is just here for binary compatibility. $MESSAGE_1_0" -public const val DF_READ_EXCEL: String = "This function is just here for binary compatibility. $MESSAGE_0_16" +public const val DF_READ_EXCEL: String = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val PARSER_OPTIONS = "This constructor is only here for binary compatibility. $MESSAGE_0_16" +internal const val PARSER_OPTIONS = "This constructor is only here for binary compatibility. $MESSAGE_1_0" -internal const val PARSER_OPTIONS_COPY = "This function is only here for binary compatibility. $MESSAGE_0_16" +internal const val PARSER_OPTIONS_COPY = "This function is only here for binary compatibility. $MESSAGE_1_0" internal const val IS_COMPARABLE = - "This function is replaced by `valuesAreComparable()` to better reflect its purpose. $MESSAGE_0_16" + "This function is replaced by `valuesAreComparable()` to better reflect its purpose. $MESSAGE_1_0" internal const val IS_COMPARABLE_REPLACE = "valuesAreComparable()" internal const val IS_INTER_COMPARABLE_IMPORT = "org.jetbrains.kotlinx.dataframe.api.valuesAreComparable" -internal const val AS_URL = "This function is replaced by `asUrl()`. $MESSAGE_0_16" +internal const val AS_URL = "This function is replaced by `asUrl()`. $MESSAGE_1_0" internal const val AS_URL_REPLACE = "asUrl(fileOrUrl)" internal const val AS_URL_IMPORT = "org.jetbrains.kotlinx.dataframe.io.asUrl" -internal const val IS_URL = "This function is replaced by `isUrl()`. $MESSAGE_0_16" +internal const val IS_URL = "This function is replaced by `isUrl()`. $MESSAGE_1_0" internal const val IS_URL_REPLACE = "isUrl(path)" internal const val IS_URL_IMPORT = "org.jetbrains.kotlinx.dataframe.io.isUrl" -internal const val MINUS = "This minus overload will be removed in favor of `remove`. $MESSAGE_0_16" +internal const val MINUS = "This minus overload will be removed in favor of `remove`. $MESSAGE_1_0" internal const val MINUS_REPLACE = "this.remove(columns)" -internal const val READ_JSON = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val READ_JSON = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val MOVE_TO_LEFT = "This `moveToLeft` overload will be removed in favor of `moveToStart`. $MESSAGE_0_16" +internal const val MOVE_TO_LEFT = "This `moveToLeft` overload will be removed in favor of `moveToStart`. $MESSAGE_1_0" internal const val MOVE_TO_LEFT_REPLACE = "this.moveToStart(columns)" -internal const val MOVE_TO_RIGHT = "This `moveToRight` overload will be removed in favor of `moveToEnd`. $MESSAGE_0_16" +internal const val MOVE_TO_RIGHT = "This `moveToRight` overload will be removed in favor of `moveToEnd`. $MESSAGE_1_0" internal const val MOVE_TO_RIGHT_REPLACE = "this.moveToEnd(columns)" -internal const val TO_LEFT = "This `toLeft` overload will be removed in favor of `toStart`. $MESSAGE_0_16" +internal const val TO_LEFT = "This `toLeft` overload will be removed in favor of `toStart`. $MESSAGE_1_0" internal const val TO_LEFT_REPLACE = "this.toStart()" -internal const val TO_RIGHT = "This `toRight` overload will be removed in favor of `toEnd`. $MESSAGE_0_16" +internal const val TO_RIGHT = "This `toRight` overload will be removed in favor of `toEnd`. $MESSAGE_1_0" internal const val TO_RIGHT_REPLACE = "this.toEnd()" -internal const val ROW_MIN = "`rowMin` is deprecated in favor of `rowMinOf`. $MESSAGE_0_16" -internal const val ROW_MIN_OR_NULL = "`rowMinOrNull` is deprecated in favor of `rowMinOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MIN = "`rowMin` is deprecated in favor of `rowMinOf`. $MESSAGE_1_0" +internal const val ROW_MIN_OR_NULL = "`rowMinOrNull` is deprecated in favor of `rowMinOfOrNull`. $MESSAGE_1_0" -internal const val ROW_MAX = "`rowMax` is deprecated in favor of `rowMaxOf`. $MESSAGE_0_16" -internal const val ROW_MAX_OR_NULL = "`rowMaxOrNull` is deprecated in favor of `rowMaxOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MAX = "`rowMax` is deprecated in favor of `rowMaxOf`. $MESSAGE_1_0" +internal const val ROW_MAX_OR_NULL = "`rowMaxOrNull` is deprecated in favor of `rowMaxOfOrNull`. $MESSAGE_1_0" -internal const val ROW_MEDIAN = "`rowMedian` is deprecated in favor of `rowMedianOf`. $MESSAGE_0_16" -internal const val ROW_MEDIAN_OR_NULL = "`rowMedianOrNull` is deprecated in favor of `rowMedianOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MEDIAN = "`rowMedian` is deprecated in favor of `rowMedianOf`. $MESSAGE_1_0" +internal const val ROW_MEDIAN_OR_NULL = "`rowMedianOrNull` is deprecated in favor of `rowMedianOfOrNull`. $MESSAGE_1_0" -internal const val ROW_PERCENTILE = "`rowPercentile` is deprecated in favor of `rowPercentileOf`. $MESSAGE_0_16" +internal const val ROW_PERCENTILE = "`rowPercentile` is deprecated in favor of `rowPercentileOf`. $MESSAGE_1_0" internal const val ROW_PERCENTILE_OR_NULL = - "`rowPercentileOrNull` is deprecated in favor of `rowPercentileOfOrNull`. $MESSAGE_0_16" + "`rowPercentileOrNull` is deprecated in favor of `rowPercentileOfOrNull`. $MESSAGE_1_0" -internal const val SUM_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MAX_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MIN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MEAN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val SUM_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MAX_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MIN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MEAN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val CONVERT_TO = "This to overload will be removed in favor of `asColumn`. $MESSAGE_0_16" +internal const val CONVERT_TO = "This to overload will be removed in favor of `asColumn`. $MESSAGE_1_0" internal const val CONVERT_TO_REPLACE = "this.asColumn(columnConverter)" -internal const val TO_HTML = "This function is replaced by `toHtml()`. $MESSAGE_0_16" +internal const val TO_HTML = "This function is replaced by `toHtml()`. $MESSAGE_1_0" internal const val TO_HTML_REPLACE = "toHtml(configuration, cellRenderer, getFooter)" -internal const val TO_STANDALONE_HTML = "This function is replaced by `toStandaloneHtml()`. $MESSAGE_0_16" +internal const val TO_STANDALONE_HTML = "This function is replaced by `toStandaloneHtml()`. $MESSAGE_1_0" internal const val TO_STANDALONE_HTML_REPLACE = "toStandaloneHtml(configuration, cellRenderer, getFooter)" -internal const val WRITE_HTML = "This function is replaced by `writeHtml()`. $MESSAGE_0_16" +internal const val WRITE_HTML = "This function is replaced by `writeHtml()`. $MESSAGE_1_0" internal const val WRITE_HTML_REPLACE = "writeHtml(destination)" -internal const val CONVERT_TO_URL = "This function is replaced by `convertToUrl()`. $MESSAGE_0_16" +internal const val CONVERT_TO_URL = "This function is replaced by `convertToUrl()`. $MESSAGE_1_0" internal const val CONVERT_TO_URL_REPLACE = "convertToUrl()" -internal const val TO_URL = "This function is replaced by `toUrl()`. $MESSAGE_0_16" +internal const val TO_URL = "This function is replaced by `toUrl()`. $MESSAGE_1_0" internal const val TO_URL_REPLACE = "toUrl()" // endregion -// region WARNING in 0.16, ERROR in 0.17 +// region WARNING in 1.0, ERROR in 1.1 -private const val MESSAGE_0_17 = "Will be ERROR in 0.17." +private const val MESSAGE_1_1 = "Will be ERROR in 1.1." internal const val APACHE_CSV = - "The Apache-based CSV/TSV reader is deprecated in favor of the new Deephaven CSV reader in dataframe-csv. $MESSAGE_0_17" + "The Apache-based CSV/TSV reader is deprecated in favor of the new Deephaven CSV reader in dataframe-csv. $MESSAGE_1_1" internal const val READ_CSV = - "Apache-based readCSV() is deprecated in favor of Deephaven-based readCsv() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readCSV() is deprecated in favor of Deephaven-based readCsv() in dataframe-csv. $MESSAGE_1_1" internal const val READ_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.readCsv" internal const val READ_CSV_FILE_OR_URL_REPLACE = "this.readCsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" @@ -131,14 +131,14 @@ internal const val READ_CSV_STREAM_REPLACE = "this.readCsv(inputStream = stream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_DELIM = - "Apache-based readDelim() is deprecated in favor of Deephaven-based readDelim() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readDelim() is deprecated in favor of Deephaven-based readDelim() in dataframe-csv. $MESSAGE_1_1" internal const val READ_DELIM_STREAM_REPLACE = "this.readDelim(inputStream = inStream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_DELIM_READER_REPLACE = "this.readDelimStr(text = reader.readText(), delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_TSV = - "Apache-based readTSV() is deprecated in favor of Deephaven-based readTsv() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readTSV() is deprecated in favor of Deephaven-based readTsv() in dataframe-csv. $MESSAGE_1_1" internal const val READ_TSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.readTsv" internal const val READ_TSV_FILE_OR_URL_REPLACE = "this.readTsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" @@ -150,26 +150,40 @@ internal const val READ_TSV_STREAM_REPLACE = "this.readTsv(inputStream = stream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val WRITE_CSV = - "The writeCSV() functions are deprecated in favor of writeCsv() in dataframe-csv. $MESSAGE_0_17" + "The writeCSV() functions are deprecated in favor of writeCsv() in dataframe-csv. $MESSAGE_1_1" internal const val WRITE_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.writeCsv" internal const val WRITE_CSV_FILE_REPLACE = "this.writeCsv(file = file)" internal const val WRITE_CSV_PATH_REPLACE = "this.writeCsv(path = path)" internal const val WRITE_CSV_WRITER_REPLACE = "this.writeCsv(writer = writer)" -internal const val TO_CSV = "toCsv() is deprecated in favor of toCsvStr() in dataframe-csv. $MESSAGE_0_17" +internal const val TO_CSV = "toCsv() is deprecated in favor of toCsvStr() in dataframe-csv. $MESSAGE_1_1" internal const val TO_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.toCsvStr" internal const val TO_CSV_REPLACE = "this.toCsvStr()" internal const val SPLIT_STR = - "Please explicitly specify how the String should be split. This shortcut will be removed in version 1.1.0" + "Please explicitly specify how the String should be split. Shortcut: $MESSAGE_1_1" internal const val DATAFRAME_OF_WITH_VALUES = - "Deprecated in favor of dataFrameOf(names).withValues(values). Will be error in 1.1.0" + "Deprecated in favor of dataFrameOf(names).withValues(values). $MESSAGE_1_1" + +internal const val COLS_AT_ANY_DEPTH = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val COLS_AT_ANY_DEPTH_REPLACE = "this.colsAtAnyDepth().filter(predicate)" + +internal const val COLS_IN_GROUPS = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val COLS_IN_GROUPS_REPLACE = "this.colsInGroups().filter(predicate)" + +internal const val SINGLE = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val SINGLE_COL_REPLACE = "this.allCols().filter(condition).single()" +internal const val SINGLE_PLAIN_REPLACE = "this.cols().filter(condition).single()" +internal const val SINGLE_SET_REPLACE = "this.filter(condition).single()" // endregion // region keep across releases +internal const val DEPRECATED_ACCESS_API = + "It's recommended to migrate to the String or Extension Properties Access API https://kotlin.github.io/dataframe/apilevels.html" + internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted." internal const val COL_REPLACE = "col" diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index 4f9735d4c1..aefb0d43e9 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -149,8 +149,8 @@ class AllExceptTests : ColumnsSelectionDslTests() { listOf( df.select { name.firstName }, - df.select { name.allCols() except { colsAtAnyDepth { "last" in it.name } } }, - df.select { name.allCols() except colsAtAnyDepth { "last" in it.name } }, + df.select { name.allCols() except { colsAtAnyDepth().filter { "last" in it.name } } }, + df.select { name.allCols() except colsAtAnyDepth().filter { "last" in it.name } }, df.select { name.allCols() except { name.lastName } }, df.select { name.allCols() except name.lastName }, df.select { name.allCols() except { colGroup("name").col("lastName") } }, diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index 88b33f551d..0c584b0c98 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -55,21 +55,21 @@ class AtAnyDepth : TestBase() { dfGroup.select { name.firstName.firstName }, dfGroup.select { first { col -> col.any { it == "Alice" } }.atAnyDepthImpl() }, dfGroup.select { colsAtAnyDepth().first { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.first() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.first() }, dfGroup.select { colsAtAnyDepth().last { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.last() }, - dfGroup.select { colsAtAnyDepth().single { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.last() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.single() }, ).shouldAllBeEqual() listOf( dfGroup.select { city }, dfGroup.select { colsAtAnyDepth().first { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.first() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.first() }, dfGroup.select { colsAtAnyDepth().last { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.last() }, - dfGroup.select { colsAtAnyDepth().single { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.last() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.single() }, ).shouldAllBeEqual() } @@ -78,7 +78,7 @@ class AtAnyDepth : TestBase() { listOf( df.select { name }, df.select { colsAtAnyDepth().colGroups() }, - df.select { colsAtAnyDepth { it.kind == Group } }, + df.select { colsAtAnyDepth().filter { it.kind == Group } }, df.select { colGroups() }, df.select { all().colGroups() }, df.select { all().colsAtAnyDepth().colGroups() }, @@ -111,7 +111,7 @@ class AtAnyDepth : TestBase() { fun `all allAtAnyDepth`() { dfGroup.getColumnsWithPaths { all().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal dfGroup - .getColumnsWithPaths { all().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { all().colsAtAnyDepth().filter { !it.isColumnGroup() } } .sortedBy { it.name } shouldBe atAnyDepthNoGroups } @@ -119,7 +119,7 @@ class AtAnyDepth : TestBase() { fun `cols allAtAnyDepth`() { dfGroup.getColumnsWithPaths { cols().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal dfGroup - .getColumnsWithPaths { cols().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { cols().colsAtAnyDepth().filter { !it.isColumnGroup() } } .sortedBy { it.name } shouldBe atAnyDepthNoGroups } diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index f78d83ead7..45edbe5bf8 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -30,7 +30,7 @@ class MoveTests { @Test fun `select all atAnyDepth`() { val selected = grouped - .getColumnsWithPaths { colGroups().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { colGroups().colsAtAnyDepth().filter { !it.isColumnGroup() } } .map { it.path.joinToString(".") } selected shouldBe listOf("a.b", "a.c.d", "b.c", "b.d", "e.f") } @@ -38,7 +38,7 @@ class MoveTests { @Test fun `batch ungrouping`() { val ungrouped = grouped.move { - colsAtAnyDepth { it.depth() > 0 && !it.isColumnGroup() } + colsAtAnyDepth().filter { it.depth() > 0 && !it.isColumnGroup() } }.into { pathOf(it.path.joinToString(".")) } ungrouped.columnNames() shouldBe listOf("q", "a.b", "a.c.d", "b.c", "b.d", "w", "e.f", "r") } @@ -71,7 +71,7 @@ class MoveTests { @Test fun `select recursively`() { val selected = grouped.select { - it["a"].asColumnGroup().colsAtAnyDepth { !it.isColumnGroup() } + it["a"].asColumnGroup().colsAtAnyDepth().filter { !it.isColumnGroup() } } selected.columnNames() shouldBe listOf("b", "d") } @@ -80,7 +80,7 @@ class MoveTests { fun `columnsWithPath in selector`() { val selected = grouped.getColumnsWithPaths { it["a"] } val actual = grouped.getColumnsWithPaths { - selected.map { it.asColumnGroup().colsAtAnyDepth { !it.isColumnGroup() } }.toColumnSet() + selected.map { it.asColumnGroup().colsAtAnyDepth().filter { !it.isColumnGroup() } }.toColumnSet() } actual.map { it.path.joinToString(".") } shouldBe listOf("a.b", "a.c.d") } @@ -114,7 +114,7 @@ class MoveTests { @Test fun `move after with column selector`() { - val df = grouped.move { colsAtAnyDepth { it.name == "r" || it.name == "w" } } + val df = grouped.move { colsAtAnyDepth().filter { it.name == "r" || it.name == "w" } } .after { "a"["c"]["d"] } df.columnNames() shouldBe listOf("q", "a", "b", "e") df["a"]["c"].asColumnGroup().columnNames() shouldBe listOf("d", "w", "r") diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index c85d05e797..cb9b54f184 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -43,7 +43,7 @@ class PivotTests { } pivoted.columnsCount() shouldBe 3 pivoted.rowsCount() shouldBe 2 - val cols = pivoted.getColumns { allExcept(a).colsAtAnyDepth { !it.isColumnGroup() } } + val cols = pivoted.getColumns { allExcept(a).colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 4 cols.forEach { it.type() shouldBe typeOf() diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index 9fbb91e151..30c14645e2 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -19,10 +19,10 @@ class SingleTests : ColumnsSelectionDslTests() { df.select { Person::age.singleCol() } } shouldThrow { - df.select { single { false } } + df.select { cols().filter { false }.single() } } shouldThrow { - df.select { single { true } } + df.select { single() } } val singleDf = df.select { take(1) } @@ -32,12 +32,12 @@ class SingleTests : ColumnsSelectionDslTests() { singleDf.select { name }, singleDf.select { single() }, singleDf.select { all().single() }, - df.select { single { it.name().startsWith("n") } }, + df.select { cols().filter { it.name().startsWith("n") }.single() }, ).shouldAllBeEqual() listOf( df.select { name.firstName }, - df.select { name.colsOf().single { col -> col.any { it == "Alice" } } }, + df.select { name.colsOf().filter { col -> col.any { it == "Alice" } }.single() }, df.select { name.singleCol { col -> col.any { it == "Alice" } } }, df.select { "name".singleCol { col -> col.any { it == "Alice" } } }, df.select { Person::name.singleCol { col -> col.any { it == "Alice" } } }, diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt index 3c53afc800..665ff99883 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt @@ -138,7 +138,7 @@ class PlaylistJsonTest { @Test fun `deep batch update all`() { val updated = item - .convert { colsAtAnyDepth { it.name() == "url" } } + .convert { colsAtAnyDepth().filter { it.name() == "url" } } .with { (it as? String)?.let { IMG(it) } } updated.snippet.thumbnails.default.url.type() shouldBe typeOf() updated.snippet.thumbnails.maxres.url.type() shouldBe typeOf() diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt index 32888d31ce..a798cd386c 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt @@ -590,7 +590,7 @@ class Access : TestBase() { df.select { name.allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { name.colsAtAnyDepth { !it.isColumnGroup() } } + df.select { name.colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -626,7 +626,7 @@ class Access : TestBase() { df.select { Person::name.allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { Person::name.colsAtAnyDepth { !it.isColumnGroup() } } + df.select { Person::name.colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -660,7 +660,7 @@ class Access : TestBase() { df.select { "name".allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { "name".colsAtAnyDepth { !it.isColumnGroup() } } + df.select { "name".colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -719,13 +719,13 @@ class Access : TestBase() { } // traversal of columns at any depth from here excluding ColumnGroups - df.select { colsAtAnyDepth { !it.isColumnGroup() } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() } } // traversal of columns at any depth from here including ColumnGroups df.select { colsAtAnyDepth() } // traversal of columns at any depth with condition - df.select { colsAtAnyDepth { it.name().contains(":") } } + df.select { colsAtAnyDepth().filter() { it.name().contains(":") } } // traversal of columns at any depth to find columns of given type df.select { colsAtAnyDepth().colsOf() } @@ -743,18 +743,18 @@ class Access : TestBase() { fun columnSelectorsModifySet() { // SampleStart // first/last n value- and frame columns in column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.take(3) } - df.select { colsAtAnyDepth { !it.isColumnGroup() }.takeLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.takeLast(3) } // all except first/last n value- and frame columns in column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.drop(3) } - df.select { colsAtAnyDepth { !it.isColumnGroup() }.dropLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.drop(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.dropLast(3) } // filter column set by condition - df.select { colsAtAnyDepth { !it.isColumnGroup() }.filter { it.name().startsWith("year") } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() && it.name().startsWith("year") } } // exclude columns from column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.except { age } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.except { age } } // keep only unique columns df.select { (colsOf() and age).distinct() } diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt index 4c63fe51ae..f4281d1568 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt @@ -932,7 +932,7 @@ class DataFrameTests : BaseTest() { df["e"].kind() shouldBe ColumnKind.Group df.getColumnGroup("d").columnNames() shouldBe listOf("f") df.getColumnGroup("e").getColumnGroup("g").columnNames() shouldBe listOf("h") - val cols = df.getColumns { colsAtAnyDepth { !it.isColumnGroup() } } + val cols = df.getColumns { colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 5 cols.forEach { it.toList() shouldBe expected diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt index 38a185722b..f20f43269d 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt @@ -288,7 +288,7 @@ class DataFrameTreeTests : BaseTest() { @Test fun `select atAnyDepth`() { - val cols = typed2.select { colsAtAnyDepth { it.hasNulls } } + val cols = typed2.select { colsAtAnyDepth().filter { it.hasNulls } } cols shouldBe typed2.select { nameAndCity.city and weight } } @@ -535,14 +535,16 @@ class DataFrameTreeTests : BaseTest() { @Test fun parentColumnTest() { - val res = typed2.move { colsAtAnyDepth { it.depth > 0 } }.toTop { it.parentName + "-" + it.name } + val res = typed2.move { colsAtAnyDepth().filter { it.depth > 0 } }.toTop { it.parentName + "-" + it.name } res.columnsCount() shouldBe 4 res.columnNames() shouldBe listOf("nameAndCity-name", "nameAndCity-city", "age", "weight") } @Test fun `group cols`() { - val joined = typed2.move { colsAtAnyDepth { !it.isColumnGroup() } }.into { pathOf(it.path.joinToString(".")) } + val joined = typed2.move { + colsAtAnyDepth().filter { !it.isColumnGroup() } + }.into { pathOf(it.path.joinToString(".")) } val grouped = joined.group { nameContains(".") }.into { it.name().substringBefore(".") } val expected = typed2.rename { nameAndCity.allCols() }.into { it.path.joinToString(".") } grouped shouldBe expected diff --git a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt index 84be5b6027..d8dd136982 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt +++ b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt @@ -283,7 +283,7 @@ class PivotTests { val leafColumns = pivoted.getColumnsWithPaths { all() .drop(1) - .colsAtAnyDepth { !it.isColumnGroup() } + .colsAtAnyDepth().filter { !it.isColumnGroup() } } leafColumns.size shouldBe typed.name.countDistinct() * typed.key.countDistinct() - 1 leafColumns.forEach { it.path.size shouldBe 2 } @@ -344,7 +344,7 @@ class PivotTests { // nullGroup.columnTypes() shouldBe listOf(typeOf?>(), typeOf?>()) nullGroup.columnTypes() shouldBe listOf(nothingType(true), nothingType(true)) - val cols = pivotedDf.getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val cols = pivotedDf.getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 2 * typed.name.countDistinct() * typed.key.countDistinct() - 2 cols.forEach { diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt index 16ff0c3e72..6f58c938ec 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/ColumnsContainer.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.FrameColumn import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -43,15 +44,11 @@ public interface ColumnsContainer : ColumnsScope { public fun getColumnOrNull(index: Int): AnyCol? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getColumnOrNull(column: ColumnReference): DataColumn? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getColumnOrNull(column: KProperty): DataColumn? @@ -67,58 +64,40 @@ public interface ColumnsContainer : ColumnsScope { public operator fun get(columnPath: ColumnPath): AnyCol = getColumn(columnPath) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn): DataColumn = getColumn(column.name()).cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn>): ColumnGroup = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: DataColumn>): FrameColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference): DataColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference>): ColumnGroup = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference>): FrameColumn = getColumn(column) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty): DataColumn = get(column.columnName).cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty>): ColumnGroup = get(column.columnName).asColumnGroup().cast() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: KProperty>): FrameColumn = get(column.columnName).asAnyFrameColumn().castFrameColumn() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt index 2e4acb596c..26a5d88451 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataFrame.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.headPlusIterable import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrame import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrameOf import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KType /** @@ -121,9 +122,7 @@ public interface DataFrame : */ public operator fun DataFrame.get(columns: ColumnsSelector): List> = this.get(columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun DataFrame.get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame = select { (listOf(first) + other).toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt index ef8513529c..c365541a77 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.owner import org.jetbrains.kotlinx.dataframe.impl.toIterable +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -28,27 +29,19 @@ public interface DataRow { public operator fun get(expression: RowExpression): R = expression(this, this) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(column: ColumnReference): R - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(columns: List>): List = columns.map { get(it) } - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(property: KProperty): R = get(property.columnName) as R - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataRow = owner.get(first, *other)[index] @@ -83,9 +76,7 @@ public interface DataRow { public fun getOrNull(name: String): Any? - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun getValueOrNull(column: ColumnReference): R? @@ -95,9 +86,7 @@ public interface DataRow { public operator fun String.get(vararg path: String): ColumnPath = ColumnPath(listOf(this) + path) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnReference.invoke(): R = get(this) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt index bb1ab4caae..f1dacc2a9e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.FrameColumn import org.jetbrains.kotlinx.dataframe.impl.columns.getColumn +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Column Selection DSL][ColumnSelectionDsl] */ @@ -71,9 +72,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyInvokeDocs] * @return The [DataColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.invoke(): DataColumn = this@ColumnSelectionDsl[this] @@ -81,9 +80,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyInvokeDocs] * @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.invoke(): ColumnGroup = this@ColumnSelectionDsl[this] @@ -91,9 +88,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyInvokeDocs] * @return The [FrameColumn] this [KProperty Accessor][KProperty] points to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.invoke(): FrameColumn = this@ColumnSelectionDsl[this] @@ -118,9 +113,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty): DataColumn = invoke()[column] @@ -130,9 +123,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty>): ColumnGroup = invoke()[column] @@ -143,9 +134,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowGet") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty>.get(column: KProperty>): FrameColumn = invoke()[column] @@ -154,9 +143,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyGetDocs] * @return The [DataColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty): DataColumn = invoke().asColumnGroup()[column] @@ -164,9 +151,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyGetDocs] * @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty>): ColumnGroup = invoke().asColumnGroup()[column] @@ -175,9 +160,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * @include [CommonKPropertyGetDocs] * @return The [FrameColumn] these [KProperty Accessors][KProperty] point to. */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.get(column: KProperty>): FrameColumn = invoke().asColumnGroup()[column] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt index babb0d3bc1..dc409fcf66 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Columns Selection DSL][ColumnsSelectionDsl] */ @@ -193,9 +194,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `| `{@include [ColsColumnsSelectionDsl.Grammar.PlainDslName]}`[`**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**`]`**`(`**{@include [DslGrammarTemplate.ColumnRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`** * - * `| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * `| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.PlainDslName]}`()` * - * `| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * `| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.PlainDslName]}`()` * * `| `{@include [ColsOfColumnsSelectionDsl.Grammar.PlainDslName]}**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**` [ `**`(`**{@include [DslGrammarTemplate.KTypeRef]}**`)`**` ] [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` * @@ -207,7 +208,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `| `{@include [ExprColumnsSelectionDsl.Grammar.PlainDslName]}**`(`**`[`{@include [DslGrammarTemplate.NameRef]}**`,`**`][`{@include [DslGrammarTemplate.InferRef]}`]`**`) { `**{@include [DslGrammarTemplate.ColumnExpressionRef]}**` \}`** * - * `| (`{@include [FirstColumnsSelectionDsl.Grammar.PlainDslName]}`| `{@include [LastColumnsSelectionDsl.Grammar.PlainDslName]}`| `{@include [SingleColumnsSelectionDsl.Grammar.PlainDslName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * `| (`{@include [FirstColumnsSelectionDsl.Grammar.PlainDslName]}`|`{@include [LastColumnsSelectionDsl.Grammar.PlainDslName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * + * `| `{@include [SingleColumnsSelectionDsl.Grammar.PlainDslName]}`()` * * `| `{@include [ColumnNameFiltersColumnsSelectionDsl.Grammar.PlainDslNameContains]}**`(`**{@include [DslGrammarTemplate.TextRef]}`[`**`, `**{@include [DslGrammarTemplate.IgnoreCaseRef]}`] | `{@include [DslGrammarTemplate.RegexRef]}**`)`** * @@ -247,9 +250,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [ColsColumnsSelectionDsl.Grammar.ColumnSetName]}**`(`**{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`** * - * {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnSetName]}`()` * - * {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnSetName]}`()` * * {@include [Indent]}`| `{@include [ColsOfColumnsSelectionDsl.Grammar.ColumnSetName]}**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**` [ `**`(`**{@include [DslGrammarTemplate.KTypeRef]}**`)`**` ] [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` * @@ -269,7 +272,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [FilterColumnsSelectionDsl.Grammar.ColumnSetName]}**` { `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`** * - * {@include [Indent]}`| (`{@include [FirstColumnsSelectionDsl.Grammar.ColumnSetName]}`| `{@include [LastColumnsSelectionDsl.Grammar.ColumnSetName]}`| `{@include [SingleColumnsSelectionDsl.Grammar.ColumnSetName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| (`{@include [FirstColumnsSelectionDsl.Grammar.ColumnSetName]}`|`{@include [LastColumnsSelectionDsl.Grammar.ColumnSetName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * + * {@include [Indent]}`| `{@include [SingleColumnsSelectionDsl.Grammar.ColumnSetName]}`()` * * {@include [Indent]}`| `{@include [ColumnNameFiltersColumnsSelectionDsl.Grammar.ColumnSetNameStartsEndsWith]}__`(`__{@include [DslGrammarTemplate.TextRef]}`[`**`, `**{@include [DslGrammarTemplate.IgnoreCaseRef]}`]`**`)`** * @@ -318,9 +323,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [ColsColumnsSelectionDsl.Grammar.ColumnGroupName]}`[`**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**`]`**`(`**{@include [DslGrammarTemplate.ColumnRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`** * - * {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnGroupName]}`()` * - * {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnGroupName]}`()` * * {@include [Indent]}`| `{@include [ColumnNameFiltersColumnsSelectionDsl.Grammar.ColumnGroupNameStartsWith]}__`(`__{@include [DslGrammarTemplate.TextRef]}`[`**`, `**{@include [DslGrammarTemplate.IgnoreCaseRef]}`]`**`)`** * @@ -338,7 +343,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExceptName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`)`** * - * {@include [Indent]}`| (`{@include [FirstColumnsSelectionDsl.Grammar.ColumnGroupName]}`| `{@include [LastColumnsSelectionDsl.Grammar.ColumnGroupName]}`| `{@include [SingleColumnsSelectionDsl.Grammar.ColumnGroupName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}`| (`{@include [FirstColumnsSelectionDsl.Grammar.ColumnGroupName]}`|`{@include [LastColumnsSelectionDsl.Grammar.ColumnGroupName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * + * {@include [Indent]}`| `{@include [SingleColumnsSelectionDsl.Grammar.ColumnGroupName]}`()` * * {@include [Indent]}`| `{@include [SelectColumnsSelectionDsl.Grammar.ColumnGroupName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \}`** * @@ -399,9 +406,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup `[`{`][KProperty.select]` colA `[`and`][ColumnsSelectionDsl.and]` colB `[`}`][KProperty.select]` }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty.invoke(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt index 23eafc5070..23eca777a0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths import org.jetbrains.kotlinx.dataframe.ncol import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun DataFrame.getColumnsWithPaths(selector: ColumnsSelector): List> = @@ -87,23 +88,17 @@ public fun DataFrame.properties(): ColumnsScope = this public fun ColumnsContainer.getColumn(name: String): AnyCol = getColumnOrNull(name) ?: throw IllegalArgumentException("Column not found: '$name'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference>): FrameColumn = getColumnOrNull(column)?.asFrameColumn() ?: throw IllegalArgumentException("FrameColumn not found: '$column'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference>): ColumnGroup = getColumnOrNull(column)?.asColumnGroup() ?: throw IllegalArgumentException("ColumnGroup not found: '$column'") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumn(column: ColumnReference): DataColumn = getColumnOrNull(column) ?: throw IllegalArgumentException("Column not found: '$column'") @@ -125,16 +120,12 @@ public fun ColumnsContainer.getColumnGroup(index: Int): ColumnGroup<*> = public fun ColumnsContainer.getColumnGroup(name: String): ColumnGroup<*> = getColumn(name).asColumnGroup() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroup(column: KProperty<*>): ColumnGroup<*> = getColumnGroup(column.columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroup(column: ColumnReference>): ColumnGroup = getColumn(column) @@ -149,9 +140,7 @@ public fun ColumnsContainer.getColumnGroup(column: ColumnSelector ColumnsContainer.getColumnGroupOrNull(name: String): ColumnGroup<*>? = getColumnOrNull(name)?.asColumnGroup() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): ColumnGroup<*>? = getColumnGroupOrNull(column.columnName) @@ -160,27 +149,19 @@ public fun ColumnsContainer.getColumnGroupOrNull(column: KProperty<*>): C // region containsColumn -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer<*>.containsColumn(column: ColumnReference): Boolean = getColumnOrNull(column) != null -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt index 7ef23b9700..51e853be21 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.indices import org.jetbrains.kotlinx.dataframe.ncol import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KProperty import kotlin.reflect.KType @@ -62,23 +63,17 @@ public fun AnyRow.namedValues(): List> = public fun AnyRow.getValue(columnName: String): T = get(columnName) as T -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValue(column: ColumnReference): T = get(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValue(column: KProperty): T = get(column) public fun AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T? -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull(column.columnName) @@ -88,23 +83,17 @@ public fun AnyRow.getValueOrNull(column: KProperty): T? = getValueOrNull< public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column) public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt index 4583d590cf..4d458b11e7 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.NaN import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.get import org.jetbrains.kotlinx.dataframe.typeClass +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract import kotlin.reflect.KProperty @@ -85,9 +86,7 @@ public fun DataFrame.fillNulls(vararg columns: String): Update = * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNullsOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNulls(vararg columns: KProperty): Update = fillNulls { columns.toColumnSet() } @@ -97,9 +96,7 @@ public fun DataFrame.fillNulls(vararg columns: KProperty): Update DataFrame.fillNulls(vararg columns: ColumnReference): Update = fillNulls { columns.toColumnSet() } @@ -219,9 +216,7 @@ public fun DataFrame.fillNaNs(vararg columns: String): Update = * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNaNsOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNaNs(vararg columns: KProperty): Update = fillNaNs { columns.toColumnSet() } @@ -230,9 +225,7 @@ public fun DataFrame.fillNaNs(vararg columns: KProperty): Update DataFrame.fillNaNs(vararg columns: ColumnReference): Update = fillNaNs { columns.toColumnSet() } @@ -298,9 +291,7 @@ public fun DataFrame.fillNA(vararg columns: String): Update = fi * @include [SelectingColumns.KProperties.WithExample] {@include [SetFillNAOperationArg]} * @include [Update.KPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.fillNA(vararg columns: KProperty): Update = fillNA { columns.toColumnSet() } @@ -309,9 +300,7 @@ public fun DataFrame.fillNA(vararg columns: KProperty): Update DataFrame.fillNA(vararg columns: ColumnReference): Update = fillNA { columns.toColumnSet() } @@ -410,9 +399,7 @@ public fun DataFrame.dropNulls(whereAllNull: Boolean = false): DataFrame< * @include [DropNulls.WhereAllNullParam] * @include [DropKPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNulls(vararg columns: KProperty<*>, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -434,9 +421,7 @@ public fun DataFrame.dropNulls(vararg columns: String, whereAllNull: Bool * @include [DropNulls.WhereAllNullParam] * @include [DropColumnAccessorsParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNulls(vararg columns: AnyColumnReference, whereAllNull: Boolean = false): DataFrame = dropNulls(whereAllNull) { columns.toColumnSet() } @@ -517,9 +502,7 @@ public fun DataFrame.dropNA(whereAllNA: Boolean = false, columns: Columns * @include [DropNA.WhereAllNAParam] * @include [DropKPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNA(vararg columns: KProperty<*>, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -541,9 +524,7 @@ public fun DataFrame.dropNA(vararg columns: String, whereAllNA: Boolean = * @include [DropNA.WhereAllNAParam] * @include [DropColumnAccessorsParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNA(vararg columns: AnyColumnReference, whereAllNA: Boolean = false): DataFrame = dropNA(whereAllNA) { columns.toColumnSet() } @@ -632,9 +613,7 @@ public fun DataFrame.dropNaNs(whereAllNaN: Boolean = false, columns: Colu * @include [DropNaNs.WhereAllNaNParam] * @include [DropKPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNaNs(vararg columns: KProperty<*>, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } @@ -656,9 +635,7 @@ public fun DataFrame.dropNaNs(vararg columns: String, whereAllNaN: Boolea * @include [DropNaNs.WhereAllNaNParam] * @include [DropColumnAccessorsParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.dropNaNs(vararg columns: AnyColumnReference, whereAllNaN: Boolean = false): DataFrame = dropNaNs(whereAllNaN) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt index 94b7b5710c..21143891fa 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.exceptions.DuplicateColumnNamesException import org.jetbrains.kotlinx.dataframe.exceptions.UnequalColumnSizesException import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.columns.resolveSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /* @@ -132,9 +133,7 @@ public inline fun DataFrame.add( noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(name, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.add( property: KProperty, @@ -142,9 +141,7 @@ public inline fun DataFrame.add( noinline expression: AddExpression, ): DataFrame = (this + mapToColumn(property, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.add( column: ColumnAccessor, @@ -198,61 +195,45 @@ public class AddDsl( add(this, Infer.Nulls, expression) // TODO: use path instead of name - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun ColumnAccessor.from(noinline expression: RowExpression): Boolean = name().from(expression) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(noinline expression: RowExpression): Boolean = add(name, Infer.Nulls, expression) public infix fun String.from(column: AnyColumnReference): Boolean = add(column.rename(this)) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun ColumnAccessor.from(column: ColumnReference): Boolean = name() from column - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(column: ColumnReference): Boolean = name from column @Interpretable("Into") public infix fun AnyColumnReference.into(name: String): Boolean = add(rename(name)) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(column: ColumnAccessor): Boolean = into(column.name()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(column: KProperty): Boolean = into(column.name) @Interpretable("AddDslStringInvoke") public operator fun String.invoke(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun AnyColumnGroupAccessor.from(body: AddDsl.() -> Unit): Unit = group(this, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun group(column: AnyColumnGroupAccessor, body: AddDsl.() -> Unit): Unit = group(column.name(), body) @@ -267,9 +248,7 @@ public class AddDsl( public infix fun AddGroup.into(groupName: String): Unit = group(groupName, body) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun AddGroup.into(column: AnyColumnGroupAccessor): Unit = into(column.name()) } @@ -290,9 +269,7 @@ public inline fun GroupBy.add( noinline expression: RowExpression, ): GroupBy = updateGroups { add(name, infer, expression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.add( column: ColumnAccessor, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt index e9e4c2175d..4a177e8e81 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/addId.kt @@ -7,6 +7,7 @@ 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.ColumnAccessor +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API // region DataColumn @@ -16,9 +17,7 @@ public fun AnyCol.addId(columnName: String = "id"): AnyFrame = toDataFrame().add // region DataFrame -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.addId(column: ColumnAccessor): DataFrame = insert(column) { index() }.at(0) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt index a9c4daecb4..d468647c12 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.owner +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -300,9 +301,7 @@ public interface AllColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::columnGroup.`[allCols][KProperty.allCols]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols() @@ -485,39 +484,29 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] \ \{ myColumn \}} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsAfter(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] ("myColumn")} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: String): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] (myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsAfter(column) /** @include [KPropertyAllAfterDocs] {@set [KPropertyAllAfterDocs.Arg] (Type::myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsAfter(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsAfter(column) @@ -721,39 +710,29 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] \ \{ myColumn \}} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsFrom(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] ("myColumn")} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: String): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] (myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsFrom(column) /** @include [KPropertyAllFromDocs] {@set [KPropertyAllFromDocs.Arg] (Type::myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsFrom(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsFrom(column) @@ -956,39 +935,29 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] \ \{ myColumn \}} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsBefore(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] ("myColumn")} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: String): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] (myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsBefore(column) /** @include [KPropertyAllBeforeDocs] {@set [KPropertyAllBeforeDocs.Arg] (Type::myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsBefore(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsBefore(column) @@ -1192,39 +1161,29 @@ public interface AllColumnsSelectionDsl { /** * @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] \ \{ myColumn \}} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsUpTo(column: ColumnSelector): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] ("pathTo"["myColumn"])} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] ("myColumn")} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: String): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] (myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: AnyColumnReference): ColumnSet<*> = columnGroup(this).allColsUpTo(column) /** @include [KPropertyAllUpToDocs] {@set [KPropertyAllUpToDocs.Arg] (Type::myColumn)} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index edc00abe61..b4c1c9ac90 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT_REPLACE import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_EXCEPT_REPLACE_VARARG +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.EXCEPT_REPLACE import org.jetbrains.kotlinx.dataframe.util.EXCEPT_REPLACE_VARARG import kotlin.reflect.KProperty @@ -287,9 +288,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetInfixDocs.ARGUMENT_1] Person::age * @set [ColumnSetInfixDocs.ARGUMENT_2] Person::name */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnSet.except(other: KProperty): ColumnSet = except(column(other)) @@ -300,9 +299,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetVarargDocs.ARGUMENT_1] (Person::age, Person::height) * @set [ColumnSetVarargDocs.ARGUMENT_2] (Person::name) */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnSet.except(vararg others: KProperty): ColumnSet = except(others.toColumnSet()) @@ -383,9 +380,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnsSelectionDslDocs.ARGUMENT_1] `(Person::age, Person::height)` * @set [ColumnsSelectionDslDocs.ARGUMENT_2] `(Person::name)` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsSelectionDsl<*>.allExcept(vararg others: KProperty<*>): ColumnSet<*> = asSingleColumn().allColsExceptInternal(others.toColumnSet()) @@ -533,9 +528,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.SingleColumnReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = allColsExceptInternal(others.toColumnSet()) @@ -591,9 +584,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.except(vararg others: KProperty<*>): SingleColumn> = exceptInternal(others.toColumnSet()) @@ -643,9 +634,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.StringReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -663,9 +652,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.SelectorArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(selector: ColumnsSelector): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @@ -693,9 +680,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.StringArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -707,9 +692,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -719,9 +702,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -733,9 +714,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -745,9 +724,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -759,9 +736,7 @@ public interface AllExceptColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty>.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -803,9 +778,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] * @include [ColumnGroupExceptDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) @@ -860,9 +833,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.StringReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -884,9 +855,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.SelectorArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.allColsExcept(selector: ColumnsSelector): ColumnSet<*> = columnGroup(this).allColsExcept(selector) @@ -914,9 +883,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.StringArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: String): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -926,9 +893,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) @@ -938,9 +903,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.KPropertyReceiverArgs] * @include [ColumnGroupDocs.ColumnPathArgs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = columnGroup(this).allColsExceptInternal(others.toColumnSet()) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt index 91961693c6..097ad09c53 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnListImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -123,9 +124,7 @@ public interface AndColumnsSelectionDsl { public infix fun ColumnsResolver.and(other: String): ColumnSet<*> = this and other.toColumnAccessor() /** @include [ColumnsResolverAndDocs] {@set [ColumnsResolverAndDocs.Argument] `Type::colB`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnsResolver.and(other: KProperty): ColumnSet = this and other.toColumnAccessor() @@ -154,9 +153,7 @@ public interface AndColumnsSelectionDsl { public infix fun String.and(other: String): ColumnSet<*> = toColumnAccessor() and other.toColumnAccessor() /** @include [StringAndDocs] {@set [StringAndDocs.Argument] `Type::colB`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.and(other: KProperty): ColumnSet<*> = toColumnAccessor() and other @@ -176,31 +173,23 @@ public interface AndColumnsSelectionDsl { } /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] [`colsOf`][SingleColumn.colsOf]`<`[`Int`][Int]`>()`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: ColumnsResolver): ColumnSet = toColumnAccessor() and other /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `{ colA `[/][DataColumn.div]` 2.0 `[`named`][ColumnReference.named]` "half colA" \}`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: () -> ColumnsResolver): ColumnSet = toColumnAccessor() and other() /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `"colB"`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: String): ColumnSet<*> = toColumnAccessor() and other /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] `Type::colB`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.and(other: KProperty): ColumnSet = toColumnAccessor() and other.toColumnAccessor() 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 999cdec455..4830dfbe3e 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 @@ -19,6 +19,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.util.COL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.IDENTITY_FUNCTION import kotlin.reflect.KProperty @@ -166,9 +167,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.col(col: ColumnAccessor): SingleColumn = this.ensureIsColumnGroup().transformSingle { @@ -180,9 +179,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.col(col: ColumnAccessor): ColumnAccessor = this.ensureIsColumnGroup().column(col.path()) @@ -190,9 +187,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -200,9 +195,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -210,9 +203,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.col(col: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(col.path()) @@ -294,9 +285,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(name: String): ColumnAccessor<*> = col(name) @@ -304,9 +293,7 @@ public interface ColColumnsSelectionDsl { * @include [ColNameDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(name) @@ -401,9 +388,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor<*> = col(path) @@ -411,9 +396,7 @@ public interface ColColumnsSelectionDsl { * @include [ColPathDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(path) @@ -448,27 +431,21 @@ public interface ColColumnsSelectionDsl { /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun col(property: KProperty): SingleColumn = column(property) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.col(property: KProperty): SingleColumn = col(property.name) /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.col(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().column(property) @@ -476,9 +453,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -486,9 +461,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -496,9 +469,7 @@ public interface ColColumnsSelectionDsl { /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.col(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().column(property) @@ -587,9 +558,7 @@ public interface ColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(index: Int): SingleColumn<*> = col(index) @@ -597,9 +566,7 @@ public interface ColColumnsSelectionDsl { * @include [ColIndexDocs] {@set [CommonColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColDocs.ColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.col(index: Int): SingleColumn = columnGroup(this).col(index) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt index 83a1c6b4a3..3474fc6126 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -160,9 +161,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = colGroup.ensureIsColumnGroup() @@ -170,9 +169,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(colGroup: ColumnAccessor>): SingleColumn> = this.ensureIsColumnGroup().transformSingle { @@ -187,9 +184,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -197,9 +192,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -207,9 +200,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -217,9 +208,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(colGroup: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(colGroup.path()).ensureIsColumnGroup() @@ -301,9 +290,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = colGroup(name) @@ -311,9 +298,7 @@ public interface ColGroupColumnsSelectionDsl { * @include [ColGroupNameDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(name: String): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(name).ensureIsColumnGroup() @@ -410,9 +395,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = colGroup(path) @@ -420,9 +403,7 @@ public interface ColGroupColumnsSelectionDsl { * @include [ColGroupPathDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(path: ColumnPath): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(path).ensureIsColumnGroup() @@ -459,9 +440,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(property: KProperty>): SingleColumn> = columnGroup(property).ensureIsColumnGroup() @@ -469,9 +448,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun colGroup(property: KProperty): SingleColumn> = columnGroup(property).ensureIsColumnGroup() @@ -481,9 +458,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(property: KProperty>): SingleColumn> = colGroup(property.name) @@ -491,9 +466,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.colGroup(property: KProperty): SingleColumn> = colGroup(property.name) @@ -503,9 +476,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -513,9 +484,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.colGroup(property: KProperty): ColumnAccessor> = this.ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -525,9 +494,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -535,9 +502,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -547,9 +512,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -557,9 +520,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -569,9 +530,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupDataRowKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -579,9 +538,7 @@ public interface ColGroupColumnsSelectionDsl { /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.colGroup(property: KProperty): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().columnGroup(property).ensureIsColumnGroup() @@ -667,9 +624,7 @@ public interface ColGroupColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("colGroupUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(index: Int): SingleColumn> = colGroup(index) @@ -677,9 +632,7 @@ public interface ColGroupColumnsSelectionDsl { * @include [ColGroupIndexDocs] {@set [CommonColGroupDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colGroup(index: Int): SingleColumn> = columnGroup(this).colGroup(index) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt index 061b3108f4..ce765ad69c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.impl.headPlusArray +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -342,17 +343,13 @@ public interface ColsColumnsSelectionDsl { private interface KPropertyColsPredicateDocs /** @include [KPropertyColsPredicateDocs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).cols(predicate) /** @include [KPropertyColsPredicateDocs] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = cols(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index ba878e0786..0226d3507e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -15,6 +15,9 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.atAnyDepthImpl +import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH +import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -36,18 +39,16 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * {@include [DslGrammarTemplate.ColumnSetDef]} * {@include [LineBreak]} * {@include [DslGrammarTemplate.ColumnGroupDef]} - * {@include [LineBreak]} - * {@include [DslGrammarTemplate.ConditionDef]} * } * * {@set [DslGrammarTemplate.PLAIN_DSL_FUNCTIONS] - * {@include [PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [PlainDslName]}`()` * } * {@set [DslGrammarTemplate.COLUMN_SET_FUNCTIONS] - * {@include [Indent]}{@include [ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnSetName]}`()` * } * {@set [DslGrammarTemplate.COLUMN_GROUP_FUNCTIONS] - * {@include [Indent]}{@include [ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnGroupName]}`()` * } */ public interface Grammar { @@ -65,8 +66,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { /** * ## Cols At Any Depth * - * Returns all columns in [this\] at any depth (so also inside [Column Groups][ColumnGroup]) if they satisfy the - * optional given predicate. + * Returns all columns in [this\] at any depth (so also inside [Column Groups][ColumnGroup]) * * This function can also be followed by another [ColumnSet] filter function like * [colsOf][ColumnsSelectionDsl.colsOf], [single][ColumnsSelectionDsl.single], or [valueCols][ColumnsSelectionDsl.valueCols]. @@ -74,7 +74,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * #### For example: * `// Depth-first search to a column containing the value "Alice"` * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[first][ColumnsSelectionDsl.firstCol]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.firstCol]`() }` * {@include [LineBreak]} * `// The columns at any depth excluding the top-level` * @@ -82,7 +82,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * {@include [LineBreak]} * `// All value- and frame columns at any depth` * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` * {@include [LineBreak]} * `// All value columns at any depth nested under a column group named "myColGroup"` * @@ -94,17 +94,17 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * #### Converting from deprecated syntax: * - * `dfs { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }` + * `dfs { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }` * - * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][colsAtAnyDepth]` { includeGroups || !it.`[isColumnGroup][DataColumn.isColumnGroup]`() }` + * `allDfs(includeGroups = false) -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { includeGroups || !it.`[isColumnGroup][DataColumn.isColumnGroup]`() }` * * `dfsOf { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[colsOf][ColumnsSelectionDsl.colsOf]` { condition }` * - * [cols][ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }` + * [cols][ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }` * - * [first][ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()` + * [first][ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()` * - * [all][ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]`()` + * [all][ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`()` * * @see [DataFrame.flatten\] * @see [ColumnsSelectionDsl.simplify\] @@ -122,6 +122,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ @Interpretable("ColsAtAnyDepth0") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = colsAtAnyDepthInternal(predicate) @@ -129,14 +134,39 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * @include [CommonAtAnyDepthDocs] * @set [CommonAtAnyDepthDocs.Examples] * - * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` + * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + */ + @Interpretable("ColsAtAnyDepth0") + public fun ColumnSet<*>.colsAtAnyDepth(): ColumnSet<*> = colsAtAnyDepthInternal { true } + + /** + * @include [CommonAtAnyDepthDocs] + * @set [CommonAtAnyDepthDocs.Examples] + * + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` * * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` */ @Interpretable("ColsAtAnyDepth1") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = asSingleColumn().colsAtAnyDepthInternal(predicate) + /** + * @include [CommonAtAnyDepthDocs] + * @set [CommonAtAnyDepthDocs.Examples] + * + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() }.`[first][ColumnsSelectionDsl.first]`() }` + * + * `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }` + */ + @Interpretable("ColsAtAnyDepth1") + public fun ColumnsSelectionDsl<*>.colsAtAnyDepth(): ColumnSet<*> = asSingleColumn().colsAtAnyDepthInternal { true } + /** * @include [CommonAtAnyDepthDocs] * @set [CommonAtAnyDepthDocs.Examples] @@ -144,27 +174,53 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { myColGroup.`[colsAtAnyDepth][SingleColumn.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ @Interpretable("ColsAtAnyDepth2") + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = ensureIsColumnGroup().colsAtAnyDepthInternal(predicate) + /** + * @include [CommonAtAnyDepthDocs] + * @set [CommonAtAnyDepthDocs.Examples] + * + * `df.`[select][DataFrame.select]` { myColGroup.`[colsAtAnyDepth][SingleColumn.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + */ + @Interpretable("ColsAtAnyDepth2") + public fun SingleColumn>.colsAtAnyDepth(): ColumnSet<*> = + ensureIsColumnGroup().colsAtAnyDepthInternal { true } + /** * @include [CommonAtAnyDepthDocs] * @set [CommonAtAnyDepthDocs.Examples] * * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsAtAnyDepth][String.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ + @Deprecated( + message = COLS_AT_ANY_DEPTH, + replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) + /** + * @include [CommonAtAnyDepthDocs] + * @set [CommonAtAnyDepthDocs.Examples] + * + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsAtAnyDepth][String.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + */ + public fun String.colsAtAnyDepth(): ColumnSet<*> = columnGroup(this).colsAtAnyDepth { true } + /** * @include [CommonAtAnyDepthDocs] * @set [CommonAtAnyDepthDocs.Examples] * * `df.`[select][DataFrame.select]` { Type::myColumnGroup.`[colsAtAnyDepth][KProperty.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) @@ -175,9 +231,18 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { "pathTo"["myGroupCol"].`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` */ + @Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)")) public fun ColumnPath.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).colsAtAnyDepth(predicate) + /** + * @include [CommonAtAnyDepthDocs] + * @set [CommonAtAnyDepthDocs.Examples] + * + * `df.`[select][DataFrame.select]` { "pathTo"["myGroupCol"].`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().filter { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }` + */ + public fun ColumnPath.colsAtAnyDepth(): ColumnSet<*> = columnGroup(this).colsAtAnyDepth { true } + // endregion } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt index a143c2c581..f35a6cdd48 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt @@ -15,6 +15,9 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.transform +import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS +import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -34,20 +37,18 @@ public interface ColsInGroupsColumnsSelectionDsl { * {@include [DslGrammarTemplate.ColumnSetDef]} * {@include [LineBreak]} * {@include [DslGrammarTemplate.ColumnGroupDef]} - * {@include [LineBreak]} - * {@include [DslGrammarTemplate.ConditionDef]} * } * * {@set [DslGrammarTemplate.PLAIN_DSL_FUNCTIONS] - * {@include [PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [PlainDslName]}`()` * } * * {@set [DslGrammarTemplate.COLUMN_SET_FUNCTIONS] - * {@include [Indent]}{@include [ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnSetName]}`()` * } * * {@set [DslGrammarTemplate.COLUMN_GROUP_FUNCTIONS] - * {@include [Indent]}{@include [ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnGroupName]}`()` * } */ public interface Grammar { @@ -65,7 +66,7 @@ public interface ColsInGroupsColumnsSelectionDsl { /** * ## Cols in Groups * - * [colsInGroups][colsInGroups] is a function that returns all (optionally filtered) columns at the top-levels of + * [colsInGroups][colsInGroups] is a function that returns all columns at the top-levels of * all [column groups][ColumnGroup] in [this\]. This is useful if you want to select all columns that are * "one level deeper". * @@ -87,11 +88,11 @@ public interface ColsInGroupsColumnsSelectionDsl { * * and * - * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnsSelectionDsl.colsInGroups]` { "user" `[in][String.contains]` it.`[name][DataColumn.name]` } }` + * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnsSelectionDsl.colsInGroups]`().`[nameContains][ColumnsSelectionDsl.nameContains]`("user") }` * {@include [LineBreak]} * Similarly, you can take the columns inside all [column groups][ColumnGroup] in a [ColumnSet]: * {@include [LineBreak]} - * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]` { "my" `[in][String.contains]` it.`[name][DataColumn.name]` }.`[colsInGroups][ColumnSet.colsInGroups]`() }` + * `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[nameContains][ColumnsSelectionDsl.nameContains]`("my").`[colsInGroups][ColumnSet.colsInGroups]`() }` * {@include [LineBreak]} * * #### Examples of this overload: @@ -100,8 +101,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.cols\] * @see [ColumnsSelectionDsl.colGroups\] - * @param [predicate\] An optional predicate to filter the cols by. - * @return A [TransformableColumnSet] containing the (filtered) cols. + * @return A [TransformableColumnSet] containing the cols. */ private interface ColsInGroupsDocs { @@ -117,9 +117,22 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[DataRow][DataRow]`>().`[colsInGroups][ColumnSet.colsInGroups]`() }` */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = transform { it.flatMap { it.cols().filter { predicate(it) } } } + /** + * @include [ColsInGroupsDocs] + * @set [ColsInGroupsDocs.EXAMPLE] + * + * `df.`[select][DataFrame.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[DataRow][DataRow]`>().`[colsInGroups][ColumnSet.colsInGroups]`() }` + */ + public fun ColumnSet<*>.colsInGroups(): TransformableColumnSet<*> = transform { it.flatMap { it.cols() } } + /** * @include [ColsInGroupsDocs] * @set [ColsInGroupsDocs.EXAMPLE] @@ -128,9 +141,22 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnSet.colsInGroups]`() }` */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = asSingleColumn().colsInGroups(predicate) + /** + * @include [ColsInGroupsDocs] + * @set [ColsInGroupsDocs.EXAMPLE] + * + * `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnSet.colsInGroups]`() }` + */ + public fun ColumnsSelectionDsl<*>.colsInGroups(): TransformableColumnSet<*> = asSingleColumn().colsInGroups() + /** * @include [ColsInGroupsDocs] * @set [ColsInGroupsDocs.EXAMPLE] @@ -139,18 +165,45 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { myColumnGroup.`[colsInGroups][SingleColumn.colsInGroups]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = ensureIsColumnGroup().allColumnsInternal().colsInGroups(predicate) + /** + * @include [ColsInGroupsDocs] + * @set [ColsInGroupsDocs.EXAMPLE] + * + * `df.`[select][DataFrame.select]` { myColumnGroup.`[colsInGroups][SingleColumn.colsInGroups]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` + */ + public fun SingleColumn>.colsInGroups(): TransformableColumnSet<*> = + ensureIsColumnGroup().allColumnsInternal().colsInGroups() + /** * @include [ColsInGroupsDocs] * @set [ColsInGroupsDocs.EXAMPLE] * * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsInGroups][String.colsInGroups]`() }` */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) + /** + * @include [ColsInGroupsDocs] + * @set [ColsInGroupsDocs.EXAMPLE] + * + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsInGroups][String.colsInGroups]`() }` + */ + public fun String.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups() + /** * @include [ColsInGroupsDocs] * @set [ColsInGroupsDocs.EXAMPLE] @@ -159,9 +212,7 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[colsInGroups][KProperty.colsInGroups]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) @@ -172,8 +223,21 @@ public interface ColsInGroupsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[colsInGroups][ColumnPath.colsInGroups]`() }` */ + @Deprecated( + message = COLS_IN_GROUPS, + replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = columnGroup(this).colsInGroups(predicate) + + /** + * @include [ColsInGroupsDocs] + * @set [ColsInGroupsDocs.EXAMPLE] + * + * `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[colsInGroups][ColumnPath.colsInGroups]`() }` + */ + public fun ColumnPath.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt index 8e45223e42..8be2c6e04a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -153,9 +154,7 @@ public interface ColsOfColumnsSelectionDsl { * @include [CommonColsOfDocs.FilterParam] * @include [CommonColsOfDocs.Return] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsOf(type: KType, filter: ColumnFilter = { true }): ColumnSet<*> = columnGroup(this).colsOf(type, filter) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt index 69b09f50db..1655aec45e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.headPlusArray +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -173,9 +174,7 @@ public interface ColsOfKindColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { Type::myColumnGroup.`[colsOfKind][KProperty.colsOfKind]`(`[Value][ColumnKind.Value]`, `[Frame][ColumnKind.Frame]`) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsOfKind( kind: ColumnKind, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt index a42c095b19..876f86219a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -193,9 +194,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameContains][KProperty.colsNameContains]`("my") }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameContains( text: CharSequence, @@ -263,9 +262,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameContains][KProperty.colsNameContains]`(`[Regex][Regex]`("order-[0-9]+")) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameContains(regex: Regex): TransformableColumnSet<*> = columnGroup(this).colsNameContains(regex) @@ -408,9 +405,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameStartsWith][KProperty.colsNameStartsWith]`("order-") }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameStartsWith( prefix: CharSequence, @@ -499,9 +494,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::someGroupCol.`[colsNameEndsWith][KProperty.colsNameEndsWith]`("-order") }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsNameEndsWith( suffix: CharSequence, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt index 381385fa95..d4446cdc3d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.impl.columns.addPath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -83,9 +84,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `"fromColumn"`[`..`][String.rangeTo]`Type::toColumn`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun String.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -101,9 +100,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`"toColumn"`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: String): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -112,9 +109,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`Type::toColumn`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: KProperty<*>): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor()) @@ -123,9 +118,7 @@ public interface ColumnRangeColumnsSelectionDsl { * @include [CommonRangeOfColumnsDocs] * {@set [CommonRangeOfColumnsDocs.Example] `Type::fromColumn`[`..`][KProperty.rangeTo]`toColumn`} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public operator fun KProperty<*>.rangeTo(endInclusive: AnyColumnReference): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt index cf95bebba6..57daad5ef2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/constructors.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.forceResolve import org.jetbrains.kotlinx.dataframe.impl.columns.unbox import org.jetbrains.kotlinx.dataframe.size import org.jetbrains.kotlinx.dataframe.util.DATAFRAME_OF_WITH_VALUES +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.random.Random import kotlin.random.nextInt import kotlin.reflect.KProperty @@ -49,9 +50,7 @@ public fun column(name: String): ColumnAccessor = ColumnAccessorImpl(name public fun column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(property.name) @@ -61,9 +60,7 @@ public fun ColumnGroupReference.column(name: String): ColumnAccessor = Co public fun ColumnGroupReference.column(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.column(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -101,9 +98,7 @@ public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) @JvmName("valueColumnTyped") public fun valueColumn(path: ColumnPath): ColumnAccessor = column(path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueColumn(property: KProperty): ColumnAccessor = column(property.name) @@ -124,9 +119,7 @@ public fun ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor ColumnGroupReference.valueColumn(path: ColumnPath): ColumnAccessor = ColumnAccessorImpl(this.path() + path) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.valueColumn(property: KProperty): ColumnAccessor = ColumnAccessorImpl(this.path() + property.name) @@ -151,15 +144,11 @@ public fun columnGroup(path: ColumnPath): ColumnAccessor = column(path) public fun columnGroup(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("columnGroupDataRowKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun columnGroup(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun columnGroup(property: KProperty): ColumnAccessor> = column(property.name) @@ -182,16 +171,12 @@ public fun ColumnGroupReference.columnGroup(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("columnGroupDataRowKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.columnGroup(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.columnGroup(property: KProperty): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) @@ -216,15 +201,11 @@ public fun frameColumn(path: ColumnPath): ColumnAccessor = column(path public fun frameColumn(path: ColumnPath): ColumnAccessor> = column(path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameColumn(property: KProperty>): ColumnAccessor> = column(property.name) @@ -247,16 +228,12 @@ public fun ColumnGroupReference.frameColumn(path: ColumnPath): ColumnAccesso ColumnAccessorImpl(this.path() + path) @JvmName("frameColumnDataFrameKProperty") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnGroupReference.frameColumn(property: KProperty>): ColumnAccessor> = ColumnAccessorImpl(this.path() + property.name) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt index 85c0edb5b6..db0b97e986 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt @@ -52,6 +52,7 @@ import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_REPLACE import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL import org.jetbrains.kotlinx.dataframe.util.CONVERT_TO_URL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.TO_URL import org.jetbrains.kotlinx.dataframe.util.TO_URL_REPLACE import java.math.BigDecimal @@ -224,9 +225,7 @@ private interface CommonConvertDocs @Interpretable("Convert0") public fun DataFrame.convert(columns: ColumnsSelector): Convert = Convert(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.convert(vararg columns: KProperty): Convert = convert { columns.toColumnSet() } @@ -243,16 +242,12 @@ public fun DataFrame.convert(vararg columns: KProperty): Convert DataFrame.convert(vararg columns: String): Convert = convert { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.convert(vararg columns: ColumnReference): Convert = convert { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.convert( firstCol: ColumnReference, @@ -261,9 +256,7 @@ public inline fun DataFrame.convert( noinline expression: RowValueExpression, ): DataFrame = convert(*headPlusArray(firstCol, cols)).with(infer, expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.convert( firstCol: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt index 9bc6de7d28..d4df7e426e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.corrImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -16,21 +17,20 @@ internal fun AnyCol.isSuitableForCorr() = isSubtypeOf() || type() == typ public data class Corr(internal val df: DataFrame, internal val columns: ColumnsSelector) -public fun DataFrame.corr(): DataFrame = corr { colsAtAnyDepth { it.isSuitableForCorr() } }.withItself() +public fun DataFrame.corr(): DataFrame = + corr { + colsAtAnyDepth().filter { it.isSuitableForCorr() } + }.withItself() public fun DataFrame.corr(columns: ColumnsSelector): Corr = Corr(this, columns) public fun DataFrame.corr(vararg columns: String): Corr = corr { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.corr(vararg columns: KProperty): Corr = corr { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.corr(vararg columns: ColumnReference): Corr = corr { columns.toColumnSet() } @@ -38,16 +38,12 @@ public fun Corr.with(otherColumns: ColumnsSelector): DataF public fun Corr.with(vararg otherColumns: String): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Corr.with(vararg otherColumns: KProperty): DataFrame = with { otherColumns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Corr.with(vararg otherColumns: ColumnReference): DataFrame = with { otherColumns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt index 404cbeb4ca..b6c2a79279 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/countDistinct.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -20,16 +21,12 @@ public fun DataFrame.countDistinct(columns: ColumnsSelector): In public fun DataFrame.countDistinct(vararg columns: String): Int = countDistinct { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.countDistinct(vararg columns: KProperty): Int = countDistinct { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.countDistinct(vararg columns: AnyColumnReference): Int = countDistinct { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt index effb6d0431..3db5ccf9dd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cumSum.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.math.cumSumImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -129,9 +130,7 @@ public fun DataFrame.cumSum(vararg columns: String, skipNA: Boolean = def * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.cumSum( vararg columns: ColumnReference, @@ -142,9 +141,7 @@ public fun DataFrame.cumSum( * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [DataFrame]} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.cumSum( vararg columns: KProperty, @@ -159,7 +156,7 @@ public fun DataFrame.cumSum( public fun DataFrame.cumSum(skipNA: Boolean = defaultCumSumSkipNA): DataFrame = cumSum(skipNA) { // TODO keep at any depth? - colsAtAnyDepth { it.isNumber() }.cast() + colsAtAnyDepth().filter { it.isNumber() }.cast() } // endregion @@ -186,9 +183,7 @@ public fun GroupBy.cumSum(vararg columns: String, skipNA: Boolean = * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.cumSum( vararg columns: ColumnReference, @@ -199,9 +194,7 @@ public fun GroupBy.cumSum( * {@include [CumSumDocs]} * {@set [CumSumDocs.DATA_TYPE] [GroupBy]} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.cumSum( vararg columns: KProperty, @@ -216,7 +209,7 @@ public fun GroupBy.cumSum( public fun GroupBy.cumSum(skipNA: Boolean = defaultCumSumSkipNA): GroupBy = cumSum(skipNA) { // TODO keep at any depth? - colsAtAnyDepth { it.isNumber() }.cast() + colsAtAnyDepth().filter { it.isNumber() }.cast() } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt index 1b340e233f..eee25433e6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/describe.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.api.describeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataSchema @@ -120,7 +121,7 @@ public fun DataColumn.describe(): DataFrame = describe */ public fun DataFrame.describe(): DataFrame = describe { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } /** @@ -147,9 +148,7 @@ public fun DataFrame.describe(vararg columns: String): DataFrame DataFrame.describe(vararg columns: ColumnReference): DataFrame = describe { columns.toColumnSet() } @@ -160,9 +159,7 @@ public fun DataFrame.describe(vararg columns: ColumnReferenc * @param [columns] The [KProperties][KProperty] that specifies which * columns of this [DataFrame] should be described. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.describe(vararg columns: KProperty): DataFrame = describe { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt index 5d4861c057..e30f087a61 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/distinct.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.exceptions.DuplicateColumnNamesException import org.jetbrains.kotlinx.dataframe.impl.columns.DistinctColumnSet import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -61,9 +62,7 @@ public fun DataFrame.distinct(columns: ColumnsSelector): DataFra * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinct(vararg columns: KProperty<*>): DataFrame = distinct { @@ -81,9 +80,7 @@ public fun DataFrame.distinct(vararg columns: String): DataFrame = dis * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFrame = distinct { columns.toColumnSet() } @@ -92,9 +89,7 @@ public fun DataFrame.distinct(vararg columns: AnyColumnReference): DataFr * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinctBy(vararg columns: KProperty<*>): DataFrame = distinctBy { columns.toColumnSet() } @@ -109,9 +104,7 @@ public fun DataFrame.distinctBy(vararg columns: String): DataFrame = d * {@include [DistinctDocs]} * {@set PHRASE_ENDING the specified columns}. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.distinctBy(vararg columns: AnyColumnReference): DataFrame = distinctBy { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt index 2a27e835a5..ddd3eda148 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/drop.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -162,9 +163,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropCols][KProperty.dropCols]`(1) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropCols(n: Int): ColumnSet<*> = columnGroup(this).dropCols(n) @@ -233,9 +232,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropLastCols][KProperty.dropLastCols]`(1) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropLastCols(n: Int): ColumnSet<*> = columnGroup(this).dropLastCols(n) @@ -304,9 +301,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropColsWhile][KProperty.dropColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropColsWhile(predicate) @@ -379,9 +374,7 @@ public interface DropColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[dropLastColsWhile][KProperty.dropLastColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.dropLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).dropLastColsWhile(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt index 0f36cd226b..8c59bba5af 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/explode.kt @@ -11,9 +11,12 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.explodeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty -private val defaultExplodeColumns: ColumnsSelector<*, *> = { colsAtAnyDepth { it.isList() || it.isFrameColumn() } } +private val defaultExplodeColumns: ColumnsSelector<*, *> = { + colsAtAnyDepth().filter { it.isList() || it.isFrameColumn() } +} // region explode DataFrame @Refine @@ -26,16 +29,12 @@ public fun DataFrame.explode( public fun DataFrame.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } @@ -52,16 +51,12 @@ public fun DataRow.explode( public fun DataRow.explode(vararg columns: String, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataRow.explode(vararg columns: ColumnReference, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataRow.explode(vararg columns: KProperty, dropEmpty: Boolean = true): DataFrame = explode(dropEmpty) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt index cfbbb62ae4..b60121aace 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet import org.jetbrains.kotlinx.dataframe.impl.getTrueIndices import org.jetbrains.kotlinx.dataframe.indices +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -44,15 +45,11 @@ public fun DataFrame.filterBy(column: ColumnSelector): DataFr public fun DataFrame.filterBy(column: String): DataFrame = filterBy { column.toColumnOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.filterBy(column: ColumnReference): DataFrame = filterBy { column } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.filterBy(column: KProperty): DataFrame = filterBy { column.toColumnAccessor() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt index 8ca90f2883..3a290413a3 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -215,9 +216,7 @@ public interface FirstColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[firstCol][KProperty.firstCol]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.firstCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).firstCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt index edf5da935e..cde6796d5b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.api.flattenImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -87,9 +88,7 @@ public fun DataFrame.flatten( * {@include [FlattenDocs]} * {@set [FlattenDocs.GROUPS] selected} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.flatten( vararg columns: ColumnReference, @@ -101,9 +100,7 @@ public fun DataFrame.flatten( * {@include [FlattenDocs]} * {@set [FlattenDocs.GROUPS] selected} */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.flatten( vararg columns: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt index 8bdf1b1997..d21d4d4fa2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration import org.jetbrains.kotlinx.dataframe.io.toHtml import org.jetbrains.kotlinx.dataframe.io.toStandaloneHtml +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -27,16 +28,12 @@ public fun DataFrame.format(columns: ColumnsSelector): FormatCla public fun DataFrame.format(vararg columns: String): FormatClause = format { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.format(vararg columns: ColumnReference): FormatClause = format { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.format(vararg columns: KProperty): FormatClause = format { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt index b8a8150963..97ba869cff 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -160,9 +161,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = frameCol.ensureIsFrameColumn() @@ -170,9 +169,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol( frameCol: ColumnAccessor>, @@ -189,9 +186,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.frameCol( frameCol: ColumnAccessor>, @@ -200,9 +195,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -210,9 +203,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -220,9 +211,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(frameCol: ColumnAccessor>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(frameCol.path()).ensureIsFrameColumn() @@ -445,9 +434,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() @@ -455,9 +442,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun frameCol(property: KProperty>): SingleColumn> = frameColumn(property).ensureIsFrameColumn() @@ -467,9 +452,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) @@ -477,9 +460,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.frameCol(property: KProperty>): SingleColumn> = frameCol(property.name) @@ -487,9 +468,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") @@ -499,9 +478,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.frameCol(property: KProperty>): ColumnAccessor> = this.ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -511,9 +488,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -521,9 +496,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -533,9 +506,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -543,9 +514,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -555,9 +524,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColDataFrameKProperty") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -565,9 +532,7 @@ public interface FrameColColumnsSelectionDsl { /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.frameCol(property: KProperty>): ColumnAccessor> = columnGroup(this).ensureIsColumnGroup().frameColumn(property).ensureIsFrameColumn() @@ -654,9 +619,7 @@ public interface FrameColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("frameColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(index: Int): SingleColumn> = frameCol(index) @@ -664,9 +627,7 @@ public interface FrameColColumnsSelectionDsl { * @include [FrameColIndexDocs] {@set [CommonFrameColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonFrameColDocs.FrameColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCol(index: Int): SingleColumn> = columnGroup(this).frameCol(index) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt index 100437db26..d9e66c6e94 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -162,9 +163,7 @@ public interface FrameColsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup.`[frameCols][KProperty.frameCols]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.frameCols( filter: Predicate> = { true }, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt index bfe9b3c090..b1ee62e0ba 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.gatherImpl import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -31,16 +32,12 @@ public fun DataFrame.gather(selector: ColumnsSelector): Gather DataFrame.gather(vararg columns: String): Gather = gather { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.gather(vararg columns: ColumnReference): Gather = gather { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.gather(vararg columns: KProperty): Gather = gather { columns.toColumnSet() } @@ -131,18 +128,14 @@ public class Gather( public fun Gather.into(keyColumn: String, valueColumn: String): DataFrame = gatherImpl(keyColumn, valueColumn) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.into( keyColumn: ColumnAccessor, valueColumn: ColumnAccessor, ): DataFrame = into(keyColumn.name(), valueColumn.name) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.into(keyColumn: KProperty, valueColumn: KProperty): DataFrame = into(keyColumn.columnName, valueColumn.columnName) @@ -155,16 +148,12 @@ public fun Gather.into(keyColumn: KProperty, valueCo @Interpretable("GatherKeysInto") public fun Gather.keysInto(keyColumn: String): DataFrame = gatherImpl(keyColumn, null) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.keysInto(keyColumn: ColumnAccessor): DataFrame = keysInto(keyColumn.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.keysInto(keyColumn: KProperty): DataFrame = keysInto(keyColumn.columnName) @@ -177,16 +166,12 @@ public fun Gather.keysInto(keyColumn: KProperty): Da @Interpretable("GatherValuesInto") public fun Gather.valuesInto(valueColumn: String): DataFrame = gatherImpl(null, valueColumn) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.valuesInto(valueColumn: ColumnAccessor): DataFrame = valuesInto(valueColumn.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Gather.valuesInto(valueColumn: KProperty): DataFrame = valuesInto(valueColumn.columnName) 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 5771cad8a8..77e6449972 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 @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KProperty @@ -112,16 +113,12 @@ public fun DataFrame.group(columns: ColumnsSelector): GroupClaus */ public fun DataFrame.group(vararg columns: String): GroupClause = group { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.group(vararg columns: AnyColumnReference): GroupClause = group { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.group(vararg columns: KProperty<*>): GroupClause = group { columns.toColumnSet() } @@ -239,15 +236,11 @@ public fun GroupClause.into( @Interpretable("Into0") public fun GroupClause.into(column: String): DataFrame = into(columnGroup().named(column)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupClause.into(column: AnyColumnGroupAccessor): DataFrame = df.move(columns).under(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupClause.into(column: KProperty<*>): DataFrame = into(column.columnName) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt index 9f1a0f568b..cea5bdc489 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotImpl import org.jetbrains.kotlinx.dataframe.impl.api.getPivotColumnPaths import org.jetbrains.kotlinx.dataframe.impl.api.groupByImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -34,17 +35,13 @@ import kotlin.reflect.KProperty public fun DataFrame.groupBy(moveToTop: Boolean = true, cols: ColumnsSelector): GroupBy = groupByImpl(moveToTop, cols) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.groupBy(vararg cols: KProperty<*>): GroupBy = groupBy { cols.toColumnSet() } public fun DataFrame.groupBy(vararg cols: String): GroupBy = groupBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: Boolean = true): GroupBy = groupBy(moveToTop) { cols.toColumnSet() } @@ -56,17 +53,13 @@ public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: public fun Pivot.groupBy(moveToTop: Boolean = true, columns: ColumnsSelector): PivotGroupBy = (this as PivotImpl).toGroupedPivot(moveToTop, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.groupBy(vararg columns: AnyColumnReference): PivotGroupBy = groupBy { columns.toColumnSet() } public fun Pivot.groupBy(vararg columns: String): PivotGroupBy = groupBy { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.groupBy(vararg columns: KProperty<*>): PivotGroupBy = groupBy { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt index e9a45d5bb1..81bc7095a4 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/implode.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.implodeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -25,16 +26,12 @@ public fun DataFrame.implode(dropNA: Boolean = false, columns: Columns public fun DataFrame.implode(vararg columns: String, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.implode(vararg columns: ColumnReference, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.implode(vararg columns: KProperty, dropNA: Boolean = false): DataFrame = implode(dropNA) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt index 91a73ba6ad..20679be29e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/inferType.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.columns.TypeSuggestion import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnGuessingType import org.jetbrains.kotlinx.dataframe.type +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun AnyCol.inferType(): DataColumn<*> = @@ -21,23 +22,22 @@ public fun AnyCol.inferType(): DataColumn<*> = // region DataFrame -public fun DataFrame.inferType(): DataFrame = inferType { colsAtAnyDepth { !it.isColumnGroup() } } +public fun DataFrame.inferType(): DataFrame = + inferType { + colsAtAnyDepth().filter { !it.isColumnGroup() } + } public fun DataFrame.inferType(columns: ColumnsSelector): DataFrame = replace(columns).with { it.inferType() } public fun DataFrame.inferType(vararg columns: String): DataFrame = inferType { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.inferType(vararg columns: ColumnReference<*>): DataFrame = inferType { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.inferType(vararg columns: KProperty<*>): DataFrame = inferType { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt index 5e59d47485..5cb7742e16 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.removeAt +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -28,9 +29,7 @@ public inline fun DataFrame.insert( noinline expression: RowExpression, ): InsertClause = insert(mapToColumn(name, infer, expression)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.insert( column: ColumnAccessor, @@ -38,9 +37,7 @@ public inline fun DataFrame.insert( noinline expression: RowExpression, ): InsertClause = insert(column.name(), infer, expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.insert( column: KProperty, @@ -65,15 +62,11 @@ public fun InsertClause.under(column: ColumnSelector): DataFrame public fun InsertClause.under(columnPath: ColumnPath): DataFrame = df.insertImpl(columnPath + column.name, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.under(column: ColumnAccessor<*>): DataFrame = under(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.under(column: KProperty<*>): DataFrame = under(column.columnName) @@ -91,15 +84,11 @@ public fun InsertClause.after(column: ColumnSelector): DataFrame public fun InsertClause.after(column: String): DataFrame = df.add(this.column).move(this.column).after(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.after(column: ColumnAccessor<*>): DataFrame = after(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun InsertClause.after(column: KProperty<*>): DataFrame = after(column.columnName) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt index cc90c83c24..285becb5f6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/into.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.impl.aggregation.internal import org.jetbrains.kotlinx.dataframe.impl.aggregation.withExpr import org.jetbrains.kotlinx.dataframe.impl.columnName +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -22,15 +23,11 @@ import kotlin.reflect.typeOf @Interpretable("GroupByInto") public fun GroupBy.into(column: String): DataFrame = toDataFrame(column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.into(column: ColumnAccessor): DataFrame = toDataFrame(column.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.into(column: KProperty): DataFrame = toDataFrame(column.columnName) @@ -40,9 +37,7 @@ public inline fun GroupBy.into( ): DataFrame = into(pathOf(columnName ?: groups.name()), expression, typeOf()) // @Hide -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.into( column: ColumnAccessor, @@ -65,9 +60,7 @@ internal fun GroupBy.into( internal().withExpr(type, path, expression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun GroupBy.into( column: KProperty, @@ -92,18 +85,14 @@ public inline fun ReducedGroupBy.into( } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ReducedGroupBy.into( column: ColumnAccessor, noinline expression: RowExpression, ): DataFrame = into(column.name(), expression) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ReducedGroupBy.into( column: KProperty, @@ -114,15 +103,11 @@ public inline fun ReducedGroupBy.into( @Interpretable("GroupByReduceInto") public fun ReducedGroupBy.into(columnName: String): DataFrame = into(columnName) { this } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.into(column: ColumnAccessor): DataFrame = into(column) { this } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.into(column: KProperty): DataFrame = into(column) { this } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt index 00bdb52d91..43c6c7dcba 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/join.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver import org.jetbrains.kotlinx.dataframe.impl.api.extractJoinColumns import org.jetbrains.kotlinx.dataframe.impl.api.joinImpl import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnListImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty @Refine @@ -112,23 +113,17 @@ public interface JoinDsl : ColumnsSelectionDsl { public infix fun String.match(other: String): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.match(other: KProperty): ColumnMatch = ColumnMatch(toColumnAccessor(), other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.match(other: KProperty): ColumnMatch = ColumnMatch(this, other.toColumnAccessor()) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.match(other: ColumnReference): ColumnMatch = ColumnMatch(toColumnAccessor(), other) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt index 0a64116962..e8cdd5b2f0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -211,9 +212,7 @@ public interface LastColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[lastCol][KProperty.lastCol]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.lastCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).lastCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt index d191e78411..539271a2e9 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt @@ -15,15 +15,14 @@ import org.jetbrains.kotlinx.dataframe.columns.FrameColumn 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 kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf // region ColumnReference -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnReference.map( infer: Infer = Infer.Nulls, @@ -77,9 +76,7 @@ public inline fun ColumnsContainer.mapToColumn( noinline body: AddExpression, ): DataColumn = mapToColumn(name, typeOf(), infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnsContainer.mapToColumn( column: ColumnReference, @@ -87,9 +84,7 @@ public inline fun ColumnsContainer.mapToColumn( noinline body: AddExpression, ): DataColumn = mapToColumn(column, typeOf(), infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ColumnsContainer.mapToColumn( column: KProperty, @@ -104,9 +99,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = newColumn(type, name, infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.mapToColumn( column: ColumnReference, @@ -115,9 +108,7 @@ public fun ColumnsContainer.mapToColumn( body: AddExpression, ): DataColumn = mapToColumn(column.name(), type, infer, body) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnsContainer.mapToColumn( column: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt index 12a665f89f..511376b9de 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/max.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MAX_NO_SKIPNAN import org.jetbrains.kotlinx.dataframe.util.ROW_MAX import org.jetbrains.kotlinx.dataframe.util.ROW_MAX_OR_NULL @@ -88,18 +89,14 @@ public fun ?> DataFrame.maxFor( public fun DataFrame.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxFor( vararg columns: KProperty, @@ -114,18 +111,14 @@ public fun ?> DataFrame.max( public fun DataFrame.max(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = maxOrNull(*columns, skipNaN = skipNaN).suggestIfNull("max") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.max( vararg columns: KProperty, @@ -140,18 +133,14 @@ public fun ?> DataFrame.maxOrNull( public fun DataFrame.maxOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = maxOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = maxOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.maxOrNull( vararg columns: KProperty, @@ -176,18 +165,14 @@ public inline fun ?> DataFrame.maxBy( public fun DataFrame.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = maxByOrNull(column, skipNaN).suggestIfNull("maxBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxBy( column: KProperty, @@ -202,18 +187,14 @@ public inline fun ?> DataFrame.maxByOrNull public fun DataFrame.maxByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = maxByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.max(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.maxByOrNull( column: KProperty, @@ -239,18 +220,14 @@ public fun ?> Grouped.maxFor( public fun Grouped.maxFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = maxFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.maxFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.maxFor( vararg columns: KProperty, @@ -271,9 +248,7 @@ public fun Grouped.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.max( vararg columns: ColumnReference, @@ -281,9 +256,7 @@ public fun ?> Grouped.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.max( vararg columns: KProperty, @@ -305,9 +278,7 @@ public inline fun ?> GroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.maxBy( column: ColumnReference, @@ -317,9 +288,7 @@ public inline fun ?> GroupBy.maxBy( public fun GroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.maxBy( column: KProperty, @@ -345,9 +314,7 @@ public fun Pivot.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.maxFor( vararg columns: ColumnReference, @@ -355,9 +322,7 @@ public fun ?> Pivot.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.maxFor( vararg columns: KProperty, @@ -375,18 +340,14 @@ public fun ?> Pivot.max( skipNaN: Boolean = skipNaNDefault, ): DataRow = max(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.max( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = max(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.max( vararg columns: KProperty, @@ -403,9 +364,7 @@ public inline fun ?> Pivot.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.maxBy( column: ColumnReference, @@ -415,9 +374,7 @@ public inline fun ?> Pivot.maxBy( public fun Pivot.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.maxBy( column: KProperty, @@ -443,9 +400,7 @@ public fun PivotGroupBy.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.maxFor( vararg columns: ColumnReference, @@ -453,9 +408,7 @@ public fun ?> PivotGroupBy.maxFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = maxFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.maxFor( vararg columns: KProperty, @@ -476,9 +429,7 @@ public fun ?> PivotGroupBy.max( skipNaN: Boolean = skipNaNDefault, ): DataFrame = max(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.max( vararg columns: KProperty, @@ -495,9 +446,7 @@ public inline fun ?> PivotGroupBy.maxBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { maxByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.maxBy( column: ColumnReference, @@ -507,9 +456,7 @@ public inline fun ?> PivotGroupBy.maxBy( public fun PivotGroupBy.maxBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = maxBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.maxBy( column: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt index 2171b592c8..1229b960aa 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/mean.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.columns.toNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MEAN_NO_SKIPNAN import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -75,18 +76,14 @@ public fun DataFrame.meanFor( public fun DataFrame.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.meanFor( vararg columns: KProperty, @@ -101,18 +98,14 @@ public fun DataFrame.mean( public fun DataFrame.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Double = mean(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): Double = mean(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.mean( vararg columns: KProperty, @@ -142,18 +135,14 @@ public fun Grouped.meanFor( public fun Grouped.meanFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = meanFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.meanFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.meanFor( vararg columns: KProperty, @@ -174,9 +163,7 @@ public fun Grouped.mean( skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.mean( vararg columns: ColumnReference, @@ -184,9 +171,7 @@ public fun Grouped.mean( skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.mean( vararg columns: KProperty, @@ -221,9 +206,7 @@ public fun Pivot.meanFor( separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.meanFor( vararg columns: ColumnReference, @@ -231,9 +214,7 @@ public fun Pivot.meanFor( separate: Boolean = false, ): DataRow = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.meanFor( vararg columns: KProperty, @@ -270,9 +251,7 @@ public fun PivotGroupBy.meanFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.meanFor( vararg columns: ColumnReference, @@ -280,9 +259,7 @@ public fun PivotGroupBy.meanFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = meanFor(skipNaN, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.meanFor( vararg columns: KProperty, @@ -298,18 +275,14 @@ public fun PivotGroupBy.mean( public fun PivotGroupBy.mean(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = mean(skipNaN) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.mean( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = mean(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.mean( vararg columns: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt index 798f69f858..0bf290dc49 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/median.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.ROW_MEDIAN import org.jetbrains.kotlinx.dataframe.util.ROW_MEDIAN_OR_NULL import kotlin.experimental.ExperimentalTypeInference @@ -145,18 +146,14 @@ public fun ?> DataFrame.medianFor( public fun DataFrame.medianFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianFor( vararg columns: KProperty, @@ -196,23 +193,17 @@ public fun DataFrame.median(vararg columns: String, skipNaN: Boolean = sk public fun DataFrame.medianOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Any? = Aggregators.medianCommon?>(skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.median(vararg columns: ColumnReference): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianOrNull(vararg columns: ColumnReference): C? = medianOrNull { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.median( vararg columns: ColumnReference, @@ -221,9 +212,7 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.medianOrNull( vararg columns: ColumnReference, @@ -231,23 +220,17 @@ public fun DataFrame.medianOrNull( ): Double? where C : Comparable?, C : Number? = medianOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.median(vararg columns: KProperty): C & Any = medianOrNull(*columns).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.medianOrNull(vararg columns: KProperty): C? = medianOrNull { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.median( vararg columns: KProperty, @@ -256,9 +239,7 @@ public fun DataFrame.median( where C : Comparable?, C : Number? = medianOrNull(*columns, skipNaN = skipNaN).suggestIfNull("median") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.medianOrNull( vararg columns: KProperty, @@ -302,18 +283,14 @@ public inline fun ?> DataFrame.medianBy( public fun DataFrame.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = medianByOrNull(column, skipNaN).suggestIfNull("medianBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianBy( column: KProperty, @@ -328,18 +305,14 @@ public inline fun ?> DataFrame.medianByOrN public fun DataFrame.medianByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = medianByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.medianCommon(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.medianByOrNull( column: KProperty, @@ -363,18 +336,14 @@ public fun ?> Grouped.medianFor( public fun Grouped.medianFor(vararg columns: String): DataFrame = medianFor { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.medianFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.medianFor( vararg columns: KProperty, @@ -395,9 +364,7 @@ public fun Grouped.median( skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.median( vararg columns: ColumnReference, @@ -405,9 +372,7 @@ public fun ?> Grouped.median( skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.median( vararg columns: KProperty, @@ -429,9 +394,7 @@ public inline fun ?> GroupBy.medianB crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.medianBy( column: ColumnReference, @@ -441,9 +404,7 @@ public inline fun ?> GroupBy.medianB public fun GroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.medianBy( column: KProperty, @@ -469,9 +430,7 @@ public fun Pivot.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.medianFor( vararg columns: ColumnReference, @@ -479,9 +438,7 @@ public fun ?> Pivot.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.medianFor( vararg columns: KProperty, @@ -497,18 +454,14 @@ public fun ?> Pivot.median( public fun Pivot.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = median(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = median(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.median( vararg columns: KProperty, @@ -525,9 +478,7 @@ public inline fun ?> Pivot.medianBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.medianBy( column: ColumnReference, @@ -537,9 +488,7 @@ public inline fun ?> Pivot.medianBy( public fun Pivot.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.medianBy( column: KProperty, @@ -564,9 +513,7 @@ public fun PivotGroupBy.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.medianFor( vararg columns: ColumnReference, @@ -574,9 +521,7 @@ public fun ?> PivotGroupBy.medianFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = medianFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.medianFor( vararg columns: KProperty, @@ -592,18 +537,14 @@ public fun ?> PivotGroupBy.median( public fun PivotGroupBy.median(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = median(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.median( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = median(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.median( vararg columns: KProperty, @@ -620,9 +561,7 @@ public inline fun ?> PivotGroupBy.medianBy crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { medianByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.medianBy( column: ColumnReference, @@ -632,9 +571,7 @@ public inline fun ?> PivotGroupBy.medianBy public fun PivotGroupBy.medianBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = medianBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.medianBy( column: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt index a4235f3c9c..cda1d830cc 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/merge.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl import org.jetbrains.kotlinx.dataframe.impl.api.withRowCellImpl import org.jetbrains.kotlinx.dataframe.impl.nameGenerator +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.KType import kotlin.reflect.typeOf @@ -24,16 +25,12 @@ public fun DataFrame.merge(selector: ColumnsSelector): Merge DataFrame.merge(vararg columns: String): Merge> = merge { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.merge(vararg columns: ColumnReference): Merge> = merge { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun DataFrame.merge(vararg columns: KProperty): Merge> = merge { columns.toColumnSet() } @@ -78,15 +75,11 @@ public fun MergeWithTransform.into(columnName: String): DataF @Interpretable("MergeInto0") public fun Merge.into(columnName: String): DataFrame = into(pathOf(columnName)) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Merge.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun MergeWithTransform.into(column: ColumnAccessor<*>): DataFrame = into(column.path()) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt index 6bcfbd31b7..96a22b9f05 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/min.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MIN_NO_SKIPNAN import org.jetbrains.kotlinx.dataframe.util.ROW_MIN import org.jetbrains.kotlinx.dataframe.util.ROW_MIN_OR_NULL @@ -88,18 +89,14 @@ public fun ?> DataFrame.minFor( public fun DataFrame.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minFor( vararg columns: KProperty, @@ -114,18 +111,14 @@ public fun ?> DataFrame.min( public fun DataFrame.min(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C & Any = minOrNull(*columns, skipNaN = skipNaN).suggestIfNull("min") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.min( vararg columns: KProperty, @@ -140,18 +133,14 @@ public fun ?> DataFrame.minOrNull( public fun DataFrame.minOrNull(vararg columns: String, skipNaN: Boolean = skipNaNDefault): Comparable? = minOrNull(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minOrNull( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): C? = minOrNull(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.minOrNull( vararg columns: KProperty, @@ -176,18 +165,14 @@ public inline fun ?> DataFrame.minBy( public fun DataFrame.minBy(column: String, skipNaN: Boolean = skipNaNDefault): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minBy( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = minByOrNull(column, skipNaN).suggestIfNull("minBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minBy( column: KProperty, @@ -202,18 +187,14 @@ public inline fun ?> DataFrame.minByOrNull public fun DataFrame.minByOrNull(column: String, skipNaN: Boolean = skipNaNDefault): DataRow? = minByOrNull(column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minByOrNull( column: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.min(skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.minByOrNull( column: KProperty, @@ -239,18 +220,14 @@ public fun ?> Grouped.minFor( public fun Grouped.minFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = minFor(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.minFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.minFor( vararg columns: KProperty, @@ -271,9 +248,7 @@ public fun Grouped.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.min( vararg columns: ColumnReference, @@ -281,9 +256,7 @@ public fun ?> Grouped.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.min( vararg columns: KProperty, @@ -305,9 +278,7 @@ public inline fun ?> GroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.minBy( column: ColumnReference, @@ -317,9 +288,7 @@ public inline fun ?> GroupBy.minBy( public fun GroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.minBy( column: KProperty, @@ -345,9 +314,7 @@ public fun Pivot.minFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.minFor( vararg columns: ColumnReference, @@ -355,9 +322,7 @@ public fun ?> Pivot.minFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.minFor( vararg columns: KProperty, @@ -375,18 +340,14 @@ public fun ?> Pivot.min( skipNaN: Boolean = skipNaNDefault, ): DataRow = min(skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.min( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = min(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.min( vararg columns: KProperty, @@ -403,9 +364,7 @@ public inline fun ?> Pivot.minBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.minBy( column: ColumnReference, @@ -415,9 +374,7 @@ public inline fun ?> Pivot.minBy( public fun Pivot.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivot = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.minBy( column: KProperty, @@ -443,9 +400,7 @@ public fun PivotGroupBy.minFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.minFor( vararg columns: ColumnReference, @@ -453,9 +408,7 @@ public fun ?> PivotGroupBy.minFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = minFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.minFor( vararg columns: KProperty, @@ -476,9 +429,7 @@ public fun ?> PivotGroupBy.min( skipNaN: Boolean = skipNaNDefault, ): DataFrame = min(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.min( vararg columns: KProperty, @@ -495,9 +446,7 @@ public inline fun ?> PivotGroupBy.minBy( crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { minByOrNull(skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.minBy( column: ColumnReference, @@ -507,9 +456,7 @@ public inline fun ?> PivotGroupBy.minBy( public fun PivotGroupBy.minBy(column: String, skipNaN: Boolean = skipNaNDefault): ReducedPivotGroupBy = minBy(column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.minBy( column: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index fa40b5dd9c..b1fe1f5d25 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.afterOrBefore import org.jetbrains.kotlinx.dataframe.impl.api.moveImpl import org.jetbrains.kotlinx.dataframe.impl.api.moveTo import org.jetbrains.kotlinx.dataframe.ncol +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_LEFT import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_LEFT_REPLACE import org.jetbrains.kotlinx.dataframe.util.MOVE_TO_RIGHT @@ -134,16 +135,12 @@ public fun DataFrame.move(columns: ColumnsSelector): MoveClause< */ public fun DataFrame.move(vararg columns: String): MoveClause = move { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.move(vararg columns: ColumnReference): MoveClause = move { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.move(vararg columns: KProperty): MoveClause = move { columns.toColumnSet() } @@ -212,16 +209,12 @@ public fun DataFrame.moveTo(newColumnIndex: Int, columns: ColumnsSelector public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: String): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: AnyColumnReference): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveTo(newColumnIndex: Int, vararg columns: KProperty<*>): DataFrame = moveTo(newColumnIndex) { columns.toColumnSet() } @@ -286,9 +279,7 @@ public fun DataFrame.moveToStart(vararg columns: String): DataFrame = public fun DataFrame.moveToLeft(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): DataFrame = moveToStart { columns.toColumnSet() } @@ -298,9 +289,7 @@ public fun DataFrame.moveToStart(vararg columns: AnyColumnReference): Dat public fun DataFrame.moveToLeft(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToStart(vararg columns: KProperty<*>): DataFrame = moveToStart { columns.toColumnSet() } @@ -365,9 +354,7 @@ public fun DataFrame.moveToEnd(vararg columns: String): DataFrame = mo public fun DataFrame.moveToRight(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataFrame = moveToEnd { columns.toColumnSet() } @@ -377,9 +364,7 @@ public fun DataFrame.moveToEnd(vararg columns: AnyColumnReference): DataF public fun DataFrame.moveToRight(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.moveToEnd(vararg columns: KProperty<*>): DataFrame = moveToEnd { columns.toColumnSet() } @@ -486,9 +471,7 @@ public fun MoveClause.intoIndexed( @Interpretable("MoveUnder0") public fun MoveClause.under(column: String): DataFrame = pathOf(column).let { path -> under { path } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.under(column: AnyColumnGroupAccessor): DataFrame = column.path().let { path -> under { path } } @@ -625,15 +608,11 @@ public fun MoveClause.after(column: ColumnSelector): DataFram */ public fun MoveClause.after(column: String): DataFrame = after { column.toColumnAccessor() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.after(column: AnyColumnReference): DataFrame = after { column } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun MoveClause.after(column: KProperty<*>): DataFrame = after { column.toColumnAccessor() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt index 601e008d66..e0055c71af 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.parseImpl import org.jetbrains.kotlinx.dataframe.impl.api.tryParseImpl import org.jetbrains.kotlinx.dataframe.impl.io.FastDoubleParser import org.jetbrains.kotlinx.dataframe.typeClass +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS_COPY import java.time.format.DateTimeFormatter @@ -37,16 +38,12 @@ public fun DataFrame.parse(options: ParserOptions? = null, columns: Colum public fun DataFrame.parse(vararg columns: String, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.parse(vararg columns: ColumnReference, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.parse(vararg columns: KProperty, options: ParserOptions? = null): DataFrame = parse(options) { columns.toColumnSet() } @@ -214,7 +211,7 @@ public fun DataColumn.tryParse(options: ParserOptions? = null): DataCol public fun DataFrame.parse(options: ParserOptions? = null): DataFrame = parse(options) { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt index 082d913f9d..0371994f4d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/percentile.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOf import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.columns.toComparableColumns import org.jetbrains.kotlinx.dataframe.impl.suggestIfNull +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.ROW_PERCENTILE import org.jetbrains.kotlinx.dataframe.util.ROW_PERCENTILE_OR_NULL import kotlin.experimental.ExperimentalTypeInference @@ -163,9 +164,7 @@ public fun DataFrame.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileFor( percentile: Double, @@ -173,9 +172,7 @@ public fun ?> DataFrame.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileFor( percentile: Double, @@ -230,27 +227,21 @@ public fun DataFrame.percentileOrNull( ): Any? = Aggregators.percentileCommon?>(percentile, skipNaN).aggregateAll(this) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentile( percentile: Double, vararg columns: ColumnReference, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: ColumnReference, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentile( percentile: Double, @@ -260,9 +251,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentileOrNull( percentile: Double, @@ -272,27 +261,21 @@ public fun DataFrame.percentileOrNull( where C : Comparable?, C : Number? = percentileOrNull(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentile( percentile: Double, vararg columns: KProperty, ): C & Any = percentileOrNull(percentile, *columns).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> DataFrame.percentileOrNull( percentile: Double, vararg columns: KProperty, ): C? = percentileOrNull(percentile) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentile( percentile: Double, @@ -302,9 +285,7 @@ public fun DataFrame.percentile( where C : Comparable?, C : Number? = percentileOrNull(percentile, *columns, skipNaN = skipNaN).suggestIfNull("percentile") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.percentileOrNull( percentile: Double, @@ -358,9 +339,7 @@ public fun DataFrame.percentileBy( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileBy( percentile: Double, @@ -368,9 +347,7 @@ public inline fun ?> DataFrame.percentileB skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileByOrNull(percentile, column, skipNaN).suggestIfNull("percentileBy") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileBy( percentile: Double, @@ -390,9 +367,7 @@ public fun DataFrame.percentileByOrNull( skipNaN: Boolean = skipNaNDefault, ): DataRow? = percentileByOrNull(percentile, column.toColumnOf?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, @@ -400,9 +375,7 @@ public inline fun ?> DataFrame.percentileB skipNaN: Boolean = skipNaNDefault, ): DataRow? = Aggregators.percentileCommon(percentile, skipNaN).aggregateByOrNull(this, column) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> DataFrame.percentileByOrNull( percentile: Double, @@ -429,9 +402,7 @@ public fun ?> Grouped.percentileFor( public fun Grouped.percentileFor(percentile: Double, vararg columns: String): DataFrame = percentileFor(percentile) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentileFor( percentile: Double, @@ -439,9 +410,7 @@ public fun ?> Grouped.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentileFor( percentile: Double, @@ -465,9 +434,7 @@ public fun Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentile( percentile: Double, @@ -476,9 +443,7 @@ public fun ?> Grouped.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Grouped.percentile( percentile: Double, @@ -503,9 +468,7 @@ public inline fun ?> GroupBy.percent crossinline rowExpression: RowExpression, ): ReducedGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.percentileBy( percentile: Double, @@ -519,9 +482,7 @@ public fun GroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> GroupBy.percentileBy( percentile: Double, @@ -553,9 +514,7 @@ public fun Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentileFor( percentile: Double, @@ -564,9 +523,7 @@ public fun ?> Pivot.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentileFor( percentile: Double, @@ -587,9 +544,7 @@ public fun Pivot.percentile( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentile( percentile: Double, @@ -597,9 +552,7 @@ public fun ?> Pivot.percentile( skipNaN: Boolean = skipNaNDefault, ): DataRow = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> Pivot.percentile( percentile: Double, @@ -619,9 +572,7 @@ public inline fun ?> Pivot.percentileBy( crossinline rowExpression: RowExpression, ): ReducedPivot = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.percentileBy( percentile: Double, @@ -635,9 +586,7 @@ public fun Pivot.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivot = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> Pivot.percentileBy( percentile: Double, @@ -668,9 +617,7 @@ public fun PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentileFor( percentile: Double, @@ -679,9 +626,7 @@ public fun ?> PivotGroupBy.percentileFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentileFor(percentile, separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentileFor( percentile: Double, @@ -702,9 +647,7 @@ public fun PivotGroupBy.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toComparableColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentile( percentile: Double, @@ -712,9 +655,7 @@ public fun ?> PivotGroupBy.percentile( skipNaN: Boolean = skipNaNDefault, ): DataFrame = percentile(percentile, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ?> PivotGroupBy.percentile( percentile: Double, @@ -734,9 +675,7 @@ public inline fun ?> PivotGroupBy.percenti crossinline rowExpression: RowExpression, ): ReducedPivotGroupBy = reduce { percentileByOrNull(percentile, skipNaN, rowExpression) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, @@ -750,9 +689,7 @@ public fun PivotGroupBy.percentileBy( skipNaN: Boolean = skipNaNDefault, ): ReducedPivotGroupBy = percentileBy(percentile, column.toColumnAccessor().cast?>(), skipNaN) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun ?> PivotGroupBy.percentileBy( percentile: Double, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index 7e27603d93..acfc2145ea 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotGroupByImpl import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotImpl import org.jetbrains.kotlinx.dataframe.impl.aggregation.PivotInAggregateImpl import org.jetbrains.kotlinx.dataframe.impl.api.PivotChainColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public interface PivotDsl : ColumnsSelectionDsl { @@ -29,34 +30,24 @@ public interface PivotDsl : ColumnsSelectionDsl { public infix fun String.then(other: String): ColumnSet = toColumnAccessor() then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: ColumnsResolver): ColumnSet = toColumnAccessor() then other - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnsResolver.then(other: KProperty): ColumnSet = this then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: KProperty): ColumnSet = toColumnAccessor() then other.toColumnAccessor() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.then(other: String): ColumnSet = toColumnAccessor() then other.toColumnOf() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.then(other: KProperty): ColumnSet = toColumnOf() then other.toColumnAccessor() } @@ -71,16 +62,12 @@ public fun DataFrame.pivot(inward: Boolean? = null, columns: PivotColumns public fun DataFrame.pivot(vararg columns: String, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivot(vararg columns: AnyColumnReference, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivot(vararg columns: KProperty<*>, inward: Boolean? = null): Pivot = pivot(inward) { columns.toColumnSet() } @@ -95,16 +82,12 @@ public fun DataFrame.pivotMatches(inward: Boolean = true, columns: Column public fun DataFrame.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -119,16 +102,12 @@ public fun DataFrame.pivotCounts(inward: Boolean = true, columns: Columns public fun DataFrame.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -144,9 +123,7 @@ public fun DataFrame.pivotCounts(vararg columns: KProperty<*>, inward: Bo public fun GroupBy<*, G>.pivot(inward: Boolean = true, columns: ColumnsSelector): PivotGroupBy = PivotGroupByImpl(this, columns, inward) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -154,9 +131,7 @@ public fun GroupBy<*, G>.pivot(vararg columns: AnyColumnReference, inward: B public fun GroupBy<*, G>.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -171,16 +146,12 @@ public fun GroupBy<*, G>.pivotMatches(inward: Boolean = true, columns: Colum public fun GroupBy<*, G>.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotMatches(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -195,16 +166,12 @@ public fun GroupBy<*, G>.pivotCounts(inward: Boolean = true, columns: Column public fun GroupBy<*, G>.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotCounts(vararg columns: AnyColumnReference, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy<*, G>.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } @@ -225,18 +192,14 @@ public fun AggregateGroupedDsl.pivot( public fun AggregateGroupedDsl.pivot(vararg columns: String, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivot( vararg columns: AnyColumnReference, inward: Boolean = true, ): PivotGroupBy = pivot(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivot(vararg columns: KProperty<*>, inward: Boolean = true): PivotGroupBy = pivot(inward) { columns.toColumnSet() } @@ -253,18 +216,14 @@ public fun AggregateGroupedDsl.pivotMatches( public fun AggregateGroupedDsl.pivotMatches(vararg columns: String, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotMatches( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotMatches(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotMatches(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotMatches(inward) { columns.toColumnSet() } @@ -281,18 +240,14 @@ public fun AggregateGroupedDsl.pivotCounts( public fun AggregateGroupedDsl.pivotCounts(vararg columns: String, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotCounts( vararg columns: AnyColumnReference, inward: Boolean = true, ): DataFrame = pivotCounts(inward) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AggregateGroupedDsl.pivotCounts(vararg columns: KProperty<*>, inward: Boolean = true): DataFrame = pivotCounts(inward) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt index dd2f25633d..35e8bbebd0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.MINUS import org.jetbrains.kotlinx.dataframe.util.MINUS_REPLACE import kotlin.reflect.KProperty @@ -66,9 +67,7 @@ public fun DataFrame.remove(vararg columns: String): DataFrame = remov * @include [SelectingColumns.ColumnAccessors.WithExample] {@include [SetRemoveOperationArg]} * @param [columns] The [Column Accessors][ColumnReference] used to remove the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFrame = remove { columns.toColumnSet() } @@ -77,9 +76,7 @@ public fun DataFrame.remove(vararg columns: AnyColumnReference): DataFram * @include [SelectingColumns.KProperties.WithExample] {@include [SetRemoveOperationArg]} * @param [columns] The [KProperties][KProperty] used to remove the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.remove(vararg columns: KProperty<*>): DataFrame = remove { columns.toColumnSet() } 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 d31e01fc29..755a165a87 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 @@ -18,6 +18,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.impl.api.renameImpl import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.toCamelCaseByDelimiters +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -31,16 +32,12 @@ public fun DataFrame.rename(vararg mappings: Pair): DataF @Interpretable("Rename") public fun DataFrame.rename(columns: ColumnsSelector): RenameClause = RenameClause(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.rename(vararg cols: ColumnReference): RenameClause = rename { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.rename(vararg cols: KProperty): RenameClause = rename { cols.toColumnSet() } @@ -91,9 +88,7 @@ public fun DataFrame.renameToCamelCase(): DataFrame = it.renameToCamelCase() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun RenameClause.into(vararg newColumns: ColumnReference<*>): DataFrame = into(*newColumns.map { it.name() }.toTypedArray()) @@ -102,9 +97,7 @@ public fun RenameClause.into(vararg newColumns: ColumnReference<*>) @Interpretable("RenameInto") public fun RenameClause.into(vararg newNames: String): DataFrame = renameImpl(newNames) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun RenameClause.into(vararg newNames: KProperty<*>): DataFrame = into(*newNames.map { it.name }.toTypedArray()) @@ -338,9 +331,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.named(nameOf: ColumnReference<*>): ColumnReference = named(nameOf.name) @@ -350,9 +341,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.named(nameOf: KProperty<*>): ColumnReference = named(nameOf.columnName) @@ -370,9 +359,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.named(nameOf: ColumnReference<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.name) @@ -383,9 +370,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.named(nameOf: KProperty<*>): ColumnReference<*> = toColumnAccessor().named(nameOf.columnName) @@ -396,9 +381,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.StringParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(newName: String): ColumnReference = toColumnAccessor().named(newName) @@ -408,9 +391,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(nameOf: ColumnReference<*>): ColumnReference = toColumnAccessor().named(nameOf.name) @@ -421,9 +402,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.named(nameOf: KProperty<*>): ColumnReference = toColumnAccessor().named(nameOf.columnName) @@ -447,9 +426,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) @@ -459,9 +436,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.ColumnReferenceReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun ColumnReference.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) @@ -479,9 +454,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.into(nameOf: ColumnReference<*>): ColumnReference<*> = named(nameOf) @@ -491,9 +464,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.StringReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun String.into(nameOf: KProperty<*>): ColumnReference<*> = named(nameOf) @@ -503,9 +474,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.StringParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(newName: String): ColumnReference = named(newName) @@ -515,9 +484,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.ColumnReferenceParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(nameOf: ColumnReference<*>): ColumnReference = named(nameOf) @@ -527,9 +494,7 @@ public interface RenameColumnsSelectionDsl { * @include [CommonRenameDocs.KPropertyReceiver] * @include [CommonRenameDocs.KPropertyParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public infix fun KProperty.into(nameOf: KProperty<*>): ColumnReference = named(nameOf) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt index 34eaa57245..8b0014cf7d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/reorder.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.ColumnReference import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.reorderImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -26,16 +27,12 @@ public data class Reorder( @Interpretable("Reorder") public fun DataFrame.reorder(selector: ColumnsSelector): Reorder = Reorder(this, selector, false) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.reorder(vararg columns: ColumnReference): Reorder = reorder { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.reorder(vararg columns: KProperty): Reorder = reorder { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt index 9749c196bb..f55e825481 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/replace.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.get import org.jetbrains.kotlinx.dataframe.impl.api.ColumnToInsert import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl import org.jetbrains.kotlinx.dataframe.impl.api.removeImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public fun DataFrame.replace(columns: ColumnsSelector): ReplaceClause = @@ -20,23 +21,19 @@ public fun DataFrame.replace(columns: ColumnsSelector): ReplaceC public fun DataFrame.replace(vararg columns: String): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.replace(vararg columns: ColumnReference): ReplaceClause = replace { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.replace(vararg columns: KProperty): ReplaceClause = replace { columns.toColumnSet() } public fun DataFrame.replaceAll( vararg valuePairs: Pair, - columns: ColumnsSelector = { colsAtAnyDepth { !it.isColumnGroup() } }, + columns: ColumnsSelector = { colsAtAnyDepth().filter { !it.isColumnGroup() } }, ): DataFrame { val map = valuePairs.toMap() return update(columns).with { map[it] ?: it } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt index 81a8f4fb27..e82c27b2ca 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.columns.changePath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -71,9 +72,7 @@ public fun DataFrame.select(columns: ColumnsSelector): DataFrame * @include [SelectingColumns.KProperties.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [KProperties][KProperty] used to select the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.select(vararg columns: KProperty<*>): DataFrame = select { columns.toColumnSet() } @@ -89,9 +88,7 @@ public fun DataFrame.select(vararg columns: String): DataFrame = selec * @include [SelectingColumns.ColumnAccessors.WithExample] {@include [SetSelectOperationArg]} * @param [columns] The [Column Accessors][ColumnReference] used to select the columns of this [DataFrame]. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.select(vararg columns: AnyColumnReference): DataFrame = select { columns.toColumnSet() } @@ -196,9 +193,7 @@ public interface SelectColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup `[`{`][KProperty.select]` colA `[and][ColumnsSelectionDsl.and]` colB `[`}`][KProperty.select]` }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.select(selector: ColumnsSelector): ColumnSet = columnGroup(this).select(selector) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index a6f02b6a76..3877b032cc 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -22,6 +22,11 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn import org.jetbrains.kotlinx.dataframe.impl.columns.singleOrNullWithTransformerImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API +import org.jetbrains.kotlinx.dataframe.util.SINGLE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_COL_REPLACE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_PLAIN_REPLACE +import org.jetbrains.kotlinx.dataframe.util.SINGLE_SET_REPLACE import kotlin.reflect.KProperty // region DataColumn @@ -66,20 +71,18 @@ public interface SingleColumnsSelectionDsl { * {@include [DslGrammarTemplate.ColumnSetDef]} * {@include [LineBreak]} * {@include [DslGrammarTemplate.ColumnGroupDef]} - * {@include [LineBreak]} - * {@include [DslGrammarTemplate.ConditionDef]} * } * * {@set [DslGrammarTemplate.PLAIN_DSL_FUNCTIONS] - * {@include [PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [PlainDslName]}`()` * } * * {@set [DslGrammarTemplate.COLUMN_SET_FUNCTIONS] - * {@include [Indent]}{@include [ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnSetName]}`()` * } * * {@set [DslGrammarTemplate.COLUMN_GROUP_FUNCTIONS] - * {@include [Indent]}{@include [ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` + * {@include [Indent]}{@include [ColumnGroupName]}`()` * } */ public interface Grammar { @@ -96,9 +99,9 @@ public interface SingleColumnsSelectionDsl { /** * ## Single (Col) - * Returns the single column from [this\] that adheres to the optional given [condition\]. - * If no column adheres to the given [condition\], [NoSuchElementException] is thrown. - * If multiple columns adhere to it, [IllegalArgumentException] is thrown. + * Returns the single column from [this\]. + * If there is no column, [NoSuchElementException] is thrown. + * If there are multiple columns, [IllegalArgumentException] is thrown. * * This function operates solely on columns at the top-level. * @@ -108,18 +111,17 @@ public interface SingleColumnsSelectionDsl { * * #### Examples: * - * `df.`[select][DataFrame.select]` { `[single][ColumnsSelectionDsl.single]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][DataFrame.select]` { `[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[single][ColumnsSelectionDsl.single]`() }` * - * `df.`[select][DataFrame.select]` { "myColumnGroup".`[singleCol][String.singleCol]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("order") } }` + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("order").`[singleCol][String.singleCol]`() }` * * #### Examples for this overload: * * {@get [Examples]} * - * @param [condition\] The optional [ColumnFilter] condition that the column must adhere to. - * @return A [SingleColumn] containing the single column that adheres to the given [condition\]. - * @throws [NoSuchElementException\] if no column adheres to the given [condition\]. - * @throws [IllegalArgumentException\] if more than one column adheres to the given [condition\]. + * @return A [SingleColumn] containing the single column. + * @throws [NoSuchElementException\] if there are no columns in [this\]. + * @throws [IllegalArgumentException\] if there is more than one column in [this\]. */ private interface CommonSingleDocs { @@ -135,9 +137,24 @@ public interface SingleColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>().`[single][ColumnSet.single]`() }` */ @Interpretable("Single0") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_SET_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnSet.single(condition: ColumnFilter = { true }): TransformableSingleColumn = singleInternal(condition) + /** + * @include [CommonSingleDocs] + * @set [CommonSingleDocs.Examples] + * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[String][String]`>().nameStartsWith("year").`[single][ColumnSet.single]`() }` + * + * `df.`[select][DataFrame.select]` { `[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>().`[single][ColumnSet.single]`() }` + */ + @Interpretable("Single0") + public fun ColumnSet.single(): TransformableSingleColumn = singleInternal { true } + /** * @include [CommonSingleDocs] * @set [CommonSingleDocs.Examples] @@ -145,9 +162,23 @@ public interface SingleColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { `[single][ColumnsSelectionDsl.single]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("year") } }` */ @Interpretable("Single1") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_PLAIN_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun ColumnsSelectionDsl<*>.single(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = asSingleColumn().singleCol(condition) + /** + * @include [CommonSingleDocs] + * @set [CommonSingleDocs.Examples] + * + * `df.`[select][DataFrame.select]` { nameStartsWith("year").`[single][ColumnsSelectionDsl.single]`() }` + */ + @Interpretable("Single1") + public fun ColumnsSelectionDsl<*>.single(): TransformableSingleColumn<*> = asSingleColumn().singleCol { true } + /** * @include [CommonSingleDocs] * @set [CommonSingleDocs.Examples] @@ -155,17 +186,44 @@ public interface SingleColumnsSelectionDsl { * `df.`[select][DataFrame.select]` { myColumnGroup.`[singleCol][SingleColumn.singleCol]`() }` */ @Interpretable("Single2") + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_COL_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun SingleColumn>.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = this.ensureIsColumnGroup().asColumnSet().single(condition) + /** + * @include [CommonSingleDocs] + * @set [CommonSingleDocs.Examples] + * + * `df.`[select][DataFrame.select]` { myColumnGroup.`[singleCol][SingleColumn.singleCol]`() }` + */ + @Interpretable("Single2") + public fun SingleColumn>.singleCol(): TransformableSingleColumn<*> = + this.ensureIsColumnGroup().asColumnSet().single() + /** * @include [CommonSingleDocs] * @set [CommonSingleDocs.Examples] * `df.`[select][DataFrame.select]` { "myColumnGroup".`[singleCol][String.singleCol]` { it.`[name][ColumnReference.name]`().`[startsWith][String.startsWith]`("year") } }` */ + @Deprecated( + message = SINGLE, + replaceWith = ReplaceWith(SINGLE_COL_REPLACE), + level = DeprecationLevel.WARNING, + ) public fun String.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).singleCol(condition) + /** + * @include [CommonSingleDocs] + * @set [CommonSingleDocs.Examples] + * `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsNameStartsWith][ColumnNameFiltersColumnsSelectionDsl.colsNameStartsWith]`("year").`[singleCol][String.singleCol]`() }` + */ + public fun String.singleCol(): TransformableSingleColumn<*> = columnGroup(this).singleCol() + /** * @include [CommonSingleDocs] * @set [CommonSingleDocs.Examples] @@ -173,9 +231,7 @@ public interface SingleColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[singleCol][KProperty.singleCol]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.singleCol(condition: ColumnFilter<*> = { true }): TransformableSingleColumn<*> = columnGroup(this).singleCol(condition) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt index 6b16c4aff2..f4901dea1b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow import org.jetbrains.kotlinx.dataframe.type +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty public interface SortDsl : ColumnsSelectionDsl { @@ -34,9 +35,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.desc(): SingleColumn?> = invoke>().desc() - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.desc(): SingleColumn = toColumnAccessor().desc() @@ -49,9 +48,7 @@ public interface SortDsl : ColumnsSelectionDsl { public fun String.nullsLast(flag: Boolean = true): SingleColumn?> = invoke>().nullsLast(flag) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty.nullsLast(flag: Boolean = true): SingleColumn = toColumnAccessor().nullsLast(flag) } @@ -115,17 +112,13 @@ public fun > C.sortWith(comparator: (T, T) -> Int): C = sor public fun DataFrame.sortBy(columns: SortColumnsSelector): DataFrame = sortByImpl(UnresolvedColumnsPolicy.Fail, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortBy(vararg cols: ColumnReference<*>): DataFrame = sortBy { cols.toColumnSet() } public fun DataFrame.sortBy(vararg cols: String): DataFrame = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortBy(vararg cols: KProperty?>): DataFrame = sortBy { cols.toColumnSet() } @@ -142,18 +135,14 @@ public fun DataFrame.sortByDesc(columns: SortColumnsSelector): D return sortByImpl { set.desc() } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortByDesc(vararg columns: KProperty?>): DataFrame = sortByDesc { columns.toColumnSet() } public fun DataFrame.sortByDesc(vararg columns: String): DataFrame = sortByDesc { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): DataFrame = sortByDesc { columns.toColumnSet() } @@ -164,15 +153,11 @@ public fun DataFrame.sortByDesc(vararg columns: ColumnReference<*>): Data public fun GroupBy.sortBy(vararg cols: String): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortBy(vararg cols: ColumnReference<*>): GroupBy = sortBy { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortBy(vararg cols: KProperty?>): GroupBy = sortBy { cols.toColumnSet() } @@ -181,16 +166,12 @@ public fun GroupBy.sortBy(selector: SortColumnsSelector): public fun GroupBy.sortByDesc(vararg cols: String): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortByDesc(vararg cols: ColumnReference<*>): GroupBy = sortByDesc { cols.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun GroupBy.sortByDesc(vararg cols: KProperty?>): GroupBy = sortByDesc { cols.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt index 7ee2e92172..54461736e4 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/split.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.withRowCellImpl import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.getListType +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.SPLIT_STR import kotlin.reflect.KProperty import kotlin.reflect.KType @@ -30,15 +31,11 @@ public fun DataFrame.split(columns: ColumnsSelector): Split DataFrame.split(vararg columns: String): Split = split { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.split(vararg columns: ColumnReference): Split = split { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.split(vararg columns: KProperty): Split = split { columns.toColumnSet() } @@ -195,18 +192,14 @@ internal fun Split.toDataFrame(): DataFrame = // region into -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.into( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = into(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.into( firstName: KProperty<*>, @@ -250,9 +243,7 @@ public fun Split>.into( public fun Split>.into(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.into(firstCol, secondCol) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Split>.into( firstCol: ColumnAccessor, @@ -282,18 +273,14 @@ public fun SplitWithTransform.inward( extraNamesGenerator: ColumnNamesGenerator? = null, ): DataFrame = inward(names.toList(), extraNamesGenerator) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.inward( firstName: ColumnAccessor<*>, vararg otherNames: ColumnAccessor<*>, ): DataFrame = inward(listOf(firstName.name()) + otherNames.map { it.name() }) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SplitWithTransform.inward( firstName: KProperty<*>, @@ -314,9 +301,7 @@ public fun , R> Split.inward( public fun Split>.inward(firstCol: String, secondCol: String): DataFrame = by { listOf(it.first, it.second) }.inward(firstCol, secondCol) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Split>.inward( firstCol: ColumnAccessor, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt index de398ff70e..38966ec8d6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/std.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.numberColumns import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -90,9 +91,7 @@ public fun DataFrame.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.stdFor( vararg columns: KProperty, @@ -106,17 +105,13 @@ public fun DataFrame.std( columns: ColumnsSelector, ): Double = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.std(vararg columns: ColumnReference): Double = std { columns.toColumnSet() } public fun DataFrame.std(vararg columns: String): Double = std { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.std(vararg columns: KProperty): Double = std { columns.toColumnSet() } @@ -148,9 +143,7 @@ public fun Grouped.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.stdFor( vararg columns: ColumnReference, @@ -158,9 +151,7 @@ public fun Grouped.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.stdFor( vararg columns: KProperty, @@ -177,9 +168,7 @@ public fun Grouped.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, name, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.std( vararg columns: ColumnReference, @@ -195,9 +184,7 @@ public fun Grouped.std( ddof: Int = ddofDefault, ): DataFrame = std(name, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.std( vararg columns: KProperty, @@ -246,9 +233,7 @@ public fun Pivot.stdFor( ddof: Int = ddofDefault, ): DataRow = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.stdFor( vararg columns: KProperty, @@ -275,9 +260,7 @@ public fun Pivot.std( ddof: Int = ddofDefault, ): DataRow = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.std( vararg columns: KProperty, @@ -315,9 +298,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.stdFor( vararg columns: ColumnReference, @@ -326,9 +307,7 @@ public fun PivotGroupBy.stdFor( ddof: Int = ddofDefault, ): DataFrame = stdFor(separate, skipNaN, ddof) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.stdFor( vararg columns: KProperty, @@ -343,9 +322,7 @@ public fun PivotGroupBy.std( columns: ColumnsSelector, ): DataFrame = Aggregators.std(skipNaN, ddof).aggregateAll(this, columns) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.std( vararg columns: ColumnReference, @@ -359,9 +336,7 @@ public fun PivotGroupBy.std( ddof: Int = ddofDefault, ): DataFrame = std(skipNaN, ddof) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.std( vararg columns: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt index 95041a9158..2b7f3724de 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sum.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.modes.aggregateOfRow import org.jetbrains.kotlinx.dataframe.impl.aggregation.primitiveOrMixedNumberColumns import org.jetbrains.kotlinx.dataframe.impl.columns.toNumberColumns import org.jetbrains.kotlinx.dataframe.impl.isPrimitiveOrMixedNumber +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import org.jetbrains.kotlinx.dataframe.util.SUM_NO_SKIPNAN import kotlin.experimental.ExperimentalTypeInference import kotlin.reflect.KClass @@ -140,18 +141,14 @@ public fun DataFrame.sumFor( public fun DataFrame.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sumFor(skipNaN) { columns.toColumnsSetOf() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sumFor( vararg columns: KProperty, @@ -177,23 +174,17 @@ public fun DataFrame.sum( ): C & Any = Aggregators.sum(skipNaN).aggregateAll(this, columns) as (C & Any) @JvmName("sumShort") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: ColumnReference): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum( vararg columns: ColumnReference, @@ -204,23 +195,17 @@ public fun DataFrame.sum(vararg columns: String, skipNaN: Boolean = skipN sum(skipNaN) { columns.toColumnsSetOf() } @JvmName("sumShort") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumByte") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum(vararg columns: KProperty): Int = sum { columns.toColumnSet() } @JvmName("sumNumber") -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.sum( skipNaN: Boolean = skipNaNDefault, @@ -263,18 +248,14 @@ public fun Grouped.sumFor( public fun Grouped.sumFor(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sumFor(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sumFor( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sumFor( vararg columns: KProperty, @@ -295,9 +276,7 @@ public fun Grouped.sum( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sum( vararg columns: ColumnReference, @@ -305,9 +284,7 @@ public fun Grouped.sum( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(name, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.sum( vararg columns: KProperty, @@ -342,9 +319,7 @@ public fun Pivot.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sumFor( vararg columns: ColumnReference, @@ -352,9 +327,7 @@ public fun Pivot.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataRow = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sumFor( vararg columns: KProperty, @@ -370,18 +343,14 @@ public fun Pivot.sum( public fun Pivot.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataRow = sum(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.sum(vararg columns: KProperty, skipNaN: Boolean = skipNaNDefault): DataRow = sum(skipNaN) { columns.toColumnSet() } @@ -410,9 +379,7 @@ public fun PivotGroupBy.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sumFor( vararg columns: ColumnReference, @@ -420,9 +387,7 @@ public fun PivotGroupBy.sumFor( skipNaN: Boolean = skipNaNDefault, ): DataFrame = sumFor(separate, skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sumFor( vararg columns: KProperty, @@ -438,18 +403,14 @@ public fun PivotGroupBy.sum( public fun PivotGroupBy.sum(vararg columns: String, skipNaN: Boolean = skipNaNDefault): DataFrame = sum(skipNaN) { columns.toNumberColumns() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sum( vararg columns: ColumnReference, skipNaN: Boolean = skipNaNDefault, ): DataFrame = sum(skipNaN) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.sum( vararg columns: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt index aa8a5a2bc5..1a95b426b3 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.transform import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle import org.jetbrains.kotlinx.dataframe.index import org.jetbrains.kotlinx.dataframe.nrow +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataColumn @@ -157,9 +158,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeCols][KProperty.takeCols]`(1) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeCols(n: Int): ColumnSet<*> = columnGroup(this).takeCols(n) @@ -230,9 +229,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeLastCols][KProperty.takeLastCols]`(1) }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeLastCols(n: Int): ColumnSet<*> = columnGroup(this).takeLastCols(n) @@ -303,9 +300,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeColsWhile][KProperty.takeColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeColsWhile(predicate) @@ -378,9 +373,7 @@ public interface TakeColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[takeLastColsWhile][KProperty.takeLastColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.takeLastColsWhile(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).takeLastColsWhile(predicate) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt index 5c45944a7e..3752dccd4d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/toDataFrame.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnGuessingType import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KCallable import kotlin.reflect.KClass import kotlin.reflect.KProperty @@ -196,9 +197,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { @Interpretable("ToDataFrameFrom0") public inline infix fun String.from(noinline expression: (T) -> R): Unit = add(this, expression) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(noinline expression: (T) -> R): Unit = add(columnName, expression) @@ -206,9 +205,7 @@ public abstract class CreateDataFrameDsl : TraversePropertiesDsl { public inline infix fun String.from(inferType: InferType): Unit = add(DataColumn.createByInference(this, source.map { inferType.expression(it) })) - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline infix fun KProperty.from(inferType: InferType): Unit = add(DataColumn.createByInference(columnName, source.map { inferType.expression(it) })) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt index ff39e395a7..cde30fd302 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.asValues import org.jetbrains.kotlinx.dataframe.impl.columns.forceResolve import org.jetbrains.kotlinx.dataframe.impl.owner import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.typeOf @@ -231,9 +232,7 @@ public inline fun Iterable.toValueColumn(name: String = ""): Valu public inline fun Iterable.toValueColumn(column: ColumnAccessor): ValueColumn = toValueColumn(column.name()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Iterable.toValueColumn(column: KProperty): ValueColumn = toValueColumn(column.columnName) @@ -338,9 +337,7 @@ public inline fun Iterable<*>.toColumnOf(name: String = ""): DataCol public inline fun Iterable.toColumn(ref: ColumnReference): DataColumn = DataColumn.createByType(ref.name(), asList()).forceResolve() -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public inline fun Iterable.toColumn(property: KProperty): DataColumn = DataColumn.createByType(property.columnName, asList()).forceResolve() @@ -375,9 +372,7 @@ public fun DataFrame.asGroupBy(groupedColumnName: String): GroupBy return asGroupBy { groups.cast() } } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.asGroupBy(groupedColumn: ColumnReference>): GroupBy { val groups = getFrameColumn(groupedColumn.name()).castFrameColumn() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt index 97fe1313c8..e0b9f17520 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/unfold.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Interpretable import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.api.unfoldImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KCallable import kotlin.reflect.KProperty @@ -26,14 +27,10 @@ public fun DataFrame.unfold( public fun DataFrame.unfold(vararg columns: String): DataFrame = unfold { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.unfold(vararg columns: AnyColumnReference): DataFrame = unfold { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.unfold(vararg columns: KProperty<*>): DataFrame = unfold { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt index b37c58b3d7..ce94a93ca7 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources import org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.removeAt +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -69,16 +70,12 @@ public fun DataFrame.ungroup(columns: ColumnsSelector): DataFram */ public fun DataFrame.ungroup(vararg columns: String): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.ungroup(vararg columns: AnyColumnReference): DataFrame = ungroup { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.ungroup(vararg columns: KProperty<*>): DataFrame = ungroup { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt index a87effefba..51d3337794 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.updateImpl import org.jetbrains.kotlinx.dataframe.impl.api.updateWithValuePerColumnImpl import org.jetbrains.kotlinx.dataframe.impl.headPlusArray import org.jetbrains.kotlinx.dataframe.index +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** @@ -178,9 +179,7 @@ public fun DataFrame.update(vararg columns: String): Update = up * @include [UpdateWithNote] * @include [Update.KPropertiesParam] */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update(vararg columns: KProperty): Update = update { columns.toColumnSet() } @@ -190,9 +189,7 @@ public fun DataFrame.update(vararg columns: KProperty): Update DataFrame.update(vararg columns: ColumnReference): Update = update { columns.toColumnSet() } @@ -443,9 +440,7 @@ public fun Update.notNull(expression: UpdateExpression): * @include [Update.ColumnAccessorsParam] * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update( firstCol: ColumnReference, @@ -465,9 +460,7 @@ public fun DataFrame.update( * @include [Update.KPropertiesParam] * @param [expression] The {@include [ExpressionsGivenRow.RowValueExpressionLink]} to update the rows with. */ -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.update( firstCol: KProperty, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt index 4d2be0bb6c..42f44b9617 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.getAt import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve import org.jetbrains.kotlinx.dataframe.impl.columns.singleImpl import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -160,9 +161,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColReferenceDocs] {@set [CommonValueColDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueCol(valueCol: ColumnAccessor): ColumnAccessor = valueCol.ensureIsValueColumn() @@ -194,9 +193,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColReferenceDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(valueCol: ColumnAccessor): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(valueCol.path()).ensureIsValueColumn() @@ -284,9 +281,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(name: String): ColumnAccessor<*> = valueCol(name) @@ -294,9 +289,7 @@ public interface ValueColColumnsSelectionDsl { * @include [ValueColNameDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(name: String): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(name).ensureIsValueColumn() @@ -392,9 +385,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor<*> = valueCol(path) @@ -402,9 +393,7 @@ public interface ValueColColumnsSelectionDsl { * @include [ValueColPathDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(path: ColumnPath): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(path).ensureIsValueColumn() @@ -439,18 +428,14 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER]} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun valueCol(property: KProperty): SingleColumn = valueColumn(property).ensureIsValueColumn() /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun SingleColumn>.valueCol(property: KProperty): SingleColumn = valueCol(property.name) @@ -458,9 +443,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun AnyColumnGroupAccessor.valueCol(property: KProperty): ColumnAccessor = this.ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -468,9 +451,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] "myColumnGroup".} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun String.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -478,9 +459,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -488,9 +467,7 @@ public interface ValueColColumnsSelectionDsl { /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER] "pathTo"["myColumnGroup"].} */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ColumnPath.valueCol(property: KProperty): ColumnAccessor = columnGroup(this).ensureIsColumnGroup().valueColumn(property).ensureIsValueColumn() @@ -564,9 +541,7 @@ public interface ValueColColumnsSelectionDsl { */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("valueColUnTyped") - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(index: Int): SingleColumn<*> = valueCol(index) @@ -574,9 +549,7 @@ public interface ValueColColumnsSelectionDsl { * @include [ValueColIndexDocs] {@set [CommonValueColDocs.RECEIVER] Type::myColumnGroup.} * @include [CommonValueColDocs.ValueColumnTypeParam] */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCol(index: Int): SingleColumn = columnGroup(this).valueCol(index) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt index f691e0ea7c..e5a59f8f8b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -161,9 +162,7 @@ public interface ValueColsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[valueCols][KProperty.valueCols]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.valueCols(filter: Predicate> = { true }): TransformableColumnSet<*> = columnGroup(this).valueCols(filter) diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt index 7beaa73272..be49a1a580 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCounts.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.annotations.Interpretable import org.jetbrains.kotlinx.dataframe.annotations.Refine import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.impl.nameGenerator +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty import kotlin.reflect.full.withNullability import kotlin.reflect.typeOf @@ -83,9 +84,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.valueCounts( vararg columns: AnyColumnReference, @@ -95,9 +94,7 @@ public fun DataFrame.valueCounts( resultColumn: String = defaultCountColumnName, ): DataFrame = valueCounts(sort, ascending, dropNA, resultColumn) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun DataFrame.valueCounts( vararg columns: KProperty<*>, diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt index ba91641b01..85c6bebfb6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/values.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlinx.dataframe.impl.aggregation.columnValues import org.jetbrains.kotlinx.dataframe.impl.aggregation.internal import org.jetbrains.kotlinx.dataframe.impl.aggregation.remainingColumnsSelector import org.jetbrains.kotlinx.dataframe.impl.valuesImpl +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region DataFrame @@ -29,9 +30,7 @@ public fun DataFrame.valuesNotNull(byRow: Boolean = false): Sequence // region GroupBy -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Grouped.values( vararg columns: AnyColumnReference, @@ -60,18 +59,14 @@ public fun Grouped.values(dropNA: Boolean = false, distinct: Boolean = fa public fun ReducedGroupBy.values(): DataFrame = values(groupBy.remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.values(vararg columns: AnyColumnReference): DataFrame = values { columns.toColumnSet() } public fun ReducedGroupBy.values(vararg columns: String): DataFrame = values { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedGroupBy.values(vararg columns: KProperty<*>): DataFrame = values { columns.toColumnSet() } @@ -90,9 +85,7 @@ public fun Pivot.values( columns: ColumnsForAggregateSelector, ): DataRow = delegate { values(dropNA, distinct, separate, columns) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.values( vararg columns: AnyColumnReference, @@ -108,9 +101,7 @@ public fun Pivot.values( separate: Boolean = false, ): DataRow = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun Pivot.values( vararg columns: KProperty<*>, @@ -135,9 +126,7 @@ public fun Pivot.values( public fun ReducedPivot.values(separate: Boolean = false): DataRow = pivot.delegate { reduce(reducer).values(separate = separate) } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivot.values(vararg columns: AnyColumnReference, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } @@ -145,9 +134,7 @@ public fun ReducedPivot.values(vararg columns: AnyColumnReference, separa public fun ReducedPivot.values(vararg columns: String, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivot.values(vararg columns: KProperty<*>, separate: Boolean = false): DataRow = values(separate) { columns.toColumnSet() } @@ -167,9 +154,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate, remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.values( vararg columns: AnyColumnReference, @@ -185,9 +170,7 @@ public fun PivotGroupBy.values( separate: Boolean = false, ): DataFrame = values(dropNA, distinct, separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun PivotGroupBy.values( vararg columns: KProperty<*>, @@ -210,9 +193,7 @@ public fun PivotGroupBy.values( public fun ReducedPivotGroupBy.values(separate: Boolean = false): DataFrame = values(separate, pivot.remainingColumnsSelector()) -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivotGroupBy.values( vararg columns: AnyColumnReference, @@ -222,9 +203,7 @@ public fun ReducedPivotGroupBy.values( public fun ReducedPivotGroupBy.values(vararg columns: String, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } -@Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", -) +@Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun ReducedPivotGroupBy.values(vararg columns: KProperty<*>, separate: Boolean = false): DataFrame = values(separate) { columns.toColumnSet() } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt index 0e79aafd50..1b203687c3 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.columns.transform +import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -130,9 +131,7 @@ public interface WithoutNullsColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { DataSchemaType::myColumnGroup.`[colsWithoutNulls][KProperty.colsWithoutNulls]`() }` */ - @Deprecated( - "Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html", - ) + @Deprecated(DEPRECATED_ACCESS_API) @AccessApiOverload public fun KProperty<*>.colsWithoutNulls(): ColumnSet = columnGroup(this).colsWithoutNulls() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt index 4a99a5a15b..21d932046c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/xs.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlinx.dataframe.impl.api.xsImpl @Interpretable("DataFrameXs") public fun DataFrame.xs(vararg keyValues: Any?): DataFrame = xs(*keyValues) { - colsAtAnyDepth { !it.isColumnGroup() }.take(keyValues.size) + colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } @Refine @@ -28,7 +28,7 @@ public fun DataFrame.xs(vararg keyValues: C, keyColumns: ColumnsSelect @Interpretable("GroupByXs") public fun GroupBy.xs(vararg keyValues: Any?): GroupBy = xs(*keyValues) { - colsAtAnyDepth { !it.isColumnGroup() }.take(keyValues.size) + colsAtAnyDepth().filter { !it.isColumnGroup() }.take(keyValues.size) } @Refine diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt index 3e8336f8d4..8c251a5ed8 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/columns/BaseColumn.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.columns import org.jetbrains.kotlinx.dataframe.AnyBaseCol import org.jetbrains.kotlinx.dataframe.AnyCol import org.jetbrains.kotlinx.dataframe.AnyRow +import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl import org.jetbrains.kotlinx.dataframe.impl.asList import org.jetbrains.kotlinx.dataframe.impl.columnName diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt index fec386d1a6..3f4da0d86d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt @@ -95,7 +95,7 @@ public interface DslGrammarTemplateColumnsSelectionDsl { // region Definitions for at the top of the template /** - * `columnGroupReference: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroupReference: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ public interface ColumnGroupNoSingleColumnDef @@ -106,16 +106,16 @@ public interface DslGrammarTemplateColumnsSelectionDsl { public interface ColumnsSelectorDef /** - * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ public interface ColumnDef /** - * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] + * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ public interface ColumnGroupDef - /** `columnNoAccessor: `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ + /** `columnNoAccessor: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ public interface ColumnNoAccessorDef /** `columnOrSet: `{@include [ColumnRef]}` | `{@include [ColumnSetRef]} */ diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt index 5d150f979a..eab8acff76 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/GroupByImpl.kt @@ -107,7 +107,9 @@ internal fun aggregateGroupBy( if (!removeColumns) removedNode.data.wasRemoved = false - val columnsToInsert = groupedFrame.getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }.map { + val columnsToInsert = groupedFrame.getColumnsWithPaths { + colsAtAnyDepth().filter { !it.isColumnGroup() } + }.map { ColumnToInsert(insertPath + it.path, it, removedNode) } val src = if (removeColumns) removed.df else df diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt index c4fb2d78f5..bbdd412851 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/corr.kt @@ -26,7 +26,9 @@ internal fun Corr.corrImpl(otherColumns: ColumnsSelector): // extract nested number columns from ColumnGroups if (it.isColumnGroup()) { val groupPath = it.path - df.getColumnsWithPaths { groupPath.colsAtAnyDepth { it.isSuitableForCorr() } }.map { it.cast() } + df.getColumnsWithPaths { + groupPath.colsAtAnyDepth().filter { it.isSuitableForCorr() } + }.map { it.cast() } } else { listOf(it) } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt index f353ab48e5..399d74bd62 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/join.kt @@ -67,10 +67,10 @@ internal fun DataFrame.joinImpl( val rightCol = rightJoinColumns[i] if (leftCol.isColumnGroup() && rightCol.isColumnGroup()) { val leftColumns = getColumnsWithPaths { - leftCol.colsAtAnyDepth { !it.isColumnGroup() } + leftCol.colsAtAnyDepth().filter { !it.isColumnGroup() } } val rightColumns = other.getColumnsWithPaths { - rightCol.colsAtAnyDepth { !it.isColumnGroup() } + rightCol.colsAtAnyDepth().filter { !it.isColumnGroup() } } val leftPrefixLength = leftCol.path.size @@ -112,7 +112,7 @@ internal fun DataFrame.joinImpl( // group row indices by key from right data frame val groupedRight = when (joinType) { - JoinType.Exclude -> rightJoinKeyToIndex.associate { it.first to emptyList() } + JoinType.Exclude -> rightJoinKeyToIndex.associate { it.first to emptyList() } else -> rightJoinKeyToIndex.groupBy({ it.first }) { it.second } } @@ -145,14 +145,14 @@ internal fun DataFrame.joinImpl( outputRowsCount += rightUnmatchedCount } - val leftColumns = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val leftColumns = getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } val rightJoinColumnPaths = allRightJoinColumns.associate { it.path to it.data } val newRightColumns = if (addNewColumns) { other.getColumnsWithPaths { - colsAtAnyDepth { + colsAtAnyDepth().filter { !it.isColumnGroup() && !rightJoinColumnPaths.contains(it.path) } } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt index e0a19d9eff..04fb4d4ea0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt @@ -681,7 +681,7 @@ internal fun DataFrame.parseImpl(options: ParserOptions?, columns: Column col.isFrameColumn() -> { col.map { it.parseImpl(options) { - colsAtAnyDepth { !it.isColumnGroup() } + colsAtAnyDepth().filter { !it.isColumnGroup() } } } } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt index 44b4520c2c..2674e6c5bd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt @@ -283,7 +283,7 @@ public fun AnyFrame.toStaticHtml( val id = "static_df_${nextTableId()}" // Retrieve all columns, including nested ones - val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val flattenedCols = getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } // Get a grid of columns for the header, as well as the side borders for each cell val colGrid = getColumnsHeaderGrid() diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt index 2c8921e3e0..7cb3fa01ff 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt @@ -7,119 +7,119 @@ package org.jetbrains.kotlinx.dataframe.util * Level.ERROR -> Remove */ -// region WARNING in 0.15, ERROR in 0.16 +// region WARNING in 0.15, ERROR in 1.0 -private const val MESSAGE_0_16 = "Will be ERROR in 0.16." +private const val MESSAGE_1_0 = "Will be ERROR in 1.0." -internal const val DF_READ_NO_CSV = "This function is deprecated and should be replaced with `readCsv`. $MESSAGE_0_16" +internal const val DF_READ_NO_CSV = "This function is deprecated and should be replaced with `readCsv`. $MESSAGE_1_0" internal const val DF_READ_NO_CSV_REPLACE = "this.readCsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val CREATE_FRAME_COLUMN = - "Removed from public API as this can likely better be solved by `DataFrame.chunked()`. Replaced by internal df.chunkedImpl(). $MESSAGE_0_16" + "Removed from public API as this can likely better be solved by `DataFrame.chunked()`. Replaced by internal df.chunkedImpl(). $MESSAGE_1_0" internal const val CREATE_FRAME_COLUMN_REPLACE = "df.chunkedImpl(startIndices, name)" internal const val CHUNKED_IMPL_IMPORT = "org.jetbrains.kotlinx.dataframe.impl.api.chunkedImpl" internal const val CREATE_WITH_TYPE_INFERENCE = - "This function is deprecated and should be replaced by `createByInference()`. $MESSAGE_0_16" + "This function is deprecated and should be replaced by `createByInference()`. $MESSAGE_1_0" internal const val CREATE_WITH_TYPE_INFERENCE_REPLACE = "createByInference(name, values, TypeSuggestion.Infer, nullable)" internal const val CREATE_BY_INFERENCE_IMPORT = "org.jetbrains.kotlinx.dataframe.DataColumn.Companion.createByInference" internal const val TYPE_SUGGESTION_IMPORT = "org.jetbrains.kotlinx.dataframe.columns.TypeSuggestion" -internal const val CREATE = "This function is deprecated and should be replaced by `createByType()`. $MESSAGE_0_16" +internal const val CREATE = "This function is deprecated and should be replaced by `createByType()`. $MESSAGE_1_0" internal const val CREATE_REPLACE = "createByType(name, values, type, infer)" internal const val CREATE_INLINE_REPLACE = "createByType(name, values, infer)" internal const val CREATE_BY_TYPE_IMPORT = "org.jetbrains.kotlinx.dataframe.DataColumn.Companion.createByType" -internal const val GUESS_VALUE_TYPE = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val GUESS_VALUE_TYPE = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val CREATE_COLUMN = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val CREATE_COLUMN = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val GUESS_COLUMN_TYPE = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val GUESS_COLUMN_TYPE = "This function is just here for binary compatibility. $MESSAGE_1_0" -public const val DF_READ_EXCEL: String = "This function is just here for binary compatibility. $MESSAGE_0_16" +public const val DF_READ_EXCEL: String = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val PARSER_OPTIONS = "This constructor is only here for binary compatibility. $MESSAGE_0_16" +internal const val PARSER_OPTIONS = "This constructor is only here for binary compatibility. $MESSAGE_1_0" -internal const val PARSER_OPTIONS_COPY = "This function is only here for binary compatibility. $MESSAGE_0_16" +internal const val PARSER_OPTIONS_COPY = "This function is only here for binary compatibility. $MESSAGE_1_0" internal const val IS_COMPARABLE = - "This function is replaced by `valuesAreComparable()` to better reflect its purpose. $MESSAGE_0_16" + "This function is replaced by `valuesAreComparable()` to better reflect its purpose. $MESSAGE_1_0" internal const val IS_COMPARABLE_REPLACE = "valuesAreComparable()" internal const val IS_INTER_COMPARABLE_IMPORT = "org.jetbrains.kotlinx.dataframe.api.valuesAreComparable" -internal const val AS_URL = "This function is replaced by `asUrl()`. $MESSAGE_0_16" +internal const val AS_URL = "This function is replaced by `asUrl()`. $MESSAGE_1_0" internal const val AS_URL_REPLACE = "asUrl(fileOrUrl)" internal const val AS_URL_IMPORT = "org.jetbrains.kotlinx.dataframe.io.asUrl" -internal const val IS_URL = "This function is replaced by `isUrl()`. $MESSAGE_0_16" +internal const val IS_URL = "This function is replaced by `isUrl()`. $MESSAGE_1_0" internal const val IS_URL_REPLACE = "isUrl(path)" internal const val IS_URL_IMPORT = "org.jetbrains.kotlinx.dataframe.io.isUrl" -internal const val MINUS = "This minus overload will be removed in favor of `remove`. $MESSAGE_0_16" +internal const val MINUS = "This minus overload will be removed in favor of `remove`. $MESSAGE_1_0" internal const val MINUS_REPLACE = "this.remove(columns)" -internal const val READ_JSON = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val READ_JSON = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val MOVE_TO_LEFT = "This `moveToLeft` overload will be removed in favor of `moveToStart`. $MESSAGE_0_16" +internal const val MOVE_TO_LEFT = "This `moveToLeft` overload will be removed in favor of `moveToStart`. $MESSAGE_1_0" internal const val MOVE_TO_LEFT_REPLACE = "this.moveToStart(columns)" -internal const val MOVE_TO_RIGHT = "This `moveToRight` overload will be removed in favor of `moveToEnd`. $MESSAGE_0_16" +internal const val MOVE_TO_RIGHT = "This `moveToRight` overload will be removed in favor of `moveToEnd`. $MESSAGE_1_0" internal const val MOVE_TO_RIGHT_REPLACE = "this.moveToEnd(columns)" -internal const val TO_LEFT = "This `toLeft` overload will be removed in favor of `toStart`. $MESSAGE_0_16" +internal const val TO_LEFT = "This `toLeft` overload will be removed in favor of `toStart`. $MESSAGE_1_0" internal const val TO_LEFT_REPLACE = "this.toStart()" -internal const val TO_RIGHT = "This `toRight` overload will be removed in favor of `toEnd`. $MESSAGE_0_16" +internal const val TO_RIGHT = "This `toRight` overload will be removed in favor of `toEnd`. $MESSAGE_1_0" internal const val TO_RIGHT_REPLACE = "this.toEnd()" -internal const val ROW_MIN = "`rowMin` is deprecated in favor of `rowMinOf`. $MESSAGE_0_16" -internal const val ROW_MIN_OR_NULL = "`rowMinOrNull` is deprecated in favor of `rowMinOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MIN = "`rowMin` is deprecated in favor of `rowMinOf`. $MESSAGE_1_0" +internal const val ROW_MIN_OR_NULL = "`rowMinOrNull` is deprecated in favor of `rowMinOfOrNull`. $MESSAGE_1_0" -internal const val ROW_MAX = "`rowMax` is deprecated in favor of `rowMaxOf`. $MESSAGE_0_16" -internal const val ROW_MAX_OR_NULL = "`rowMaxOrNull` is deprecated in favor of `rowMaxOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MAX = "`rowMax` is deprecated in favor of `rowMaxOf`. $MESSAGE_1_0" +internal const val ROW_MAX_OR_NULL = "`rowMaxOrNull` is deprecated in favor of `rowMaxOfOrNull`. $MESSAGE_1_0" -internal const val ROW_MEDIAN = "`rowMedian` is deprecated in favor of `rowMedianOf`. $MESSAGE_0_16" -internal const val ROW_MEDIAN_OR_NULL = "`rowMedianOrNull` is deprecated in favor of `rowMedianOfOrNull`. $MESSAGE_0_16" +internal const val ROW_MEDIAN = "`rowMedian` is deprecated in favor of `rowMedianOf`. $MESSAGE_1_0" +internal const val ROW_MEDIAN_OR_NULL = "`rowMedianOrNull` is deprecated in favor of `rowMedianOfOrNull`. $MESSAGE_1_0" -internal const val ROW_PERCENTILE = "`rowPercentile` is deprecated in favor of `rowPercentileOf`. $MESSAGE_0_16" +internal const val ROW_PERCENTILE = "`rowPercentile` is deprecated in favor of `rowPercentileOf`. $MESSAGE_1_0" internal const val ROW_PERCENTILE_OR_NULL = - "`rowPercentileOrNull` is deprecated in favor of `rowPercentileOfOrNull`. $MESSAGE_0_16" + "`rowPercentileOrNull` is deprecated in favor of `rowPercentileOfOrNull`. $MESSAGE_1_0" -internal const val SUM_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MAX_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MIN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" -internal const val MEAN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_0_16" +internal const val SUM_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MAX_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MIN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" +internal const val MEAN_NO_SKIPNAN = "This function is just here for binary compatibility. $MESSAGE_1_0" -internal const val CONVERT_TO = "This to overload will be removed in favor of `asColumn`. $MESSAGE_0_16" +internal const val CONVERT_TO = "This to overload will be removed in favor of `asColumn`. $MESSAGE_1_0" internal const val CONVERT_TO_REPLACE = "this.asColumn(columnConverter)" -internal const val TO_HTML = "This function is replaced by `toHtml()`. $MESSAGE_0_16" +internal const val TO_HTML = "This function is replaced by `toHtml()`. $MESSAGE_1_0" internal const val TO_HTML_REPLACE = "toHtml(configuration, cellRenderer, getFooter)" -internal const val TO_STANDALONE_HTML = "This function is replaced by `toStandaloneHtml()`. $MESSAGE_0_16" +internal const val TO_STANDALONE_HTML = "This function is replaced by `toStandaloneHtml()`. $MESSAGE_1_0" internal const val TO_STANDALONE_HTML_REPLACE = "toStandaloneHtml(configuration, cellRenderer, getFooter)" -internal const val WRITE_HTML = "This function is replaced by `writeHtml()`. $MESSAGE_0_16" +internal const val WRITE_HTML = "This function is replaced by `writeHtml()`. $MESSAGE_1_0" internal const val WRITE_HTML_REPLACE = "writeHtml(destination)" -internal const val CONVERT_TO_URL = "This function is replaced by `convertToUrl()`. $MESSAGE_0_16" +internal const val CONVERT_TO_URL = "This function is replaced by `convertToUrl()`. $MESSAGE_1_0" internal const val CONVERT_TO_URL_REPLACE = "convertToUrl()" -internal const val TO_URL = "This function is replaced by `toUrl()`. $MESSAGE_0_16" +internal const val TO_URL = "This function is replaced by `toUrl()`. $MESSAGE_1_0" internal const val TO_URL_REPLACE = "toUrl()" // endregion -// region WARNING in 0.16, ERROR in 0.17 +// region WARNING in 1.0, ERROR in 1.1 -private const val MESSAGE_0_17 = "Will be ERROR in 0.17." +private const val MESSAGE_1_1 = "Will be ERROR in 1.1." internal const val APACHE_CSV = - "The Apache-based CSV/TSV reader is deprecated in favor of the new Deephaven CSV reader in dataframe-csv. $MESSAGE_0_17" + "The Apache-based CSV/TSV reader is deprecated in favor of the new Deephaven CSV reader in dataframe-csv. $MESSAGE_1_1" internal const val READ_CSV = - "Apache-based readCSV() is deprecated in favor of Deephaven-based readCsv() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readCSV() is deprecated in favor of Deephaven-based readCsv() in dataframe-csv. $MESSAGE_1_1" internal const val READ_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.readCsv" internal const val READ_CSV_FILE_OR_URL_REPLACE = "this.readCsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" @@ -131,14 +131,14 @@ internal const val READ_CSV_STREAM_REPLACE = "this.readCsv(inputStream = stream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_DELIM = - "Apache-based readDelim() is deprecated in favor of Deephaven-based readDelim() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readDelim() is deprecated in favor of Deephaven-based readDelim() in dataframe-csv. $MESSAGE_1_1" internal const val READ_DELIM_STREAM_REPLACE = "this.readDelim(inputStream = inStream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_DELIM_READER_REPLACE = "this.readDelimStr(text = reader.readText(), delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val READ_TSV = - "Apache-based readTSV() is deprecated in favor of Deephaven-based readTsv() in dataframe-csv. $MESSAGE_0_17" + "Apache-based readTSV() is deprecated in favor of Deephaven-based readTsv() in dataframe-csv. $MESSAGE_1_1" internal const val READ_TSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.readTsv" internal const val READ_TSV_FILE_OR_URL_REPLACE = "this.readTsv(fileOrUrl = fileOrUrl, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" @@ -150,26 +150,40 @@ internal const val READ_TSV_STREAM_REPLACE = "this.readTsv(inputStream = stream, delimiter = delimiter, header = header, colTypes = colTypes, skipLines = skipLines, readLines = readLines, allowMissingColumns = duplicate, parserOptions = parserOptions)" internal const val WRITE_CSV = - "The writeCSV() functions are deprecated in favor of writeCsv() in dataframe-csv. $MESSAGE_0_17" + "The writeCSV() functions are deprecated in favor of writeCsv() in dataframe-csv. $MESSAGE_1_1" internal const val WRITE_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.writeCsv" internal const val WRITE_CSV_FILE_REPLACE = "this.writeCsv(file = file)" internal const val WRITE_CSV_PATH_REPLACE = "this.writeCsv(path = path)" internal const val WRITE_CSV_WRITER_REPLACE = "this.writeCsv(writer = writer)" -internal const val TO_CSV = "toCsv() is deprecated in favor of toCsvStr() in dataframe-csv. $MESSAGE_0_17" +internal const val TO_CSV = "toCsv() is deprecated in favor of toCsvStr() in dataframe-csv. $MESSAGE_1_1" internal const val TO_CSV_IMPORT = "org.jetbrains.kotlinx.dataframe.io.toCsvStr" internal const val TO_CSV_REPLACE = "this.toCsvStr()" internal const val SPLIT_STR = - "Please explicitly specify how the String should be split. This shortcut will be removed in version 1.1.0" + "Please explicitly specify how the String should be split. Shortcut: $MESSAGE_1_1" internal const val DATAFRAME_OF_WITH_VALUES = - "Deprecated in favor of dataFrameOf(names).withValues(values). Will be error in 1.1.0" + "Deprecated in favor of dataFrameOf(names).withValues(values). $MESSAGE_1_1" + +internal const val COLS_AT_ANY_DEPTH = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val COLS_AT_ANY_DEPTH_REPLACE = "this.colsAtAnyDepth().filter(predicate)" + +internal const val COLS_IN_GROUPS = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val COLS_IN_GROUPS_REPLACE = "this.colsInGroups().filter(predicate)" + +internal const val SINGLE = "Deprecated shortcut for better compiler plugin support. $MESSAGE_1_1" +internal const val SINGLE_COL_REPLACE = "this.allCols().filter(condition).single()" +internal const val SINGLE_PLAIN_REPLACE = "this.cols().filter(condition).single()" +internal const val SINGLE_SET_REPLACE = "this.filter(condition).single()" // endregion // region keep across releases +internal const val DEPRECATED_ACCESS_API = + "It's recommended to migrate to the String or Extension Properties Access API https://kotlin.github.io/dataframe/apilevels.html" + internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted." internal const val COL_REPLACE = "col" diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index 4f9735d4c1..aefb0d43e9 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -149,8 +149,8 @@ class AllExceptTests : ColumnsSelectionDslTests() { listOf( df.select { name.firstName }, - df.select { name.allCols() except { colsAtAnyDepth { "last" in it.name } } }, - df.select { name.allCols() except colsAtAnyDepth { "last" in it.name } }, + df.select { name.allCols() except { colsAtAnyDepth().filter { "last" in it.name } } }, + df.select { name.allCols() except colsAtAnyDepth().filter { "last" in it.name } }, df.select { name.allCols() except { name.lastName } }, df.select { name.allCols() except name.lastName }, df.select { name.allCols() except { colGroup("name").col("lastName") } }, diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index 88b33f551d..0c584b0c98 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -55,21 +55,21 @@ class AtAnyDepth : TestBase() { dfGroup.select { name.firstName.firstName }, dfGroup.select { first { col -> col.any { it == "Alice" } }.atAnyDepthImpl() }, dfGroup.select { colsAtAnyDepth().first { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.first() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.first() }, dfGroup.select { colsAtAnyDepth().last { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.last() }, - dfGroup.select { colsAtAnyDepth().single { col -> col.any { it == "Alice" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "Alice" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.last() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "Alice" } }.single() }, ).shouldAllBeEqual() listOf( dfGroup.select { city }, dfGroup.select { colsAtAnyDepth().first { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.first() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.first() }, dfGroup.select { colsAtAnyDepth().last { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.last() }, - dfGroup.select { colsAtAnyDepth().single { col -> col.any { it == "London" } } }, - dfGroup.select { colsAtAnyDepth { col -> col.any { it == "London" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.last() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.single() }, + dfGroup.select { colsAtAnyDepth().filter { col -> col.any { it == "London" } }.single() }, ).shouldAllBeEqual() } @@ -78,7 +78,7 @@ class AtAnyDepth : TestBase() { listOf( df.select { name }, df.select { colsAtAnyDepth().colGroups() }, - df.select { colsAtAnyDepth { it.kind == Group } }, + df.select { colsAtAnyDepth().filter { it.kind == Group } }, df.select { colGroups() }, df.select { all().colGroups() }, df.select { all().colsAtAnyDepth().colGroups() }, @@ -111,7 +111,7 @@ class AtAnyDepth : TestBase() { fun `all allAtAnyDepth`() { dfGroup.getColumnsWithPaths { all().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal dfGroup - .getColumnsWithPaths { all().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { all().colsAtAnyDepth().filter { !it.isColumnGroup() } } .sortedBy { it.name } shouldBe atAnyDepthNoGroups } @@ -119,7 +119,7 @@ class AtAnyDepth : TestBase() { fun `cols allAtAnyDepth`() { dfGroup.getColumnsWithPaths { cols().colsAtAnyDepth().all() }.sortedBy { it.name } shouldBe atAnyDepthGoal dfGroup - .getColumnsWithPaths { cols().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { cols().colsAtAnyDepth().filter { !it.isColumnGroup() } } .sortedBy { it.name } shouldBe atAnyDepthNoGroups } diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index f78d83ead7..45edbe5bf8 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -30,7 +30,7 @@ class MoveTests { @Test fun `select all atAnyDepth`() { val selected = grouped - .getColumnsWithPaths { colGroups().colsAtAnyDepth { !it.isColumnGroup() } } + .getColumnsWithPaths { colGroups().colsAtAnyDepth().filter { !it.isColumnGroup() } } .map { it.path.joinToString(".") } selected shouldBe listOf("a.b", "a.c.d", "b.c", "b.d", "e.f") } @@ -38,7 +38,7 @@ class MoveTests { @Test fun `batch ungrouping`() { val ungrouped = grouped.move { - colsAtAnyDepth { it.depth() > 0 && !it.isColumnGroup() } + colsAtAnyDepth().filter { it.depth() > 0 && !it.isColumnGroup() } }.into { pathOf(it.path.joinToString(".")) } ungrouped.columnNames() shouldBe listOf("q", "a.b", "a.c.d", "b.c", "b.d", "w", "e.f", "r") } @@ -71,7 +71,7 @@ class MoveTests { @Test fun `select recursively`() { val selected = grouped.select { - it["a"].asColumnGroup().colsAtAnyDepth { !it.isColumnGroup() } + it["a"].asColumnGroup().colsAtAnyDepth().filter { !it.isColumnGroup() } } selected.columnNames() shouldBe listOf("b", "d") } @@ -80,7 +80,7 @@ class MoveTests { fun `columnsWithPath in selector`() { val selected = grouped.getColumnsWithPaths { it["a"] } val actual = grouped.getColumnsWithPaths { - selected.map { it.asColumnGroup().colsAtAnyDepth { !it.isColumnGroup() } }.toColumnSet() + selected.map { it.asColumnGroup().colsAtAnyDepth().filter { !it.isColumnGroup() } }.toColumnSet() } actual.map { it.path.joinToString(".") } shouldBe listOf("a.b", "a.c.d") } @@ -114,7 +114,7 @@ class MoveTests { @Test fun `move after with column selector`() { - val df = grouped.move { colsAtAnyDepth { it.name == "r" || it.name == "w" } } + val df = grouped.move { colsAtAnyDepth().filter { it.name == "r" || it.name == "w" } } .after { "a"["c"]["d"] } df.columnNames() shouldBe listOf("q", "a", "b", "e") df["a"]["c"].asColumnGroup().columnNames() shouldBe listOf("d", "w", "r") diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index c85d05e797..cb9b54f184 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -43,7 +43,7 @@ class PivotTests { } pivoted.columnsCount() shouldBe 3 pivoted.rowsCount() shouldBe 2 - val cols = pivoted.getColumns { allExcept(a).colsAtAnyDepth { !it.isColumnGroup() } } + val cols = pivoted.getColumns { allExcept(a).colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 4 cols.forEach { it.type() shouldBe typeOf() diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index 9fbb91e151..30c14645e2 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -19,10 +19,10 @@ class SingleTests : ColumnsSelectionDslTests() { df.select { Person::age.singleCol() } } shouldThrow { - df.select { single { false } } + df.select { cols().filter { false }.single() } } shouldThrow { - df.select { single { true } } + df.select { single() } } val singleDf = df.select { take(1) } @@ -32,12 +32,12 @@ class SingleTests : ColumnsSelectionDslTests() { singleDf.select { name }, singleDf.select { single() }, singleDf.select { all().single() }, - df.select { single { it.name().startsWith("n") } }, + df.select { cols().filter { it.name().startsWith("n") }.single() }, ).shouldAllBeEqual() listOf( df.select { name.firstName }, - df.select { name.colsOf().single { col -> col.any { it == "Alice" } } }, + df.select { name.colsOf().filter { col -> col.any { it == "Alice" } }.single() }, df.select { name.singleCol { col -> col.any { it == "Alice" } } }, df.select { "name".singleCol { col -> col.any { it == "Alice" } } }, df.select { Person::name.singleCol { col -> col.any { it == "Alice" } } }, diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt index 3c53afc800..665ff99883 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/PlaylistJsonTest.kt @@ -138,7 +138,7 @@ class PlaylistJsonTest { @Test fun `deep batch update all`() { val updated = item - .convert { colsAtAnyDepth { it.name() == "url" } } + .convert { colsAtAnyDepth().filter { it.name() == "url" } } .with { (it as? String)?.let { IMG(it) } } updated.snippet.thumbnails.default.url.type() shouldBe typeOf() updated.snippet.thumbnails.maxres.url.type() shouldBe typeOf() diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt index 32888d31ce..a798cd386c 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Access.kt @@ -590,7 +590,7 @@ class Access : TestBase() { df.select { name.allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { name.colsAtAnyDepth { !it.isColumnGroup() } } + df.select { name.colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -626,7 +626,7 @@ class Access : TestBase() { df.select { Person::name.allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { Person::name.colsAtAnyDepth { !it.isColumnGroup() } } + df.select { Person::name.colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -660,7 +660,7 @@ class Access : TestBase() { df.select { "name".allCols() } // traversal of columns at any depth from here excluding ColumnGroups - df.select { "name".colsAtAnyDepth { !it.isColumnGroup() } } + df.select { "name".colsAtAnyDepth().filter { !it.isColumnGroup() } } // SampleEnd } @@ -719,13 +719,13 @@ class Access : TestBase() { } // traversal of columns at any depth from here excluding ColumnGroups - df.select { colsAtAnyDepth { !it.isColumnGroup() } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() } } // traversal of columns at any depth from here including ColumnGroups df.select { colsAtAnyDepth() } // traversal of columns at any depth with condition - df.select { colsAtAnyDepth { it.name().contains(":") } } + df.select { colsAtAnyDepth().filter() { it.name().contains(":") } } // traversal of columns at any depth to find columns of given type df.select { colsAtAnyDepth().colsOf() } @@ -743,18 +743,18 @@ class Access : TestBase() { fun columnSelectorsModifySet() { // SampleStart // first/last n value- and frame columns in column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.take(3) } - df.select { colsAtAnyDepth { !it.isColumnGroup() }.takeLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.takeLast(3) } // all except first/last n value- and frame columns in column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.drop(3) } - df.select { colsAtAnyDepth { !it.isColumnGroup() }.dropLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.drop(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.dropLast(3) } // filter column set by condition - df.select { colsAtAnyDepth { !it.isColumnGroup() }.filter { it.name().startsWith("year") } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() && it.name().startsWith("year") } } // exclude columns from column set - df.select { colsAtAnyDepth { !it.isColumnGroup() }.except { age } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.except { age } } // keep only unique columns df.select { (colsOf() and age).distinct() } diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt index 4c63fe51ae..f4281d1568 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt @@ -932,7 +932,7 @@ class DataFrameTests : BaseTest() { df["e"].kind() shouldBe ColumnKind.Group df.getColumnGroup("d").columnNames() shouldBe listOf("f") df.getColumnGroup("e").getColumnGroup("g").columnNames() shouldBe listOf("h") - val cols = df.getColumns { colsAtAnyDepth { !it.isColumnGroup() } } + val cols = df.getColumns { colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 5 cols.forEach { it.toList() shouldBe expected diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt index 38a185722b..f20f43269d 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt @@ -288,7 +288,7 @@ class DataFrameTreeTests : BaseTest() { @Test fun `select atAnyDepth`() { - val cols = typed2.select { colsAtAnyDepth { it.hasNulls } } + val cols = typed2.select { colsAtAnyDepth().filter { it.hasNulls } } cols shouldBe typed2.select { nameAndCity.city and weight } } @@ -535,14 +535,16 @@ class DataFrameTreeTests : BaseTest() { @Test fun parentColumnTest() { - val res = typed2.move { colsAtAnyDepth { it.depth > 0 } }.toTop { it.parentName + "-" + it.name } + val res = typed2.move { colsAtAnyDepth().filter { it.depth > 0 } }.toTop { it.parentName + "-" + it.name } res.columnsCount() shouldBe 4 res.columnNames() shouldBe listOf("nameAndCity-name", "nameAndCity-city", "age", "weight") } @Test fun `group cols`() { - val joined = typed2.move { colsAtAnyDepth { !it.isColumnGroup() } }.into { pathOf(it.path.joinToString(".")) } + val joined = typed2.move { + colsAtAnyDepth().filter { !it.isColumnGroup() } + }.into { pathOf(it.path.joinToString(".")) } val grouped = joined.group { nameContains(".") }.into { it.name().substringBefore(".") } val expected = typed2.rename { nameAndCity.allCols() }.into { it.path.joinToString(".") } grouped shouldBe expected diff --git a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt index 84be5b6027..d8dd136982 100644 --- a/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt +++ b/core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/PivotTests.kt @@ -283,7 +283,7 @@ class PivotTests { val leafColumns = pivoted.getColumnsWithPaths { all() .drop(1) - .colsAtAnyDepth { !it.isColumnGroup() } + .colsAtAnyDepth().filter { !it.isColumnGroup() } } leafColumns.size shouldBe typed.name.countDistinct() * typed.key.countDistinct() - 1 leafColumns.forEach { it.path.size shouldBe 2 } @@ -344,7 +344,7 @@ class PivotTests { // nullGroup.columnTypes() shouldBe listOf(typeOf?>(), typeOf?>()) nullGroup.columnTypes() shouldBe listOf(nothingType(true), nothingType(true)) - val cols = pivotedDf.getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } } + val cols = pivotedDf.getColumnsWithPaths { colsAtAnyDepth().filter { !it.isColumnGroup() } } cols.size shouldBe 2 * typed.name.countDistinct() * typed.key.countDistinct() - 2 cols.forEach { diff --git a/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html b/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html index 13212e4a82..99654215e6 100644 --- a/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html +++ b/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html @@ -177,7 +177,7 @@ -
+

@@ -458,23 +458,23 @@ /**/ /**/ /**/ -call_DataFrame(function() { DataFrame.renderTable(-1426063360) }); +call_DataFrame(function() { DataFrame.renderTable(-553648128) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html index e970b7b26b..965d0f1659 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "ColumnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "column_b", children: [], rightAlign: false, values: ["a","b"] }, { name: "COLUMN-C", children: [], rightAlign: false, values: ["true","false"] }, -], id: -1426063357, rootId: -1426063357, totalRows: 2 } ) }); +], id: -553648125, rootId: -553648125, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063357) }); +call_DataFrame(function() { DataFrame.renderTable(-553648125) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html index 456766324f..fd4d1bcb79 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "columnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "column_b", children: [], rightAlign: false, values: ["a","b"] }, { name: "columnC", children: [], rightAlign: false, values: ["true","false"] }, -], id: -1426063356, rootId: -1426063356, totalRows: 2 } ) }); +], id: -553648124, rootId: -553648124, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063356) }); +call_DataFrame(function() { DataFrame.renderTable(-553648124) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html index a40bcfc659..aaac896cf0 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "columnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "columnB", children: [], rightAlign: false, values: ["a","b"] }, { name: "columnC", children: [], rightAlign: false, values: ["true","false"] }, -], id: -1426063355, rootId: -1426063355, totalRows: 2 } ) }); +], id: -553648123, rootId: -553648123, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063355) }); +call_DataFrame(function() { DataFrame.renderTable(-553648123) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html index 82817aa3cd..e9f9bd31c2 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -461,10 +461,10 @@ { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-pl..., ...]","[domain-specific-language, dsl]","[code-editor, ide, intellij, i..., i...]","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intel..., ...]","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, ...]","[]","[]","[gradle, gradle-intellij-plugin, ...]","[sprite, svg, svg-sprite, svg-s..., ...]","[hacktoberfest, jetbrains, plugin, ...]","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, ...]","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, ...]","[intellij, intellij-idea, intel..., ...]"] }, { name: "isIntellij", children: [], rightAlign: false, values: ["true","false","true","true","false","true","false","false","true","false","false","true","false","false","false","false","false","false","false","true"] }, -], id: -1426063348, rootId: -1426063348, totalRows: 24 } ) }); +], id: -553648116, rootId: -553648116, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063348) }); +call_DataFrame(function() { DataFrame.renderTable(-553648116) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html index 82fe0684de..d082e15136 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html @@ -177,7 +177,7 @@ -
+

@@ -458,8 +458,8 @@ /**/ /**/ /**/ -call_DataFrame(function() { DataFrame.renderTable(-1426063347) }); +call_DataFrame(function() { DataFrame.renderTable(-553648115) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html index 0a4932062e..d1dd5256ef 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html @@ -177,7 +177,7 @@ -
+

@@ -459,10 +459,10 @@ /**/ -call_DataFrame(function() { DataFrame.renderTable(-1426063344) }); +call_DataFrame(function() { DataFrame.renderTable(-553648112) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html index 73b123769d..638120234d 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "isIntellij", children: [], rightAlign: false, values: ["true","false"] }, { name: "sumStars", children: [], rightAlign: true, values: ["25221","85392"] }, { name: "maxStars", children: [], rightAlign: true, values: ["12926","39402"] }, -], id: -1426063343, rootId: -1426063343, totalRows: 2 } ) }); +], id: -553648111, rootId: -553648111, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063343) }); +call_DataFrame(function() { DataFrame.renderTable(-553648111) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html index 614bc868f7..cbd6378f27 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html @@ -177,7 +177,7 @@ -
+

@@ -461,10 +461,10 @@ { name: "starsCount", children: [], rightAlign: true, values: ["39402","12926","7101","6805","6120","6059","5688","2836","2628","2424"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[compiler, gradle-plugin, intel..., ...]","[code-editor, ide, intellij, i..., i...]","[c, compiler, kotlin, llvm, objective-c]","[android, awt, compose, declara..., ...]","[ideavim, intellij, intellij-pl..., ...]","[coding-font, font, ligatures, ...]","[dao, kotlin, orm, sql]","[components, jetbrains-ui, react]","[]","[create-react-app, jetbrains-ui, ...]"] }, { name: "isIntellij", children: [], rightAlign: false, values: ["false","true","false","false","true","false","false","false","false","false"] }, -], id: -1426063342, rootId: -1426063342, totalRows: 10 } ) }); +], id: -553648110, rootId: -553648110, totalRows: 10 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063342) }); +call_DataFrame(function() { DataFrame.renderTable(-553648110) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html index b9149cbfde..f44d1342c6 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 562 rows

@@ -462,10 +462,10 @@ { name: "stargazers_count", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, { name: "topics", children: [], rightAlign: false, values: ["[]","[jetbrains, jetbrains-youtrack, youtr...","[]","[ideavim, intellij, intellij-platform...","[]","[]","[]","[]","[nuget, nuget-feed, teamcity, teamcit...","[]","[]","[]","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[c-sharp, teamcity, teamcity-service-...","[]","[intellij-idea, intellij-plugin, scala]","[]","[]","[compiler, gradle-plugin, intellij-pl..."] }, { name: "watchers", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, -], id: -1426063354, rootId: -1426063354, totalRows: 562 } ) }); +], id: -553648122, rootId: -553648122, totalRows: 562 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063354) }); +call_DataFrame(function() { DataFrame.renderTable(-553648122) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html index 72f5c3f51b..da0a3bb8be 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html @@ -177,7 +177,7 @@ -
+

@@ -471,10 +471,10 @@ { name: "?\">median", children: [], rightAlign: false, values: ["JetBrains/lightbeam","null","8","[]","8"] }, { name: "?\">p75", children: [], rightAlign: false, values: ["JetBrains/teamcity-bazel-plugin","null","48","[awt, swing]","48"] }, { name: "?\">max", children: [], rightAlign: false, values: ["JetBrains/ztools","null","39402","[youtrack, youtrack-workflow]","39402"] }, -], id: -1426063353, rootId: -1426063353, totalRows: 5 } ) }); +], id: -553648121, rootId: -553648121, totalRows: 5 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063353) }); +call_DataFrame(function() { DataFrame.renderTable(-553648121) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html index c78ba26822..9743054374 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 562 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "full_name", children: [], rightAlign: false, values: ["JetBrains/JPS","JetBrains/YouTrackSharp","JetBrains/colorSchemeTool","JetBrains/ideavim","JetBrains/youtrack-vcs-hooks","JetBrains/youtrack-rest-ruby-library","JetBrains/emacs4ij","JetBrains/codereview4intellij","JetBrains/teamcity-nuget-support","JetBrains/Grammar-Kit","JetBrains/intellij-starteam-plugin","JetBrains/la-clojure","JetBrains/MPS","JetBrains/intellij-community","JetBrains/TeamCity.ServiceMessages","JetBrains/youtrack-rest-python-library","JetBrains/intellij-scala","JetBrains/teamcity-messages","JetBrains/teamcity-cpp","JetBrains/kotlin"] }, { name: "stargazers_count", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, { name: "topics", children: [], rightAlign: false, values: ["[]","[jetbrains, jetbrains-youtrack, youtr...","[]","[ideavim, intellij, intellij-platform...","[]","[]","[]","[]","[nuget, nuget-feed, teamcity, teamcit...","[]","[]","[]","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[c-sharp, teamcity, teamcity-service-...","[]","[intellij-idea, intellij-plugin, scala]","[]","[]","[compiler, gradle-plugin, intellij-pl..."] }, -], id: -1426063352, rootId: -1426063352, totalRows: 562 } ) }); +], id: -553648120, rootId: -553648120, totalRows: 562 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063352) }); +call_DataFrame(function() { DataFrame.renderTable(-553648120) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html index e57e454330..6468fb7827 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "full_name", children: [], rightAlign: false, values: ["JetBrains/ideavim","JetBrains/MPS","JetBrains/intellij-community","JetBrains/intellij-scala","JetBrains/kotlin","JetBrains/intellij-plugins","JetBrains/Exposed","JetBrains/kotlin-web-site","JetBrains/idea-gitignore","JetBrains/swot","JetBrains/phpstorm-stubs","JetBrains/gradle-intellij-plugin","JetBrains/svg-sprite-loader","JetBrains/resharper-unity","JetBrains/kotlin-native","JetBrains/create-react-kotlin-app","JetBrains/ring-ui","JetBrains/kotlinconf-app","JetBrains/JetBrainsMono","JetBrains/intellij-platform-plugin-te..."] }, { name: "stargazers_count", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-platform...","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intellij-pl...","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, i...","[]","[]","[gradle, gradle-intellij-plugin, grad...","[sprite, svg, svg-sprite, svg-stack, ...","[hacktoberfest, jetbrains, plugin, re...","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, kotl...","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, monosp...","[intellij, intellij-idea, intellij-id..."] }, -], id: -1426063351, rootId: -1426063351, totalRows: 24 } ) }); +], id: -553648119, rootId: -553648119, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063351) }); +call_DataFrame(function() { DataFrame.renderTable(-553648119) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html index 2169974234..e6429b1e52 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "name", children: [], rightAlign: false, values: ["JetBrains/ideavim","JetBrains/MPS","JetBrains/intellij-community","JetBrains/intellij-scala","JetBrains/kotlin","JetBrains/intellij-plugins","JetBrains/Exposed","JetBrains/kotlin-web-site","JetBrains/idea-gitignore","JetBrains/swot","JetBrains/phpstorm-stubs","JetBrains/gradle-intellij-plugin","JetBrains/svg-sprite-loader","JetBrains/resharper-unity","JetBrains/kotlin-native","JetBrains/create-react-kotlin-app","JetBrains/ring-ui","JetBrains/kotlinconf-app","JetBrains/JetBrainsMono","JetBrains/intellij-platform-plugin-te..."] }, { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-platform...","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intellij-pl...","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, i...","[]","[]","[gradle, gradle-intellij-plugin, grad...","[sprite, svg, svg-sprite, svg-stack, ...","[hacktoberfest, jetbrains, plugin, re...","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, kotl...","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, monosp...","[intellij, intellij-idea, intellij-id..."] }, -], id: -1426063350, rootId: -1426063350, totalRows: 24 } ) }); +], id: -553648118, rootId: -553648118, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063350) }); +call_DataFrame(function() { DataFrame.renderTable(-553648118) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html index d7ef13f241..37e35daa59 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "name", children: [], rightAlign: false, values: ["ideavim","MPS","intellij-community","intellij-scala","kotlin","intellij-plugins","Exposed","kotlin-web-site","idea-gitignore","swot","phpstorm-stubs","gradle-intellij-plugin","svg-sprite-loader","resharper-unity","kotlin-native","create-react-kotlin-app","ring-ui","kotlinconf-app","JetBrainsMono","intellij-platform-plugin-template"] }, { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-pl..., ...]","[domain-specific-language, dsl]","[code-editor, ide, intellij, i..., i...]","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intel..., ...]","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, ...]","[]","[]","[gradle, gradle-intellij-plugin, ...]","[sprite, svg, svg-sprite, svg-s..., ...]","[hacktoberfest, jetbrains, plugin, ...]","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, ...]","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, ...]","[intellij, intellij-idea, intel..., ...]"] }, -], id: -1426063349, rootId: -1426063349, totalRows: 24 } ) }); +], id: -553648117, rootId: -553648117, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-1426063349) }); +call_DataFrame(function() { DataFrame.renderTable(-553648117) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html index ac5a705c0f..2d8a667566 100644 --- a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html +++ b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html @@ -85,5 +85,5 @@ window.addEventListener('resize', sendHeight); -

columnGroup

    | [column, ..]

    | [{ condition }]

    | { colsSelector }

    | .allCols()

    | .allCols(Before|After|From|UpTo) ( (column) | { colSelector } )

    | .allColsExcept { colsSelector }

    | .allColsExcept(columnNoAccessor, ..)

    | .and (|{ columnOrSet }|)

    | (.col| .valueCol| .frameCol| .colGroup)[<T>](column | index)

    | (.cols| .valueCols| .frameCols| .colGroups) [ { condition } ]

    | .cols[<T>](column,.. |index,.. |indexRange)

    | .colsAtAnyDepth [ { condition } ]

    | .colsInGroups [ { condition } ]

    | .colsName(Starts|Ends)With(text[, ignoreCase])

    | .colsNameContains(text[, ignoreCase] | regex)

    | .colsOfKind(kind, ..) [ { condition } ]

    | .colsWithoutNulls()

    | .drop(Last)Cols(number)

    | .drop(Last)ColsWhile { condition }

    | .except { colsSelector }

    | .except(columnNoAccessor, ..)

    | (.firstCol| .lastCol| .singleCol) [ { condition } ]

    | .select { colsSelector }

    | .take(Last)Cols(number)

    | .take(Last)ColsWhile { condition }

    

singleColumn

    .colsOf<T> [ (kType) ] [ { condition } ]

    

columnGroupReference

    .colsOf<T>(kType) [ { condition } ]

+

columnGroup

    | [column, ..]

    | [{ condition }]

    | { colsSelector }

    | .allCols()

    | .allCols(Before|After|From|UpTo) ( (column) | { colSelector } )

    | .allColsExcept { colsSelector }

    | .allColsExcept(columnNoAccessor, ..)

    | .and (|{ columnOrSet }|)

    | (.col| .valueCol| .frameCol| .colGroup)[<T>](column | index)

    | (.cols| .valueCols| .frameCols| .colGroups) [ { condition } ]

    | .cols[<T>](column,.. |index,.. |indexRange)

    | .colsAtAnyDepth()

    | .colsInGroups()

    | .colsName(Starts|Ends)With(text[, ignoreCase])

    | .colsNameContains(text[, ignoreCase] | regex)

    | .colsOfKind(kind, ..) [ { condition } ]

    | .colsWithoutNulls()

    | .drop(Last)Cols(number)

    | .drop(Last)ColsWhile { condition }

    | .except { colsSelector }

    | .except(columnNoAccessor, ..)

    | (.firstCol|.lastCol) [ { condition } ]

    | .singleCol()

    | .select { colsSelector }

    | .take(Last)Cols(number)

    | .take(Last)ColsWhile { condition }

    

singleColumn

    .colsOf<T> [ (kType) ] [ { condition } ]

    

columnGroupReference

    .colsOf<T>(kType) [ { condition } ]

diff --git a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html index 107d1af8de..74d9b9d611 100644 --- a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html +++ b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html @@ -85,5 +85,5 @@ window.addEventListener('resize', sendHeight); -

columnSet

    [index]

    | [index,.. |indexRange]

    | [{ condition }]

    | .all()

    | .all(Before|After|From|UpTo) ( (column) | { condition } )

    | .and (|{ columnOrSet }|)

    | (.col| .valueCol| .frameCol| .colGroup)(index)

    | (.cols| .valueCols| .frameCols| .colGroups) [ { condition } ]

    | .cols(index,.. |indexRange)

    | .colsAtAnyDepth [ { condition } ]

    | .colsInGroups [ { condition } ]

    | .colsOf<T> [ (kType) ] [ { condition } ]

    | .colsOfKind(kind, ..) [ { condition } ]

    | .distinct()

    | .drop(Last)(number)

    | .drop(Last)While { condition }

    | except [ { ] columnsResolver [ } ]

    | except column

    | .except(column, ..)

    | .filter { condition }

    | (.first| .last| .single) [ { condition } ]

    | .name(Starts|Ends)With(text[, ignoreCase])

    | .nameContains(text[, ignoreCase] | regex)

    | .simplify()

    | .take(Last)(number)

    | .take(Last)While { condition }

    | .withoutNulls()

+

columnSet

    [index]

    | [index,.. |indexRange]

    | [{ condition }]

    | .all()

    | .all(Before|After|From|UpTo) ( (column) | { condition } )

    | .and (|{ columnOrSet }|)

    | (.col| .valueCol| .frameCol| .colGroup)(index)

    | (.cols| .valueCols| .frameCols| .colGroups) [ { condition } ]

    | .cols(index,.. |indexRange)

    | .colsAtAnyDepth()

    | .colsInGroups()

    | .colsOf<T> [ (kType) ] [ { condition } ]

    | .colsOfKind(kind, ..) [ { condition } ]

    | .distinct()

    | .drop(Last)(number)

    | .drop(Last)While { condition }

    | except [ { ] columnsResolver [ } ]

    | except column

    | .except(column, ..)

    | .filter { condition }

    | (.first|.last) [ { condition } ]

    | .single()

    | .name(Starts|Ends)With(text[, ignoreCase])

    | .nameContains(text[, ignoreCase] | regex)

    | .simplify()

    | .take(Last)(number)

    | .take(Last)While { condition }

    | .withoutNulls()

diff --git a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html index 679d3d28dd..c04dc9c229 100644 --- a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html +++ b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html @@ -85,5 +85,5 @@ window.addEventListener('resize', sendHeight); -

columnGroupReference: String | KProperty<*> | ColumnPath

colSelector: ColumnSelector

colsSelector: ColumnsSelector

column: ColumnAccessor | String |KProperty<*> | ColumnPath

columnGroup: SingleColumn<DataRow<*>> | String | KProperty<* | DataRow<*>> | ColumnPath

columnNoAccessor: String | KProperty<*> | ColumnPath

columnOrSet: column | columnSet

columnSet: ColumnSet<*>

columnsResolver: ColumnsResolver

condition: ColumnFilter

expression: Column Expression

ignoreCase: Boolean

index: Int

indexRange: IntRange

infer: Infer

kind: ColumnKind

kType: KType

name: String

number: Int

regex: Regex

singleColumn: SingleColumn<DataRow<*>>

T: Column type

text: String

+

columnGroupReference: String | ColumnPath

colSelector: ColumnSelector

colsSelector: ColumnsSelector

column: ColumnAccessor | String | ColumnPath

columnGroup: SingleColumn<DataRow<*>> | String | ColumnPath

columnNoAccessor: String | ColumnPath

columnOrSet: column | columnSet

columnSet: ColumnSet<*>

columnsResolver: ColumnsResolver

condition: ColumnFilter

expression: Column Expression

ignoreCase: Boolean

index: Int

indexRange: IntRange

infer: Infer

kind: ColumnKind

kType: KType

name: String

number: Int

regex: Regex

singleColumn: SingleColumn<DataRow<*>>

T: Column type

text: String

diff --git a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html index 21e5aa15f7..c786264e38 100644 --- a/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html +++ b/docs/StardustDocs/resources/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html @@ -85,5 +85,5 @@ window.addEventListener('resize', sendHeight); -

column .. column

| this/it[column,..]

| this/it[{ condition }]

| all()

| all(Before|After|From|UpTo) ( (column)|{ colSelector } )

| allExcept { colsSelector }

| allExcept(column, ..)

| columnOrSet and [ { ] columnOrSet [ } ]

| columnOrSet.and (|{ columnOrSet }|)

| (col| valueCol| frameCol| colGroup)[<T>](column | index)

| (cols| valueCols| frameCols| colGroups) [ { condition } ]

| cols[<T>](column,.. |index,.. |indexRange)

| colsAtAnyDepth [ { condition } ]

| colsInGroups [ { condition } ]

| colsOf<T> [ (kType) ] [ { condition } ]

| colsOfKind(kind, ..) [ { condition } ]

| drop(Last)(number)

| drop(Last)While { condition }

| expr([name,][infer]) { expression }

| (first| last| single) [ { condition } ]

| nameContains(text[, ignoreCase] | regex)

| name(Starts|Ends)With(text[, ignoreCase])

| column named/into column

| column(.named|.into)(column)

| none()

| take(Last)(number)

| take(Last)While { condition }

| withoutNulls()

+

column .. column

| this/it[column,..]

| this/it[{ condition }]

| all()

| all(Before|After|From|UpTo) ( (column)|{ colSelector } )

| allExcept { colsSelector }

| allExcept(column, ..)

| columnOrSet and [ { ] columnOrSet [ } ]

| columnOrSet.and (|{ columnOrSet }|)

| (col| valueCol| frameCol| colGroup)[<T>](column | index)

| (cols| valueCols| frameCols| colGroups) [ { condition } ]

| cols[<T>](column,.. |index,.. |indexRange)

| colsAtAnyDepth()

| colsInGroups()

| colsOf<T> [ (kType) ] [ { condition } ]

| colsOfKind(kind, ..) [ { condition } ]

| drop(Last)(number)

| drop(Last)While { condition }

| expr([name,][infer]) { expression }

| (first|last) [ { condition } ]

| single()

| nameContains(text[, ignoreCase] | regex)

| name(Starts|Ends)With(text[, ignoreCase])

| column named/into column

| column(.named|.into)(column)

| none()

| take(Last)(number)

| take(Last)While { condition }

| withoutNulls()

diff --git a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html index 3f6b672696..970d6859fd 100644 --- a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html +++ b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html @@ -322,7 +322,7 @@
- df.select { name.colsAtAnyDepth { !it.isColumnGroup() } } + df.select { name.colsAtAnyDepth().filter { !it.isColumnGroup() } }
Input DataFrame: rowsCount = 7, columnsCount = 5
diff --git a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html index f2122d05f1..29b762e400 100644 --- a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html +++ b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html @@ -390,7 +390,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() } }
Input DataFrame: rowsCount = 7, columnsCount = 6
@@ -422,7 +422,7 @@

- df.select { colsAtAnyDepth { it.name().contains(":") } } + df.select { colsAtAnyDepth().filter() { it.name().contains(":") } }
Input DataFrame: rowsCount = 7, columnsCount = 6
diff --git a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html index 4db604504f..52e480ab8c 100644 --- a/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html +++ b/docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html @@ -178,7 +178,7 @@
- df.select { colsAtAnyDepth { !it.isColumnGroup() }.take(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(3) }
Input DataFrame: rowsCount = 7, columnsCount = 5
@@ -194,7 +194,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() }.takeLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.takeLast(3) }
Input DataFrame: rowsCount = 7, columnsCount = 5
@@ -210,7 +210,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() }.drop(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.drop(3) }
Input DataFrame: rowsCount = 7, columnsCount = 5
@@ -226,7 +226,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() }.dropLast(3) } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.dropLast(3) }
Input DataFrame: rowsCount = 7, columnsCount = 5
@@ -242,7 +242,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() }.filter { it.name().startsWith("year") } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() && it.name().startsWith("year") } }
Input DataFrame: rowsCount = 7, columnsCount = 5
@@ -258,7 +258,7 @@

- df.select { colsAtAnyDepth { !it.isColumnGroup() }.except { age } } + df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.except { age } }
Input DataFrame: rowsCount = 7, columnsCount = 5
diff --git a/docs/StardustDocs/topics/ColumnSelectors.md b/docs/StardustDocs/topics/ColumnSelectors.md index 9fc19133d6..eded79ccff 100644 --- a/docs/StardustDocs/topics/ColumnSelectors.md +++ b/docs/StardustDocs/topics/ColumnSelectors.md @@ -451,7 +451,7 @@ df.select { name..age } df.select { name.allCols() } // traversal of columns at any depth from here excluding ColumnGroups -df.select { name.colsAtAnyDepth { !it.isColumnGroup() } } +df.select { name.colsAtAnyDepth().filter { !it.isColumnGroup() } } ``` @@ -484,7 +484,7 @@ df.select { "name".."age" } df.select { "name".allCols() } // traversal of columns at any depth from here excluding ColumnGroups -df.select { "name".colsAtAnyDepth { !it.isColumnGroup() } } +df.select { "name".colsAtAnyDepth().filter { !it.isColumnGroup() } } ``` @@ -549,13 +549,13 @@ df.select { } // traversal of columns at any depth from here excluding ColumnGroups -df.select { colsAtAnyDepth { !it.isColumnGroup() } } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() } } // traversal of columns at any depth from here including ColumnGroups df.select { colsAtAnyDepth() } // traversal of columns at any depth with condition -df.select { colsAtAnyDepth { it.name().contains(":") } } +df.select { colsAtAnyDepth().filter() { it.name().contains(":") } } // traversal of columns at any depth to find columns of given type df.select { colsAtAnyDepth().colsOf() } @@ -576,18 +576,18 @@ df.select { take(2) and col(3) } ```kotlin // first/last n value- and frame columns in column set -df.select { colsAtAnyDepth { !it.isColumnGroup() }.take(3) } -df.select { colsAtAnyDepth { !it.isColumnGroup() }.takeLast(3) } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.take(3) } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.takeLast(3) } // all except first/last n value- and frame columns in column set -df.select { colsAtAnyDepth { !it.isColumnGroup() }.drop(3) } -df.select { colsAtAnyDepth { !it.isColumnGroup() }.dropLast(3) } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.drop(3) } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.dropLast(3) } // filter column set by condition -df.select { colsAtAnyDepth { !it.isColumnGroup() }.filter { it.name().startsWith("year") } } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() && it.name().startsWith("year") } } // exclude columns from column set -df.select { colsAtAnyDepth { !it.isColumnGroup() }.except { age } } +df.select { colsAtAnyDepth().filter { !it.isColumnGroup() }.except { age } } // keep only unique columns df.select { (colsOf() and age).distinct() } diff --git a/examples/idea-examples/titanic/src/main/kotlin/org/jetbrains/kotlinx/dataframe/examples/titanic/ml/titanic.kt b/examples/idea-examples/titanic/src/main/kotlin/org/jetbrains/kotlinx/dataframe/examples/titanic/ml/titanic.kt index 685c2520a6..19520bca36 100644 --- a/examples/idea-examples/titanic/src/main/kotlin/org/jetbrains/kotlinx/dataframe/examples/titanic/ml/titanic.kt +++ b/examples/idea-examples/titanic/src/main/kotlin/org/jetbrains/kotlinx/dataframe/examples/titanic/ml/titanic.kt @@ -82,7 +82,7 @@ private fun OnHeapDataset.Companion.create( fun extractX(): Array = dataframe.remove(yColumn) - .convert { colsAtAnyDepth { !it.isColumnGroup() } }.toFloat() + .convert { colsAtAnyDepth().filter { !it.isColumnGroup() } }.toFloat() .merge { colsAtAnyDepth().colsOf() }.by { it.toFloatArray() }.into("X") .getColumn("X").cast().toTypedArray()