Skip to content

Commit a4104d7

Browse files
Automated commit of generated code
1 parent da17b1f commit a4104d7

File tree

10 files changed

+138
-642
lines changed

10 files changed

+138
-642
lines changed

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

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package org.jetbrains.kotlinx.dataframe.api
22

33
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
4-
import org.jetbrains.kotlinx.dataframe.DataColumn
54
import org.jetbrains.kotlinx.dataframe.DataFrame
65
import org.jetbrains.kotlinx.dataframe.DataRow
76
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
87
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
98
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
109
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
11-
import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnsList
12-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_LIST_DATACOLUMN_GET
13-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE
1410
import kotlin.reflect.KProperty
1511

1612
/** [Columns Selection DSL][ColumnsSelectionDsl] */
@@ -287,11 +283,11 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
287283
*
288284
* &nbsp;&nbsp;&nbsp;&nbsp;`| `__`.`__[**`drop`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.dropWhile]`(`[**`Last`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.dropLastWhile]`)`[**`While`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.dropWhile]**` { `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**
289285
*
290-
* &nbsp;&nbsp;&nbsp;&nbsp;`| `[**`except`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]` [`**` { `**`] `[`columnsResolver`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnsResolverDef]` [`**` } `**`]`
286+
* &nbsp;&nbsp;&nbsp;&nbsp;`| `[**`except`**][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]` [`**` { `**`] `[`columnsResolver`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnsResolverDef]` [`**` } `**`]`
291287
*
292-
* &nbsp;&nbsp;&nbsp;&nbsp;`| `[**`except`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]` `[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
288+
* &nbsp;&nbsp;&nbsp;&nbsp;`| `[**`except`**][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]` `[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
293289
*
294-
* &nbsp;&nbsp;&nbsp;&nbsp;`| `**`.`**[**`except`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]**`(`**[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]**`,`**` ..`**`)`**
290+
* &nbsp;&nbsp;&nbsp;&nbsp;`| `**`.`**[**`except`**][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]**`(`**[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]**`,`**` ..`**`)`**
295291
*
296292
* &nbsp;&nbsp;&nbsp;&nbsp;`| `__`.`__[**`filter`**][org.jetbrains.kotlinx.dataframe.api.FilterColumnsSelectionDsl.filter]**` { `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**
297293
*
@@ -399,22 +395,6 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
399395
public operator fun <C> ColumnsSelector<T, C>.invoke(): ColumnsResolver<C> =
400396
this@invoke(this@ColumnsSelectionDsl, this@ColumnsSelectionDsl)
401397

402-
/**
403-
* ## Deprecated: Columns by Index Range from List of Columns
404-
* Helper function to create a [ColumnSet] from a list of columns by specifying a range of indices.
405-
*
406-
* ### Deprecated
407-
*
408-
* Deprecated because it's too niche. Let us know if you have a good use for it!
409-
*/
410-
@Deprecated(
411-
message = COL_SELECT_DSL_LIST_DATACOLUMN_GET,
412-
replaceWith = ReplaceWith(COL_SELECT_DSL_LIST_DATACOLUMN_GET_REPLACE),
413-
level = DeprecationLevel.ERROR,
414-
)
415-
public operator fun <C> List<DataColumn<C>>.get(range: IntRange): ColumnSet<C> =
416-
ColumnsList(subList(range.first, range.last + 1))
417-
418398
// region select
419399
// NOTE: due to invoke conflicts these cannot be moved out of the interface
420400

@@ -452,7 +432,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
452432
* &nbsp;&nbsp;&nbsp;&nbsp;
453433
*
454434
*
455-
* See also [except][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
435+
* See also [except][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
456436
*
457437
* @param [selector] The [ColumnsSelector][org.jetbrains.kotlinx.dataframe.ColumnsSelector] to use for the selection.
458438
* @receiver The [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] to select from.
@@ -497,7 +477,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
497477
* &nbsp;&nbsp;&nbsp;&nbsp;
498478
*
499479
*
500-
* See also [except][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
480+
* See also [except][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
501481
*
502482
* @param [selector] The [ColumnsSelector][org.jetbrains.kotlinx.dataframe.ColumnsSelector] to use for the selection.
503483
* @receiver The [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] to select from.
@@ -542,7 +522,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
542522
* &nbsp;&nbsp;&nbsp;&nbsp;
543523
*
544524
*
545-
* See also [except][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
525+
* See also [except][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
546526
*
547527
* @param [selector] The [ColumnsSelector][org.jetbrains.kotlinx.dataframe.ColumnsSelector] to use for the selection.
548528
* @receiver The [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] to select from.
@@ -590,7 +570,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
590570
* &nbsp;&nbsp;&nbsp;&nbsp;
591571
*
592572
*
593-
* See also [except][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
573+
* See also [except][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.except]/[allExcept][org.jetbrains.kotlinx.dataframe.api.AllExceptColumnsSelectionDsl.allColsExcept] for the inverted operation of this function.
594574
*
595575
* @param [selector] The [ColumnsSelector][org.jetbrains.kotlinx.dataframe.ColumnsSelector] to use for the selection.
596576
* @receiver The [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup] to select from.

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

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
2626
import org.jetbrains.kotlinx.dataframe.impl.columns.onResolve
2727
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
2828
import org.jetbrains.kotlinx.dataframe.impl.owner
29-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS
30-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_AFTER
31-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE
32-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_BEFORE
33-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE
34-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_FROM
35-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_FROM_REPLACE
36-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_REPLACE
37-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_UP_TO
38-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE
39-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_FROM
40-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_FROM_REPLACE
41-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_UP_TO
42-
import org.jetbrains.kotlinx.dataframe.util.COL_SELECT_DSL_ALL_UP_TO_REPLACE
4329
import kotlin.reflect.KProperty
4430

4531
// region DataColumn
@@ -8058,126 +8044,6 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
80588044
public fun ColumnPath.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column)
80598045

80608046
// endregion
8061-
8062-
// region deprecated
8063-
8064-
@Deprecated(
8065-
COL_SELECT_DSL_ALL_COLS,
8066-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
8067-
level = DeprecationLevel.ERROR,
8068-
)
8069-
public fun SingleColumn<DataRow<*>>.all(): TransformableColumnSet<*> = allCols()
8070-
8071-
@Deprecated(
8072-
COL_SELECT_DSL_ALL_COLS,
8073-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_REPLACE),
8074-
level = DeprecationLevel.ERROR,
8075-
)
8076-
public fun String.all(): TransformableColumnSet<*> = allCols()
8077-
8078-
@Deprecated(
8079-
COL_SELECT_DSL_ALL_COLS_AFTER,
8080-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8081-
level = DeprecationLevel.ERROR,
8082-
)
8083-
public fun SingleColumn<DataRow<*>>.allAfter(column: ColumnPath): ColumnSet<*> = allColsAfter(column)
8084-
8085-
@Deprecated(
8086-
COL_SELECT_DSL_ALL_COLS_AFTER,
8087-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8088-
level = DeprecationLevel.ERROR,
8089-
)
8090-
public fun SingleColumn<DataRow<*>>.allAfter(column: String): ColumnSet<*> = allColsAfter(column)
8091-
8092-
@Deprecated(
8093-
COL_SELECT_DSL_ALL_COLS_AFTER,
8094-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_AFTER_REPLACE),
8095-
level = DeprecationLevel.ERROR,
8096-
)
8097-
public fun SingleColumn<DataRow<*>>.allAfter(column: AnyColumnReference): ColumnSet<*> = allColsAfter(column)
8098-
8099-
@Deprecated(
8100-
COL_SELECT_DSL_ALL_COLS_BEFORE,
8101-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8102-
level = DeprecationLevel.ERROR,
8103-
)
8104-
public fun SingleColumn<DataRow<*>>.allBefore(column: ColumnPath): ColumnSet<*> = allColsBefore(column)
8105-
8106-
@Deprecated(
8107-
COL_SELECT_DSL_ALL_COLS_BEFORE,
8108-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8109-
level = DeprecationLevel.ERROR,
8110-
)
8111-
public fun SingleColumn<DataRow<*>>.allBefore(column: String): ColumnSet<*> = allColsBefore(column)
8112-
8113-
@Deprecated(
8114-
COL_SELECT_DSL_ALL_COLS_BEFORE,
8115-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_BEFORE_REPLACE),
8116-
level = DeprecationLevel.ERROR,
8117-
)
8118-
public fun SingleColumn<DataRow<*>>.allBefore(column: AnyColumnReference): ColumnSet<*> = allColsBefore(column)
8119-
8120-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
8121-
public fun ColumnsSelectionDsl<*>.allSince(column: ColumnPath): ColumnSet<*> = allFrom(column)
8122-
8123-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
8124-
public fun ColumnsSelectionDsl<*>.allSince(column: String): ColumnSet<*> = allFrom(column)
8125-
8126-
@Deprecated(COL_SELECT_DSL_ALL_FROM, ReplaceWith(COL_SELECT_DSL_ALL_FROM_REPLACE), level = DeprecationLevel.ERROR)
8127-
public fun ColumnsSelectionDsl<*>.allSince(column: AnyColumnReference): ColumnSet<*> = allFrom(column)
8128-
8129-
@Deprecated(
8130-
COL_SELECT_DSL_ALL_COLS_FROM,
8131-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8132-
level = DeprecationLevel.ERROR,
8133-
)
8134-
public fun SingleColumn<DataRow<*>>.allSince(column: ColumnPath): ColumnSet<*> = allColsFrom(column)
8135-
8136-
@Deprecated(
8137-
COL_SELECT_DSL_ALL_COLS_FROM,
8138-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8139-
level = DeprecationLevel.ERROR,
8140-
)
8141-
public fun SingleColumn<DataRow<*>>.allSince(column: String): ColumnSet<*> = allColsFrom(column)
8142-
8143-
@Deprecated(
8144-
COL_SELECT_DSL_ALL_COLS_FROM,
8145-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_FROM_REPLACE),
8146-
level = DeprecationLevel.ERROR,
8147-
)
8148-
public fun SingleColumn<DataRow<*>>.allSince(column: AnyColumnReference): ColumnSet<*> = allColsFrom(column)
8149-
8150-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
8151-
public fun ColumnsSelectionDsl<*>.allUntil(column: ColumnPath): ColumnSet<*> = allUpTo(column)
8152-
8153-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
8154-
public fun ColumnsSelectionDsl<*>.allUntil(column: String): ColumnSet<*> = allUpTo(column)
8155-
8156-
@Deprecated(COL_SELECT_DSL_ALL_UP_TO, ReplaceWith(COL_SELECT_DSL_ALL_UP_TO_REPLACE), level = DeprecationLevel.ERROR)
8157-
public fun ColumnsSelectionDsl<*>.allUntil(column: AnyColumnReference): ColumnSet<*> = allUpTo(column)
8158-
8159-
@Deprecated(
8160-
COL_SELECT_DSL_ALL_COLS_UP_TO,
8161-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8162-
level = DeprecationLevel.ERROR,
8163-
)
8164-
public fun SingleColumn<DataRow<*>>.allUntil(column: ColumnPath): ColumnSet<*> = allColsUpTo(column)
8165-
8166-
@Deprecated(
8167-
COL_SELECT_DSL_ALL_COLS_UP_TO,
8168-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8169-
level = DeprecationLevel.ERROR,
8170-
)
8171-
public fun SingleColumn<DataRow<*>>.allUntil(column: String): ColumnSet<*> = allColsUpTo(column)
8172-
8173-
@Deprecated(
8174-
COL_SELECT_DSL_ALL_COLS_UP_TO,
8175-
ReplaceWith(COL_SELECT_DSL_ALL_COLS_UP_TO_REPLACE),
8176-
level = DeprecationLevel.ERROR,
8177-
)
8178-
public fun SingleColumn<DataRow<*>>.allUntil(column: AnyColumnReference): ColumnSet<*> = allColsUpTo(column)
8179-
8180-
// endregion
81818047
}
81828048

81838049
/**

0 commit comments

Comments
 (0)