Skip to content

Commit c95438d

Browse files
Automated commit of generated code
1 parent 3448fc9 commit c95438d

File tree

5 files changed

+36
-0
lines changed

5 files changed

+36
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public class AddDsl<T>(
225225
@AccessApiOverload
226226
public fun group(column: AnyColumnGroupAccessor, body: AddDsl<T>.() -> Unit): Unit = group(column.name(), body)
227227

228+
@Interpretable("AddDslNamedGroup")
228229
public fun group(name: String, body: AddDsl<T>.() -> Unit) {
229230
val dsl = AddDsl(df)
230231
body(dsl)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public fun <T> InsertClause<T>.after(column: ColumnSelector<T, *>): DataFrame<T>
8383

8484
public fun <T> InsertClause<T>.after(column: String): DataFrame<T> = df.add(this.column).move(this.column).after(column)
8585

86+
@AccessApiOverload
8687
public fun <T> InsertClause<T>.after(column: ColumnAccessor<*>): DataFrame<T> = after(column.path())
8788

8889
@AccessApiOverload

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@ public fun <T> DataFrame<T>.moveTo(newColumnIndex: Int, vararg columns: KPropert
5353

5454
// region moveToLeft
5555

56+
@Refine
57+
@Interpretable("MoveToLeft1")
5658
public fun <T> DataFrame<T>.moveToLeft(columns: ColumnsSelector<T, *>): DataFrame<T> = move(columns).toLeft()
5759

5860
public fun <T> DataFrame<T>.moveToLeft(vararg columns: String): DataFrame<T> = moveToLeft { columns.toColumnSet() }
5961

62+
@AccessApiOverload
6063
public fun <T> DataFrame<T>.moveToLeft(vararg columns: AnyColumnReference): DataFrame<T> =
6164
moveToLeft { columns.toColumnSet() }
6265

@@ -68,13 +71,17 @@ public fun <T> DataFrame<T>.moveToLeft(vararg columns: KProperty<*>): DataFrame<
6871

6972
// region moveToRight
7073

74+
@Refine
75+
@Interpretable("MoveToRight1")
7176
public fun <T> DataFrame<T>.moveToRight(columns: ColumnsSelector<T, *>): DataFrame<T> = move(columns).toRight()
7277

7378
public fun <T> DataFrame<T>.moveToRight(vararg columns: String): DataFrame<T> = moveToRight { columns.toColumnSet() }
7479

80+
@AccessApiOverload
7581
public fun <T> DataFrame<T>.moveToRight(vararg columns: AnyColumnReference): DataFrame<T> =
7682
moveToRight { columns.toColumnSet() }
7783

84+
@AccessApiOverload
7885
public fun <T> DataFrame<T>.moveToRight(vararg columns: KProperty<*>): DataFrame<T> =
7986
moveToRight { columns.toColumnSet() }
8087

@@ -94,6 +101,11 @@ public fun <T, C> MoveClause<T, C>.into(
94101
newPathExpression = column,
95102
)
96103

104+
/**
105+
* Move a single selected column to top level with a new name
106+
*/
107+
@Refine
108+
@Interpretable("MoveInto0")
97109
public fun <T, C> MoveClause<T, C>.into(column: String): DataFrame<T> = pathOf(column).let { path -> into { path } }
98110

99111
public fun <T, C> MoveClause<T, C>.intoIndexed(
@@ -109,11 +121,19 @@ public fun <T, C> MoveClause<T, C>.intoIndexed(
109121

110122
// region under
111123

124+
@Refine
125+
@Interpretable("MoveUnder0")
112126
public fun <T, C> MoveClause<T, C>.under(column: String): DataFrame<T> = pathOf(column).let { path -> under { path } }
113127

128+
@AccessApiOverload
114129
public fun <T, C> MoveClause<T, C>.under(column: AnyColumnGroupAccessor): DataFrame<T> =
115130
column.path().let { path -> under { path } }
116131

132+
/**
133+
* Move selected columns under existing column group
134+
*/
135+
@Refine
136+
@Interpretable("MoveUnder1")
117137
public fun <T, C> MoveClause<T, C>.under(
118138
column: ColumnsSelectionDsl<T>.(ColumnWithPath<C>) -> AnyColumnReference,
119139
): DataFrame<T> =
@@ -138,10 +158,13 @@ public fun <T, C> MoveClause<T, C>.toTop(
138158

139159
// region after
140160

161+
@Refine
162+
@Interpretable("MoveAfter0")
141163
public fun <T, C> MoveClause<T, C>.after(column: ColumnSelector<T, *>): DataFrame<T> = afterOrBefore(column, true)
142164

143165
public fun <T, C> MoveClause<T, C>.after(column: String): DataFrame<T> = after { column.toColumnAccessor() }
144166

167+
@AccessApiOverload
145168
public fun <T, C> MoveClause<T, C>.after(column: AnyColumnReference): DataFrame<T> = after { column }
146169

147170
@AccessApiOverload
@@ -157,8 +180,12 @@ fun <T, C> MoveColsClause<T, C>.before(column: String) = before { column.toColum
157180
fun <T, C> MoveColsClause<T, C>.before(column: ColumnSelector<T, *>) = afterOrBefore(column, false)
158181
*/
159182

183+
@Refine
184+
@Interpretable("MoveToLeft0")
160185
public fun <T, C> MoveClause<T, C>.toLeft(): DataFrame<T> = to(0)
161186

187+
@Refine
188+
@Interpretable("MoveToRight0")
162189
public fun <T, C> MoveClause<T, C>.toRight(): DataFrame<T> = to(df.ncol)
163190

164191
public class MoveClause<T, C>(internal val df: DataFrame<T>, internal val columns: ColumnsSelector<T, C>) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ public abstract class CreateDataFrameDsl<T> : TraversePropertiesDsl {
202202

203203
public inline fun <reified R> inferType(noinline expression: (T) -> R): InferType<T, R> = InferType(expression)
204204

205+
@Interpretable("ToDataFrameDslStringInvoke")
205206
public abstract operator fun String.invoke(builder: CreateDataFrameDsl<T>.() -> Unit)
206207
}
207208

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,4 +795,10 @@ class DataFrameTreeTests : BaseTest() {
795795
val df = typed2.convert { nameAndCity }.asFrame { it.remove { city } }
796796
df.nameAndCity.columns() shouldBe typed2.nameAndCity.remove { city }.columns()
797797
}
798+
799+
@Test
800+
fun `move under existing group`() {
801+
val df = typed2.move { age }.under { nameAndCity }
802+
df.nameAndCity.columnNames() shouldBe listOf("name", "city", "age")
803+
}
798804
}

0 commit comments

Comments
 (0)