Skip to content

Commit 8be692b

Browse files
JolanrensenJolanrensen
authored
Merge pull request #1302 from Kotlin/recursively-remnants
Removing `recursively()` remnants from public api
2 parents daff466 + d7dd1f5 commit 8be692b

File tree

18 files changed

+336
-401
lines changed

18 files changed

+336
-401
lines changed

‎core/api/core.api‎

Lines changed: 184 additions & 194 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
266266
*/
267267
@Suppress("UNCHECKED_CAST")
268268
@Interpretable("All0")
269-
public fun <C> ColumnSet<C>.all(): TransformableColumnSet<C> = allColumnsInternal() as TransformableColumnSet<C>
269+
public fun <C> ColumnSet<C>.all(): ColumnSet<C> = allColumnsInternal().cast()
270270

271271
/**
272272
* @include [CommonAllDocs]
@@ -275,7 +275,7 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
275275
* `df.`[select][DataFrame.select]` { `[all][ColumnsSelectionDsl.all]`() }`
276276
*/
277277
@Interpretable("All1")
278-
public fun ColumnsSelectionDsl<*>.all(): TransformableColumnSet<*> = asSingleColumn().allColumnsInternal()
278+
public fun ColumnsSelectionDsl<*>.all(): ColumnSet<*> = asSingleColumn().allColumnsInternal()
279279

280280
/**
281281
* @include [CommonAllDocs]
@@ -284,16 +284,15 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
284284
* `df.`[select][DataFrame.select]` { myGroup.`[allCols][SingleColumn.allCols]`() }`
285285
*/
286286
@Interpretable("All2")
287-
public fun SingleColumn<DataRow<*>>.allCols(): TransformableColumnSet<*> =
288-
ensureIsColumnGroup().allColumnsInternal()
287+
public fun SingleColumn<DataRow<*>>.allCols(): ColumnSet<*> = ensureIsColumnGroup().allColumnsInternal()
289288

290289
/**
291290
* @include [CommonAllDocs]
292291
* @set [CommonAllDocs.Examples]
293292
*
294293
* `df.`[select][DataFrame.select]` { "myGroupCol".`[allCols][String.allCols]`() }`
295294
*/
296-
public fun String.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols()
295+
public fun String.allCols(): ColumnSet<*> = columnGroup(this).allCols()
297296

298297
/**
299298
* @include [CommonAllDocs]
@@ -303,15 +302,15 @@ public interface AllColumnsSelectionDsl<out _UNUSED> {
303302
*/
304303
@Deprecated(DEPRECATED_ACCESS_API)
305304
@AccessApiOverload
306-
public fun KProperty<*>.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols()
305+
public fun KProperty<*>.allCols(): ColumnSet<*> = columnGroup(this).allCols()
307306

308307
/**
309308
* @include [CommonAllDocs]
310309
* @set [CommonAllDocs.Examples]
311310
*
312311
* `df.`[select][DataFrame.select]` { "pathTo"["myGroup"].`[allCols][ColumnPath.allCols]`() }`
313312
*/
314-
public fun ColumnPath.allCols(): TransformableColumnSet<*> = columnGroup(this).allCols()
313+
public fun ColumnPath.allCols(): ColumnSet<*> = columnGroup(this).allCols()
315314

316315
// endregion
317316

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1919
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
2020
import org.jetbrains.kotlinx.dataframe.columns.ValueColumn
2121
import org.jetbrains.kotlinx.dataframe.impl.api.convertToImpl
22-
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
23-
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableSingleColumn
2422
import kotlin.reflect.typeOf
2523

2624
@Check
@@ -94,10 +92,6 @@ public fun <C> ColumnsResolver<*>.cast(): ColumnsResolver<C> = this as ColumnsRe
9492

9593
public fun <C> SingleColumn<*>.cast(): SingleColumn<C> = this as SingleColumn<C>
9694

97-
public fun <C> TransformableColumnSet<*>.cast(): TransformableColumnSet<C> = this as TransformableColumnSet<C>
98-
99-
public fun <C> TransformableSingleColumn<*>.cast(): TransformableSingleColumn<C> = this as TransformableSingleColumn<C>
100-
10195
public fun <C> ColumnReference<*>.cast(): ColumnReference<C> = this as ColumnReference<C>
10296

10397
public fun <T, G> GroupBy<*, *>.cast(): GroupBy<T, G> = this as GroupBy<T, G>

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.jetbrains.kotlinx.dataframe.documentation.AccessApi
1515
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1616
import org.jetbrains.kotlinx.dataframe.documentation.Indent
1717
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
18-
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
1918
import kotlin.reflect.KProperty
2019

2120
// region ColumnsSelectionDsl
@@ -110,7 +109,7 @@ public interface ColGroupsColumnsSelectionDsl {
110109
* `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]` { it.`[name][ColumnReference.name]`.`[startsWith][String.startsWith]`("my") } }`
111110
*/
112111
@Interpretable("ColGroups0")
113-
public fun ColumnSet<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): TransformableColumnSet<AnyRow> =
112+
public fun ColumnSet<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
114113
columnGroupsInternal(filter)
115114

116115
/**
@@ -122,9 +121,8 @@ public interface ColGroupsColumnsSelectionDsl {
122121
* `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]` { it.`[name][ColumnReference.name]`.`[startsWith][String.startsWith]`("my") } }`
123122
*/
124123
@Interpretable("ColGroups1")
125-
public fun ColumnsSelectionDsl<*>.colGroups(
126-
filter: Predicate<ColumnGroup<*>> = { true },
127-
): TransformableColumnSet<AnyRow> = asSingleColumn().columnGroupsInternal(filter)
124+
public fun ColumnsSelectionDsl<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
125+
asSingleColumn().columnGroupsInternal(filter)
128126

129127
/**
130128
* @include [CommonColGroupsDocs]
@@ -135,9 +133,8 @@ public interface ColGroupsColumnsSelectionDsl {
135133
* `df.`[select][DataFrame.select]` { myColGroup.`[colGroups][SingleColumn.colGroups]` { it.`[name][ColumnReference.name]`.`[startsWith][String.startsWith]`("my") } }`
136134
*/
137135
@Interpretable("ColGroups2")
138-
public fun SingleColumn<DataRow<*>>.colGroups(
139-
filter: Predicate<ColumnGroup<*>> = { true },
140-
): TransformableColumnSet<AnyRow> = this.ensureIsColumnGroup().columnGroupsInternal(filter)
136+
public fun SingleColumn<DataRow<*>>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
137+
this.ensureIsColumnGroup().columnGroupsInternal(filter)
141138

142139
/**
143140
* @include [CommonColGroupsDocs]
@@ -147,7 +144,7 @@ public interface ColGroupsColumnsSelectionDsl {
147144
*
148145
* `df.`[select][DataFrame.select]` { "myColGroup".`[colGroups][String.colGroups]`() }`
149146
*/
150-
public fun String.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): TransformableColumnSet<AnyRow> =
147+
public fun String.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
151148
columnGroup(this).colGroups(filter)
152149

153150
/**
@@ -158,7 +155,7 @@ public interface ColGroupsColumnsSelectionDsl {
158155
*
159156
* `df.`[select][DataFrame.select]` { DataSchemaType::myColGroup.`[colGroups][KProperty.colGroups]`() }`
160157
*/
161-
public fun KProperty<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): TransformableColumnSet<AnyRow> =
158+
public fun KProperty<*>.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
162159
columnGroup(this).colGroups(filter)
163160

164161
/**
@@ -167,19 +164,19 @@ public interface ColGroupsColumnsSelectionDsl {
167164
*
168165
* `df.`[select][DataFrame.select]` { "pathTo"["myGroupCol"].`[colGroups][ColumnPath.colGroups]`() }`
169166
*/
170-
public fun ColumnPath.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): TransformableColumnSet<AnyRow> =
167+
public fun ColumnPath.colGroups(filter: Predicate<ColumnGroup<*>> = { true }): ColumnSet<AnyRow> =
171168
columnGroup(this).colGroups(filter)
172169
}
173170

174171
/**
175-
* Returns a TransformableColumnSet containing the column groups that satisfy the given filter.
172+
* Returns a ColumnSet containing the column groups that satisfy the given filter.
176173
*
177174
* @param filter The filter function to apply on each column group. Must accept a ColumnGroup object and return a Boolean.
178-
* @return A [TransformableColumnSet] containing the column groups that satisfy the filter.
175+
* @return A [ColumnSet] containing the column groups that satisfy the filter.
179176
*/
180177
@Suppress("UNCHECKED_CAST")
181178
internal inline fun ColumnsResolver<*>.columnGroupsInternal(
182179
crossinline filter: (ColumnGroup<*>) -> Boolean,
183-
): TransformableColumnSet<AnyRow> = colsInternal { it.isColumnGroup() && filter(it) } as TransformableColumnSet<AnyRow>
180+
): ColumnSet<AnyRow> = colsInternal { it.isColumnGroup() && filter(it) }.cast()
184181

185182
// endregion

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,11 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
244244

245245
/** @include [ColumnSetColsPredicateDocs] */
246246
@Suppress("UNCHECKED_CAST")
247-
public fun <C> ColumnSet<C>.cols(predicate: ColumnFilter<C> = { true }): TransformableColumnSet<C> =
248-
colsInternal(predicate as ColumnFilter<*>) as TransformableColumnSet<C>
247+
public fun <C> ColumnSet<C>.cols(predicate: ColumnFilter<C> = { true }): ColumnSet<C> =
248+
colsInternal(predicate as ColumnFilter<*>).cast()
249249

250250
/** @include [ColumnSetColsPredicateDocs] */
251-
public operator fun <C> ColumnSet<C>.get(predicate: ColumnFilter<C> = { true }): TransformableColumnSet<C> =
252-
cols(predicate)
251+
public operator fun <C> ColumnSet<C>.get(predicate: ColumnFilter<C> = { true }): ColumnSet<C> = cols(predicate)
253252

254253
/**
255254
* @include [CommonColsDocs.Predicate]
@@ -270,11 +269,11 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
270269
private interface ColumnsSelectionDslColsPredicateDocs
271270

272271
/** @include [ColumnsSelectionDslColsPredicateDocs] */
273-
public fun ColumnsSelectionDsl<*>.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
272+
public fun ColumnsSelectionDsl<*>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
274273
this.asSingleColumn().colsInternal(predicate)
275274

276275
/** @include [ColumnsSelectionDslColsPredicateDocs] */
277-
public operator fun ColumnsSelectionDsl<*>.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
276+
public operator fun ColumnsSelectionDsl<*>.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
278277
cols(predicate)
279278

280279
/**
@@ -295,15 +294,14 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
295294
private interface SingleColumnAnyRowColsPredicateDocs
296295

297296
/** @include [SingleColumnAnyRowColsPredicateDocs] */
298-
public fun SingleColumn<DataRow<*>>.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
297+
public fun SingleColumn<DataRow<*>>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
299298
this.ensureIsColumnGroup().colsInternal(predicate)
300299

301300
/**
302301
* @include [SingleColumnAnyRowColsPredicateDocs]
303302
*/
304-
public operator fun SingleColumn<DataRow<*>>.get(
305-
predicate: ColumnFilter<*> = { true },
306-
): TransformableColumnSet<*> = cols(predicate)
303+
public operator fun SingleColumn<DataRow<*>>.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
304+
cols(predicate)
307305

308306
/**
309307
* @include [CommonColsDocs.Predicate]
@@ -320,11 +318,10 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
320318
private interface StringColsPredicateDocs
321319

322320
/** @include [StringColsPredicateDocs] */
323-
public fun String.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
324-
columnGroup(this).cols(predicate)
321+
public fun String.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).cols(predicate)
325322

326323
/** @include [StringColsPredicateDocs] */
327-
public operator fun String.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> = cols(predicate)
324+
public operator fun String.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate)
328325

329326
/**
330327
* @include [CommonColsDocs.Predicate]
@@ -345,14 +342,13 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
345342
/** @include [KPropertyColsPredicateDocs] */
346343
@Deprecated(DEPRECATED_ACCESS_API)
347344
@AccessApiOverload
348-
public fun KProperty<*>.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
345+
public fun KProperty<*>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
349346
columnGroup(this).cols(predicate)
350347

351348
/** @include [KPropertyColsPredicateDocs] */
352349
@Deprecated(DEPRECATED_ACCESS_API)
353350
@AccessApiOverload
354-
public operator fun KProperty<*>.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
355-
cols(predicate)
351+
public operator fun KProperty<*>.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate)
356352

357353
/**
358354
* @include [CommonColsDocs.Predicate]
@@ -367,12 +363,10 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
367363
private interface ColumnPathPredicateDocs
368364

369365
/** @include [ColumnPathPredicateDocs] */
370-
public fun ColumnPath.cols(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
371-
columnGroup(this).cols(predicate)
366+
public fun ColumnPath.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).cols(predicate)
372367

373368
/** @include [ColumnPathPredicateDocs] */
374-
public operator fun ColumnPath.get(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
375-
cols(predicate)
369+
public operator fun ColumnPath.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate)
376370

377371
// endregion
378372

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1313
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
1414
import org.jetbrains.kotlinx.dataframe.documentation.Indent
1515
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
16-
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
1716
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
1817
import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS
1918
import org.jetbrains.kotlinx.dataframe.util.COLS_IN_GROUPS_REPLACE
@@ -101,7 +100,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
101100
*
102101
* @see [ColumnsSelectionDsl.cols\]
103102
* @see [ColumnsSelectionDsl.colGroups\]
104-
* @return A [TransformableColumnSet] containing the cols.
103+
* @return A [ColumnSet] containing the cols.
105104
*/
106105
private interface ColsInGroupsDocs {
107106

@@ -122,7 +121,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
122121
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
123122
level = DeprecationLevel.WARNING,
124123
)
125-
public fun ColumnSet<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
124+
public fun ColumnSet<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
126125
transform { it.flatMap { it.cols().filter { predicate(it) } } }
127126

128127
/**
@@ -131,7 +130,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
131130
*
132131
* `df.`[select][DataFrame.select]` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[DataRow][DataRow]`<MyGroupType>>().`[colsInGroups][ColumnSet.colsInGroups]`() }`
133132
*/
134-
public fun ColumnSet<*>.colsInGroups(): TransformableColumnSet<*> = transform { it.flatMap { it.cols() } }
133+
public fun ColumnSet<*>.colsInGroups(): ColumnSet<*> = transform { it.flatMap { it.cols() } }
135134

136135
/**
137136
* @include [ColsInGroupsDocs]
@@ -146,7 +145,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
146145
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
147146
level = DeprecationLevel.WARNING,
148147
)
149-
public fun ColumnsSelectionDsl<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
148+
public fun ColumnsSelectionDsl<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
150149
asSingleColumn().colsInGroups(predicate)
151150

152151
/**
@@ -155,7 +154,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
155154
*
156155
* `df.`[select][DataFrame.select]` { `[colsInGroups][ColumnSet.colsInGroups]`() }`
157156
*/
158-
public fun ColumnsSelectionDsl<*>.colsInGroups(): TransformableColumnSet<*> = asSingleColumn().colsInGroups()
157+
public fun ColumnsSelectionDsl<*>.colsInGroups(): ColumnSet<*> = asSingleColumn().colsInGroups()
159158

160159
/**
161160
* @include [ColsInGroupsDocs]
@@ -170,7 +169,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
170169
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
171170
level = DeprecationLevel.WARNING,
172171
)
173-
public fun SingleColumn<DataRow<*>>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
172+
public fun SingleColumn<DataRow<*>>.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
174173
ensureIsColumnGroup().allColumnsInternal().colsInGroups(predicate)
175174

176175
/**
@@ -179,7 +178,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
179178
*
180179
* `df.`[select][DataFrame.select]` { myColumnGroup.`[colsInGroups][SingleColumn.colsInGroups]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }`
181180
*/
182-
public fun SingleColumn<DataRow<*>>.colsInGroups(): TransformableColumnSet<*> =
181+
public fun SingleColumn<DataRow<*>>.colsInGroups(): ColumnSet<*> =
183182
ensureIsColumnGroup().allColumnsInternal().colsInGroups()
184183

185184
/**
@@ -193,7 +192,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
193192
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
194193
level = DeprecationLevel.WARNING,
195194
)
196-
public fun String.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
195+
public fun String.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
197196
columnGroup(this).colsInGroups(predicate)
198197

199198
/**
@@ -202,7 +201,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
202201
*
203202
* `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsInGroups][String.colsInGroups]`() }`
204203
*/
205-
public fun String.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups()
204+
public fun String.colsInGroups(): ColumnSet<*> = columnGroup(this).colsInGroups()
206205

207206
/**
208207
* @include [ColsInGroupsDocs]
@@ -214,7 +213,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
214213
*/
215214
@Deprecated(DEPRECATED_ACCESS_API)
216215
@AccessApiOverload
217-
public fun KProperty<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
216+
public fun KProperty<*>.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
218217
columnGroup(this).colsInGroups(predicate)
219218

220219
/**
@@ -228,7 +227,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
228227
replaceWith = ReplaceWith(COLS_IN_GROUPS_REPLACE),
229228
level = DeprecationLevel.WARNING,
230229
)
231-
public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): TransformableColumnSet<*> =
230+
public fun ColumnPath.colsInGroups(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
232231
columnGroup(this).colsInGroups(predicate)
233232

234233
/**
@@ -237,7 +236,7 @@ public interface ColsInGroupsColumnsSelectionDsl {
237236
*
238237
* `df.`[select][DataFrame.select]` { "pathTo"["myColumnGroup"].`[colsInGroups][ColumnPath.colsInGroups]`() }`
239238
*/
240-
public fun ColumnPath.colsInGroups(): TransformableColumnSet<*> = columnGroup(this).colsInGroups()
239+
public fun ColumnPath.colsInGroups(): ColumnSet<*> = columnGroup(this).colsInGroups()
241240
}
242241

243242
// endregion

0 commit comments

Comments
 (0)