Skip to content

Commit b04aaf4

Browse files
github-actions[bot]github-actions[bot]
committed
Automated commit of generated code
1 parent 99ef63b commit b04aaf4

33 files changed

Lines changed: 163 additions & 189 deletions

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

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

33
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
4-
import org.jetbrains.kotlinx.dataframe.AnyRow
54
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
65
import org.jetbrains.kotlinx.dataframe.DataColumn
76
import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -30,13 +29,13 @@ import kotlin.reflect.KProperty
3029
import kotlin.reflect.KType
3130

3231
@Deprecated(MESSAGE_SHORTCUT, ReplaceWith(IS_EMPTY_REPLACE), DeprecationLevel.WARNING)
33-
public fun AnyRow.isEmpty(): Boolean = owner.columns().all { it[index] == null }
32+
public fun DataRow<*>.isEmpty(): Boolean = owner.columns().all { it[index] == null }
3433

3534
@Suppress("DEPRECATION_ERROR")
3635
@Deprecated(MESSAGE_SHORTCUT, ReplaceWith(IS_NOT_EMPTY_REPLACE), DeprecationLevel.WARNING)
37-
public fun AnyRow.isNotEmpty(): Boolean = !isEmpty()
36+
public fun DataRow<*>.isNotEmpty(): Boolean = !isEmpty()
3837

39-
public inline fun <reified R> AnyRow.valuesOf(): List<R> = values().filterIsInstance<R>()
38+
public inline fun <reified R> DataRow<*>.valuesOf(): List<R> = values().filterIsInstance<R>()
4039

4140
// region DataSchema
4241
@DataSchema
@@ -62,50 +61,50 @@ public val DataRow<NameValuePair<*>>.value: Any?
6261

6362
// endregion
6463

65-
public inline fun <reified R> AnyRow.namedValuesOf(): List<NameValuePair<R>> =
64+
public inline fun <reified R> DataRow<*>.namedValuesOf(): List<NameValuePair<R>> =
6665
values().zip(columnNames()).filter { it.first is R }.map { NameValuePair(it.second, it.first as R) }
6766

6867
@RequiredByIntellijPlugin
69-
public fun AnyRow.namedValues(): List<NameValuePair<Any?>> =
68+
public fun DataRow<*>.namedValues(): List<NameValuePair<Any?>> =
7069
values().zip(columnNames()) { value, name -> NameValuePair(name, value) }
7170

7271
// region getValue
7372

74-
public fun <T> AnyRow.getValue(columnName: String): T = get(columnName) as T
73+
public fun <T> DataRow<*>.getValue(columnName: String): T = get(columnName) as T
7574

7675
@Deprecated(DEPRECATED_ACCESS_API)
7776
@AccessApiOverload
78-
public fun <T> AnyRow.getValue(column: ColumnReference<T>): T = get(column)
77+
public fun <T> DataRow<*>.getValue(column: ColumnReference<T>): T = get(column)
7978

8079
@Deprecated(DEPRECATED_ACCESS_API)
8180
@AccessApiOverload
82-
public fun <T> AnyRow.getValue(column: KProperty<T>): T = get(column)
81+
public fun <T> DataRow<*>.getValue(column: KProperty<T>): T = get(column)
8382

84-
public fun <T> AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T?
83+
public fun <T> DataRow<*>.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T?
8584

8685
@Deprecated(DEPRECATED_ACCESS_API)
8786
@AccessApiOverload
88-
public fun <T> AnyRow.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<T>(column.columnName)
87+
public fun <T> DataRow<*>.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<T>(column.columnName)
8988

9089
// endregion
9190

9291
// region contains
9392

94-
public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName)
93+
public fun DataRow<*>.containsKey(columnName: String): Boolean = owner.containsColumn(columnName)
9594

9695
@Deprecated(DEPRECATED_ACCESS_API)
9796
@AccessApiOverload
98-
public fun AnyRow.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column)
97+
public fun DataRow<*>.containsKey(column: AnyColumnReference): Boolean = owner.containsColumn(column)
9998

10099
@Deprecated(DEPRECATED_ACCESS_API)
101100
@AccessApiOverload
102-
public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column)
101+
public fun DataRow<*>.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column)
103102

104-
public operator fun AnyRow.contains(column: AnyColumnReference): Boolean = containsKey(column)
103+
public operator fun DataRow<*>.contains(column: AnyColumnReference): Boolean = containsKey(column)
105104

106105
@Deprecated(DEPRECATED_ACCESS_API)
107106
@AccessApiOverload
108-
public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column)
107+
public operator fun DataRow<*>.contains(column: KProperty<*>): Boolean = containsKey(column)
109108

110109
// endregion
111110

@@ -199,11 +198,11 @@ public inline fun <T> DataRow<T>.diffOrNull(expression: RowExpression<T, Float>)
199198
prev()?.let { p -> expression(this, this) - expression(p, p) }
200199

201200
@RequiredByIntellijPlugin
202-
public fun AnyRow.columnsCount(): Int = df().ncol
201+
public fun DataRow<*>.columnsCount(): Int = df().ncol
203202

204-
public fun AnyRow.columnNames(): List<String> = df().columnNames()
203+
public fun DataRow<*>.columnNames(): List<String> = df().columnNames()
205204

206-
public fun AnyRow.columnTypes(): List<KType> = df().columnTypes()
205+
public fun DataRow<*>.columnTypes(): List<KType> = df().columnTypes()
207206

208207
@Suppress("DEPRECATION_ERROR")
209208
@Deprecated(MESSAGE_SHORTCUT, ReplaceWith(GET_ROW_REPLACE), DeprecationLevel.WARNING)

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

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

3-
import org.jetbrains.kotlinx.dataframe.AnyBaseCol
43
import org.jetbrains.kotlinx.dataframe.AnyCol
54
import org.jetbrains.kotlinx.dataframe.AnyColumnGroupAccessor
65
import org.jetbrains.kotlinx.dataframe.AnyColumnReference
7-
import org.jetbrains.kotlinx.dataframe.AnyFrame
8-
import org.jetbrains.kotlinx.dataframe.AnyRow
96
import org.jetbrains.kotlinx.dataframe.ColumnsContainer
107
import org.jetbrains.kotlinx.dataframe.DataColumn
118
import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -51,7 +48,7 @@ import kotlin.reflect.KProperty
5148
replaceWith = ReplaceWith(ADD_VARARG_COLUMNS_REPLACE),
5249
level = DeprecationLevel.WARNING,
5350
)
54-
public fun <T> DataFrame<T>.add(vararg columns: AnyBaseCol): DataFrame<T> = addAll(columns.asIterable())
51+
public fun <T> DataFrame<T>.add(vararg columns: BaseColumn<*>): DataFrame<T> = addAll(columns.asIterable())
5552

5653
/**
5754
* Adds new [columns] to the end of this [DataFrame] (at the top level).
@@ -65,7 +62,7 @@ public fun <T> DataFrame<T>.add(vararg columns: AnyBaseCol): DataFrame<T> = addA
6562
* @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
6663
* @return new [DataFrame] with added columns.
6764
*/
68-
public fun <T> DataFrame<T>.addAll(vararg columns: AnyBaseCol): DataFrame<T> = addAll(columns.asIterable())
65+
public fun <T> DataFrame<T>.addAll(vararg columns: BaseColumn<*>): DataFrame<T> = addAll(columns.asIterable())
6966

7067
/**
7168
* Adds new [columns] to the end of this [DataFrame] (at the top level).
@@ -79,7 +76,7 @@ public fun <T> DataFrame<T>.addAll(vararg columns: AnyBaseCol): DataFrame<T> = a
7976
* @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
8077
* @return new [DataFrame] with added columns.
8178
*/
82-
public fun <T> DataFrame<T>.addAll(columns: Iterable<AnyBaseCol>): DataFrame<T> =
79+
public fun <T> DataFrame<T>.addAll(columns: Iterable<BaseColumn<*>>): DataFrame<T> =
8380
dataFrameOf(columns() + columns).cast()
8481

8582
/**
@@ -100,7 +97,7 @@ public fun <T> DataFrame<T>.addAll(columns: Iterable<AnyBaseCol>): DataFrame<T>
10097
replaceWith = ReplaceWith(ADD_VARARG_FRAMES_REPLACE),
10198
level = DeprecationLevel.WARNING,
10299
)
103-
public fun <T> DataFrame<T>.add(vararg dataFrames: AnyFrame): DataFrame<T> = addAll(dataFrames.asIterable())
100+
public fun <T> DataFrame<T>.add(vararg dataFrames: DataFrame<*>): DataFrame<T> = addAll(dataFrames.asIterable())
104101

105102
/**
106103
* Adds all columns from the given [dataFrames] to the end of this [DataFrame] (at the top level).
@@ -117,7 +114,7 @@ public fun <T> DataFrame<T>.add(vararg dataFrames: AnyFrame): DataFrame<T> = add
117114
*/
118115
@Refine
119116
@Interpretable("DataFrameAddAll")
120-
public fun <T> DataFrame<T>.addAll(vararg dataFrames: AnyFrame): DataFrame<T> = addAll(dataFrames.asIterable())
117+
public fun <T> DataFrame<T>.addAll(vararg dataFrames: DataFrame<*>): DataFrame<T> = addAll(dataFrames.asIterable())
121118

122119
/**
123120
* Adds all columns from the given [dataFrames] to the end of this [DataFrame] (at the top level).
@@ -133,7 +130,7 @@ public fun <T> DataFrame<T>.addAll(vararg dataFrames: AnyFrame): DataFrame<T> =
133130
* @return new [DataFrame] with added columns.
134131
*/
135132
@JvmName("addAllFrames")
136-
public fun <T> DataFrame<T>.addAll(dataFrames: Iterable<AnyFrame>): DataFrame<T> =
133+
public fun <T> DataFrame<T>.addAll(dataFrames: Iterable<DataFrame<*>>): DataFrame<T> =
137134
addAll(dataFrames.flatMap { it.columns() })
138135

139136
// endregion
@@ -154,7 +151,7 @@ public interface AddDataRow<out T> : DataRow<T> {
154151
*
155152
* @throws IndexOutOfBoundsException when called on a successive row that doesn't have new value yet
156153
*/
157-
public fun <C> AnyRow.newValue(): C
154+
public fun <C> DataRow<*>.newValue(): C
158155
}
159156

160157
/**

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

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

33
import org.jetbrains.kotlinx.dataframe.AnyCol
4-
import org.jetbrains.kotlinx.dataframe.AnyFrame
54
import org.jetbrains.kotlinx.dataframe.DataFrame
65
import org.jetbrains.kotlinx.dataframe.annotations.AccessApiOverload
76
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
@@ -11,7 +10,7 @@ import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1110

1211
// region DataColumn
1312

14-
public fun AnyCol.addId(columnName: String = "id"): AnyFrame = toDataFrame().addId(columnName)
13+
public fun AnyCol.addId(columnName: String = "id"): DataFrame<*> = toDataFrame().addId(columnName)
1514

1615
// endregion
1716

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public fun <C> DataColumn<C>.allNulls(): Boolean =
5050

5151
// region DataRow
5252

53-
public fun AnyRow.allNA(): Boolean = owner.columns().all { it[index()].isNA }
53+
public fun DataRow<*>.allNA(): Boolean = owner.columns().all { it[index()].isNA }
5454

5555
// endregion
5656

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
package org.jetbrains.kotlinx.dataframe.api
44

55
import org.jetbrains.kotlinx.dataframe.AnyCol
6-
import org.jetbrains.kotlinx.dataframe.AnyFrame
7-
import org.jetbrains.kotlinx.dataframe.AnyRow
86
import org.jetbrains.kotlinx.dataframe.DataColumn
97
import org.jetbrains.kotlinx.dataframe.DataFrame
108
import org.jetbrains.kotlinx.dataframe.DataRow
@@ -23,9 +21,9 @@ import org.jetbrains.kotlinx.dataframe.impl.api.convertToImpl
2321
import kotlin.reflect.typeOf
2422

2523
@Check
26-
public fun <T> AnyFrame.cast(): DataFrame<T> = this as DataFrame<T>
24+
public fun <T> DataFrame<*>.cast(): DataFrame<T> = this as DataFrame<T>
2725

28-
public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T> =
26+
public inline fun <reified T> DataFrame<*>.cast(verify: Boolean = true): DataFrame<T> =
2927
if (verify) {
3028
convertToImpl(
3129
typeOf<T>(),
@@ -36,7 +34,7 @@ public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T
3634
cast()
3735
}
3836

39-
public inline fun <reified T> AnyFrame.castTo(
37+
public inline fun <reified T> DataFrame<*>.castTo(
4038
@Suppress("UNUSED_PARAMETER") schemaFrom: DataFrame<T>,
4139
verify: Boolean = true,
4240
): DataFrame<T> = cast<T>(verify = verify)
@@ -66,14 +64,14 @@ public inline fun <reified T> AnyFrame.castTo(
6664
* }
6765
* ```
6866
*/
69-
public inline fun <reified T> AnyFrame.castTo(
67+
public inline fun <reified T> DataFrame<*>.castTo(
7068
@Suppress("UNUSED_PARAMETER") schemaFrom: Function<DataFrame<T>>,
7169
verify: Boolean = true,
7270
): DataFrame<T> = cast<T>(verify = verify)
7371

74-
public fun <T> AnyRow.cast(): DataRow<T> = this as DataRow<T>
72+
public fun <T> DataRow<*>.cast(): DataRow<T> = this as DataRow<T>
7573

76-
public inline fun <reified T> AnyRow.cast(verify: Boolean = true): DataRow<T> = df().cast<T>(verify)[0]
74+
public inline fun <reified T> DataRow<*>.cast(verify: Boolean = true): DataRow<T> = df().cast<T>(verify)[0]
7775

7876
@Interpretable("AnyColCast")
7977
public fun <T> AnyCol.cast(): DataColumn<T> = this as DataColumn<T>

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

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

3-
import org.jetbrains.kotlinx.dataframe.AnyRow
43
import org.jetbrains.kotlinx.dataframe.DataFrame
54
import org.jetbrains.kotlinx.dataframe.DataRow
65
import org.jetbrains.kotlinx.dataframe.Predicate
@@ -179,7 +178,7 @@ public interface ColGroupsColumnsSelectionDsl {
179178
* @see [ColumnsSelectionDsl.valueCols]
180179
*/
181180
@Interpretable("ColGroups0")
182-
public fun ColumnSet<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
181+
public fun ColumnSet<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
183182
columnGroupsInternal(filter)
184183

185184
/**
@@ -215,7 +214,7 @@ public interface ColGroupsColumnsSelectionDsl {
215214
* @see [ColumnsSelectionDsl.valueCols]
216215
*/
217216
@Interpretable("ColGroups1")
218-
public fun ColumnsSelectionDsl<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
217+
public fun ColumnsSelectionDsl<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
219218
asSingleColumn().columnGroupsInternal(filter)
220219

221220
/**
@@ -251,7 +250,7 @@ public interface ColGroupsColumnsSelectionDsl {
251250
* @see [ColumnsSelectionDsl.valueCols]
252251
*/
253252
@Interpretable("ColGroups2")
254-
public fun SingleColumn<DataRow<*>>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
253+
public fun SingleColumn<DataRow<*>>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
255254
this.ensureIsColumnGroup().columnGroupsInternal(filter)
256255

257256
/**
@@ -286,7 +285,7 @@ public interface ColGroupsColumnsSelectionDsl {
286285
* @see [ColumnsSelectionDsl.frameCols]
287286
* @see [ColumnsSelectionDsl.valueCols]
288287
*/
289-
public fun String.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
288+
public fun String.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
290289
columnGroup(this).colGroups(filter)
291290

292291
/**
@@ -321,7 +320,7 @@ public interface ColGroupsColumnsSelectionDsl {
321320
* @see [ColumnsSelectionDsl.frameCols]
322321
* @see [ColumnsSelectionDsl.valueCols]
323322
*/
324-
public fun KProperty<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
323+
public fun KProperty<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
325324
columnGroup(this).colGroups(filter)
326325

327326
/**
@@ -354,7 +353,7 @@ public interface ColGroupsColumnsSelectionDsl {
354353
* @see [ColumnsSelectionDsl.frameCols]
355354
* @see [ColumnsSelectionDsl.valueCols]
356355
*/
357-
public fun ColumnPath.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
356+
public fun ColumnPath.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<DataRow<*>> =
358357
columnGroup(this).colGroups(filter)
359358
}
360359

@@ -367,6 +366,6 @@ public interface ColGroupsColumnsSelectionDsl {
367366
@Suppress("UNCHECKED_CAST")
368367
internal inline fun ColumnsResolver<*>.columnGroupsInternal(
369368
crossinline filter: (ColumnGroup<*>) -> Boolean,
370-
): ColumnSet<AnyRow> = colsInternal { it.isColumnGroup() && filter(it) }.cast()
369+
): ColumnSet<DataRow<*>> = colsInternal { it.isColumnGroup() && filter(it) }.cast()
371370

372371
// endregion

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
1010
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
1111
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
1212
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
13-
import org.jetbrains.kotlinx.dataframe.columns.size
1413
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1514
import org.jetbrains.kotlinx.dataframe.documentation.Indent
1615
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak

0 commit comments

Comments
 (0)