Skip to content

Commit 973b521

Browse files
JolanrensenJolanrensen
committed
Merge branch 'master' into min-max
2 parents b427b6a + be58c94 commit 973b521

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+404
-16
lines changed

‎KDOC_PREPROCESSING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Since [v0.3.9](https://github.com/Jolanrensen/KoDEx/releases/tag/v0.3.9) it's al
356356
exclude a whole file from the `sources.jar` by adding the annotation to the top of the file,
357357
like `@file:ExcludeFromSources`.
358358

359-
## KoDEX Conventions in DataFrame
359+
## KoDEx Conventions in DataFrame
360360

361361
### Common Concepts and Definitions
362362

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.jetbrains.kotlinx.dataframe.ColumnsContainer
44
import org.jetbrains.kotlinx.dataframe.DataColumn
55
import org.jetbrains.kotlinx.dataframe.DataFrame
66
import org.jetbrains.kotlinx.dataframe.DataRow
7+
import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
78
import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
89
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
910
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
@@ -85,6 +86,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
8586
* @throws [IllegalArgumentException] if the column is not found.
8687
* @return The [DataColumn] this [KProperty Accessor][KProperty] points to.
8788
*/
89+
@AccessApiOverload
8890
public operator fun <T> KProperty<T>.invoke(): DataColumn<T> = this@ColumnSelectionDsl[this]
8991

9092
/**
@@ -94,6 +96,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
9496
* @throws [IllegalArgumentException] if the column is not found.
9597
* @return The [ColumnGroup] this [KProperty Accessor][KProperty] points to.
9698
*/
99+
@AccessApiOverload
97100
public operator fun <T> KProperty<DataRow<T>>.invoke(): ColumnGroup<T> = this@ColumnSelectionDsl[this]
98101

99102
/**
@@ -103,6 +106,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
103106
* @throws [IllegalArgumentException] if the column is not found.
104107
* @return The [FrameColumn] this [KProperty Accessor][KProperty] points to.
105108
*/
109+
@AccessApiOverload
106110
public operator fun <T> KProperty<DataFrame<T>>.invoke(): FrameColumn<T> = this@ColumnSelectionDsl[this]
107111

108112
/**
@@ -136,6 +140,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
136140
*/
137141
@Suppress("INAPPLICABLE_JVM_NAME")
138142
@JvmName("KPropertyDataRowGet")
143+
@AccessApiOverload
139144
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<R>): DataColumn<R> = invoke()[column]
140145

141146
/**
@@ -154,6 +159,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
154159
*/
155160
@Suppress("INAPPLICABLE_JVM_NAME")
156161
@JvmName("KPropertyDataRowGet")
162+
@AccessApiOverload
157163
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
158164
invoke()[column]
159165

@@ -173,6 +179,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
173179
*/
174180
@Suppress("INAPPLICABLE_JVM_NAME")
175181
@JvmName("KPropertyDataRowGet")
182+
@AccessApiOverload
176183
public operator fun <T, R> KProperty<DataRow<T>>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
177184
invoke()[column]
178185

@@ -190,6 +197,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
190197
* @throws [IllegalArgumentException] if the column is not found.
191198
* @return The [DataColumn] these [KProperty Accessors][KProperty] point to.
192199
*/
200+
@AccessApiOverload
193201
public operator fun <T, R> KProperty<T>.get(column: KProperty<R>): DataColumn<R> = invoke().asColumnGroup()[column]
194202

195203
/**
@@ -206,6 +214,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
206214
* @throws [IllegalArgumentException] if the column is not found.
207215
* @return The [ColumnGroup] these [KProperty Accessors][KProperty] point to.
208216
*/
217+
@AccessApiOverload
209218
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
210219
invoke().asColumnGroup()[column]
211220

@@ -223,6 +232,7 @@ public interface ColumnSelectionDsl<out T> : ColumnsContainer<T> {
223232
* @throws [IllegalArgumentException] if the column is not found.
224233
* @return The [FrameColumn] these [KProperty Accessors][KProperty] point to.
225234
*/
235+
@AccessApiOverload
226236
public operator fun <T, R> KProperty<T>.get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
227237
invoke().asColumnGroup()[column]
228238

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.api
33
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
44
import org.jetbrains.kotlinx.dataframe.DataFrame
55
import org.jetbrains.kotlinx.dataframe.DataRow
6+
import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
67
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
78
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
89
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
@@ -491,6 +492,7 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
491492
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing the columns selected by [selector].
492493
* @see [SingleColumn.except]
493494
*/
495+
@AccessApiOverload
494496
public operator fun <C, R> KProperty<C>.invoke(selector: ColumnsSelector<C, R>): ColumnSet<R> =
495497
columnGroup(this).select(selector)
496498

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
1010
import org.jetbrains.kotlinx.dataframe.DataRow
1111
import org.jetbrains.kotlinx.dataframe.Predicate
1212
import org.jetbrains.kotlinx.dataframe.RowFilter
13+
import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
1314
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
1415
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1516
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
@@ -426,6 +427,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
426427
* @see [ColumnsSelectionDsl.allExcept]
427428
* @see [ColumnsSelectionDsl.cols]
428429
*/
430+
@AccessApiOverload
429431
public fun KProperty<*>.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols()
430432

431433
/**
@@ -1829,6 +1831,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
18291831
* @param [column] The specified column after which all columns should be taken. This column can be referenced
18301832
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
18311833
*/
1834+
@AccessApiOverload
18321835
public fun <C> KProperty<C>.allColsAfter(column: ColumnSelector<C, *>): ColumnSet<*> =
18331836
columnGroup(this).allColsAfter(column)
18341837

@@ -1890,6 +1893,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
18901893
* @param [column] The specified column after which all columns should be taken. This column can be referenced
18911894
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
18921895
*/
1896+
@AccessApiOverload
18931897
public fun KProperty<*>.allColsAfter(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsAfter(column)
18941898

18951899
/** ## All (Cols) After
@@ -1950,6 +1954,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
19501954
* @param [column] The specified column after which all columns should be taken. This column can be referenced
19511955
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
19521956
*/
1957+
@AccessApiOverload
19531958
public fun KProperty<*>.allColsAfter(column: String): ColumnSet<*> = columnGroup(this).allColsAfter(column)
19541959

19551960
/** ## All (Cols) After
@@ -2010,6 +2015,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
20102015
* @param [column] The specified column after which all columns should be taken. This column can be referenced
20112016
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
20122017
*/
2018+
@AccessApiOverload
20132019
public fun KProperty<*>.allColsAfter(column: AnyColumnReference): ColumnSet<*> =
20142020
columnGroup(this).allColsAfter(column)
20152021

@@ -2071,6 +2077,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
20712077
* @param [column] The specified column after which all columns should be taken. This column can be referenced
20722078
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
20732079
*/
2080+
@AccessApiOverload
20742081
public fun KProperty<*>.allColsAfter(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsAfter(column)
20752082

20762083
/** ## All (Cols) After
@@ -3725,6 +3732,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
37253732
* @param [column] The specified column from which all columns should be taken. This column can be referenced
37263733
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
37273734
*/
3735+
@AccessApiOverload
37283736
public fun <C> KProperty<C>.allColsFrom(column: ColumnSelector<C, *>): ColumnSet<*> =
37293737
columnGroup(this).allColsFrom(column)
37303738

@@ -3786,6 +3794,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
37863794
* @param [column] The specified column from which all columns should be taken. This column can be referenced
37873795
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
37883796
*/
3797+
@AccessApiOverload
37893798
public fun KProperty<*>.allColsFrom(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsFrom(column)
37903799

37913800
/** ## All (Cols) From
@@ -3846,6 +3855,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
38463855
* @param [column] The specified column from which all columns should be taken. This column can be referenced
38473856
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
38483857
*/
3858+
@AccessApiOverload
38493859
public fun KProperty<*>.allColsFrom(column: String): ColumnSet<*> = columnGroup(this).allColsFrom(column)
38503860

38513861
/** ## All (Cols) From
@@ -3906,6 +3916,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
39063916
* @param [column] The specified column from which all columns should be taken. This column can be referenced
39073917
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
39083918
*/
3919+
@AccessApiOverload
39093920
public fun KProperty<*>.allColsFrom(column: AnyColumnReference): ColumnSet<*> =
39103921
columnGroup(this).allColsFrom(column)
39113922

@@ -3967,6 +3978,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
39673978
* @param [column] The specified column from which all columns should be taken. This column can be referenced
39683979
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
39693980
*/
3981+
@AccessApiOverload
39703982
public fun KProperty<*>.allColsFrom(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsFrom(column)
39713983

39723984
/** ## All (Cols) From
@@ -5620,6 +5632,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
56205632
* @param [column] The specified column before which all columns should be taken. This column can be referenced
56215633
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
56225634
*/
5635+
@AccessApiOverload
56235636
public fun <C> KProperty<C>.allColsBefore(column: ColumnSelector<C, *>): ColumnSet<*> =
56245637
columnGroup(this).allColsBefore(column)
56255638

@@ -5681,6 +5694,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
56815694
* @param [column] The specified column before which all columns should be taken. This column can be referenced
56825695
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
56835696
*/
5697+
@AccessApiOverload
56845698
public fun KProperty<*>.allColsBefore(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsBefore(column)
56855699

56865700
/** ## All (Cols) Before
@@ -5741,6 +5755,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
57415755
* @param [column] The specified column before which all columns should be taken. This column can be referenced
57425756
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
57435757
*/
5758+
@AccessApiOverload
57445759
public fun KProperty<*>.allColsBefore(column: String): ColumnSet<*> = columnGroup(this).allColsBefore(column)
57455760

57465761
/** ## All (Cols) Before
@@ -5801,6 +5816,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
58015816
* @param [column] The specified column before which all columns should be taken. This column can be referenced
58025817
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
58035818
*/
5819+
@AccessApiOverload
58045820
public fun KProperty<*>.allColsBefore(column: AnyColumnReference): ColumnSet<*> =
58055821
columnGroup(this).allColsBefore(column)
58065822

@@ -5862,6 +5878,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
58625878
* @param [column] The specified column before which all columns should be taken. This column can be referenced
58635879
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
58645880
*/
5881+
@AccessApiOverload
58655882
public fun KProperty<*>.allColsBefore(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsBefore(column)
58665883

58675884
/** ## All (Cols) Before
@@ -7516,6 +7533,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
75167533
* @param [column] The specified column up to which all columns should be taken. This column can be referenced
75177534
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
75187535
*/
7536+
@AccessApiOverload
75197537
public fun <C> KProperty<C>.allColsUpTo(column: ColumnSelector<C, *>): ColumnSet<*> =
75207538
columnGroup(this).allColsUpTo(column)
75217539

@@ -7577,6 +7595,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
75777595
* @param [column] The specified column up to which all columns should be taken. This column can be referenced
75787596
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
75797597
*/
7598+
@AccessApiOverload
75807599
public fun KProperty<*>.allColsUpTo(column: ColumnPath): ColumnSet<*> = columnGroup(this).allColsUpTo(column)
75817600

75827601
/** ## All (Cols) Up To
@@ -7637,6 +7656,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
76377656
* @param [column] The specified column up to which all columns should be taken. This column can be referenced
76387657
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
76397658
*/
7659+
@AccessApiOverload
76407660
public fun KProperty<*>.allColsUpTo(column: String): ColumnSet<*> = columnGroup(this).allColsUpTo(column)
76417661

76427662
/** ## All (Cols) Up To
@@ -7697,6 +7717,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
76977717
* @param [column] The specified column up to which all columns should be taken. This column can be referenced
76987718
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
76997719
*/
7720+
@AccessApiOverload
77007721
public fun KProperty<*>.allColsUpTo(column: AnyColumnReference): ColumnSet<*> =
77017722
columnGroup(this).allColsUpTo(column)
77027723

@@ -7758,6 +7779,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
77587779
* @param [column] The specified column up to which all columns should be taken. This column can be referenced
77597780
* to both relatively to the current [ColumnsResolver][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] and absolutely.
77607781
*/
7782+
@AccessApiOverload
77617783
public fun KProperty<*>.allColsUpTo(column: KProperty<*>): ColumnSet<*> = columnGroup(this).allColsUpTo(column)
77627784

77637785
/** ## All (Cols) Up To

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ public interface AndColumnsSelectionDsl {
549549
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
550550
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.
551551
*/
552+
@AccessApiOverload
552553
public infix fun <C> KProperty<C>.and(other: ColumnsResolver<C>): ColumnSet<C> = toColumnAccessor() and other
553554

554555
/** ## And Operator
@@ -581,6 +582,7 @@ public interface AndColumnsSelectionDsl {
581582
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
582583
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.
583584
*/
585+
@AccessApiOverload
584586
public infix fun <C> KProperty<C>.and(other: () -> ColumnsResolver<C>): ColumnSet<C> =
585587
toColumnAccessor() and other()
586588

@@ -614,6 +616,7 @@ public interface AndColumnsSelectionDsl {
614616
* @return A [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] that contains all the columns from the [ColumnsResolvers][org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver] on the left
615617
* and right side of the [and][org.jetbrains.kotlinx.dataframe.api.AndColumnsSelectionDsl.and] operator.
616618
*/
619+
@AccessApiOverload
617620
public infix fun <C> KProperty<C>.and(other: String): ColumnSet<*> = toColumnAccessor() and other
618621

619622
/** ## And Operator

0 commit comments

Comments
 (0)