Skip to content

Commit 0849309

Browse files
committed
updating docs plugin
1 parent f40a021 commit 0849309

40 files changed

+730
-598
lines changed

core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id("org.jetbrains.kotlinx.kover")
1919
id("org.jmailen.kotlinter")
2020
id("org.jetbrains.kotlinx.dataframe")
21-
id("com.github.jolanrensen.docProcessorGradlePlugin") version "v0.0.24"
21+
id("com.github.jolanrensen.docProcessorGradlePlugin") version "v0.0.29"
2222
// id("nl.jolanrensen.docProcessor") version "1.0-SNAPSHOT"
2323
}
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public interface DataFrame<out T> : Aggregatable<T>, ColumnsContainer<T> {
5757
override operator fun <C> get(columns: ColumnsSelector<T, C>): List<DataColumn<C>> =
5858
getColumnsImpl(UnresolvedColumnsPolicy.Fail, columns)
5959

60-
public operator fun get(first: Column, vararg other: Column): DataFrame<T> = select(listOf(first) + other)
60+
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame<T> = select(listOf(first) + other)
6161
public operator fun get(first: String, vararg other: String): DataFrame<T> = select(listOf(first) + other)
6262
public operator fun get(columnRange: ClosedRange<String>): DataFrame<T> =
6363
select { columnRange.start..columnRange.endInclusive }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public interface DataRow<out T> {
2828
public operator fun <R> get(column: ColumnReference<R>): R
2929
public operator fun <R> get(columns: List<ColumnReference<R>>): List<R> = columns.map { get(it) }
3030
public operator fun <R> get(property: KProperty<R>): R = get(property.columnName) as R
31-
public operator fun get(first: Column, vararg other: Column): DataRow<T> = owner.get(first, *other)[index]
31+
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataRow<T> = owner.get(first, *other)[index]
3232
public operator fun get(first: String, vararg other: String): DataRow<T> = owner.get(first, *other)[index]
3333
public operator fun get(path: ColumnPath): Any? = owner.get(path)[index]
3434
public operator fun get(name: String): Any?

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public typealias RowValueFilter<T, C> = RowValueExpression<T, C, Boolean>
149149

150150
// region columns
151151

152-
public typealias Column = ColumnReference<*>
152+
public typealias AnyColumnReference = ColumnReference<*>
153153

154154
public typealias ColumnGroupReference = ColumnReference<AnyRow>
155155
public typealias ColumnGroupAccessor<T> = ColumnAccessor<DataRow<T>>

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

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

3-
import org.jetbrains.kotlinx.dataframe.*
3+
import org.jetbrains.kotlinx.dataframe.AnyCol
4+
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
5+
import org.jetbrains.kotlinx.dataframe.AnyRow
46
import org.jetbrains.kotlinx.dataframe.ColumnFilter
7+
import org.jetbrains.kotlinx.dataframe.ColumnGroupReference
58
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
69
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
710
import org.jetbrains.kotlinx.dataframe.DataColumn
11+
import org.jetbrains.kotlinx.dataframe.DataFrame
12+
import org.jetbrains.kotlinx.dataframe.DataRow
813
import org.jetbrains.kotlinx.dataframe.Predicate
914
import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
1015
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
@@ -16,6 +21,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
1621
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1722
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1823
import org.jetbrains.kotlinx.dataframe.columns.renamedReference
24+
import org.jetbrains.kotlinx.dataframe.hasNulls
1925
import org.jetbrains.kotlinx.dataframe.impl.columnName
2026
import org.jetbrains.kotlinx.dataframe.impl.columns.ColumnsList
2127
import org.jetbrains.kotlinx.dataframe.impl.columns.DistinctColumnSet
@@ -74,7 +80,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
7480

7581
public operator fun String.rangeTo(endInclusive: String): ColumnSet<*> = toColumnAccessor().rangeTo(endInclusive.toColumnAccessor())
7682

77-
public operator fun Column.rangeTo(endInclusive: Column): ColumnSet<*> = object : ColumnSet<Any?> {
83+
public operator fun AnyColumnReference.rangeTo(endInclusive: AnyColumnReference): ColumnSet<*> = object : ColumnSet<Any?> {
7884
override fun resolve(context: ColumnResolutionContext): List<ColumnWithPath<Any?>> {
7985
val startPath = this@rangeTo.resolveSingle(context)!!.path
8086
val endPath = endInclusive.resolveSingle(context)!!.path
@@ -168,7 +174,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
168174
}
169175

170176
public fun SingleColumn<*>.allAfter(colName: String): ColumnSet<Any?> = allAfter(pathOf(colName))
171-
public fun SingleColumn<*>.allAfter(column: Column): ColumnSet<Any?> = allAfter(column.path())
177+
public fun SingleColumn<*>.allAfter(column: AnyColumnReference): ColumnSet<Any?> = allAfter(column.path())
172178

173179
// endregion
174180

@@ -187,7 +193,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
187193
}
188194

189195
public fun SingleColumn<*>.allSince(colName: String): ColumnSet<Any?> = allSince(pathOf(colName))
190-
public fun SingleColumn<*>.allSince(column: Column): ColumnSet<Any?> = allSince(column.path())
196+
public fun SingleColumn<*>.allSince(column: AnyColumnReference): ColumnSet<Any?> = allSince(column.path())
191197

192198
// endregion
193199

@@ -206,7 +212,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
206212
}
207213

208214
public fun SingleColumn<*>.allBefore(colName: String): ColumnSet<Any?> = allBefore(pathOf(colName))
209-
public fun SingleColumn<*>.allBefore(column: Column): ColumnSet<Any?> = allBefore(column.path())
215+
public fun SingleColumn<*>.allBefore(column: AnyColumnReference): ColumnSet<Any?> = allBefore(column.path())
210216

211217
// endregion
212218

@@ -225,7 +231,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
225231
}
226232

227233
public fun SingleColumn<*>.allUntil(colName: String): ColumnSet<Any?> = allUntil(pathOf(colName))
228-
public fun SingleColumn<*>.allUntil(column: Column): ColumnSet<Any?> = allUntil(column.path())
234+
public fun SingleColumn<*>.allUntil(column: AnyColumnReference): ColumnSet<Any?> = allUntil(column.path())
229235

230236
// endregion
231237

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

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

33
import org.jetbrains.kotlinx.dataframe.AnyCol
4-
import org.jetbrains.kotlinx.dataframe.Column
4+
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
55
import org.jetbrains.kotlinx.dataframe.ColumnSelector
66
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
77
import org.jetbrains.kotlinx.dataframe.ColumnsSelector
@@ -88,7 +88,7 @@ public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(column: KProperty<*>): C
8888
public fun <C> ColumnsContainer<*>.containsColumn(column: ColumnReference<C>): Boolean = getColumnOrNull(column) != null
8989
public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName)
9090

91-
public operator fun ColumnsContainer<*>.contains(column: Column): Boolean = containsColumn(column)
91+
public operator fun ColumnsContainer<*>.contains(column: AnyColumnReference): Boolean = containsColumn(column)
9292
public operator fun ColumnsContainer<*>.contains(column: KProperty<*>): Boolean = containsColumn(column)
9393

9494
// region rows

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

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

3+
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
34
import org.jetbrains.kotlinx.dataframe.AnyRow
4-
import org.jetbrains.kotlinx.dataframe.Column
55
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
66
import org.jetbrains.kotlinx.dataframe.DataColumn
77
import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -57,10 +57,10 @@ public fun <T> AnyRow.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<
5757
// region contains
5858

5959
public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName)
60-
public fun AnyRow.containsKey(column: Column): Boolean = owner.containsColumn(column)
60+
public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column)
6161
public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column)
6262

63-
public operator fun AnyRow.contains(column: Column): Boolean = containsKey(column)
63+
public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column)
6464
public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column)
6565

6666
// endregion

0 commit comments

Comments
 (0)