From 073e1bbbe713f24d0a8f55ee2d36998e6dff7642 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 29 Jan 2025 13:36:21 +0100 Subject: [PATCH 1/7] added tests for issue 761, fixed allColumnsExceptKeepingStructure --- .../kotlinx/dataframe/api/allExcept.kt | 2 +- .../kotlinx/dataframe/impl/columns/Utils.kt | 97 ++++++++++--------- .../kotlinx/dataframe/api/allExcept.kt | 29 +++++- 3 files changed, 78 insertions(+), 50 deletions(-) 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 9129fa06c5..5405772d29 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 @@ -665,7 +665,7 @@ public interface AllExceptColumnsSelectionDsl { internal fun ColumnSet.exceptInternal(other: ColumnsResolver<*>): ColumnSet = createColumnSet { context -> val resolvedCols = this.resolve(context) - val resolvedColsToExcept = other.resolve(context) + val resolvedColsToExcept = other.resolve(context).toSet() resolvedCols.allColumnsExceptKeepingStructure(resolvedColsToExcept) } as ColumnSet diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt index 4eac81874f..a6ce34f0e0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt @@ -416,59 +416,66 @@ internal fun List>.allColumnsExceptAndUnpack( * Empty groups will be removed if [removeEmptyGroups]` == true` */ internal fun List>.allColumnsExceptKeepingStructure( - columns: Iterable>, + columns: Set>, removeEmptyGroups: Boolean = true, ): List> { if (isEmpty()) return emptyList() - val fullTree = collectTree() - for (columnToExcept in columns) { - // grab the node representing the column from the tree - val nodeToExcept = fullTree.getOrPut(columnToExcept.path).asNullable() - if (nodeToExcept != null) { - // remove the children from the node (if it's a column group) and remove its data (the column itself) - nodeToExcept.allChildren().forEach { it.data = null } - nodeToExcept.data = null - - // we need to update the data of the parent node(s) to reflect the removal of the column - if (nodeToExcept.parent != null) { - // we grab the data of the parent node, which should be a column group - // treat it as a DF to remove the column to except from it and - // convert it back to a column group - val current = nodeToExcept.parent.data as ColumnGroup<*>? ?: continue - val adjustedCurrent = current - .remove(nodeToExcept.name) - .asColumnGroup(current.name) - .addPath(current.path()) - - // remove the group if it's empty and removeEmptyGroups is true - // else, simply update the parent's data with the adjusted column group - nodeToExcept.parent.data = - if (adjustedCurrent.cols().isEmpty() && removeEmptyGroups) { - null - } else { - adjustedCurrent + return flatMap { + val fullTree = listOf(it).collectTree() + for (columnToExcept in columns.sortedByDescending { it.path.size }) { + // grab the node representing the column from the tree + val nodeToExcept = fullTree.getOrPut(columnToExcept.path).asNullable() + if (nodeToExcept != null) { + // remove the children from the node (if it's a column group) and remove its data (the column itself) + nodeToExcept.allChildren().forEach { it.data = null } + nodeToExcept.data = null + + // we need to update the data of the parent node(s) to reflect the removal of the column + if (nodeToExcept.parent != null) { + // we grab the data of the parent node, which should be a column group + // treat it as a DF to remove the column to except from it and + // convert it back to a column group + val current = nodeToExcept.parent.data as ColumnGroup<*>? ?: continue + val adjustedCurrent = current + .remove(nodeToExcept.name) + .asColumnGroup(current.name) + .addPath(current.path()) + + // remove the group if it's empty and removeEmptyGroups is true + // else, simply update the parent's data with the adjusted column group + nodeToExcept.parent.data = + if (adjustedCurrent.cols().isEmpty() && removeEmptyGroups) { + null + } else { + adjustedCurrent + } + + // now we update the parent's parents recursively with new column group instances + var parent = nodeToExcept.parent.parent + + @Suppress("UNNECESSARY_NOT_NULL_ASSERTION") + var currentNode = nodeToExcept.parent!! + while (parent != null) { + val parentData = parent.data as ColumnGroup<*>? ?: break + val currentData = currentNode.data + val modifiedParentData = + if (currentData == null) { + parentData.remove(currentNode.name) + } else { + parentData.replace(currentNode.name).with { currentData } + } + parent.data = modifiedParentData + .asColumnGroup(parentData.name) + .addPath(parentData.path()) + currentNode = parent + parent = parent.parent } - - // now we update the parent's parents recursively with new column group instances - var parent = nodeToExcept.parent.parent - - @Suppress("UNNECESSARY_NOT_NULL_ASSERTION") - var currentNode = nodeToExcept.parent!! - while (parent != null) { - val parentData = parent.data as ColumnGroup<*>? ?: break - parent.data = parentData - .replace(currentNode.name).with { currentNode.data!! } - .asColumnGroup(parentData.name) - .addPath(parentData.path()) - - currentNode = parent - parent = parent.parent } } } + val subtrees = fullTree.topmostChildren { it.data != null } + subtrees.map { it.data!!.addPath(it.pathFromRoot()) } } - val subtrees = fullTree.topmostChildren { it.data != null } - return subtrees.map { it.data!!.addPath(it.pathFromRoot()) } } /** 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 8489a9db32..5466a55507 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 @@ -16,6 +16,24 @@ import org.junit.Test class AllExceptTests : ColumnsSelectionDslTests() { + @Test + fun `issue 761`() { + val renamed = df.rename { colsAtAnyDepth() except name.firstName }.into { it.name.uppercase() } + renamed.columnNames() shouldBe listOf("NAME", "AGE", "CITY", "WEIGHT", "ISHAPPY") + renamed.getColumnGroup("NAME").columnNames() shouldBe listOf("firstName", "LASTNAME") + + val df2 = dataFrameOf("a.b", "a.c.d", "d.e", "d.f")(1, 3.0, 2, "b") + .move { all() }.into { it.name.split(".").toPath() } + df2.select { cols("a") except "a"["b"] }.let { + it.getColumnGroup("a").getColumnOrNull("b") shouldBe null + it[pathOf("a", "c", "d")].single() shouldBe 3.0 + } + df2.select { cols("a") except "a"["c"]["d"] }.let { + it.getColumnGroup("a").getColumnOrNull("c") shouldBe null + it[pathOf("a", "b")].single() shouldBe 1 + } + } + @Test fun `exceptions`() { shouldThrow { @@ -70,12 +88,15 @@ class AllExceptTests : ColumnsSelectionDslTests() { ).shouldAllBeEqual() listOf( - df.select { name and name.firstName }.alsoDebug(), + df.select { cols(name) except name.firstName }, + df.select { (name and name.firstName and name.firstName) except name.firstName }, + df.select { (name and name and name.firstName).except(name.firstName).simplify() }, ).shouldAllBeEqual() - df.select { (name and name.firstName and name.firstName) except name.firstName }.alsoDebug() - - df.select { (name and name and name.firstName) except name.firstName }.alsoDebug() + df.getColumns { (name and name and name.firstName).except(name.firstName) }.forEach { + it.isColumnGroup() shouldBe true + it.asColumnGroup().columnNames() shouldBe listOf("lastName") + } } @Test From 2086e0bc70c9168a310e97b734372a9d727bdb2e Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 14:36:00 +0100 Subject: [PATCH 2/7] Revert "removed references to `exceptNew`" This reverts commit 3f85c208ca390a866869d4e516a4222e82e41fbf. --- core/api/core.api | 300 ++++++++++++++ .../dataframe/api/ColumnsSelectionDsl.kt | 4 + .../kotlinx/dataframe/api/allExcept.kt | 387 ++++++++++++++++++ .../kotlinx/dataframe/api/allExcept.kt | 100 +++++ ...mmar.ColumnGroupPartOfGrammar.ForHtml.html | 2 +- docs/StardustDocs/topics/ColumnSelectors.md | 20 +- 6 files changed, 811 insertions(+), 2 deletions(-) diff --git a/core/api/core.api b/core/api/core.api index 332e1ed34f..605ef682bf 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -512,6 +512,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/aggregation/Colu public final class org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn; @@ -923,6 +929,42 @@ public final class org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggrega public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -1702,6 +1744,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSe } public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl { + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public abstract fun allColsExcept (Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun allColsExcept (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun allColsExcept (Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1740,9 +1788,51 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptCol public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public abstract fun exceptNew (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } public final class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$DefaultImpls { + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun allColsExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun allColsExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun allColsExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1781,11 +1871,50 @@ public final class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelection public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar { } +public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupExperimentalName { +} + public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupName { } @@ -2822,6 +2951,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelec public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn; @@ -3231,6 +3366,42 @@ public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$Defau public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -4245,6 +4416,9 @@ public final class org/jetbrains/kotlinx/dataframe/api/ExcessiveColumns : java/l public static fun values ()[Lorg/jetbrains/kotlinx/dataframe/api/ExcessiveColumns; } +public abstract interface annotation class org/jetbrains/kotlinx/dataframe/api/ExperimentalExceptCsDsl : java/lang/annotation/Annotation { +} + public final class org/jetbrains/kotlinx/dataframe/api/ExplodeKt { public static final fun explode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;ZLkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun explode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;Z)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -4859,6 +5033,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/JoinDsl : or public final class org/jetbrains/kotlinx/dataframe/api/JoinDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn; @@ -5268,6 +5448,42 @@ public final class org/jetbrains/kotlinx/dataframe/api/JoinDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -6310,6 +6526,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/PivotDsl : o public final class org/jetbrains/kotlinx/dataframe/api/PivotDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn; @@ -6719,6 +6941,42 @@ public final class org/jetbrains/kotlinx/dataframe/api/PivotDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -7375,6 +7633,12 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SortDsl : or public final class org/jetbrains/kotlinx/dataframe/api/SortDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnGroup; public static fun KPropertyDataRowGet (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/FrameColumn; @@ -7788,6 +8052,42 @@ public final class org/jetbrains/kotlinx/dataframe/api/SortDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; 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 d0af31c05e..b6aeb13915 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 @@ -333,6 +333,10 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [DropColumnsSelectionDsl.Grammar.ColumnGroupWhileName]}**` { `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`** * + * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExperimentalName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} EXPERIMENTAL!`** + * + * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExperimentalName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`) EXPERIMENTAL!`** + * * {@include [Indent]}`| (`{@include [FirstColumnsSelectionDsl.Grammar.ColumnGroupName]}`| `{@include [LastColumnsSelectionDsl.Grammar.ColumnGroupName]}`| `{@include [SingleColumnsSelectionDsl.Grammar.ColumnGroupName]}`) [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]` * * {@include [Indent]}`| `{@include [SelectColumnsSelectionDsl.Grammar.ColumnGroupName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \}`** 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 9129fa06c5..ea05e42e2c 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 @@ -7,16 +7,20 @@ import org.jetbrains.kotlinx.dataframe.DataRow import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet +import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApiLink +import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate import org.jetbrains.kotlinx.dataframe.documentation.Indent import org.jetbrains.kotlinx.dataframe.documentation.LineBreak import org.jetbrains.kotlinx.dataframe.impl.aggregation.toColumns import org.jetbrains.kotlinx.dataframe.impl.columns.allColumnsExceptKeepingStructure +import org.jetbrains.kotlinx.dataframe.impl.columns.changePath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet +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_REPLACE import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE_VARARG @@ -66,6 +70,10 @@ public interface AllExceptColumnsSelectionDsl { * {@include [Indent]}{@include [ColumnGroupName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} `** * * {@include [Indent]}`| `{@include [ColumnGroupName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`)`** + * + * {@include [Indent]}`| `{@include [ColumnGroupExperimentalName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} EXPERIMENTAL!`** + * + * {@include [Indent]}`| `{@include [ColumnGroupExperimentalName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`) EXPERIMENTAL!`** * } */ public interface Grammar { @@ -78,6 +86,9 @@ public interface AllExceptColumnsSelectionDsl { /** __`.`__[**`allColsExcept`**][ColumnsSelectionDsl.allColsExcept] */ public interface ColumnGroupName + + /** [**`exceptNew`**][ColumnsSelectionDsl.exceptNew] */ + public interface ColumnGroupExperimentalName } /** @@ -652,6 +663,353 @@ public interface AllExceptColumnsSelectionDsl { columnGroup(this).allColsExceptInternal(others.toColumnSet()) // endregion + + // region experiments + + /** + * ## EXPERIMENTAL: Except on Column Group + * + * Selects the current column group itself, except for the specified columns. This is different from + * [allColsExcept] in that it does not 'lift' the columns out of the group, but instead selects the group itself. + * + * As usual, all overloads for each {@include [AccessApiLink]} are available. + * + * These produce the same result: + * + * `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]`(colGroup) `[except][ColumnSet.except]` colGroup.col }` + * + * `df.`[select][DataFrame.select]` { colGroup `[exceptNew][SingleColumn.except]` { col } }` + * + * These functions are experimental and may be removed or changed in the future. + * + * Trying these functions requires you to `@`[`OptIn`][OptIn]`(`[ExperimentalExceptCsDsl][ExperimentalExceptCsDsl]`::class)` first. + * + * ## NOTE: + * `exceptNew` will likely be renamed to `except` when the deprecated [SingleColumn.except] functions + * are deleted. + */ + private interface ExperimentalExceptDocs + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun SingleColumn>.exceptNew(selector: ColumnsSelector): SingleColumn> = + exceptExperimentalInternal(selector.toColumns()) + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { other }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public infix fun SingleColumn>.exceptNew(other: ColumnsResolver<*>): SingleColumn> = + exceptNew { other } + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun SingleColumn>.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = + exceptNew { others.toColumnSet() } + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun SingleColumn>.exceptNew(other: String): SingleColumn> = + exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun SingleColumn>.exceptNew(vararg others: String): SingleColumn> = + exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun SingleColumn>.exceptNew(other: KProperty): SingleColumn> = + exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun SingleColumn>.exceptNew(vararg others: KProperty<*>): SingleColumn> = + exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun SingleColumn>.exceptNew(other: ColumnPath): SingleColumn> = + exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun SingleColumn>.exceptNew(vararg others: ColumnPath): SingleColumn> = + exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun String.exceptNew(selector: ColumnsSelector<*, *>): SingleColumn> = + columnGroup(this).exceptNew(selector) + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { other }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public infix fun String.exceptNew(other: ColumnsResolver<*>): SingleColumn> = + exceptNew { other } + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun String.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = + exceptNew { others.toColumnSet() } + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun String.exceptNew(other: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun String.exceptNew(vararg others: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun String.exceptNew(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun String.exceptNew(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun String.exceptNew(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun String.exceptNew(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun KProperty.exceptNew(selector: ColumnsSelector): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(selector.toColumns()) + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { other }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public infix fun KProperty<*>.exceptNew(other: ColumnsResolver<*>): SingleColumn> = + exceptNew { other } + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun KProperty<*>.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = + exceptNew { others.toColumnSet() } + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun KProperty.exceptNew(other: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun KProperty.exceptNew(vararg others: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public infix fun KProperty>.exceptNew(other: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public fun KProperty>.exceptNew(vararg others: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun KProperty.exceptNew(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun KProperty.exceptNew(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public infix fun KProperty>.exceptNew(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public fun KProperty>.exceptNew(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun KProperty.exceptNew(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun KProperty.exceptNew(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public infix fun KProperty>.exceptNew(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + @Suppress("INAPPLICABLE_JVM_NAME") + @JvmName("KPropertyDataRowExceptNew") + public fun KProperty>.exceptNew(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun ColumnPath.exceptNew(selector: ColumnsSelector<*, *>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(selector.toColumns()) + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { other }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public infix fun ColumnPath.exceptNew(other: ColumnsResolver<*>): SingleColumn> = + exceptNew { other } + + @ExperimentalExceptCsDsl + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun ColumnPath.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = + exceptNew { others.toColumnSet() } + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun ColumnPath.exceptNew(other: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun ColumnPath.exceptNew(vararg others: String): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun ColumnPath.exceptNew(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + @ExperimentalExceptCsDsl + public fun ColumnPath.exceptNew(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public infix fun ColumnPath.exceptNew(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(column(other)) + + /** + * @include [ExperimentalExceptDocs] + */ + @ExperimentalExceptCsDsl + public fun ColumnPath.exceptNew(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + + // endregion } /** @@ -679,4 +1037,33 @@ internal fun ColumnSet.exceptInternal(other: ColumnsResolver<*>): ColumnS internal fun SingleColumn>.allColsExceptInternal(other: ColumnsResolver<*>): ColumnSet = selectInternal { all().exceptInternal(other) } +/** + * Returns a new SingleColumn> that has the same structure as the receiver, but excludes columns + * specified in the "other" ColumnsResolver. + * + * @param other The [ColumnsResolver] to use for excluding columns. + * @return A new [SingleColumn] with the filtered columns excluded. + */ +@Suppress("UNCHECKED_CAST") +internal fun SingleColumn>.exceptExperimentalInternal( + other: ColumnsResolver<*>, +): SingleColumn> = + ensureIsColumnGroup().transformSingle { singleCol -> + val columnsToExcept = singleCol + .asColumnGroup() + .getColumnsWithPaths { other } + .map { it.changePath(singleCol.path + it.path) } + + val newCols = listOf(singleCol).allColumnsExceptKeepingStructure(columnsToExcept) + + newCols as List>> + }.singleInternal() as SingleColumn> + +/** + * Functions annotated with this annotation are experimental and will be removed or renamed in the future. + */ +@RequiresOptIn(level = RequiresOptIn.Level.ERROR) +@Target(AnnotationTarget.FUNCTION) +public annotation class ExperimentalExceptCsDsl + // endregion 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 8489a9db32..58ef042456 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 @@ -282,4 +282,104 @@ class AllExceptTests : ColumnsSelectionDslTests() { }, ).shouldAllBeEqual() } + + @OptIn(ExperimentalExceptCsDsl::class) + @Test + fun `except experiments`() { + val firstNameAccessor = column("firstName") + listOf( + df.select { name }.remove { name.firstName }.alsoDebug(), + df.select { cols(name) except name.firstName }, + df.select { name exceptNew { cols { "first" in it.name } } }, + df.select { name.exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { name exceptNew { firstName } }, + df.select { name.exceptNew { firstNameAccessor } }, + df.select { name exceptNew { firstName and firstName } }, + df.select { name.exceptNew { firstNameAccessor and firstNameAccessor } }, +// df.select { name exceptNew name.firstName }, // not allowed +// df.select { name.exceptNew(name.firstName and name.firstName) }, // not allowed +// df.select { name exceptNew firstNameAccessor }, // not allowed +// df.select { name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed + df.select { name exceptNew "firstName" }, + df.select { name.exceptNew("firstName") }, + df.select { name.exceptNew("firstName", "firstName") }, + df.select { name exceptNew Name::firstName }, + df.select { name.exceptNew(Name::firstName) }, + df.select { name.exceptNew(Name::firstName, Name::firstName) }, + df.select { name exceptNew pathOf("firstName") }, + df.select { name.exceptNew(pathOf("firstName")) }, + df.select { name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, + df.select { "name" exceptNew { cols { "first" in it.name } } }, + df.select { "name".exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { "name".exceptNew { firstNameAccessor } }, + df.select { "name".exceptNew { firstNameAccessor and firstNameAccessor } }, +// df.select { "name" exceptNew name.firstName }, // not allowed +// df.select { "name".exceptNew(name.firstName and name.firstName) }, // not allowed +// df.select { "name" exceptNew firstNameAccessor }, // not allowed +// df.select { "name".exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed + df.select { "name" exceptNew "firstName" }, + df.select { "name".exceptNew("firstName") }, + df.select { "name".exceptNew("firstName", "firstName") }, + df.select { "name" exceptNew Name::firstName }, + df.select { "name".exceptNew(Name::firstName) }, + df.select { "name".exceptNew(Name::firstName, Name::firstName) }, + df.select { "name" exceptNew pathOf("firstName") }, + df.select { "name".exceptNew(pathOf("firstName")) }, + df.select { "name".exceptNew(pathOf("firstName"), pathOf("firstName")) }, +// df.select { Person::name exceptNew name.firstName }, // not allowed +// df.select { Person::name.exceptNew(name.firstName and name.firstName) }, // not allowed +// df.select { Person::name exceptNew firstNameAccessor }, // not allowed +// df.select { Person::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed + df.select { Person::name exceptNew "firstName" }, + df.select { Person::name.exceptNew("firstName") }, + df.select { Person::name.exceptNew("firstName", "firstName") }, + df.select { Person::name exceptNew Name::firstName }, + df.select { Person::name.exceptNew(Name::firstName) }, + df.select { Person::name.exceptNew(Name::firstName, Name::firstName) }, + df.select { Person::name exceptNew pathOf("firstName") }, + df.select { Person::name.exceptNew(pathOf("firstName")) }, + df.select { Person::name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, + df.select { NonDataSchemaPerson::name exceptNew { cols { "first" in it.name } } }, + df.select { + NonDataSchemaPerson::name.exceptNew { + cols { "first" in it.name } and + cols { "first" in it.name } + } + }, + df.select { NonDataSchemaPerson::name exceptNew { firstName } }, + df.select { NonDataSchemaPerson::name.exceptNew { firstNameAccessor } }, + df.select { NonDataSchemaPerson::name exceptNew { firstName and firstName } }, + df.select { NonDataSchemaPerson::name.exceptNew { firstNameAccessor and firstNameAccessor } }, +// df.select { NonDataSchemaPerson::name exceptNew name.firstName }, // not allowed +// df.select { NonDataSchemaPerson::name.exceptNew(name.firstName and name.firstName) }, // not allowed +// df.select { NonDataSchemaPerson::name exceptNew firstNameAccessor }, // not allowed +// df.select { NonDataSchemaPerson::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed + df.select { NonDataSchemaPerson::name exceptNew "firstName" }, + df.select { NonDataSchemaPerson::name.exceptNew("firstName") }, + df.select { NonDataSchemaPerson::name.exceptNew("firstName", "firstName") }, + df.select { NonDataSchemaPerson::name exceptNew Name::firstName }, + df.select { NonDataSchemaPerson::name.exceptNew(Name::firstName) }, + df.select { NonDataSchemaPerson::name.exceptNew(Name::firstName, Name::firstName) }, + df.select { NonDataSchemaPerson::name exceptNew pathOf("firstName") }, + df.select { NonDataSchemaPerson::name.exceptNew(pathOf("firstName")) }, + df.select { NonDataSchemaPerson::name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, + df.select { pathOf("name") exceptNew { cols { "first" in it.name } } }, + df.select { pathOf("name").exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { pathOf("name").exceptNew { firstNameAccessor } }, + df.select { pathOf("name").exceptNew { firstNameAccessor and firstNameAccessor } }, +// df.select { pathOf("name") exceptNew name.firstName }, // not allowed +// df.select { pathOf("name").exceptNew(name.firstName and name.firstName) }, // not allowed +// df.select { pathOf("name") exceptNew firstNameAccessor }, // not allowed +// df.select { pathOf("name").exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed + df.select { pathOf("name") exceptNew "firstName" }, + df.select { pathOf("name").exceptNew("firstName") }, + df.select { pathOf("name").exceptNew("firstName", "firstName") }, + df.select { pathOf("name") exceptNew Name::firstName }, + df.select { pathOf("name").exceptNew(Name::firstName) }, + df.select { pathOf("name").exceptNew(Name::firstName, Name::firstName) }, + df.select { pathOf("name") exceptNew pathOf("firstName") }, + df.select { pathOf("name").exceptNew(pathOf("firstName")) }, + df.select { pathOf("name").exceptNew(pathOf("firstName"), pathOf("firstName")) }, + ).shouldAllBeEqual() + } } diff --git a/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html b/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html index 7892e06574..829f42661b 100644 --- a/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html +++ b/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html @@ -44,5 +44,5 @@ } -

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 }

    | (.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 [ { 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 }

    | exceptNew { colsSelector } EXPERIMENTAL!

    | exceptNew(columnNoAccessor, ..) EXPERIMENTAL!

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

    | .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/topics/ColumnSelectors.md b/docs/StardustDocs/topics/ColumnSelectors.md index 4b73698423..bbed8a9219 100644 --- a/docs/StardustDocs/topics/ColumnSelectors.md +++ b/docs/StardustDocs/topics/ColumnSelectors.md @@ -299,8 +299,26 @@ or Note the name change, similar to [`allCols`](ColumnSelectors.md#cols), this makes it clearer that you're selecting columns inside the group, 'lifting' them out. -##### Column Name Filters {collapsible="true"} +**Experimental: Except on Column Group** + +Selects the current [column group](DataColumn.md#columngroup) itself, except for the specified columns. +This is different from `allColsExcept` in that it does not 'lift' the columns out of the group, +but instead selects the group itself. + +These all produce the same result: + +`df.select { colGroup exceptNew { col } }` +`df.select { colGroup }.remove { colGroup.col }` + +`df.select { cols(colGroup) except colGroup.col }` + +> NOTE: This function is experimental and will definitely change in the future. +> It's named `exceptNew` until the deprecated `SingleColumn.except()` overloads are removed. +> Most likely, it'll be renamed to `except` afterward. +> Until then, it requires `@OptIn(ExperimentalExceptCsDsl::class)` to be used. + +##### Column Name Filters {collapsible="true"} `nameContains()`, `colsNameContains()`, `nameStartsWith()`, `colsNameEndsWith()` Creates a `ColumnSet` containing columns from the top-level, specified [column group](DataColumn.md#columngroup), From 2a215af9b302c3de90de9aaffd36517cfbb2fe6d Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 15:27:40 +0100 Subject: [PATCH 3/7] moved and renamed exceptNew to except. removed @ExperimentalExceptCsDsl, added @AccessApiOverloads --- .../dataframe/api/ColumnsSelectionDsl.kt | 4 +- .../kotlinx/dataframe/api/allExcept.kt | 606 +++++++++--------- .../kotlinx/dataframe/api/allExcept.kt | 131 ++-- 3 files changed, 359 insertions(+), 382 deletions(-) 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 b6aeb13915..e0cb666063 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 @@ -333,9 +333,9 @@ public interface ColumnsSelectionDsl : // SingleColumn> * * {@include [Indent]}`| `{@include [DropColumnsSelectionDsl.Grammar.ColumnGroupWhileName]}**` { `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`** * - * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExperimentalName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} EXPERIMENTAL!`** + * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExceptName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} `** * - * {@include [Indent]}`| `{@include [AllExceptColumnsSelectionDsl.Grammar.ColumnGroupExperimentalName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`) EXPERIMENTAL!`** + * {@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]}**` \}`**` ]` * 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 17e52598be..583c6220f8 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 @@ -4,6 +4,7 @@ import org.jetbrains.kotlinx.dataframe.ColumnsSelector import org.jetbrains.kotlinx.dataframe.DataColumn import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.DataRow +import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet @@ -71,9 +72,9 @@ public interface AllExceptColumnsSelectionDsl { * * {@include [Indent]}`| `{@include [ColumnGroupName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`)`** * - * {@include [Indent]}`| `{@include [ColumnGroupExperimentalName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} EXPERIMENTAL!`** + * {@include [Indent]}`| `{@include [ColumnGroupExceptName]}**` { `**{@include [DslGrammarTemplate.ColumnsSelectorRef]}**` \} `** * - * {@include [Indent]}`| `{@include [ColumnGroupExperimentalName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`) EXPERIMENTAL!`** + * {@include [Indent]}`| `{@include [ColumnGroupExceptName]}**`(`**{@include [DslGrammarTemplate.ColumnNoAccessorRef]}**`,`**` ..`**`)`** * } */ public interface Grammar { @@ -87,8 +88,8 @@ public interface AllExceptColumnsSelectionDsl { /** __`.`__[**`allColsExcept`**][ColumnsSelectionDsl.allColsExcept] */ public interface ColumnGroupName - /** [**`exceptNew`**][ColumnsSelectionDsl.exceptNew] */ - public interface ColumnGroupExperimentalName + /** [**`except`**][ColumnsSelectionDsl.except] */ + public interface ColumnGroupExceptName } /** @@ -264,6 +265,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetInfixDocs.ARGUMENT_1] `Person::age` * @set [ColumnSetInfixDocs.ARGUMENT_2] `Person::name` */ + @AccessApiOverload public infix fun ColumnSet.except(other: KProperty): ColumnSet = except(column(other)) /** @@ -273,6 +275,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnSetVarargDocs.ARGUMENT_1] `(Person::age, Person::height)` * @set [ColumnSetVarargDocs.ARGUMENT_2] `(Person::name)` */ + @AccessApiOverload public fun ColumnSet.except(vararg others: KProperty): ColumnSet = except(others.toColumnSet()) /** @@ -351,6 +354,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnsSelectionDslDocs.ARGUMENT_1] `(Person::age, Person::height)` * @set [ColumnsSelectionDslDocs.ARGUMENT_2] `(Person::name)` */ + @AccessApiOverload public fun ColumnsSelectionDsl<*>.allExcept(vararg others: KProperty<*>): ColumnSet<*> = asSingleColumn().allColsExceptInternal(others.toColumnSet()) @@ -367,6 +371,7 @@ public interface AllExceptColumnsSelectionDsl { // endregion // region SingleColumn + // region allColsExcept /** * @include [CommonExceptDocs] @@ -495,6 +500,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnGroupDocs.SingleColumnReceiverArgs] * @include [ColumnGroupDocs.KPropertyArgs] */ + @AccessApiOverload public fun SingleColumn>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = allColsExceptInternal(others.toColumnSet()) @@ -508,163 +514,7 @@ public interface AllExceptColumnsSelectionDsl { // endregion - // region String - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.StringReceiverArgs] - * @include [ColumnGroupDocs.SelectorArgs] - */ - public fun String.allColsExcept(selector: ColumnsSelector<*, *>): ColumnSet<*> = - columnGroup(this).allColsExcept(selector) - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun String.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { other } - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun String.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { others.toColumnSet() } - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.StringReceiverArgs] - * @include [ColumnGroupDocs.StringArgs] - */ - public fun String.allColsExcept(vararg others: String): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.StringReceiverArgs] - * @include [ColumnGroupDocs.KPropertyArgs] - */ - public fun String.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.StringReceiverArgs] - * @include [ColumnGroupDocs.ColumnPathArgs] - */ - public fun String.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - // endregion - - // region KProperty - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.KPropertyReceiverArgs] - * @include [ColumnGroupDocs.SelectorArgs] - */ - public fun KProperty.allColsExcept(selector: ColumnsSelector): ColumnSet<*> = - columnGroup(this).allColsExcept(selector) - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun KProperty<*>.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { other } - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun KProperty<*>.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { others.toColumnSet() } - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.KPropertyReceiverArgs] - * @include [ColumnGroupDocs.StringArgs] - */ - public fun KProperty<*>.allColsExcept(vararg others: String): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.KPropertyReceiverArgs] - * @include [ColumnGroupDocs.KPropertyArgs] - */ - public fun KProperty<*>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.KPropertyReceiverArgs] - * @include [ColumnGroupDocs.ColumnPathArgs] - */ - public fun KProperty<*>.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - // endregion - - // region ColumnPath - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.ColumnPathReceiverArgs] - * @include [ColumnGroupDocs.SelectorArgs] - */ - public fun ColumnPath.allColsExcept(selector: ColumnsSelector<*, *>): ColumnSet<*> = - columnGroup(this).allColsExcept(selector) - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun ColumnPath.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { other } - - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun ColumnPath.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = - allColsExcept { others.toColumnSet() } - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.ColumnPathReceiverArgs] - * @include [ColumnGroupDocs.StringArgs] - */ - public fun ColumnPath.allColsExcept(vararg others: String): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.ColumnPathReceiverArgs] - * @include [ColumnGroupDocs.KPropertyArgs] - */ - public fun ColumnPath.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - /** - * @include [ColumnGroupDocs] - * @include [ColumnGroupDocs.ColumnPathReceiverArgs] - * @include [ColumnGroupDocs.ColumnPathArgs] - */ - public fun ColumnPath.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = - columnGroup(this).allColsExceptInternal(others.toColumnSet()) - - // endregion - - // region experiments + // region except /** * ## EXPERIMENTAL: Except on Column Group @@ -678,336 +528,471 @@ public interface AllExceptColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]`(colGroup) `[except][ColumnSet.except]` colGroup.col }` * - * `df.`[select][DataFrame.select]` { colGroup `[exceptNew][SingleColumn.except]` { col } }` - * - * These functions are experimental and may be removed or changed in the future. - * - * Trying these functions requires you to `@`[`OptIn`][OptIn]`(`[ExperimentalExceptCsDsl][ExperimentalExceptCsDsl]`::class)` first. - * - * ## NOTE: - * `exceptNew` will likely be renamed to `except` when the deprecated [SingleColumn.except] functions - * are deleted. + * `df.`[select][DataFrame.select]` { colGroup `[except][SingleColumn.except]` { col } }` */ private interface ExperimentalExceptDocs /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun SingleColumn>.exceptNew(selector: ColumnsSelector): SingleColumn> = - exceptExperimentalInternal(selector.toColumns()) + public infix fun SingleColumn>.except(selector: ColumnsSelector): SingleColumn> = + exceptInternal(selector.toColumns()) - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { other }"), + replaceWith = ReplaceWith("except { other }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun SingleColumn>.exceptNew(other: ColumnsResolver<*>): SingleColumn> = - exceptNew { other } + public infix fun SingleColumn>.except(other: ColumnsResolver<*>): SingleColumn> = + except { other } - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + replaceWith = ReplaceWith("except { others.toColumnSet() }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public fun SingleColumn>.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = - exceptNew { others.toColumnSet() } + public fun SingleColumn>.except(vararg others: ColumnsResolver<*>): SingleColumn> = + except { others.toColumnSet() } /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun SingleColumn>.exceptNew(other: String): SingleColumn> = - exceptExperimentalInternal(column(other)) + public infix fun SingleColumn>.except(other: String): SingleColumn> = + exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun SingleColumn>.exceptNew(vararg others: String): SingleColumn> = - exceptExperimentalInternal(others.toColumnSet()) + public fun SingleColumn>.except(vararg others: String): SingleColumn> = + exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun SingleColumn>.exceptNew(other: KProperty): SingleColumn> = - exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun SingleColumn>.except(other: KProperty): SingleColumn> = + exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun SingleColumn>.exceptNew(vararg others: KProperty<*>): SingleColumn> = - exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun SingleColumn>.except(vararg others: KProperty<*>): SingleColumn> = + exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun SingleColumn>.exceptNew(other: ColumnPath): SingleColumn> = - exceptExperimentalInternal(column(other)) + public infix fun SingleColumn>.except(other: ColumnPath): SingleColumn> = + exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun SingleColumn>.exceptNew(vararg others: ColumnPath): SingleColumn> = - exceptExperimentalInternal(others.toColumnSet()) + public fun SingleColumn>.except(vararg others: ColumnPath): SingleColumn> = + exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun String.exceptNew(selector: ColumnsSelector<*, *>): SingleColumn> = - columnGroup(this).exceptNew(selector) + public infix fun String.except(selector: ColumnsSelector<*, *>): SingleColumn> = + columnGroup(this).except(selector) - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { other }"), + replaceWith = ReplaceWith("except { other }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun String.exceptNew(other: ColumnsResolver<*>): SingleColumn> = - exceptNew { other } + public infix fun String.except(other: ColumnsResolver<*>): SingleColumn> = + except { other } - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + replaceWith = ReplaceWith("except { others.toColumnSet() }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public fun String.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = - exceptNew { others.toColumnSet() } + public fun String.except(vararg others: ColumnsResolver<*>): SingleColumn> = + except { others.toColumnSet() } /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun String.exceptNew(other: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + public infix fun String.except(other: String): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun String.exceptNew(vararg others: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + public fun String.except(vararg others: String): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun String.exceptNew(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun String.except(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun String.exceptNew(vararg others: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun String.except(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun String.exceptNew(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + public infix fun String.except(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun String.exceptNew(vararg others: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + public fun String.except(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun KProperty.exceptNew(selector: ColumnsSelector): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(selector.toColumns()) + @AccessApiOverload + public infix fun KProperty.except(selector: ColumnsSelector): SingleColumn> = + columnGroup(this).exceptInternal(selector.toColumns()) - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { other }"), + replaceWith = ReplaceWith("except { other }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun KProperty<*>.exceptNew(other: ColumnsResolver<*>): SingleColumn> = - exceptNew { other } + @AccessApiOverload + public infix fun KProperty<*>.except(other: ColumnsResolver<*>): SingleColumn> = + except { other } - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + replaceWith = ReplaceWith("except { others.toColumnSet() }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public fun KProperty<*>.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = - exceptNew { others.toColumnSet() } + @AccessApiOverload + public fun KProperty<*>.except(vararg others: ColumnsResolver<*>): SingleColumn> = + except { others.toColumnSet() } /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun KProperty.exceptNew(other: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty.except(other: String): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun KProperty.exceptNew(vararg others: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty.except(vararg others: String): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public infix fun KProperty>.exceptNew(other: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty>.except(other: String): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public fun KProperty>.exceptNew(vararg others: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty>.except(vararg others: String): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun KProperty.exceptNew(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty.except(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun KProperty.exceptNew(vararg others: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty.except(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public infix fun KProperty>.exceptNew(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty>.except(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public fun KProperty>.exceptNew(vararg others: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty>.except(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun KProperty.exceptNew(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty.except(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun KProperty.exceptNew(vararg others: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty.except(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public infix fun KProperty>.exceptNew(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun KProperty>.except(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") - public fun KProperty>.exceptNew(vararg others: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun KProperty>.except(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun ColumnPath.exceptNew(selector: ColumnsSelector<*, *>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(selector.toColumns()) + public infix fun ColumnPath.except(selector: ColumnsSelector<*, *>): SingleColumn> = + columnGroup(this).exceptInternal(selector.toColumns()) - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { other }"), + replaceWith = ReplaceWith("except { other }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun ColumnPath.exceptNew(other: ColumnsResolver<*>): SingleColumn> = - exceptNew { other } + public infix fun ColumnPath.except(other: ColumnsResolver<*>): SingleColumn> = + except { other } - @ExperimentalExceptCsDsl @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("exceptNew { others.toColumnSet() }"), + replaceWith = ReplaceWith("except { others.toColumnSet() }"), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public fun ColumnPath.exceptNew(vararg others: ColumnsResolver<*>): SingleColumn> = - exceptNew { others.toColumnSet() } + public fun ColumnPath.except(vararg others: ColumnsResolver<*>): SingleColumn> = + except { others.toColumnSet() } /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun ColumnPath.exceptNew(other: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + public infix fun ColumnPath.except(other: String): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun ColumnPath.exceptNew(vararg others: String): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + public fun ColumnPath.except(vararg others: String): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun ColumnPath.exceptNew(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + @AccessApiOverload + public infix fun ColumnPath.except(other: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) - @ExperimentalExceptCsDsl - public fun ColumnPath.exceptNew(vararg others: KProperty<*>): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + @AccessApiOverload + public fun ColumnPath.except(vararg others: KProperty<*>): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public infix fun ColumnPath.exceptNew(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(column(other)) + public infix fun ColumnPath.except(other: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(column(other)) /** * @include [ExperimentalExceptDocs] */ - @ExperimentalExceptCsDsl - public fun ColumnPath.exceptNew(vararg others: ColumnPath): SingleColumn> = - columnGroup(this).exceptExperimentalInternal(others.toColumnSet()) + public fun ColumnPath.except(vararg others: ColumnPath): SingleColumn> = + columnGroup(this).exceptInternal(others.toColumnSet()) + + // endregion + // endregion + + // region String + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.StringReceiverArgs] + * @include [ColumnGroupDocs.SelectorArgs] + */ + public fun String.allColsExcept(selector: ColumnsSelector<*, *>): ColumnSet<*> = + columnGroup(this).allColsExcept(selector) + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun String.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { other } + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun String.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { others.toColumnSet() } + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.StringReceiverArgs] + * @include [ColumnGroupDocs.StringArgs] + */ + public fun String.allColsExcept(vararg others: String): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.StringReceiverArgs] + * @include [ColumnGroupDocs.KPropertyArgs] + */ + @AccessApiOverload + public fun String.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.StringReceiverArgs] + * @include [ColumnGroupDocs.ColumnPathArgs] + */ + public fun String.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + // endregion + + // region KProperty + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.KPropertyReceiverArgs] + * @include [ColumnGroupDocs.SelectorArgs] + */ + @AccessApiOverload + public fun KProperty.allColsExcept(selector: ColumnsSelector): ColumnSet<*> = + columnGroup(this).allColsExcept(selector) + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + @AccessApiOverload + public fun KProperty<*>.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { other } + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + @AccessApiOverload + public fun KProperty<*>.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { others.toColumnSet() } + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.KPropertyReceiverArgs] + * @include [ColumnGroupDocs.StringArgs] + */ + @AccessApiOverload + public fun KProperty<*>.allColsExcept(vararg others: String): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.KPropertyReceiverArgs] + * @include [ColumnGroupDocs.KPropertyArgs] + */ + @AccessApiOverload + public fun KProperty<*>.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.KPropertyReceiverArgs] + * @include [ColumnGroupDocs.ColumnPathArgs] + */ + @AccessApiOverload + public fun KProperty<*>.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + // endregion + + // region ColumnPath + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupDocs.SelectorArgs] + */ + public fun ColumnPath.allColsExcept(selector: ColumnsSelector<*, *>): ColumnSet<*> = + columnGroup(this).allColsExcept(selector) + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun ColumnPath.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { other } + + @Deprecated( + message = ALL_COLS_EXCEPT, + replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + level = DeprecationLevel.ERROR, + ) // present solely to redirect users to the right function + public fun ColumnPath.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = + allColsExcept { others.toColumnSet() } + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupDocs.StringArgs] + */ + public fun ColumnPath.allColsExcept(vararg others: String): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupDocs.KPropertyArgs] + */ + public fun ColumnPath.allColsExcept(vararg others: KProperty<*>): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) + + /** + * @include [ColumnGroupDocs] + * @include [ColumnGroupDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupDocs.ColumnPathArgs] + */ + public fun ColumnPath.allColsExcept(vararg others: ColumnPath): ColumnSet<*> = + columnGroup(this).allColsExceptInternal(others.toColumnSet()) // endregion } @@ -1045,25 +1030,18 @@ internal fun SingleColumn>.allColsExceptInternal(other: ColumnsResolv * @return A new [SingleColumn] with the filtered columns excluded. */ @Suppress("UNCHECKED_CAST") -internal fun SingleColumn>.exceptExperimentalInternal( - other: ColumnsResolver<*>, -): SingleColumn> = +@JvmName("exceptInternalSingleColumn") +internal fun SingleColumn>.exceptInternal(other: ColumnsResolver<*>): SingleColumn> = ensureIsColumnGroup().transformSingle { singleCol -> val columnsToExcept = singleCol .asColumnGroup() .getColumnsWithPaths { other } .map { it.changePath(singleCol.path + it.path) } + .toSet() val newCols = listOf(singleCol).allColumnsExceptKeepingStructure(columnsToExcept) newCols as List>> }.singleInternal() as SingleColumn> -/** - * Functions annotated with this annotation are experimental and will be removed or renamed in the future. - */ -@RequiresOptIn(level = RequiresOptIn.Level.ERROR) -@Target(AnnotationTarget.FUNCTION) -public annotation class ExperimentalExceptCsDsl - // endregion 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 b2ecdcb23f..28b9de8811 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 @@ -304,103 +304,102 @@ class AllExceptTests : ColumnsSelectionDslTests() { ).shouldAllBeEqual() } - @OptIn(ExperimentalExceptCsDsl::class) @Test fun `except experiments`() { val firstNameAccessor = column("firstName") listOf( df.select { name }.remove { name.firstName }.alsoDebug(), df.select { cols(name) except name.firstName }, - df.select { name exceptNew { cols { "first" in it.name } } }, - df.select { name.exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { name exceptNew { firstName } }, - df.select { name.exceptNew { firstNameAccessor } }, - df.select { name exceptNew { firstName and firstName } }, - df.select { name.exceptNew { firstNameAccessor and firstNameAccessor } }, + df.select { name except { cols { "first" in it.name } } }, + df.select { name.except { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { name except { firstName } }, + df.select { name.except { firstNameAccessor } }, + df.select { name except { firstName and firstName } }, + df.select { name.except { firstNameAccessor and firstNameAccessor } }, // df.select { name exceptNew name.firstName }, // not allowed // df.select { name.exceptNew(name.firstName and name.firstName) }, // not allowed // df.select { name exceptNew firstNameAccessor }, // not allowed // df.select { name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { name exceptNew "firstName" }, - df.select { name.exceptNew("firstName") }, - df.select { name.exceptNew("firstName", "firstName") }, - df.select { name exceptNew Name::firstName }, - df.select { name.exceptNew(Name::firstName) }, - df.select { name.exceptNew(Name::firstName, Name::firstName) }, - df.select { name exceptNew pathOf("firstName") }, - df.select { name.exceptNew(pathOf("firstName")) }, - df.select { name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, - df.select { "name" exceptNew { cols { "first" in it.name } } }, - df.select { "name".exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { "name".exceptNew { firstNameAccessor } }, - df.select { "name".exceptNew { firstNameAccessor and firstNameAccessor } }, + df.select { name except "firstName" }, + df.select { name.except("firstName") }, + df.select { name.except("firstName", "firstName") }, + df.select { name except Name::firstName }, + df.select { name.except(Name::firstName) }, + df.select { name.except(Name::firstName, Name::firstName) }, + df.select { name except pathOf("firstName") }, + df.select { name.except(pathOf("firstName")) }, + df.select { name.except(pathOf("firstName"), pathOf("firstName")) }, + df.select { "name" except { cols { "first" in it.name } } }, + df.select { "name".except { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { "name".except { firstNameAccessor } }, + df.select { "name".except { firstNameAccessor and firstNameAccessor } }, // df.select { "name" exceptNew name.firstName }, // not allowed // df.select { "name".exceptNew(name.firstName and name.firstName) }, // not allowed // df.select { "name" exceptNew firstNameAccessor }, // not allowed // df.select { "name".exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { "name" exceptNew "firstName" }, - df.select { "name".exceptNew("firstName") }, - df.select { "name".exceptNew("firstName", "firstName") }, - df.select { "name" exceptNew Name::firstName }, - df.select { "name".exceptNew(Name::firstName) }, - df.select { "name".exceptNew(Name::firstName, Name::firstName) }, - df.select { "name" exceptNew pathOf("firstName") }, - df.select { "name".exceptNew(pathOf("firstName")) }, - df.select { "name".exceptNew(pathOf("firstName"), pathOf("firstName")) }, + df.select { "name" except "firstName" }, + df.select { "name".except("firstName") }, + df.select { "name".except("firstName", "firstName") }, + df.select { "name" except Name::firstName }, + df.select { "name".except(Name::firstName) }, + df.select { "name".except(Name::firstName, Name::firstName) }, + df.select { "name" except pathOf("firstName") }, + df.select { "name".except(pathOf("firstName")) }, + df.select { "name".except(pathOf("firstName"), pathOf("firstName")) }, // df.select { Person::name exceptNew name.firstName }, // not allowed // df.select { Person::name.exceptNew(name.firstName and name.firstName) }, // not allowed // df.select { Person::name exceptNew firstNameAccessor }, // not allowed // df.select { Person::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { Person::name exceptNew "firstName" }, - df.select { Person::name.exceptNew("firstName") }, - df.select { Person::name.exceptNew("firstName", "firstName") }, - df.select { Person::name exceptNew Name::firstName }, - df.select { Person::name.exceptNew(Name::firstName) }, - df.select { Person::name.exceptNew(Name::firstName, Name::firstName) }, - df.select { Person::name exceptNew pathOf("firstName") }, - df.select { Person::name.exceptNew(pathOf("firstName")) }, - df.select { Person::name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, - df.select { NonDataSchemaPerson::name exceptNew { cols { "first" in it.name } } }, + df.select { Person::name except "firstName" }, + df.select { Person::name.except("firstName") }, + df.select { Person::name.except("firstName", "firstName") }, + df.select { Person::name except Name::firstName }, + df.select { Person::name.except(Name::firstName) }, + df.select { Person::name.except(Name::firstName, Name::firstName) }, + df.select { Person::name except pathOf("firstName") }, + df.select { Person::name.except(pathOf("firstName")) }, + df.select { Person::name.except(pathOf("firstName"), pathOf("firstName")) }, + df.select { NonDataSchemaPerson::name except { cols { "first" in it.name } } }, df.select { - NonDataSchemaPerson::name.exceptNew { + NonDataSchemaPerson::name.except { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { NonDataSchemaPerson::name exceptNew { firstName } }, - df.select { NonDataSchemaPerson::name.exceptNew { firstNameAccessor } }, - df.select { NonDataSchemaPerson::name exceptNew { firstName and firstName } }, - df.select { NonDataSchemaPerson::name.exceptNew { firstNameAccessor and firstNameAccessor } }, + df.select { NonDataSchemaPerson::name except { firstName } }, + df.select { NonDataSchemaPerson::name.except { firstNameAccessor } }, + df.select { NonDataSchemaPerson::name except { firstName and firstName } }, + df.select { NonDataSchemaPerson::name.except { firstNameAccessor and firstNameAccessor } }, // df.select { NonDataSchemaPerson::name exceptNew name.firstName }, // not allowed // df.select { NonDataSchemaPerson::name.exceptNew(name.firstName and name.firstName) }, // not allowed // df.select { NonDataSchemaPerson::name exceptNew firstNameAccessor }, // not allowed // df.select { NonDataSchemaPerson::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { NonDataSchemaPerson::name exceptNew "firstName" }, - df.select { NonDataSchemaPerson::name.exceptNew("firstName") }, - df.select { NonDataSchemaPerson::name.exceptNew("firstName", "firstName") }, - df.select { NonDataSchemaPerson::name exceptNew Name::firstName }, - df.select { NonDataSchemaPerson::name.exceptNew(Name::firstName) }, - df.select { NonDataSchemaPerson::name.exceptNew(Name::firstName, Name::firstName) }, - df.select { NonDataSchemaPerson::name exceptNew pathOf("firstName") }, - df.select { NonDataSchemaPerson::name.exceptNew(pathOf("firstName")) }, - df.select { NonDataSchemaPerson::name.exceptNew(pathOf("firstName"), pathOf("firstName")) }, - df.select { pathOf("name") exceptNew { cols { "first" in it.name } } }, - df.select { pathOf("name").exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { pathOf("name").exceptNew { firstNameAccessor } }, - df.select { pathOf("name").exceptNew { firstNameAccessor and firstNameAccessor } }, + df.select { NonDataSchemaPerson::name except "firstName" }, + df.select { NonDataSchemaPerson::name.except("firstName") }, + df.select { NonDataSchemaPerson::name.except("firstName", "firstName") }, + df.select { NonDataSchemaPerson::name except Name::firstName }, + df.select { NonDataSchemaPerson::name.except(Name::firstName) }, + df.select { NonDataSchemaPerson::name.except(Name::firstName, Name::firstName) }, + df.select { NonDataSchemaPerson::name except pathOf("firstName") }, + df.select { NonDataSchemaPerson::name.except(pathOf("firstName")) }, + df.select { NonDataSchemaPerson::name.except(pathOf("firstName"), pathOf("firstName")) }, + df.select { pathOf("name") except { cols { "first" in it.name } } }, + df.select { pathOf("name").except { cols { "first" in it.name } and cols { "first" in it.name } } }, + df.select { pathOf("name").except { firstNameAccessor } }, + df.select { pathOf("name").except { firstNameAccessor and firstNameAccessor } }, // df.select { pathOf("name") exceptNew name.firstName }, // not allowed // df.select { pathOf("name").exceptNew(name.firstName and name.firstName) }, // not allowed // df.select { pathOf("name") exceptNew firstNameAccessor }, // not allowed // df.select { pathOf("name").exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { pathOf("name") exceptNew "firstName" }, - df.select { pathOf("name").exceptNew("firstName") }, - df.select { pathOf("name").exceptNew("firstName", "firstName") }, - df.select { pathOf("name") exceptNew Name::firstName }, - df.select { pathOf("name").exceptNew(Name::firstName) }, - df.select { pathOf("name").exceptNew(Name::firstName, Name::firstName) }, - df.select { pathOf("name") exceptNew pathOf("firstName") }, - df.select { pathOf("name").exceptNew(pathOf("firstName")) }, - df.select { pathOf("name").exceptNew(pathOf("firstName"), pathOf("firstName")) }, + df.select { pathOf("name") except "firstName" }, + df.select { pathOf("name").except("firstName") }, + df.select { pathOf("name").except("firstName", "firstName") }, + df.select { pathOf("name") except Name::firstName }, + df.select { pathOf("name").except(Name::firstName) }, + df.select { pathOf("name").except(Name::firstName, Name::firstName) }, + df.select { pathOf("name") except pathOf("firstName") }, + df.select { pathOf("name").except(pathOf("firstName")) }, + df.select { pathOf("name").except(pathOf("firstName"), pathOf("firstName")) }, ).shouldAllBeEqual() } } From 563287853d6309ab8480e81bfca084873c01e086 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 16:07:24 +0100 Subject: [PATCH 4/7] colGroup except can no longer be infix to reduce confusion about scope. --- .../kotlinx/dataframe/api/allExcept.kt | 84 ++++++++++--------- .../dataframe/util/deprecationMessages.kt | 7 +- .../kotlinx/dataframe/api/allExcept.kt | 72 +++++++--------- 3 files changed, 75 insertions(+), 88 deletions(-) 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 583c6220f8..fc2f9398a2 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 @@ -23,8 +23,10 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.changePath import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet 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_REPLACE -import org.jetbrains.kotlinx.dataframe.util.ALL_COLS_REPLACE_VARARG +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.EXCEPT_REPLACE +import org.jetbrains.kotlinx.dataframe.util.EXCEPT_REPLACE_VARARG import kotlin.reflect.KProperty // region ColumnsSelectionDsl @@ -473,7 +475,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun SingleColumn>.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = @@ -481,7 +483,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun SingleColumn>.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = @@ -535,20 +537,20 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun SingleColumn>.except(selector: ColumnsSelector): SingleColumn> = + public fun SingleColumn>.except(selector: ColumnsSelector): SingleColumn> = exceptInternal(selector.toColumns()) @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { other }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun SingleColumn>.except(other: ColumnsResolver<*>): SingleColumn> = + public fun SingleColumn>.except(other: ColumnsResolver<*>): SingleColumn> = except { other } @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { others.toColumnSet() }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun SingleColumn>.except(vararg others: ColumnsResolver<*>): SingleColumn> = @@ -557,7 +559,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun SingleColumn>.except(other: String): SingleColumn> = + public fun SingleColumn>.except(other: String): SingleColumn> = exceptInternal(column(other)) /** @@ -570,7 +572,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun SingleColumn>.except(other: KProperty): SingleColumn> = + public fun SingleColumn>.except(other: KProperty): SingleColumn> = exceptInternal(column(other)) /** @@ -583,7 +585,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun SingleColumn>.except(other: ColumnPath): SingleColumn> = + public fun SingleColumn>.except(other: ColumnPath): SingleColumn> = exceptInternal(column(other)) /** @@ -595,20 +597,20 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun String.except(selector: ColumnsSelector<*, *>): SingleColumn> = + public fun String.except(selector: ColumnsSelector<*, *>): SingleColumn> = columnGroup(this).except(selector) @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { other }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun String.except(other: ColumnsResolver<*>): SingleColumn> = + public fun String.except(other: ColumnsResolver<*>): SingleColumn> = except { other } @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { others.toColumnSet() }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun String.except(vararg others: ColumnsResolver<*>): SingleColumn> = @@ -617,7 +619,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun String.except(other: String): SingleColumn> = + public fun String.except(other: String): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -630,7 +632,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun String.except(other: KProperty<*>): SingleColumn> = + public fun String.except(other: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -643,7 +645,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun String.except(other: ColumnPath): SingleColumn> = + public fun String.except(other: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -656,21 +658,21 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun KProperty.except(selector: ColumnsSelector): SingleColumn> = + public fun KProperty.except(selector: ColumnsSelector): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { other }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function @AccessApiOverload - public infix fun KProperty<*>.except(other: ColumnsResolver<*>): SingleColumn> = + public fun KProperty<*>.except(other: ColumnsResolver<*>): SingleColumn> = except { other } @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { others.toColumnSet() }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function @AccessApiOverload @@ -681,7 +683,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun KProperty.except(other: String): SingleColumn> = + public fun KProperty.except(other: String): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -697,7 +699,7 @@ public interface AllExceptColumnsSelectionDsl { @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @AccessApiOverload - public infix fun KProperty>.except(other: String): SingleColumn> = + public fun KProperty>.except(other: String): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -713,7 +715,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun KProperty.except(other: KProperty<*>): SingleColumn> = + public fun KProperty.except(other: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -729,7 +731,7 @@ public interface AllExceptColumnsSelectionDsl { @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @AccessApiOverload - public infix fun KProperty>.except(other: KProperty<*>): SingleColumn> = + public fun KProperty>.except(other: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -745,7 +747,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun KProperty.except(other: ColumnPath): SingleColumn> = + public fun KProperty.except(other: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -761,7 +763,7 @@ public interface AllExceptColumnsSelectionDsl { @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @AccessApiOverload - public infix fun KProperty>.except(other: ColumnPath): SingleColumn> = + public fun KProperty>.except(other: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -776,20 +778,20 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun ColumnPath.except(selector: ColumnsSelector<*, *>): SingleColumn> = + public fun ColumnPath.except(selector: ColumnsSelector<*, *>): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { other }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function - public infix fun ColumnPath.except(other: ColumnsResolver<*>): SingleColumn> = + public fun ColumnPath.except(other: ColumnsResolver<*>): SingleColumn> = except { other } @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith("except { others.toColumnSet() }"), + replaceWith = ReplaceWith(EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun ColumnPath.except(vararg others: ColumnsResolver<*>): SingleColumn> = @@ -798,7 +800,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun ColumnPath.except(other: String): SingleColumn> = + public fun ColumnPath.except(other: String): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -811,7 +813,7 @@ public interface AllExceptColumnsSelectionDsl { * @include [ExperimentalExceptDocs] */ @AccessApiOverload - public infix fun ColumnPath.except(other: KProperty<*>): SingleColumn> = + public fun ColumnPath.except(other: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(column(other)) @AccessApiOverload @@ -821,7 +823,7 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [ExperimentalExceptDocs] */ - public infix fun ColumnPath.except(other: ColumnPath): SingleColumn> = + public fun ColumnPath.except(other: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(column(other)) /** @@ -845,7 +847,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun String.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = @@ -853,7 +855,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun String.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = @@ -899,7 +901,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function @AccessApiOverload @@ -908,7 +910,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function @AccessApiOverload @@ -956,7 +958,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun ColumnPath.allColsExcept(other: ColumnsResolver<*>): ColumnSet<*> = @@ -964,7 +966,7 @@ public interface AllExceptColumnsSelectionDsl { @Deprecated( message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(ALL_COLS_REPLACE_VARARG), + replaceWith = ReplaceWith(ALL_COLS_EXCEPT_REPLACE_VARARG), level = DeprecationLevel.ERROR, ) // present solely to redirect users to the right function public fun ColumnPath.allColsExcept(vararg others: ColumnsResolver<*>): ColumnSet<*> = 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 e710b368c7..b2e213e07b 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 @@ -76,7 +76,8 @@ internal const val COL_REPLACE = "col" internal const val ALL_COLS_EXCEPT = "This overload is blocked to prevent issues with column accessors. Use the `{}` overload instead." -internal const val ALL_COLS_REPLACE = "allColsExcept { other }" -internal const val ALL_COLS_REPLACE_VARARG = "allColsExcept { others.toColumnSet() }" - +internal const val ALL_COLS_EXCEPT_REPLACE = "this.allColsExcept { other }" +internal const val ALL_COLS_EXCEPT_REPLACE_VARARG = "this.allColsExcept { others.toColumnSet() }" +internal const val EXCEPT_REPLACE = "this.except { other }" +internal const val EXCEPT_REPLACE_VARARG = "this.except { others.toColumnSet() }" // endregion 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 28b9de8811..4f9735d4c1 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 @@ -32,6 +32,14 @@ class AllExceptTests : ColumnsSelectionDslTests() { it.getColumnGroup("a").getColumnOrNull("c") shouldBe null it[pathOf("a", "b")].single() shouldBe 1 } + df2.select { "a".except("b") }.let { + it.getColumnGroup("a").getColumnOrNull("b") shouldBe null + it[pathOf("a", "c", "d")].single() shouldBe 3.0 + } + df2.select { "a".except { "c"["d"] } }.let { + it.getColumnGroup("a").getColumnOrNull("c") shouldBe null + it[pathOf("a", "b")].single() shouldBe 1 + } } @Test @@ -305,99 +313,75 @@ class AllExceptTests : ColumnsSelectionDslTests() { } @Test - fun `except experiments`() { + fun `except on column group`() { val firstNameAccessor = column("firstName") listOf( df.select { name }.remove { name.firstName }.alsoDebug(), df.select { cols(name) except name.firstName }, - df.select { name except { cols { "first" in it.name } } }, + df.select { name.except { cols { "first" in it.name } } }, df.select { name.except { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { name except { firstName } }, + df.select { name.except { firstName } }, df.select { name.except { firstNameAccessor } }, - df.select { name except { firstName and firstName } }, + df.select { name.except { firstName and firstName } }, df.select { name.except { firstNameAccessor and firstNameAccessor } }, -// df.select { name exceptNew name.firstName }, // not allowed -// df.select { name.exceptNew(name.firstName and name.firstName) }, // not allowed -// df.select { name exceptNew firstNameAccessor }, // not allowed -// df.select { name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { name except "firstName" }, +// df.select { name.except(name.firstName and name.firstName) }, // not allowed +// df.select { name.except(firstNameAccessor and firstNameAccessor) }, // not allowed df.select { name.except("firstName") }, df.select { name.except("firstName", "firstName") }, - df.select { name except Name::firstName }, df.select { name.except(Name::firstName) }, df.select { name.except(Name::firstName, Name::firstName) }, - df.select { name except pathOf("firstName") }, df.select { name.except(pathOf("firstName")) }, df.select { name.except(pathOf("firstName"), pathOf("firstName")) }, - df.select { "name" except { cols { "first" in it.name } } }, + df.select { "name".except { cols { "first" in it.name } } }, df.select { "name".except { cols { "first" in it.name } and cols { "first" in it.name } } }, df.select { "name".except { firstNameAccessor } }, df.select { "name".except { firstNameAccessor and firstNameAccessor } }, -// df.select { "name" exceptNew name.firstName }, // not allowed -// df.select { "name".exceptNew(name.firstName and name.firstName) }, // not allowed -// df.select { "name" exceptNew firstNameAccessor }, // not allowed -// df.select { "name".exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { "name" except "firstName" }, +// df.select { "name".except(name.firstName and name.firstName) }, // not allowed +// df.select { "name".except(firstNameAccessor and firstNameAccessor) }, // not allowed df.select { "name".except("firstName") }, df.select { "name".except("firstName", "firstName") }, - df.select { "name" except Name::firstName }, df.select { "name".except(Name::firstName) }, df.select { "name".except(Name::firstName, Name::firstName) }, - df.select { "name" except pathOf("firstName") }, df.select { "name".except(pathOf("firstName")) }, df.select { "name".except(pathOf("firstName"), pathOf("firstName")) }, -// df.select { Person::name exceptNew name.firstName }, // not allowed -// df.select { Person::name.exceptNew(name.firstName and name.firstName) }, // not allowed -// df.select { Person::name exceptNew firstNameAccessor }, // not allowed -// df.select { Person::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { Person::name except "firstName" }, +// df.select { Person::name.except(name.firstName and name.firstName) }, // not allowed +// df.select { Person::name.except(firstNameAccessor and firstNameAccessor) }, // not allowed df.select { Person::name.except("firstName") }, df.select { Person::name.except("firstName", "firstName") }, - df.select { Person::name except Name::firstName }, df.select { Person::name.except(Name::firstName) }, df.select { Person::name.except(Name::firstName, Name::firstName) }, - df.select { Person::name except pathOf("firstName") }, df.select { Person::name.except(pathOf("firstName")) }, df.select { Person::name.except(pathOf("firstName"), pathOf("firstName")) }, - df.select { NonDataSchemaPerson::name except { cols { "first" in it.name } } }, + df.select { NonDataSchemaPerson::name.except { cols { "first" in it.name } } }, df.select { NonDataSchemaPerson::name.except { cols { "first" in it.name } and cols { "first" in it.name } } }, - df.select { NonDataSchemaPerson::name except { firstName } }, + df.select { NonDataSchemaPerson::name.except { firstName } }, df.select { NonDataSchemaPerson::name.except { firstNameAccessor } }, - df.select { NonDataSchemaPerson::name except { firstName and firstName } }, + df.select { NonDataSchemaPerson::name.except { firstName and firstName } }, df.select { NonDataSchemaPerson::name.except { firstNameAccessor and firstNameAccessor } }, -// df.select { NonDataSchemaPerson::name exceptNew name.firstName }, // not allowed -// df.select { NonDataSchemaPerson::name.exceptNew(name.firstName and name.firstName) }, // not allowed -// df.select { NonDataSchemaPerson::name exceptNew firstNameAccessor }, // not allowed -// df.select { NonDataSchemaPerson::name.exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { NonDataSchemaPerson::name except "firstName" }, +// df.select { NonDataSchemaPerson::name.except(name.firstName and name.firstName) }, // not allowed +// df.select { NonDataSchemaPerson::name.except(firstNameAccessor and firstNameAccessor) }, // not allowed df.select { NonDataSchemaPerson::name.except("firstName") }, df.select { NonDataSchemaPerson::name.except("firstName", "firstName") }, - df.select { NonDataSchemaPerson::name except Name::firstName }, df.select { NonDataSchemaPerson::name.except(Name::firstName) }, df.select { NonDataSchemaPerson::name.except(Name::firstName, Name::firstName) }, - df.select { NonDataSchemaPerson::name except pathOf("firstName") }, df.select { NonDataSchemaPerson::name.except(pathOf("firstName")) }, df.select { NonDataSchemaPerson::name.except(pathOf("firstName"), pathOf("firstName")) }, - df.select { pathOf("name") except { cols { "first" in it.name } } }, + df.select { pathOf("name").except { cols { "first" in it.name } } }, df.select { pathOf("name").except { cols { "first" in it.name } and cols { "first" in it.name } } }, df.select { pathOf("name").except { firstNameAccessor } }, df.select { pathOf("name").except { firstNameAccessor and firstNameAccessor } }, -// df.select { pathOf("name") exceptNew name.firstName }, // not allowed -// df.select { pathOf("name").exceptNew(name.firstName and name.firstName) }, // not allowed -// df.select { pathOf("name") exceptNew firstNameAccessor }, // not allowed -// df.select { pathOf("name").exceptNew(firstNameAccessor and firstNameAccessor) }, // not allowed - df.select { pathOf("name") except "firstName" }, +// df.select { pathOf("name").except(name.firstName and name.firstName) }, // not allowed +// df.select { pathOf("name").except(firstNameAccessor and firstNameAccessor) }, // not allowed df.select { pathOf("name").except("firstName") }, df.select { pathOf("name").except("firstName", "firstName") }, - df.select { pathOf("name") except Name::firstName }, + df.select { pathOf("name").except(Name::firstName) }, df.select { pathOf("name").except(Name::firstName) }, df.select { pathOf("name").except(Name::firstName, Name::firstName) }, - df.select { pathOf("name") except pathOf("firstName") }, df.select { pathOf("name").except(pathOf("firstName")) }, df.select { pathOf("name").except(pathOf("firstName"), pathOf("firstName")) }, ).shouldAllBeEqual() From f272bbfcceb145d776b0f8f0f56a9d47ddca5b97 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 16:25:38 +0100 Subject: [PATCH 5/7] kdoc fixes in allColsExcept --- .../kotlinx/dataframe/api/allExcept.kt | 62 +++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-) 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 fc2f9398a2..f8d6bb8288 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 @@ -97,8 +97,7 @@ public interface AllExceptColumnsSelectionDsl { /** * ## (All) (Cols) Except * - * Perform a selection of columns using the {@include [ColumnsSelectionDslLink]} to - * exclude from the current selection. + * Exclude a selection of columns from the current selection using the {@include [ColumnsSelectionDslLink]}. * * ### Check out: [Grammar] * @@ -139,7 +138,7 @@ public interface AllExceptColumnsSelectionDsl { * * `df.`[select][DataFrame.select]` { `[allExcept][ColumnsSelectionDsl.allExcept]` { userData.age `[and][ColumnsSelectionDsl.and]` height } }` * - * ### On [ColumnGroups][ColumnGroup] + * ### On [ColumnGroups][ColumnGroup]: All Cols Except * The variant of this function on [ColumnGroups][ColumnGroup] is a bit different as it changes the scope relative to * the column group. * {@include [LineBreak]} @@ -158,6 +157,19 @@ public interface AllExceptColumnsSelectionDsl { * Also note the name change, similar to [allCols][ColumnsSelectionDsl.allCols], this makes it clearer that you're selecting * columns inside the group, 'lifting' them out. * + * ### On [ColumnGroups][ColumnGroup]: Except + * This variant can be used to exclude some nested columns from a [ColumnGroup] in the selection. + * In contrast to [allColsExcept][ColumnsSelectionDsl.allColsExcept], + * this function does not 'lift' the columns out of the group, preserving the structure. + * + * So: + * + * `df.`[select][DataFrame.select]` { colGroup.`[except][SingleColumn.except]` { col } }` + * + * is shorthand for: + * + * `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]`(colGroup) `[except][ColumnSet.except]` colGroup.col }` + * * ### Examples for this overload * {@get [EXAMPLE]} * @@ -184,9 +196,9 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [CommonExceptDocs] * {@set [CommonExceptDocs.EXAMPLE] - * `df.`[select][ColumnsSelectionDsl.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>() `[except][ColumnSet.except]` `{@get [ARGUMENT_1]}` \}` + * `df.`[select][ColumnsSelectionDsl.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>() `[except][ColumnSet.except]` {@get [ARGUMENT_1]} \}` * - * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age) `[except][ColumnSet.except]` `{@get [ARGUMENT_2]}` \}` + * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age) `[except][ColumnSet.except]` {@get [ARGUMENT_2]} \}` * } */ private interface ColumnSetInfixDocs { @@ -201,9 +213,9 @@ public interface AllExceptColumnsSelectionDsl { /** * @include [CommonExceptDocs] * {@set [CommonExceptDocs.EXAMPLE] - * `df.`[select][ColumnsSelectionDsl.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>().`[except][ColumnSet.except]{@get [ARGUMENT_1]}` \}` + * `df.`[select][ColumnsSelectionDsl.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Number][Number]`>().`[except][ColumnSet.except]`{@get [ARGUMENT_1]} \}` * - * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age).`[except][ColumnSet.except]{@get [ARGUMENT_2]}` \}` + * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age).`[except][ColumnSet.except]`{@get [ARGUMENT_2]} \}` * } */ private interface ColumnSetVarargDocs { @@ -219,8 +231,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetInfixDocs] * @set [CommonExceptDocs.PARAM] @param [selector\] A lambda in which you specify the columns that need to be * excluded from the [ColumnSet]. The scope of the selector is the same as the outer scope. - * @set [ColumnSetInfixDocs.ARGUMENT_1] `{ "age" `[and][ColumnsSelectionDsl.and]` height }` - * @set [ColumnSetInfixDocs.ARGUMENT_2] `{ name.firstName }` + * @set [ColumnSetInfixDocs.ARGUMENT_1] { "age" `[and][ColumnsSelectionDsl.and]` height } + * @set [ColumnSetInfixDocs.ARGUMENT_2] { name.firstName } */ public infix fun ColumnSet.except(selector: () -> ColumnsResolver<*>): ColumnSet = except(selector()) @@ -228,8 +240,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetInfixDocs] * @set [CommonExceptDocs.PARAM] @param [other\] A [ColumnsResolver] containing the columns that need to be * excluded from the [ColumnSet]. - * @set [ColumnSetInfixDocs.ARGUMENT_1] `"age" `[and][ColumnsSelectionDsl.and]` height` - * @set [ColumnSetInfixDocs.ARGUMENT_2] `name.firstName` + * @set [ColumnSetInfixDocs.ARGUMENT_1] "age" `[and][ColumnsSelectionDsl.and]` height + * @set [ColumnSetInfixDocs.ARGUMENT_2] name.firstName */ public infix fun ColumnSet.except(other: ColumnsResolver<*>): ColumnSet = exceptInternal(other) @@ -237,8 +249,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetVarargDocs] * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [ColumnsResolvers][ColumnsResolver] containing * the columns that need to be excluded from the [ColumnSet]. - * @set [ColumnSetVarargDocs.ARGUMENT_1] `(age, userData.height)` - * @set [ColumnSetVarargDocs.ARGUMENT_2] `(name.firstName, name.middleName)` + * @set [ColumnSetVarargDocs.ARGUMENT_1] (age, userData.height) + * @set [ColumnSetVarargDocs.ARGUMENT_2] (name.firstName, name.middleName) */ public fun ColumnSet.except(vararg others: ColumnsResolver<*>): ColumnSet = except(others.toColumnSet()) @@ -246,8 +258,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetInfixDocs] * @set [CommonExceptDocs.PARAM] @param [other\] A [String] referring to * the column (relative to the current scope) that needs to be excluded from the [ColumnSet]. - * @set [ColumnSetInfixDocs.ARGUMENT_1] `"age"` - * @set [ColumnSetInfixDocs.ARGUMENT_2] `"name"` + * @set [ColumnSetInfixDocs.ARGUMENT_1] "age" + * @set [ColumnSetInfixDocs.ARGUMENT_2] "name" */ public infix fun ColumnSet.except(other: String): ColumnSet = except(column(other)) @@ -255,8 +267,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetVarargDocs] * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [Strings][String] referring to * the columns (relative to the current scope) that need to be excluded from the [ColumnSet]. - * @set [ColumnSetVarargDocs.ARGUMENT_1] `("age", "height")` - * @set [ColumnSetVarargDocs.ARGUMENT_2] `("name")` + * @set [ColumnSetVarargDocs.ARGUMENT_1] ("age", "height") + * @set [ColumnSetVarargDocs.ARGUMENT_2] ("name") */ public fun ColumnSet.except(vararg others: String): ColumnSet = except(others.toColumnSet()) @@ -264,8 +276,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetInfixDocs] * @set [CommonExceptDocs.PARAM] @param [other\] A [KProperty] referring to * the column (relative to the current scope) that needs to be excluded from the [ColumnSet]. - * @set [ColumnSetInfixDocs.ARGUMENT_1] `Person::age` - * @set [ColumnSetInfixDocs.ARGUMENT_2] `Person::name` + * @set [ColumnSetInfixDocs.ARGUMENT_1] Person::age + * @set [ColumnSetInfixDocs.ARGUMENT_2] Person::name */ @AccessApiOverload public infix fun ColumnSet.except(other: KProperty): ColumnSet = except(column(other)) @@ -274,8 +286,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetVarargDocs] * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [KProperties][KProperty] referring to * the columns (relative to the current scope) that need to be excluded from the [ColumnSet]. - * @set [ColumnSetVarargDocs.ARGUMENT_1] `(Person::age, Person::height)` - * @set [ColumnSetVarargDocs.ARGUMENT_2] `(Person::name)` + * @set [ColumnSetVarargDocs.ARGUMENT_1] (Person::age, Person::height) + * @set [ColumnSetVarargDocs.ARGUMENT_2] (Person::name) */ @AccessApiOverload public fun ColumnSet.except(vararg others: KProperty): ColumnSet = except(others.toColumnSet()) @@ -284,8 +296,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetInfixDocs] * @set [CommonExceptDocs.PARAM] @param [other\] A [ColumnPath] referring to * the column (relative to the current scope) that needs to be excluded from the [ColumnSet]. - * @set [ColumnSetInfixDocs.ARGUMENT_1] `"userdata"["age"]` - * @set [ColumnSetInfixDocs.ARGUMENT_2] `pathOf("name", "firstName")` + * @set [ColumnSetInfixDocs.ARGUMENT_1] "userdata"["age"] + * @set [ColumnSetInfixDocs.ARGUMENT_2] pathOf("name", "firstName") */ public infix fun ColumnSet.except(other: ColumnPath): ColumnSet = except(column(other)) @@ -293,8 +305,8 @@ public interface AllExceptColumnsSelectionDsl { * @include [ColumnSetVarargDocs] * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [ColumnPaths][ColumnPath] referring to * the columns (relative to the current scope) that need to be excluded from the [ColumnSet]. - * @set [ColumnSetVarargDocs.ARGUMENT_1] `(pathOf("age"), "userdata"["height"])` - * @set [ColumnSetVarargDocs.ARGUMENT_2] `("name"["firstName"], "name"["middleName"])` + * @set [ColumnSetVarargDocs.ARGUMENT_1] (pathOf("age"), "userdata"["height"]) + * @set [ColumnSetVarargDocs.ARGUMENT_2] ("name"["firstName"], "name"["middleName"]) */ public fun ColumnSet.except(vararg others: ColumnPath): ColumnSet = except(others.toColumnSet()) From ca9532b675a1721e3a61f7bcbfa244ccbf4da1fa Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 17:35:04 +0100 Subject: [PATCH 6/7] removed some overloads and added kdocs for colgroup except functions --- core/api/core.api | 439 +++++++----------- .../kotlinx/dataframe/api/allExcept.kt | 216 +++------ 2 files changed, 236 insertions(+), 419 deletions(-) diff --git a/core/api/core.api b/core/api/core.api index 605ef682bf..6d27b97373 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -512,9 +512,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/aggregation/Colu public final class org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -920,6 +917,24 @@ public final class org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggrega public static fun dropLastWhile (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -929,42 +944,11 @@ public final class org/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggrega public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/aggregation/ColumnsForAggregateSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -1744,9 +1728,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSe } public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl { - public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public abstract fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -1779,6 +1760,24 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptCol public abstract fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public abstract fun except (Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1788,48 +1787,14 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptCol public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public abstract fun exceptNew (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public abstract fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public abstract fun except (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } public final class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$DefaultImpls { - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -1862,6 +1827,24 @@ public final class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelection public static fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun allExcept (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1871,48 +1854,17 @@ public final class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelection public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupExperimentalName { +public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupExceptName { } public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupName { @@ -2951,9 +2903,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelec public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -3357,6 +3306,24 @@ public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$Defau public static fun dropLastWhile (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -3366,42 +3333,11 @@ public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$Defau public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -4416,9 +4352,6 @@ public final class org/jetbrains/kotlinx/dataframe/api/ExcessiveColumns : java/l public static fun values ()[Lorg/jetbrains/kotlinx/dataframe/api/ExcessiveColumns; } -public abstract interface annotation class org/jetbrains/kotlinx/dataframe/api/ExperimentalExceptCsDsl : java/lang/annotation/Annotation { -} - public final class org/jetbrains/kotlinx/dataframe/api/ExplodeKt { public static final fun explode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;ZLkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun explode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;Z)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -5033,9 +4966,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/JoinDsl : or public final class org/jetbrains/kotlinx/dataframe/api/JoinDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -5439,6 +5369,24 @@ public final class org/jetbrains/kotlinx/dataframe/api/JoinDsl$DefaultImpls { public static fun dropLastWhile (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -5448,42 +5396,11 @@ public final class org/jetbrains/kotlinx/dataframe/api/JoinDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/JoinDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -6526,9 +6443,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/PivotDsl : o public final class org/jetbrains/kotlinx/dataframe/api/PivotDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -6932,6 +6846,24 @@ public final class org/jetbrains/kotlinx/dataframe/api/PivotDsl$DefaultImpls { public static fun dropLastWhile (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -6941,42 +6873,11 @@ public final class org/jetbrains/kotlinx/dataframe/api/PivotDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/PivotDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; @@ -7633,9 +7534,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SortDsl : or public final class org/jetbrains/kotlinx/dataframe/api/SortDsl$DefaultImpls { public static fun ColumnSetDataFrameFrameColIndex (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun KPropertyDataRowExceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -8043,6 +7941,24 @@ public final class org/jetbrains/kotlinx/dataframe/api/SortDsl$DefaultImpls { public static fun dropLastWhile (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun dropWhile (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function0;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -8052,42 +7968,11 @@ public final class org/jetbrains/kotlinx/dataframe/api/SortDsl$DefaultImpls { public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Ljava/lang/String;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lkotlin/reflect/KProperty;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; - public static fun exceptNew (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; + public static fun except (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public static fun filter (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; public static fun first (Lorg/jetbrains/kotlinx/dataframe/api/SortDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableSingleColumn; 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 f8d6bb8288..1d8e2a251e 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 @@ -5,6 +5,11 @@ import org.jetbrains.kotlinx.dataframe.DataColumn import org.jetbrains.kotlinx.dataframe.DataFrame import org.jetbrains.kotlinx.dataframe.DataRow import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload +import org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.ColumnGroupDocs.ARGUMENT_1 +import org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.ColumnGroupDocs.ARGUMENT_2 +import org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.ColumnGroupDocs.RECEIVER_1 +import org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.ColumnGroupDocs.RECEIVER_2 +import org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.ColumnGroupDocs.RECEIVER_TYPE import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup import org.jetbrains.kotlinx.dataframe.columns.ColumnPath import org.jetbrains.kotlinx.dataframe.columns.ColumnSet @@ -13,8 +18,8 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver import org.jetbrains.kotlinx.dataframe.columns.SingleColumn import org.jetbrains.kotlinx.dataframe.columns.toColumnSet import org.jetbrains.kotlinx.dataframe.documentation.AccessApi.ExtensionPropertiesApiLink -import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate +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.aggregation.toColumns @@ -182,6 +187,7 @@ public interface AllExceptColumnsSelectionDsl { * @see ColumnsSelectionDsl.allUpTo * @see ColumnsSelectionDsl.allFrom */ + @ExcludeFromSources private interface CommonExceptDocs { // Example argument @@ -201,6 +207,7 @@ public interface AllExceptColumnsSelectionDsl { * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age) `[except][ColumnSet.except]` {@get [ARGUMENT_2]} \}` * } */ + @ExcludeFromSources private interface ColumnSetInfixDocs { // argument @@ -218,6 +225,7 @@ public interface AllExceptColumnsSelectionDsl { * `df.`[select][ColumnsSelectionDsl.select]` { `[cols][ColumnsSelectionDsl.cols]`(name, age).`[except][ColumnSet.except]`{@get [ARGUMENT_2]} \}` * } */ + @ExcludeFromSources private interface ColumnSetVarargDocs { // argument @@ -321,6 +329,7 @@ public interface AllExceptColumnsSelectionDsl { * * `df.`[select][ColumnsSelectionDsl.select]` { `[allExcept][ColumnsSelectionDsl.allExcept]{@get [ARGUMENT_2]}` \}` */ + @ExcludeFromSources private interface ColumnsSelectionDslDocs { // argument @@ -395,6 +404,7 @@ public interface AllExceptColumnsSelectionDsl { * `df.`[select][ColumnsSelectionDsl.select]` { city `[and][ColumnsSelectionDsl.and]` `{@get [RECEIVER_2]}[allColsExcept][{@get [RECEIVER_TYPE]}.allColsExcept]{@get [ARGUMENT_2]}` \}` */ @Suppress("ClassName") + @ExcludeFromSources private interface ColumnGroupDocs { // receiver @@ -531,35 +541,23 @@ public interface AllExceptColumnsSelectionDsl { // region except /** - * ## EXPERIMENTAL: Except on Column Group - * - * Selects the current column group itself, except for the specified columns. This is different from - * [allColsExcept] in that it does not 'lift' the columns out of the group, but instead selects the group itself. - * - * As usual, all overloads for each {@include [AccessApiLink]} are available. - * - * These produce the same result: - * - * `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]`(colGroup) `[except][ColumnSet.except]` colGroup.col }` + * @include [CommonExceptDocs] + * @set [CommonExceptDocs.EXAMPLE] {@comment blocks are there to prevent double ``} + * `df.`[select][ColumnsSelectionDsl.select]` { `{@get [RECEIVER_1]}[except][{@get [RECEIVER_TYPE]}.except]{@get [ARGUMENT_1]}` \}` * - * `df.`[select][DataFrame.select]` { colGroup `[except][SingleColumn.except]` { col } }` + * `df.`[select][ColumnsSelectionDsl.select]` { city `[and][ColumnsSelectionDsl.and]` `{@get [RECEIVER_2]}[except][{@get [RECEIVER_TYPE]}.except]{@get [ARGUMENT_2]}` \}` */ - private interface ExperimentalExceptDocs + @ExcludeFromSources + private interface ColumnGroupExceptDocs : ColumnGroupDocs /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] + * @include [ColumnGroupExceptDocs.SelectorArgs] */ public fun SingleColumn>.except(selector: ColumnsSelector): SingleColumn> = exceptInternal(selector.toColumns()) - @Deprecated( - message = ALL_COLS_EXCEPT, - replaceWith = ReplaceWith(EXCEPT_REPLACE), - level = DeprecationLevel.ERROR, - ) // present solely to redirect users to the right function - public fun SingleColumn>.except(other: ColumnsResolver<*>): SingleColumn> = - except { other } - @Deprecated( message = ALL_COLS_EXCEPT, replaceWith = ReplaceWith(EXCEPT_REPLACE_VARARG), @@ -569,45 +567,34 @@ public interface AllExceptColumnsSelectionDsl { except { others.toColumnSet() } /** - * @include [ExperimentalExceptDocs] - */ - public fun SingleColumn>.except(other: String): SingleColumn> = - exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] + * @include [ColumnGroupExceptDocs.StringArgs] */ public fun SingleColumn>.except(vararg others: String): SingleColumn> = exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @AccessApiOverload - public fun SingleColumn>.except(other: KProperty): SingleColumn> = - exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] + * @include [ColumnGroupExceptDocs.KPropertyArgs] */ @AccessApiOverload public fun SingleColumn>.except(vararg others: KProperty<*>): SingleColumn> = exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - public fun SingleColumn>.except(other: ColumnPath): SingleColumn> = - exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.SingleColumnReceiverArgs] + * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ public fun SingleColumn>.except(vararg others: ColumnPath): SingleColumn> = exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.StringReceiverArgs] + * @include [ColumnGroupExceptDocs.SelectorArgs] */ public fun String.except(selector: ColumnsSelector<*, *>): SingleColumn> = columnGroup(this).except(selector) @@ -629,45 +616,34 @@ public interface AllExceptColumnsSelectionDsl { except { others.toColumnSet() } /** - * @include [ExperimentalExceptDocs] - */ - public fun String.except(other: String): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.StringReceiverArgs] + * @include [ColumnGroupExceptDocs.StringArgs] */ public fun String.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @AccessApiOverload - public fun String.except(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.StringReceiverArgs] + * @include [ColumnGroupExceptDocs.KPropertyArgs] */ @AccessApiOverload public fun String.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - public fun String.except(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.StringReceiverArgs] + * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ public fun String.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.SelectorArgs] */ @AccessApiOverload public fun KProperty.except(selector: ColumnsSelector): SingleColumn> = @@ -692,30 +668,18 @@ public interface AllExceptColumnsSelectionDsl { except { others.toColumnSet() } /** - * @include [ExperimentalExceptDocs] - */ - @AccessApiOverload - public fun KProperty.except(other: String): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.StringArgs] */ @AccessApiOverload public fun KProperty.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @Suppress("INAPPLICABLE_JVM_NAME") - @JvmName("KPropertyDataRowExceptNew") - @AccessApiOverload - public fun KProperty>.except(other: String): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.StringArgs] */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @@ -724,30 +688,18 @@ public interface AllExceptColumnsSelectionDsl { columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @AccessApiOverload - public fun KProperty.except(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.KPropertyArgs] */ @AccessApiOverload public fun KProperty.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @Suppress("INAPPLICABLE_JVM_NAME") - @JvmName("KPropertyDataRowExceptNew") - @AccessApiOverload - public fun KProperty>.except(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.KPropertyArgs] */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @@ -756,30 +708,18 @@ public interface AllExceptColumnsSelectionDsl { columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @AccessApiOverload - public fun KProperty.except(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ @AccessApiOverload public fun KProperty.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - @Suppress("INAPPLICABLE_JVM_NAME") - @JvmName("KPropertyDataRowExceptNew") - @AccessApiOverload - public fun KProperty>.except(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.KPropertyReceiverArgs] + * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("KPropertyDataRowExceptNew") @@ -788,7 +728,9 @@ public interface AllExceptColumnsSelectionDsl { columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupExceptDocs.SelectorArgs] */ public fun ColumnPath.except(selector: ColumnsSelector<*, *>): SingleColumn> = columnGroup(this).exceptInternal(selector.toColumns()) @@ -810,36 +752,26 @@ public interface AllExceptColumnsSelectionDsl { except { others.toColumnSet() } /** - * @include [ExperimentalExceptDocs] - */ - public fun ColumnPath.except(other: String): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupExceptDocs.StringArgs] */ public fun ColumnPath.except(vararg others: String): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupExceptDocs.KPropertyArgs] */ @AccessApiOverload - public fun ColumnPath.except(other: KProperty<*>): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - @AccessApiOverload public fun ColumnPath.except(vararg others: KProperty<*>): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) /** - * @include [ExperimentalExceptDocs] - */ - public fun ColumnPath.except(other: ColumnPath): SingleColumn> = - columnGroup(this).exceptInternal(column(other)) - - /** - * @include [ExperimentalExceptDocs] + * @include [ColumnGroupExceptDocs] + * @include [ColumnGroupExceptDocs.ColumnPathReceiverArgs] + * @include [ColumnGroupExceptDocs.ColumnPathArgs] */ public fun ColumnPath.except(vararg others: ColumnPath): SingleColumn> = columnGroup(this).exceptInternal(others.toColumnSet()) From b101243954dd1782fa4814e02c528e154a65ea84 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Tue, 11 Feb 2025 20:17:28 +0100 Subject: [PATCH 7/7] kdoc and documentation fixes for new except function --- .../kotlinx/dataframe/api/allExcept.kt | 4 ++-- .../kotlinx/dataframe/impl/columns/Utils.kt | 2 +- ...mmar.ColumnGroupPartOfGrammar.ForHtml.html | 2 +- docs/StardustDocs/topics/ColumnSelectors.md | 24 +++++++++---------- 4 files changed, 15 insertions(+), 17 deletions(-) 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 1d8e2a251e..3a73eebf1c 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 @@ -95,7 +95,7 @@ public interface AllExceptColumnsSelectionDsl { /** __`.`__[**`allColsExcept`**][ColumnsSelectionDsl.allColsExcept] */ public interface ColumnGroupName - /** [**`except`**][ColumnsSelectionDsl.except] */ + /** __`.`__[**`except`**][ColumnsSelectionDsl.except] */ public interface ColumnGroupExceptName } @@ -108,7 +108,7 @@ public interface AllExceptColumnsSelectionDsl { * * ### On [ColumnSets][ColumnSet] * This function can be explained the easiest with [ColumnSets][ColumnSet]. Let's say we want all - * [Int] columns apart from `age` and `height`. + * [Int] columns apart from `age` and `height`. * * We can do: * diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt index a6ce34f0e0..50b1587641 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt @@ -444,7 +444,7 @@ internal fun List>.allColumnsExceptKeepingStructure( // remove the group if it's empty and removeEmptyGroups is true // else, simply update the parent's data with the adjusted column group nodeToExcept.parent.data = - if (adjustedCurrent.cols().isEmpty() && removeEmptyGroups) { + if (removeEmptyGroups && adjustedCurrent.cols().isEmpty()) { null } else { adjustedCurrent diff --git a/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html b/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html index 829f42661b..7fee56941c 100644 --- a/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html +++ b/docs/StardustDocs/snippets/kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html @@ -44,5 +44,5 @@ } -

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 }

    | exceptNew { colsSelector } EXPERIMENTAL!

    | exceptNew(columnNoAccessor, ..) EXPERIMENTAL!

    | (.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 [ { 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 } ]

diff --git a/docs/StardustDocs/topics/ColumnSelectors.md b/docs/StardustDocs/topics/ColumnSelectors.md index bbed8a9219..a1ddfa91d9 100644 --- a/docs/StardustDocs/topics/ColumnSelectors.md +++ b/docs/StardustDocs/topics/ColumnSelectors.md @@ -234,9 +234,9 @@ Select `myColGroup.someCol` and all `String` columns from `myColGroup`: ##### (All) (Cols) Except {collapsible="true"} -`colSet.except()`, `allExcept {}`, `colGroupA.allColsExcept {}` +`colSet.except()`, `allExcept {}`, `colGroupA.allColsExcept {}`, `colGroupA.except {}` -Perform a selection of columns using a relative `ColumnsSelector` to exclude from the current selection. +Exclude a selection of columns from the current selection using a relative `ColumnsSelector`. This function is best explained in parts: @@ -299,24 +299,22 @@ or Note the name change, similar to [`allCols`](ColumnSelectors.md#cols), this makes it clearer that you're selecting columns inside the group, 'lifting' them out. -**Experimental: Except on Column Group** +**On [Column Groups](DataColumn.md#columngroup):** `except {}` -Selects the current [column group](DataColumn.md#columngroup) itself, except for the specified columns. -This is different from `allColsExcept` in that it does not 'lift' the columns out of the group, -but instead selects the group itself. +This variant can be used to exclude some nested columns from a [Column Group](DataColumn.md#columngroup) in the selection. +In contrast to `allColsExcept`, this function does not 'lift' the columns out of the group, preserving the structure. -These all produce the same result: +So: -`df.select { colGroup exceptNew { col } }` +`df.select { colGroup.except { col } }` -`df.select { colGroup }.remove { colGroup.col }` +is shorthand for: `df.select { cols(colGroup) except colGroup.col }` -> NOTE: This function is experimental and will definitely change in the future. -> It's named `exceptNew` until the deprecated `SingleColumn.except()` overloads are removed. -> Most likely, it'll be renamed to `except` afterward. -> Until then, it requires `@OptIn(ExperimentalExceptCsDsl::class)` to be used. +or: + +`df.remove { colGroup.col }.select { colGroup }` ##### Column Name Filters {collapsible="true"} `nameContains()`, `colsNameContains()`, `nameStartsWith()`, `colsNameEndsWith()`