diff --git a/KDOC_PREPROCESSING.md b/KDOC_PREPROCESSING.md index c4f145f8ab..944844adf9 100644 --- a/KDOC_PREPROCESSING.md +++ b/KDOC_PREPROCESSING.md @@ -29,6 +29,7 @@ This document explains how to use KoDEx in the DataFrame project. * [`\`: Escape Character](#-escape-character) * [ `@ExcludeFromSources` Annotation: Excluding code content from sources](#excludefromsources-annotation-excluding-code-content-from-sources) + * [Using Typealiases to save Byte Size](#using-nested-typealiases-instead-of-interfaces) * [KoDEx Conventions in DataFrame](#kodex-conventions-in-dataframe) * [Common Concepts and Definitions](#common-concepts-and-definitions) * [Link Interfaces](#link-interfaces) @@ -356,6 +357,31 @@ Since [v0.3.9](https://github.com/Jolanrensen/KoDEx/releases/tag/v0.3.9) it's al exclude a whole file from the `sources.jar` by adding the annotation to the top of the file, like `@file:ExcludeFromSources`. +### Using (nested) Type Aliases Instead of Interfaces + +([Nested](https://kotlinlang.org/docs/type-aliases.html#nested-type-aliases)) +[Type aliases](https://kotlinlang.org/docs/type-aliases.html) +can be used to save byte size in the published library.jar file. +This is useful when you have a lot of documentation interfaces without a body that are only used to host KDoc. + +For example: + +```kt +/** [Common doc][CommonDoc] */ +typealias CommonDocLink = Nothing + +/** + * ## {@include [CommonDocLink]} + * Hello from $[NAME]! + */ +interface CommonDoc { + + // name argument + typealias NAME = Nothing +} +``` + + ## KoDEx Conventions in DataFrame ### Common Concepts and Definitions @@ -385,24 +411,24 @@ and include things like: - [`NA`](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NA.kt) / [`NaN`](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NaN.kt) - To be linked to for more information on the concepts - [DslGrammar](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammar.kt) - - To be linked to from each DSL grammar by the link interface + - To be linked to from each DSL grammar by the link KDoc - Check the folder to see if there are more and feel free to add them if needed :) -### Link Interfaces +### Link KDocs -As can be seen, interfaces that can be "linked" to, like [`AccessApi`](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt), are often -accompanied by a `-Link` interface, like +As can be seen, KDocs that can be "linked" to, like [`AccessApi`](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt), are often +accompanied by a `-Link` doc, like ```kt /** [Access API][AccessApi] */ -internal interface AccessApiLink +internal typealias AccessApiLink = Nothing ``` This allows other docs to simply `{@include [AccessApiLink]}` if they want to refer to Access APIs, and it provides a single place of truth for if we ever want to rename this concept. -In general, docs accompanied by a `-Link` interface are meant to be linked to, while docs without -a `-Link` interface are meant to be included in other docs +In general, docs accompanied by a `-Link` KDoc are meant to be linked to, while docs without +a `-Link` doc are meant to be included in other docs (and are often accompanied by [`@ExcludeFromSources`](#excludefromsources-annotation-excluding-code-content-from-sources)). We can deviate from this convention if it makes sense, of course. @@ -416,10 +442,10 @@ We can deviate from this convention if it makes sense, of course. interface CommonDoc { // The name to be greeted from - interface NameArg + typealias NameArg = Nothing // alternative recommended notation - interface NAME + typealias NAME = Nothing } ``` @@ -432,15 +458,15 @@ A good example of this concept can be found in the This interface provides a template for all overloads of `allBefore`, `allAfter`, `allFrom`, and `allUpTo` in a single place. -Nested in the documentation interface, there are several other interfaces that define the expected arguments +Nested in the documentation interface, there are several type aliases that define the expected arguments of the template. -These interfaces are named `TitleArg`/`TITLE`, `FunctionArg`/`FUNCTION`, etc. and commonly have no KDocs itself, +These are named `TitleArg`/`TITLE`, `FunctionArg`/`FUNCTION`, etc. and commonly have no KDocs itself, just a simple comment explaining what the argument is for. -Other documentation interfaces like `AllAfterDocs` or functions then include `CommonAllSubsetDocs` and set +Other documentation holders like `AllAfterDocs` or functions then include `CommonAllSubsetDocs` and set all the arguments accordingly. -It's recommended to name argument interfaces `-Arg`, or to write their name in `ALL_CAPS` (if the linter is shushed) +It's recommended to name arguments `-Arg`, or to write their name in `ALL_CAPS` (if the linter is shushed) and have them nested in the documentation interface, though, this has not always been done in the past. @@ -455,9 +481,9 @@ it easier to update the documentation whenever (part of) a URL changes. ### Utils -The [`utils.kt` file](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt) contains all sorts of helper interfaces for the documentation. -For instance `{@include [LineBreak]}` can insert a line break in the KDoc and the family of `Indent` -documentation interfaces can provide you with different non-breaking-space-based indents. +The [`utils.kt` file](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt) contains all sorts of helpers for the documentation. +For instance `{@include [LineBreak]}` can insert a line break in the KDoc, and the family of `Indent` +documentation type aliases can provide you with different non-breaking-space-based indents. If you need a new utility, feel free to add it to this file. @@ -499,7 +525,7 @@ some [helpful templates](core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/do ![selectingColumns.png](docs/imgs/selectingColumns.png) This is a bit large, so it's best if we just link to it. Also, you'll see the examples have - the generic `operation` name. So let's create our own interface `SelectSelectingOptions` we can let users link to and + the generic `operation` name. So let's create our own type `SelectSelectingOptions` we can let users link to and `{@set [SelectingColumns.OPERATION] [select][select]}`. Actually, we can even put this setting the operation arg in a central place, since we reuse it a lot. @@ -559,7 +585,7 @@ But keep these things in mind: ![dslgrammar.png](docs/imgs/dslgrammar.png) Any family of functions or operations can show off their notation in a DSL grammar. -This is done by creating a documentation interface like +This is done by creating a documentation type like [`Update.Grammar`](./core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt) and linking to it from each function. @@ -650,13 +676,13 @@ All other parts are filled in like: interface Grammar { /** [**`first`**][ColumnsSelectionDsl.first] */ - interface PlainDslName + typealias PlainDslName = Nothing /** __`.`__[**`first`**][ColumnsSelectionDsl.first] */ - interface ColumnSetName + typealias ColumnSetName = Nothing /** __`.`__[**`firstCol`**][ColumnsSelectionDsl.firstCol] */ - interface ColumnGroupName + typealias ColumnGroupName = Nothing } ``` @@ -664,7 +690,7 @@ When a reference to a certain definition is used, we take `DslGrammarTemplate.XR Clicking on them takes users to the respective `XDef` and thus provides them with the formal name and type of the definition. -You may also notice that the `PlainDslName`, `ColumnSetName`, and `ColumnGroupName` interfaces are defined separately. +You may also notice that the `PlainDslName`, `ColumnSetName`, and `ColumnGroupName` types are defined separately. This is to make sure they can be reused in the large Columns Selection DSL grammar and on the website. You don't always need all three parts in the grammar; not all functions can be used in each context. @@ -691,7 +717,7 @@ A fully interactive, single-source-of-truth grammar for the Columns Selection DS ## KDoc -> WriterSide There's a special annotation, `@ExportAsHtml`, that allows you to export the content of the KDoc of the annotated -function, interface, or class as HTML. +function, interface, type alias, or class as HTML. The Markdown of the KDoc is rendered to HTML using [JetBrains/markdown](https://github.com/JetBrains/markdown) and, in the case of DataFrame, put in [./docs/StardustDocs/resources/snippets/kdocs](docs/StardustDocs/resources/snippets/kdocs). From there, the HTML can be included in any WriterSide page as an iFrame. diff --git a/build.gradle.kts b/build.gradle.kts index 2ab279f51e..23444e15bf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -194,6 +194,9 @@ allprojects { // enables support for kotlin.time.Instant as kotlinx.datetime.Instant was deprecated; Issue #1350 // Can be removed once kotlin.time.Instant is marked "stable". optIn.add("kotlin.time.ExperimentalTime") + + // enables support for nested type-aliases, to be used with KoDEx to save on bytecode size + freeCompilerArgs.add("-Xnested-type-aliases") } } diff --git a/core/api/core.api b/core/api/core.api index 4784802faf..b2d0682c1b 100644 --- a/core/api/core.api +++ b/core/api/core.api @@ -501,27 +501,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSe public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$After { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$Before { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$From { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$PlainDslName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllColumnsSelectionDsl$Grammar$UpTo { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl { public fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public fun KPropertyDataRowExceptNew (Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -592,18 +571,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptCol public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupExceptName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AllExceptColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/AllKt { public static final fun all (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Z public static final fun all (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Z @@ -635,12 +602,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/AndColumnsSe public abstract interface class org/jetbrains/kotlinx/dataframe/api/AndColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AndColumnsSelectionDsl$Grammar$InfixName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/AndColumnsSelectionDsl$Grammar$Name { -} - public final class org/jetbrains/kotlinx/dataframe/api/AnyKt { public static final fun any (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Z public static final fun any (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Z @@ -769,15 +730,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColColumnsSe public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColumnsSelectionDsl { public fun ColumnSetDataRowColGroupIndex (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public fun colGroup (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnAccessor; @@ -838,15 +790,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColu public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/ColGroupKt { public static final fun ensureIsColumnGroup (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } @@ -869,15 +812,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsCol public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColGroupsColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl { public fun colsAtAnyDepth (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsAtAnyDepth (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -901,15 +835,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDep public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDepthColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl { public fun cols (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun cols (Ljava/lang/String;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1014,15 +939,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl { public fun colsInGroups (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsInGroups (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1046,15 +962,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroups public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsInGroupsColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/ColsKt { public static final fun colsInternal (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnsResolver;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/impl/columns/TransformableColumnSet; } @@ -1071,15 +978,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfColumn public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindColumnsSelectionDsl { public fun colsOfKind (Ljava/lang/String;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnKind;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnKind;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun colsOfKind (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnKind;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnKind;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1098,15 +996,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindCo public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsOfKindColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/ColsOfKt { public static final fun colsOf (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KType;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public static final fun colsOf (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/reflect/KType;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1258,24 +1147,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFi public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$ColumnGroupNameContains { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$ColumnGroupNameStartsWith { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$ColumnSetNameContains { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$ColumnSetNameStartsEndsWith { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$PlainDslNameContains { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnNameFiltersColumnsSelectionDsl$Grammar$PlainDslNameStartsEndsWith { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnRangeColumnsSelectionDsl { public fun rangeTo (Ljava/lang/String;Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun rangeTo (Ljava/lang/String;Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -1291,9 +1162,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnRangeC public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnRangeColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnRangeColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/ColumnReferenceApiKt { public static final fun eq (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;Ljava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference; public static final fun gt (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;Ljava/lang/Comparable;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference; @@ -1338,21 +1206,9 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelec public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$ColumnGroupPartOfGrammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$ColumnGroupPartOfGrammar$ForHtml { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$ColumnSetPartOfGrammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$ColumnSetPartOfGrammar$ForHtml { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$DefinitionsPartOfGrammar { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl$DslGrammar$PlainDslPartOfGrammar { -} - public final class org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDslKt { public static final fun asSingleColumn (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; } @@ -2016,9 +1872,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/DistinctColu public abstract interface class org/jetbrains/kotlinx/dataframe/api/DistinctColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DistinctColumnsSelectionDsl$Grammar$ColumnSetName { -} - public final class org/jetbrains/kotlinx/dataframe/api/DistinctKt { public static final fun distinct (Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun distinct (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -2063,24 +1916,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$ColumnGroupWhileName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$ColumnSetWhileName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$PlainDslName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/DropColumnsSelectionDsl$Grammar$PlainDslWhileName { -} - public final class org/jetbrains/kotlinx/dataframe/api/DropKt { public static final fun drop (Lorg/jetbrains/kotlinx/dataframe/DataColumn;I)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static final fun drop (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; @@ -2145,9 +1980,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ExprColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/ExprColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ExprColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/FilterColumnsSelectionDsl { public fun filter (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; } @@ -2155,9 +1987,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/FilterColumn public abstract interface class org/jetbrains/kotlinx/dataframe/api/FilterColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FilterColumnsSelectionDsl$Grammar$ColumnSetName { -} - public final class org/jetbrains/kotlinx/dataframe/api/FilterKt { public static final fun filter (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static final fun filter (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -2185,15 +2014,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/FirstColumns public abstract interface class org/jetbrains/kotlinx/dataframe/api/FirstColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FirstColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FirstColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FirstColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/FirstKt { public static final fun first (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Ljava/lang/Object; public static final fun first (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; @@ -2361,15 +2181,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColColu public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsColumnsSelectionDsl { public fun frameCols (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun frameCols (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -2388,15 +2199,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsCol public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/FrameColsColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/FramesKt { public static final fun frames (Lorg/jetbrains/kotlinx/dataframe/api/Pivot;)Lorg/jetbrains/kotlinx/dataframe/DataRow; public static final fun frames (Lorg/jetbrains/kotlinx/dataframe/api/PivotGroupBy;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -2768,15 +2570,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/LastColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/LastColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/LastColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/LastColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/LastColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/LastKt { public static final fun last (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Ljava/lang/Object; public static final fun last (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; @@ -3497,9 +3290,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/NoneColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/NoneColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/NoneColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/NoneKt { public static final fun none (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Z public static final fun none (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Z @@ -3896,18 +3686,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumn public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumnsSelectionDsl$Grammar$InfixIntoName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumnsSelectionDsl$Grammar$InfixNamedName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumnsSelectionDsl$Grammar$IntoName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/RenameColumnsSelectionDsl$Grammar$NamedName { -} - public final class org/jetbrains/kotlinx/dataframe/api/RenameKt { public static final fun into (Lorg/jetbrains/kotlinx/dataframe/api/RenameClause;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun into (Lorg/jetbrains/kotlinx/dataframe/api/RenameClause;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -4009,9 +3787,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SelectColumn public abstract interface class org/jetbrains/kotlinx/dataframe/api/SelectColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/SelectColumnsSelectionDsl$Grammar$ColumnGroupName { -} - public final class org/jetbrains/kotlinx/dataframe/api/SelectKt { public static final fun select (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun select (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -4033,9 +3808,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SimplifyColu public abstract interface class org/jetbrains/kotlinx/dataframe/api/SimplifyColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/SimplifyColumnsSelectionDsl$Grammar$ColumnSetName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl { public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; public fun single (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn; @@ -4058,15 +3830,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumn public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/SingleColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/SingleKt { public static final fun single (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Ljava/lang/Object; public static final fun single (Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataRow; @@ -4444,24 +4207,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsS public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$ColumnGroupWhileName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$ColumnSetWhileName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$PlainDslName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/TakeColumnsSelectionDsl$Grammar$PlainDslWhileName { -} - public final class org/jetbrains/kotlinx/dataframe/api/TakeKt { public static final fun take (Lorg/jetbrains/kotlinx/dataframe/DataColumn;I)Lorg/jetbrains/kotlinx/dataframe/DataColumn; public static final fun take (Lorg/jetbrains/kotlinx/dataframe/DataFrame;I)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -4585,15 +4330,6 @@ public final class org/jetbrains/kotlinx/dataframe/api/Update { public abstract interface class org/jetbrains/kotlinx/dataframe/api/Update$Columns { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/Update$Columns$SELECTING_COLUMNS { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/Update$Grammar { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/Update$UpdateSelectingOptions { -} - public final class org/jetbrains/kotlinx/dataframe/api/UpdateKt { public static final fun asFrame (Lorg/jetbrains/kotlinx/dataframe/api/Update;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun at (Lorg/jetbrains/kotlinx/dataframe/api/Update;Ljava/util/Collection;)Lorg/jetbrains/kotlinx/dataframe/api/Update; @@ -4675,15 +4411,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColColu public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsColumnsSelectionDsl { public fun valueCols (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; public fun valueCols (Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet; @@ -4702,15 +4429,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsCol public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueColsColumnsSelectionDsl$Grammar$PlainDslName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/api/ValueCount { public abstract fun getCount ()I } @@ -4822,15 +4540,6 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/WithoutNulls public abstract interface class org/jetbrains/kotlinx/dataframe/api/WithoutNullsColumnsSelectionDsl$Grammar { } -public abstract interface class org/jetbrains/kotlinx/dataframe/api/WithoutNullsColumnsSelectionDsl$Grammar$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/WithoutNullsColumnsSelectionDsl$Grammar$ColumnSetName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/api/WithoutNullsColumnsSelectionDsl$Grammar$PlainDslName { -} - public final class org/jetbrains/kotlinx/dataframe/api/XsKt { public static final fun xs (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; public static final fun xs (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame; @@ -5403,186 +5112,15 @@ public final class org/jetbrains/kotlinx/dataframe/dataTypes/IMG { public fun toString ()Ljava/lang/String; } -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammar { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl { } public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate { } -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$COLUMN_GROUP_FUNCTIONS { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$COLUMN_GROUP_PART { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$COLUMN_SET_FUNCTIONS { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$COLUMN_SET_PART { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnExpressionDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnExpressionRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnGroupDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnGroupNoSingleColumnDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnGroupNoSingleColumnRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnGroupRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnKindDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnKindRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnNoAccessorDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnNoAccessorRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnOrColumnSetDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnOrColumnSetRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnSelectorDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnSelectorRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnSetDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnSetRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnTypeDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnTypeRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnsResolverDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnsResolverRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnsSelectorDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ColumnsSelectorRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ConditionDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$ConditionRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$DEFINITIONS { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$DEFINITIONS_PART { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IgnoreCaseDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IgnoreCaseRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IndexDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IndexRangeDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IndexRangeRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$IndexRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$InferDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$InferRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$KTypeDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$KTypeRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$NameDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$NameRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$NumberDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$NumberRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$PLAIN_DSL_FUNCTIONS { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$PLAIN_DSL_PART { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$RegexDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$RegexRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$SingleColumnDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$SingleColumnRef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$TextDef { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$DslGrammarTemplate$TextRef { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$UsageTemplateExample { } -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$UsageTemplateExample$ColumnGroupName { -} - -public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl$UsageTemplateExample$ColumnSetName { -} - public abstract interface class org/jetbrains/kotlinx/dataframe/documentation/UnifyingNumbers { } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt index 28a710d58a..7a39dcf51f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnSelectionDsl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Column Selection DSL][ColumnSelectionDsl] */ -internal interface ColumnSelectionDslLink +internal typealias ColumnSelectionDslLink = Nothing public interface ColumnSelectionDsl : ColumnsContainer { @@ -27,7 +27,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * This is a shorthand for [get][ColumnsContainer.get]`(myColumn)`. * @throws [IllegalArgumentException] if the column is not found. */ - private interface CommonColumnReferenceInvokeDocs + private typealias CommonColumnReferenceInvokeDocs = Nothing /** * @include [CommonColumnReferenceInvokeDocs] @@ -67,7 +67,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * This is a shorthand for [get][ColumnsContainer.get]`(MyType::myColumn)`. * @throws [IllegalArgumentException] if the column is not found. */ - private interface CommonKPropertyInvokeDocs + private typealias CommonKPropertyInvokeDocs = Nothing /** * @include [CommonKPropertyInvokeDocs] @@ -106,7 +106,7 @@ public interface ColumnSelectionDsl : ColumnsContainer { * * @throws [IllegalArgumentException] if the column is not found. */ - private interface CommonKPropertyGetDocs + private typealias CommonKPropertyGetDocs = Nothing /** * @include [CommonKPropertyGetDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt index dc409fcf66..c1cb3db256 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API import kotlin.reflect.KProperty /** [Columns Selection DSL][ColumnsSelectionDsl] */ -internal interface ColumnsSelectionDslLink +internal typealias ColumnsSelectionDslLink = Nothing @Suppress("UNCHECKED_CAST") @PublishedApi @@ -167,7 +167,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * {@include [DslGrammarTemplate.TextDef]} */ @[ExcludeFromSources ExportAsHtml] - public interface DefinitionsPartOfGrammar + public typealias DefinitionsPartOfGrammar = Nothing /** * {@include [DslGrammarTemplate.ColumnRef]}` `{@include [ColumnRangeColumnsSelectionDsl.Grammar.PlainDslName]}` `{@include [DslGrammarTemplate.ColumnRef]} @@ -229,7 +229,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * `| `{@include [WithoutNullsColumnsSelectionDsl.Grammar.PlainDslName]}**`()`** */ @[ExcludeFromSources ExportAsHtml] - public interface PlainDslPartOfGrammar + public typealias PlainDslPartOfGrammar = Nothing /** * {@include [Indent]}\[**`\[`**\][ColumnsSelectionDsl.col]{@include [DslGrammarTemplate.IndexRef]}\[**`\]`**\][ColumnsSelectionDsl.col] @@ -297,7 +297,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * {@include [ColumnSetPartOfGrammar]} */ @ExportAsHtml - public interface ForHtml + public typealias ForHtml = Nothing } /** @@ -374,7 +374,7 @@ public interface ColumnsSelectionDsl : // SingleColumn> * {@include [ColumnGroupPartOfGrammar]} */ @ExportAsHtml - public interface ForHtml + public typealias ForHtml = Nothing } } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt index 70e6a9d285..5fdb8c449b 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt @@ -114,14 +114,14 @@ public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey * * @return [firstRowValue] for the first row; difference between expression computed for current and previous row for the following rows */ -internal interface DiffDocs +internal typealias DiffDocs = Nothing /** * Calculates the difference between the results of a row expression computed on the current and previous DataRow. * * @return null for the first row; difference between expression computed for current and previous row for the following rows */ -internal interface DiffOrNullDocs +internal typealias DiffOrNullDocs = Nothing /** * @include [DiffDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt index b735c44d10..bb5a5e65bf 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt @@ -42,17 +42,17 @@ import kotlin.reflect.KProperty internal interface FillNulls { /** @include [Update.Grammar] {@set [UPDATE_OPERATION] [**fillNulls**][fillNulls]} */ - interface Grammar + typealias Grammar = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetFillNullsOperationArg]} */ - interface FillNullsSelectingOptions + typealias FillNullsSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [fillNulls][fillNulls]} */ -private interface SetFillNullsOperationArg +private typealias SetFillNullsOperationArg = Nothing /** * @include [FillNulls] {@comment Description of the fillNulls operation.} @@ -63,7 +63,7 @@ private interface SetFillNullsOperationArg * */ @ExcludeFromSources -private interface CommonFillNullsFunctionDoc +private typealias CommonFillNullsFunctionDoc = Nothing /** * @include [CommonFillNullsFunctionDoc] @@ -172,18 +172,18 @@ internal inline val Float?.isNA: Boolean get() = this == null || this.isNaN() internal interface FillNaNs { /** @include [Update.Grammar] {@set [Update.UPDATE_OPERATION] [fillNaNs][fillNaNs]} */ - interface Grammar + typealias Grammar = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetFillNaNsOperationArg]} */ - interface FillNaNsSelectingOptions + typealias FillNaNsSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [fillNaNs][fillNaNs]} */ @ExcludeFromSources -internal interface SetFillNaNsOperationArg +internal typealias SetFillNaNsOperationArg = Nothing /** * @include [FillNaNs] {@comment Description of the fillNaNs operation.} @@ -193,7 +193,7 @@ internal interface SetFillNaNsOperationArg * ### This Fill NaNs Overload */ @ExcludeFromSources -private interface CommonFillNaNsFunctionDoc +private typealias CommonFillNaNsFunctionDoc = Nothing /** * @include [CommonFillNaNsFunctionDoc] @@ -247,18 +247,18 @@ public fun DataFrame.fillNaNs(vararg columns: ColumnReference): Upd internal interface FillNA { /** @include [Update.Grammar] {@set [Update.UPDATE_OPERATION] [fillNA][fillNA]} */ - interface Grammar + typealias Grammar = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetFillNAOperationArg]} */ - interface FillNASelectingOptions + typealias FillNASelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [fillNA][fillNA]} */ @ExcludeFromSources -internal interface SetFillNAOperationArg +internal typealias SetFillNAOperationArg = Nothing /** * @include [FillNA] {@comment Description of the fillNA operation.} @@ -268,7 +268,7 @@ internal interface SetFillNAOperationArg * ### This Fill NA Overload */ @ExcludeFromSources -private interface CommonFillNAFunctionDoc +private typealias CommonFillNAFunctionDoc = Nothing /** * @include [CommonFillNAFunctionDoc] @@ -309,20 +309,19 @@ public fun DataFrame.fillNA(vararg columns: ColumnReference): Updat /** @param columns The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to drop rows in. */ @ExcludeFromSources -private interface DropDslParam +private typealias DropDslParam = Nothing /** @param columns The [KProperties][KProperty] used to select the columns of this [DataFrame] to drop rows in. */ @ExcludeFromSources -private interface DropKPropertiesParam +private typealias DropKPropertiesParam = Nothing /** @param columns The [Strings][String] corresponding to the names of columns in this [DataFrame] to drop rows in. */ @ExcludeFromSources -private interface DropColumnNamesParam +private typealias DropColumnNamesParam = Nothing /** @param columns The [Column References][ColumnReference] used to select the columns of this [DataFrame] to drop rows in. */ @ExcludeFromSources -private interface DropColumnAccessorsParam - +private typealias DropColumnAccessorsParam = Nothing // region dropNulls /** @@ -345,25 +344,25 @@ internal interface DropNulls { * If `true`, rows are dropped if all selected cells are `null`. * If `false`, rows are dropped if any of the selected cells is `null`. */ - interface WhereAllNullParam + typealias WhereAllNullParam = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetDropNullsOperationArg]} */ - interface DropNullsSelectingOptions + typealias DropNullsSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [dropNulls][dropNulls]} */ @ExcludeFromSources -private interface SetDropNullsOperationArg +private typealias SetDropNullsOperationArg = Nothing /** * @include [DropNulls] {@comment Description of the dropNulls operation.} * ### This Drop Nulls Overload */ @ExcludeFromSources -private interface CommonDropNullsFunctionDoc +private typealias CommonDropNullsFunctionDoc = Nothing /** * @include [CommonDropNullsFunctionDoc] @@ -466,25 +465,25 @@ internal interface DropNA { * If `true`, rows are dropped if all selected cells are [`NA`][NA]. * If `false`, rows are dropped if any of the selected cells is [`NA`][NA]. */ - interface WhereAllNAParam + typealias WhereAllNAParam = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetDropNAOperationArg]} */ - interface DropNASelectingOptions + typealias DropNASelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [dropNA][dropNA]} */ @ExcludeFromSources -private interface SetDropNAOperationArg +private typealias SetDropNAOperationArg = Nothing /** * @include [DropNA] {@comment Description of the dropNA operation.} * ### This Drop NA Overload */ @ExcludeFromSources -private interface CommonDropNAFunctionDoc +private typealias CommonDropNAFunctionDoc = Nothing /** * @include [CommonDropNAFunctionDoc] @@ -581,25 +580,25 @@ internal interface DropNaNs { * If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN]. * If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN]. */ - interface WhereAllNaNParam + typealias WhereAllNaNParam = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetDropNaNsOperationArg]} */ - interface DropNaNsSelectingOptions + typealias DropNaNsSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [dropNaNs][dropNaNs]} */ @ExcludeFromSources -private interface SetDropNaNsOperationArg +private typealias SetDropNaNsOperationArg = Nothing /** * @include [DropNaNs] {@comment Description of the dropNaNs operation.} * ### This Drop NaNs Overload */ @ExcludeFromSources -private interface CommonDropNaNsFunctionDoc +private typealias CommonDropNaNsFunctionDoc = Nothing /** * @include [CommonDropNaNsFunctionDoc] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt index 4aed230f44..be53cf9f46 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt @@ -178,7 +178,7 @@ public typealias AddExpression = Selector, R> * For example, use `prev().newValue()` to access the new column value from the previous row. */ @ExcludeFromSources -internal interface AddExpressionDocs +internal typealias AddExpressionDocs = Nothing /** * Creates a new column using an [AddExpression] and diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt index 21e9d8444e..6746d26ff5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt @@ -104,25 +104,25 @@ public interface AllColumnsSelectionDsl { public interface Grammar { /** [**`all`**][ColumnsSelectionDsl.all] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`all`**][ColumnsSelectionDsl.all] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`allCols`**][ColumnsSelectionDsl.allCols] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing /** [**`Before`**][ColumnsSelectionDsl.allColsBefore] */ - public interface Before + public typealias Before = Nothing /** [**`After`**][ColumnsSelectionDsl.allAfter] */ - public interface After + public typealias After = Nothing /** [**`From`**][ColumnsSelectionDsl.allColsFrom] */ - public interface From + public typealias From = Nothing /** [**`UpTo`**][ColumnsSelectionDsl.allColsUpTo] */ - public interface UpTo + public typealias UpTo = Nothing } /** @@ -144,7 +144,7 @@ public interface AllColumnsSelectionDsl { * All columns up to the specified column, including that column */ @ExcludeFromSources - private interface AllFlavors + private typealias AllFlavors = Nothing /** * ## {@get [TITLE]} @@ -191,27 +191,27 @@ public interface AllColumnsSelectionDsl { private interface CommonAllSubsetDocs { // The title of the function, a.k.a. "All (Cols) After" - interface TITLE + typealias TITLE = Nothing // The exact name of the function, a.k.a. "allAfter" - interface FUNCTION + typealias FUNCTION = Nothing // The exact name of the function, a.k.a. "allColsAfter" - interface FUNCTION_COLS + typealias FUNCTION_COLS = Nothing /* * Small line of text explaining the behavior of the function, * a.k.a. "after [column\], excluding [column\]" */ - interface BEHAVIOR + typealias BEHAVIOR = Nothing /* * Small line of text explaining what happens if `column` does not exist. */ - interface COLUMN_DOES_NOT_EXIST + typealias COLUMN_DOES_NOT_EXIST = Nothing // Example argument - interface EXAMPLE + typealias EXAMPLE = Nothing } // region all @@ -253,7 +253,7 @@ public interface AllColumnsSelectionDsl { private interface CommonAllDocs { /** Example argument */ - interface Examples + typealias Examples = Nothing } /** @@ -326,7 +326,7 @@ public interface AllColumnsSelectionDsl { * @param [column\] The specified column after which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver] and absolutely. */ - private interface AllAfterDocs + private typealias AllAfterDocs = Nothing /** * @include [AllAfterDocs] @@ -338,7 +338,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnSetAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnSetAllAfterDocs] {@set [ColumnSetAllAfterDocs.Arg] \ \{ myColumn `[in][String.contains]` it.`[name][ColumnWithPath.name]` \}} */ @@ -372,7 +372,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnsSelectionDslAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnsSelectionDslAllAfterDocs] {@set [ColumnsSelectionDslAllAfterDocs.Arg] \ \{ myColumn \}} */ @@ -404,7 +404,7 @@ public interface AllColumnsSelectionDsl { private interface SingleColumnAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [SingleColumnAllAfterDocs] {@set [SingleColumnAllAfterDocs.Arg] \ \{ myColumn \}} */ @@ -449,7 +449,7 @@ public interface AllColumnsSelectionDsl { private interface StringAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [StringAllAfterDocs] {@set [StringAllAfterDocs.Arg] \ \{ myColumn \}} */ @@ -477,7 +477,7 @@ public interface AllColumnsSelectionDsl { private interface KPropertyAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @@ -519,7 +519,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnPathAllAfterDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnPathAllAfterDocs] {@set [ColumnPathAllAfterDocs.Arg] \ \{ myColumn \}} */ @@ -553,7 +553,7 @@ public interface AllColumnsSelectionDsl { * @param [column\] The specified column from which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver] and absolutely. */ - private interface AllFromDocs + private typealias AllFromDocs = Nothing /** * @include [AllFromDocs] @@ -565,7 +565,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnSetAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnSetAllFromDocs] {@set [ColumnSetAllFromDocs.Arg] \ \{ myColumn `[in][String.contains]` it.`[name][ColumnWithPath.name]` \}} */ @@ -598,7 +598,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnsSelectionDslAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnsSelectionDslAllFromDocs] {@set [ColumnsSelectionDslAllFromDocs.Arg] \ \{ myColumn \}} */ @@ -630,7 +630,7 @@ public interface AllColumnsSelectionDsl { private interface SingleColumnAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [SingleColumnAllFromDocs] {@set [SingleColumnAllFromDocs.Arg] \ \{ myColumn \}} */ @@ -675,7 +675,7 @@ public interface AllColumnsSelectionDsl { private interface StringAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [StringAllFromDocs] {@set [StringAllFromDocs.Arg] \ \{ myColumn \}} */ @@ -703,7 +703,7 @@ public interface AllColumnsSelectionDsl { private interface KPropertyAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @@ -745,7 +745,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnPathAllFromDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnPathAllFromDocs] {@set [ColumnPathAllFromDocs.Arg] \ \{ myColumn \}} */ @@ -778,7 +778,7 @@ public interface AllColumnsSelectionDsl { * @param [column\] The specified column before which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver] and absolutely. */ - private interface AllBeforeDocs + private typealias AllBeforeDocs = Nothing /** * @include [AllBeforeDocs] @@ -790,7 +790,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnSetAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnSetAllBeforeDocs] {@set [ColumnSetAllBeforeDocs.Arg] \ \{ myColumn `[in][String.contains]` it.`[name][ColumnWithPath.name]` \}} */ @@ -824,7 +824,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnsSelectionDslAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnsSelectionDslAllBeforeDocs] {@set [ColumnsSelectionDslAllBeforeDocs.Arg] \ \{ myColumn \}} */ @@ -857,7 +857,7 @@ public interface AllColumnsSelectionDsl { private interface SingleColumnAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [SingleColumnAllBeforeDocs] {@set [SingleColumnAllBeforeDocs.Arg] \ \{ myColumn \}} */ @@ -899,7 +899,7 @@ public interface AllColumnsSelectionDsl { private interface StringAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [StringAllBeforeDocs] {@set [StringAllBeforeDocs.Arg] \ \{ myColumn \}} */ @@ -928,7 +928,7 @@ public interface AllColumnsSelectionDsl { private interface KPropertyAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @@ -970,7 +970,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnPathAllBeforeDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnPathAllBeforeDocs] {@set [ColumnPathAllBeforeDocs.Arg] \ \{ myColumn \}} */ @@ -1004,7 +1004,7 @@ public interface AllColumnsSelectionDsl { * @param [column\] The specified column up to which all columns should be taken. This column can be referenced * to both relatively to the current [ColumnsResolver] and absolutely. */ - private interface AllUpToDocs + private typealias AllUpToDocs = Nothing /** * @include [AllUpToDocs] @@ -1016,7 +1016,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnSetAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnSetAllUpToDocs] {@set [ColumnSetAllUpToDocs.Arg] \ \{ myColumn `[in][String.contains]` it.`[name][ColumnWithPath.name]` \}} */ @@ -1049,7 +1049,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnsSelectionDslAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnsSelectionDslAllUpToDocs] {@set [ColumnsSelectionDslAllUpToDocs.Arg] \ \{ myColumn \}} */ @@ -1081,7 +1081,7 @@ public interface AllColumnsSelectionDsl { private interface SingleColumnAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [SingleColumnAllUpToDocs] {@set [SingleColumnAllUpToDocs.Arg] \ \{ myColumn \}} */ @@ -1126,7 +1126,7 @@ public interface AllColumnsSelectionDsl { private interface StringAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [StringAllUpToDocs] {@set [StringAllUpToDocs.Arg] \ \{ myColumn \}} */ @@ -1154,7 +1154,7 @@ public interface AllColumnsSelectionDsl { private interface KPropertyAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @@ -1196,7 +1196,7 @@ public interface AllColumnsSelectionDsl { private interface ColumnPathAllUpToDocs { /** Example argument to use */ - interface Arg + typealias Arg = Nothing } /** @include [ColumnPathAllUpToDocs] {@set [ColumnPathAllUpToDocs.Arg] \ \{ myColumn \}} */ diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt index b4c1c9ac90..2db9bae5f0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt @@ -88,16 +88,16 @@ public interface AllExceptColumnsSelectionDsl { public interface Grammar { /** [**`allExcept`**][ColumnsSelectionDsl.allExcept] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** [**`except`**][ColumnsSelectionDsl.except] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`allColsExcept`**][ColumnsSelectionDsl.allColsExcept] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing /** __`.`__[**`except`**][ColumnsSelectionDsl.except] */ - public interface ColumnGroupExceptName + public typealias ColumnGroupExceptName = Nothing } /** @@ -192,10 +192,10 @@ public interface AllExceptColumnsSelectionDsl { private interface CommonExceptDocs { // Example argument - interface EXAMPLE + typealias EXAMPLE = Nothing // Parameter argument - interface PARAM + typealias PARAM = Nothing } // region ColumnSet @@ -212,10 +212,10 @@ public interface AllExceptColumnsSelectionDsl { private interface ColumnSetInfixDocs { // argument - interface ARGUMENT_1 + typealias ARGUMENT_1 = Nothing // argument - interface ARGUMENT_2 + typealias ARGUMENT_2 = Nothing } /** @@ -230,10 +230,10 @@ public interface AllExceptColumnsSelectionDsl { private interface ColumnSetVarargDocs { // argument - interface ARGUMENT_1 + typealias ARGUMENT_1 = Nothing // argument - interface ARGUMENT_2 + typealias ARGUMENT_2 = Nothing } /** @@ -336,10 +336,10 @@ public interface AllExceptColumnsSelectionDsl { private interface ColumnsSelectionDslDocs { // argument - interface ARGUMENT_1 + typealias ARGUMENT_1 = Nothing // argument - interface ARGUMENT_2 + typealias ARGUMENT_2 = Nothing } /** @@ -412,47 +412,47 @@ public interface AllExceptColumnsSelectionDsl { private interface ColumnGroupDocs { // receiver - interface RECEIVER_1 + typealias RECEIVER_1 = Nothing // receiver - interface RECEIVER_2 + typealias RECEIVER_2 = Nothing // type - interface RECEIVER_TYPE + typealias RECEIVER_TYPE = Nothing // argument - interface ARGUMENT_1 + typealias ARGUMENT_1 = Nothing // argument - interface ARGUMENT_2 + typealias ARGUMENT_2 = Nothing /** * @set [ColumnGroupDocs.RECEIVER_1] `userData.` * @set [ColumnGroupDocs.RECEIVER_2] `name.` * @set [ColumnGroupDocs.RECEIVER_TYPE] SingleColumn */ - interface SingleColumnReceiverArgs + typealias SingleColumnReceiverArgs = Nothing /** * @set [ColumnGroupDocs.RECEIVER_1] `"userData".` * @set [ColumnGroupDocs.RECEIVER_2] `"name".` * @set [ColumnGroupDocs.RECEIVER_TYPE] String */ - interface StringReceiverArgs + typealias StringReceiverArgs = Nothing /** * @set [ColumnGroupDocs.RECEIVER_1] `DataSchemaPerson::userData.` * @set [ColumnGroupDocs.RECEIVER_2] `Person::name.` * @set [ColumnGroupDocs.RECEIVER_TYPE] KProperty */ - interface KPropertyReceiverArgs + typealias KPropertyReceiverArgs = Nothing /** * @set [ColumnGroupDocs.RECEIVER_1] `pathOf("userData").` * @set [ColumnGroupDocs.RECEIVER_2] `"pathTo"["myColGroup"].` * @set [ColumnGroupDocs.RECEIVER_TYPE] ColumnPath */ - interface ColumnPathReceiverArgs + typealias ColumnPathReceiverArgs = Nothing /** * @set [CommonExceptDocs.PARAM] @param [selector\] A lambda in which you specify the columns that need to be @@ -461,7 +461,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnGroupDocs.ARGUMENT_1] ` { "age" `[and][ColumnsSelectionDsl.and]` height }` * @set [ColumnGroupDocs.ARGUMENT_2] ` { firstName }` */ - interface SelectorArgs + typealias SelectorArgs = Nothing /** * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [Strings][String] referring to @@ -470,7 +470,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnGroupDocs.ARGUMENT_1] `("age", "height")` * @set [ColumnGroupDocs.ARGUMENT_2] `("firstName", "middleName")` */ - interface StringArgs + typealias StringArgs = Nothing /** * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [KProperties][KProperty] referring to @@ -479,7 +479,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnGroupDocs.ARGUMENT_1] `(Person::age, Person::height)` * @set [ColumnGroupDocs.ARGUMENT_2] `(Person::firstName, Person::middleName)` */ - interface KPropertyArgs + typealias KPropertyArgs = Nothing /** * @set [CommonExceptDocs.PARAM] @param [others\] Any number of [ColumnPaths][ColumnPath] referring to @@ -488,7 +488,7 @@ public interface AllExceptColumnsSelectionDsl { * @set [ColumnGroupDocs.ARGUMENT_1] `(pathOf("age"), "extraData"["item1"])` * @set [ColumnGroupDocs.ARGUMENT_2] `(pathOf("firstName"), "middleNames"["first"])` */ - interface ColumnPathArgs + typealias ColumnPathArgs = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt index 097ad09c53..b5b9da6a0c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/and.kt @@ -58,10 +58,10 @@ public interface AndColumnsSelectionDsl { public interface Grammar { /** [**`and`**][ColumnsSelectionDsl.and] */ - public interface InfixName + public typealias InfixName = Nothing /** __`.`__[**`and`**][ColumnsSelectionDsl.and] */ - public interface Name + public typealias Name = Nothing } /** @@ -97,7 +97,7 @@ public interface AndColumnsSelectionDsl { */ private interface CommonAndDocs { - interface EXAMPLE + typealias EXAMPLE = Nothing } // region ColumnsResolver @@ -110,7 +110,7 @@ public interface AndColumnsSelectionDsl { */ private interface ColumnsResolverAndDocs { - interface Argument + typealias Argument = Nothing } /** @include [ColumnsResolverAndDocs] {@set [ColumnsResolverAndDocs.Argument] [`colsOf`][SingleColumn.colsOf]`<`[`Int`][Int]`>()`} */ @@ -140,7 +140,7 @@ public interface AndColumnsSelectionDsl { */ private interface StringAndDocs { - interface Argument + typealias Argument = Nothing } /** @include [StringAndDocs] {@set [StringAndDocs.Argument] [`colsOf`][SingleColumn.colsOf]`<`[`Int`][Int]`>()`} */ @@ -169,7 +169,7 @@ public interface AndColumnsSelectionDsl { */ private interface KPropertyAndDocs { - interface Argument + typealias Argument = Nothing } /** @include [KPropertyAndDocs] {@set [KPropertyAndDocs.Argument] [`colsOf`][SingleColumn.colsOf]`<`[`Int`][Int]`>()`} */ diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt index f4addacf8a..11131161ca 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/col.kt @@ -65,13 +65,13 @@ public interface ColColumnsSelectionDsl { public interface Grammar { /** [**`col`**][ColumnsSelectionDsl.col] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`col`**][ColumnsSelectionDsl.col] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`col`**][ColumnsSelectionDsl.col] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -119,31 +119,31 @@ public interface ColColumnsSelectionDsl { private interface CommonColDocs { // Example argument, can be either {@include [SingleExample]} or {@include [DoubleExample]} - interface EXAMPLE + typealias EXAMPLE = Nothing /** * `df.`[select][DataFrame.select]` { $[CommonColDocs.RECEIVER]`[col][col]`($[CommonColDocs.ARG]) \}` */ - interface SingleExample + typealias SingleExample = Nothing /** * `df.`[select][DataFrame.select]` { $[CommonColDocs.RECEIVER]`[col][col]`($[CommonColDocs.ARG]) \}` * * `df.`[select][DataFrame.select]` { $[CommonColDocs.RECEIVER]`[col][col]`<`[String][String]`>($[CommonColDocs.ARG]) \}` */ - interface DoubleExample + typealias DoubleExample = Nothing // Receiver argument for the example(s) - interface RECEIVER + typealias RECEIVER = Nothing // Argument for the example(s) - interface ARG + typealias ARG = Nothing // Optional note - interface NOTE + typealias NOTE = Nothing /** @param [C\] The type of the column. */ - interface ColumnTypeParam + typealias ColumnTypeParam = Nothing } // region reference @@ -155,7 +155,7 @@ public interface ColColumnsSelectionDsl { * @param [col\] The [ColumnAccessor] pointing to the column. * @include [CommonColDocs.ColumnTypeParam] */ - private interface ColReferenceDocs + private typealias ColReferenceDocs = Nothing /** * @include [ColReferenceDocs] {@set [CommonColDocs.RECEIVER]} @@ -219,7 +219,7 @@ public interface ColColumnsSelectionDsl { * {@set [CommonColDocs.EXAMPLE] {@include [CommonColDocs.DoubleExample]}} * @param [name\] The name of the column. */ - private interface ColNameDocs + private typealias ColNameDocs = Nothing /** * @include [ColNameDocs] {@set [CommonColDocs.RECEIVER]} @@ -331,7 +331,7 @@ public interface ColColumnsSelectionDsl { * {@set [CommonColDocs.EXAMPLE] {@include [CommonColDocs.DoubleExample]}} * @param [path\] The path to the column. */ - private interface ColPathDocs + private typealias ColPathDocs = Nothing /** * @include [ColPathDocs] {@set [CommonColDocs.RECEIVER]} @@ -435,7 +435,7 @@ public interface ColColumnsSelectionDsl { * @param [property\] The [KProperty] reference to the column. * @include [CommonColDocs.ColumnTypeParam] */ - private interface ColKPropertyDocs + private typealias ColKPropertyDocs = Nothing /** * @include [ColKPropertyDocs] {@set [CommonColDocs.RECEIVER]} @@ -494,7 +494,7 @@ public interface ColColumnsSelectionDsl { * @param [index\] The index of the column. * @throws [IndexOutOfBoundsException\] if the index is out of bounds. */ - private interface ColIndexDocs + private typealias ColIndexDocs = Nothing /** * @include [ColIndexDocs] {@set [CommonColDocs.RECEIVER] `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Int][Int]`>().} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt index 3474fc6126..0445ce45b2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroup.kt @@ -64,13 +64,13 @@ public interface ColGroupColumnsSelectionDsl { public interface Grammar { /** [**`colGroup`**][ColumnsSelectionDsl.colGroup] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colGroup`**][ColumnsSelectionDsl.colGroup] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colGroup`**][ColumnsSelectionDsl.colGroup] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -120,31 +120,31 @@ public interface ColGroupColumnsSelectionDsl { private interface CommonColGroupDocs { // Example argument, can be either {@include [SingleExample]} or {@include [DoubleExample]} - interface EXAMPLE + typealias EXAMPLE = Nothing /** * `df.`[select][DataFrame.select]` { $[CommonColGroupDocs.RECEIVER]`[colGroup][colGroup]`($[CommonColGroupDocs.ARG]) \}` */ - interface SingleExample + typealias SingleExample = Nothing /** * `df.`[select][DataFrame.select]` { $[CommonColGroupDocs.RECEIVER]`[colGroup][colGroup]`($[CommonColGroupDocs.ARG]) \}` * * `df.`[select][DataFrame.select]` { $[CommonColGroupDocs.RECEIVER]`[colGroup][colGroup]`<`[String][String]`>($[CommonColGroupDocs.ARG]) \}` */ - interface DoubleExample + typealias DoubleExample = Nothing // Receiver argument for the example(s) - interface RECEIVER + typealias RECEIVER = Nothing // Argument for the example(s) - interface ARG + typealias ARG = Nothing // Optional note - interface NOTE + typealias NOTE = Nothing /** @param [C\] The type of the column group. */ - interface ColumnGroupTypeParam + typealias ColumnGroupTypeParam = Nothing } // region reference @@ -156,7 +156,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [col\] The [ColumnAccessor] pointing to the value column. * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - private interface ColGroupReferenceDocs + private typealias ColGroupReferenceDocs = Nothing /** * @include [ColGroupReferenceDocs] {@set [CommonColGroupDocs.RECEIVER]} @@ -223,7 +223,7 @@ public interface ColGroupColumnsSelectionDsl { * {@set [CommonColGroupDocs.EXAMPLE] {@include [CommonColGroupDocs.DoubleExample]}} * @param [name\] The name of the value column. */ - private interface ColGroupNameDocs + private typealias ColGroupNameDocs = Nothing /** * @include [ColGroupNameDocs] {@set [CommonColGroupDocs.RECEIVER]} @@ -327,7 +327,7 @@ public interface ColGroupColumnsSelectionDsl { * {@set [CommonColGroupDocs.EXAMPLE] {@include [CommonColGroupDocs.DoubleExample]}} * @param [path\] The path to the value column. */ - private interface ColGroupPathDocs + private typealias ColGroupPathDocs = Nothing /** * @include [ColGroupPathDocs] {@set [CommonColGroupDocs.RECEIVER]} @@ -433,7 +433,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [property\] The [KProperty] reference to the value column. * @include [CommonColGroupDocs.ColumnGroupTypeParam] */ - private interface ColGroupKPropertyDocs + private typealias ColGroupKPropertyDocs = Nothing /** * @include [ColGroupKPropertyDocs] {@set [CommonColGroupDocs.RECEIVER]} @@ -554,7 +554,7 @@ public interface ColGroupColumnsSelectionDsl { * @param [index\] The index of the value column. * @throws [IndexOutOfBoundsException\] if the index is out of bounds. */ - private interface ColGroupIndexDocs + private typealias ColGroupIndexDocs = Nothing /** * @include [ColGroupIndexDocs] {@set [CommonColGroupDocs.RECEIVER] `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Int][Int]`>().} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt index 8bc122fdd6..8597b11bd5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colGroups.kt @@ -53,13 +53,13 @@ public interface ColGroupsColumnsSelectionDsl { public interface Grammar { /** [**`colGroups`**][ColumnsSelectionDsl.colGroups] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colGroups`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colGroups`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -95,7 +95,7 @@ public interface ColGroupsColumnsSelectionDsl { private interface CommonColGroupsDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt index acb9c84503..b00182cb00 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt @@ -90,13 +90,13 @@ public interface ColsColumnsSelectionDsl { public interface Grammar { /** [**`cols`**][ColumnsSelectionDsl.cols] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`cols`**][ColumnsSelectionDsl.cols] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`cols`**][ColumnsSelectionDsl.cols] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -143,7 +143,7 @@ public interface ColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.frameCols\] * @see [ColumnsSelectionDsl.colGroups\] */ - interface Predicate + typealias Predicate = Nothing /** * @include [CommonColsDocs] @@ -156,11 +156,11 @@ public interface ColsColumnsSelectionDsl { */ interface Vararg { - interface AccessorType + typealias AccessorType = Nothing } /** Example argument */ - interface Examples + typealias Examples = Nothing } /** @@ -191,7 +191,7 @@ public interface ColsColumnsSelectionDsl { private interface CommonColsIndicesDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** @@ -222,7 +222,7 @@ public interface ColsColumnsSelectionDsl { private interface CommonColsRangeDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } // region predicate @@ -244,7 +244,7 @@ public interface ColsColumnsSelectionDsl { * @see [ColumnsSelectionDsl.all\] * @see [ColumnsSelectionDsl.filter\] */ - private interface ColumnSetColsPredicateDocs + private typealias ColumnSetColsPredicateDocs = Nothing /** @include [ColumnSetColsPredicateDocs] */ @Suppress("UNCHECKED_CAST") @@ -273,7 +273,7 @@ public interface ColsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.all\] */ - private interface ColumnsSelectionDslColsPredicateDocs + private typealias ColumnsSelectionDslColsPredicateDocs = Nothing /** @include [ColumnsSelectionDslColsPredicateDocs] */ public fun ColumnsSelectionDsl<*>.cols(predicate: ColumnFilter<*>): ColumnSet<*> = @@ -301,7 +301,7 @@ public interface ColsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.allCols\] */ - private interface SingleColumnAnyRowColsPredicateDocs + private typealias SingleColumnAnyRowColsPredicateDocs = Nothing /** @include [SingleColumnAnyRowColsPredicateDocs] */ public fun SingleColumn>.cols(predicate: ColumnFilter<*>): ColumnSet<*> = @@ -328,7 +328,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "myGroupCol".`[`cols`][String.cols]`() }` */ - private interface StringColsPredicateDocs + private typealias StringColsPredicateDocs = Nothing /** @include [StringColsPredicateDocs] */ public fun String.cols(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).cols(predicate) @@ -353,7 +353,7 @@ public interface ColsColumnsSelectionDsl { * * @see [ColumnsSelectionDsl.allCols\] */ - private interface KPropertyColsPredicateDocs + private typealias KPropertyColsPredicateDocs = Nothing /** @include [KPropertyColsPredicateDocs] */ @Deprecated(DEPRECATED_ACCESS_API) @@ -376,7 +376,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["myGroupCol"].`[`cols`][ColumnPath.cols]`() } // identity call, same as `[`allCols`][ColumnsSelectionDsl.allCols] */ - private interface ColumnPathPredicateDocs + private typealias ColumnPathPredicateDocs = Nothing /** @include [ColumnPathPredicateDocs] */ public fun ColumnPath.cols(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).cols(predicate) @@ -399,7 +399,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { this`[`[`][ColumnsSelectionDsl.cols]`colGroup.columnA, columnB`[`]`][ColumnsSelectionDsl.cols]` }` */ - private interface ColumnsSelectionDslColsVarargColumnReferenceDocs + private typealias ColumnsSelectionDslColsVarargColumnReferenceDocs = Nothing /** @include [ColumnsSelectionDslColsVarargColumnReferenceDocs] */ @Interpretable("Cols0") @@ -422,7 +422,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup`[`[`][SingleColumn.cols]`columnA, columnB`[`]`][SingleColumn.cols]` }` */ - private interface SingleColumnColsVarargColumnReferenceDocs + private typealias SingleColumnColsVarargColumnReferenceDocs = Nothing /** @include [SingleColumnColsVarargColumnReferenceDocs] */ public fun SingleColumn>.cols( @@ -446,7 +446,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "myColumnGroup"`[`[`][String.cols]`columnA, columnB`[`]`][String.cols]` }` */ - private interface StringColsVarargColumnReferenceDocs + private typealias StringColsVarargColumnReferenceDocs = Nothing /** @include [StringColsVarargColumnReferenceDocs] */ public fun String.cols(firstCol: ColumnReference, vararg otherCols: ColumnReference): ColumnSet = @@ -466,7 +466,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { DataSchemaType::myColumnGroup`[`[`][KProperty.cols]`"pathTo"["colA"], "pathTo"["colB"]`[`]`][KProperty.cols]` }` */ - private interface KPropertyColsVarargColumnReferenceDocs + private typealias KPropertyColsVarargColumnReferenceDocs = Nothing /** @include [KPropertyColsVarargColumnReferenceDocs] */ public fun KProperty<*>.cols( @@ -490,7 +490,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["columnGroup"]`[`[`][ColumnPath.cols]`columnA, columnB`[`]`][ColumnPath.cols]` }` */ - private interface ColumnPathColsVarargColumnReferenceDocs + private typealias ColumnPathColsVarargColumnReferenceDocs = Nothing /** @include [ColumnPathColsVarargColumnReferenceDocs] */ public fun ColumnPath.cols(firstCol: ColumnReference, vararg otherCols: ColumnReference): ColumnSet = @@ -516,7 +516,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { this`[`[`][ColumnsSelectionDsl.cols]`"columnA", "columnB"`[`]`][ColumnsSelectionDsl.cols]` }` */ - private interface ColumnsSelectionDslVarargStringDocs + private typealias ColumnsSelectionDslVarargStringDocs = Nothing /** @include [ColumnsSelectionDslVarargStringDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -540,7 +540,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup`[`[`][SingleColumn.cols]`"columnA", "columnB"`[`]`][SingleColumn.cols]` }` */ - private interface SingleColumnColsVarargStringDocs + private typealias SingleColumnColsVarargStringDocs = Nothing /** @include [SingleColumnColsVarargStringDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -566,7 +566,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "columnGroup"`[`[`][String.cols]`"columnA", "columnB"`[`]`][String.cols]` }` */ - private interface StringColsVarargStringDocs + private typealias StringColsVarargStringDocs = Nothing /** @include [StringColsVarargStringDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -589,7 +589,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { DataSchemaType::myColumnGroup`[`[`][KProperty.cols]`"columnA", "columnB"`[`]`][KProperty.cols]` }` */ - private interface KPropertiesColsVarargStringDocs + private typealias KPropertiesColsVarargStringDocs = Nothing /** @include [KPropertiesColsVarargStringDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -613,7 +613,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["columnGroup"]`[`[`][ColumnPath.cols]`"columnA", "columnB"`[`]`][ColumnPath.cols]` }` */ - private interface ColumnPathColsVarargStringDocs + private typealias ColumnPathColsVarargStringDocs = Nothing /** @include [ColumnPathColsVarargStringDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -643,7 +643,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { this`[`[`][ColumnsSelectionDsl.cols]`"pathTo"["colA"], "pathTo"["colB"])`[`]`][ColumnsSelectionDsl.cols]` }` */ - private interface ColumnsSelectionDslVarargColumnPathDocs + private typealias ColumnsSelectionDslVarargColumnPathDocs = Nothing /** @include [ColumnsSelectionDslVarargColumnPathDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -669,7 +669,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup`[`[`][SingleColumn.cols]`"pathTo"["colA"], "pathTo"["colB"])`[`]`][SingleColumn.cols]` }` */ - private interface SingleColumnColsVarargColumnPathDocs + private typealias SingleColumnColsVarargColumnPathDocs = Nothing /** @include [SingleColumnColsVarargColumnPathDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -699,7 +699,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "columnGroup"`[`[`][String.cols]`""pathTo"["colA"], "pathTo"["colB"])`[`]`][ColumnPath.cols]` }` */ - private interface StringColsVarargColumnPathDocs + private typealias StringColsVarargColumnPathDocs = Nothing /** @include [StringColsVarargColumnPathDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -725,7 +725,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { DataSchemaType::myColumnGroup`[`[`][KProperty.cols]`"columnA", "columnB"`[`]`][KProperty.cols]` }` */ - private interface KPropertiesColsVarargColumnPathDocs + private typealias KPropertiesColsVarargColumnPathDocs = Nothing /** @include [KPropertiesColsVarargColumnPathDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -751,7 +751,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["columnGroup"]`[`[`][ColumnPath.cols]`"pathTo"["colA"], "pathTo"["colB"])`[`]`][ColumnPath.cols]` }` */ - private interface ColumnPathColsVarargColumnPathDocs + private typealias ColumnPathColsVarargColumnPathDocs = Nothing /** @include [ColumnPathColsVarargColumnPathDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -779,7 +779,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { this`[`[`][ColumnsSelectionDsl.cols]`Type::colA, Type::colB`[`]`][ColumnsSelectionDsl.cols]` }` */ - private interface ColumnsSelectionDslColsVarargKPropertyDocs + private typealias ColumnsSelectionDslColsVarargKPropertyDocs = Nothing /** @include [ColumnsSelectionDslColsVarargKPropertyDocs] */ public fun ColumnsSelectionDsl<*>.cols(firstCol: KProperty, vararg otherCols: KProperty): ColumnSet = @@ -799,7 +799,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup`[`[`][SingleColumn.cols]`Type::colA, Type::colB`[`]`][SingleColumn.cols]` }` */ - private interface SingleColumnColsVarargKPropertyDocs + private typealias SingleColumnColsVarargKPropertyDocs = Nothing /** @include [SingleColumnColsVarargKPropertyDocs] */ public fun SingleColumn>.cols( @@ -821,7 +821,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "myColumnGroup"`[`[`][String.cols]`Type::colA, Type::colB`[`]`][String.cols]` }` */ - private interface StringColsVarargKPropertyDocs + private typealias StringColsVarargKPropertyDocs = Nothing /** @include [StringColsVarargKPropertyDocs] */ public fun String.cols(firstCol: KProperty, vararg otherCols: KProperty): ColumnSet = @@ -839,7 +839,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { Type::myColumnGroup`[`[`][SingleColumn.cols]`Type::colA, Type::colB`[`]`][SingleColumn.cols]` }` */ - private interface KPropertyColsVarargKPropertyDocs + private typealias KPropertyColsVarargKPropertyDocs = Nothing /** @include [KPropertyColsVarargKPropertyDocs] */ public fun KProperty<*>.cols(firstCol: KProperty, vararg otherCols: KProperty): ColumnSet = @@ -857,7 +857,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["columnGroup"]`[`[`][ColumnPath.cols]`Type::colA, Type::colB`[`]`][ColumnPath.cols]` }` */ - private interface ColumnPathColsVarargKPropertyDocs + private typealias ColumnPathColsVarargKPropertyDocs = Nothing /** @include [ColumnPathColsVarargKPropertyDocs] */ public fun ColumnPath.cols(firstCol: KProperty, vararg otherCols: KProperty): ColumnSet = @@ -879,7 +879,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { `[`all`][ColumnsSelectionDsl.all]`()`[`[`][ColumnSet.cols]`5, 1`[`]`][ColumnSet.cols]` }` */ - private interface ColumnSetColsIndicesDocs + private typealias ColumnSetColsIndicesDocs = Nothing /** @include [ColumnSetColsIndicesDocs] */ @Suppress("UNCHECKED_CAST") @@ -898,7 +898,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { `[`cols`][ColumnsSelectionDsl.cols]`<`[`String`][String]`>(1, 3) }` */ - private interface ColumnsSelectionDslColsIndicesDocs + private typealias ColumnsSelectionDslColsIndicesDocs = Nothing /** @include [ColumnsSelectionDslColsIndicesDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -918,7 +918,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup.`[`cols`][SingleColumn.cols]`<`[`String`][String]`>(3, 4) }` */ - private interface SingleColumnColsIndicesDocs + private typealias SingleColumnColsIndicesDocs = Nothing /** @include [SingleColumnColsIndicesDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -938,7 +938,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "myColumnGroup".`[`cols`][String.cols]`<`[`String`][String]`>(5, 3, 1) }` */ - private interface StringColsIndicesDocs + private typealias StringColsIndicesDocs = Nothing /** @include [StringColsIndicesDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -958,7 +958,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { Type::myColumnGroup.`[`cols`][SingleColumn.cols]`<`[`String`][String]`>(5, 4) }` */ - private interface KPropertyColsIndicesDocs + private typealias KPropertyColsIndicesDocs = Nothing /** @include [KPropertyColsIndicesDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -978,7 +978,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["myColGroup"].`[`cols`][ColumnPath.cols]`<`[`String`][String]`>(0, 1) }` */ - private interface ColumnPathColsIndicesDocs + private typealias ColumnPathColsIndicesDocs = Nothing /** @include [ColumnPathColsIndicesDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -1002,7 +1002,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { `[`all`][all]`()`[`[`][ColumnSet.cols]`1`[`..`][Int.rangeTo]`5`[`]`][ColumnSet.cols]` }` */ - private interface ColumnSetColsRangeDocs + private typealias ColumnSetColsRangeDocs = Nothing /** @include [ColumnSetColsRangeDocs] */ @Suppress("UNCHECKED_CAST") @@ -1019,7 +1019,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { `[`cols`][ColumnsSelectionDsl.cols]`<`[`String`][String]`>(1`[`..`][Int.rangeTo]`3) }` */ - private interface ColumnsSelectionDslColsRangeDocs + private typealias ColumnsSelectionDslColsRangeDocs = Nothing /** @include [ColumnsSelectionDslColsRangeDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -1038,7 +1038,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { myColumnGroup.`[`cols`][SingleColumn.cols]`<`[`String`][String]`>(1`[`..`][Int.rangeTo]`3) }` */ - private interface SingleColumnColsRangeDocs + private typealias SingleColumnColsRangeDocs = Nothing /** @include [SingleColumnColsRangeDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -1057,7 +1057,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "myColGroup".`[`cols`][String.cols]`<`[`String`][String]`>(1`[`..`][Int.rangeTo]`3) }` */ - private interface StringColsRangeDocs + private typealias StringColsRangeDocs = Nothing /** @include [StringColsRangeDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -1076,7 +1076,7 @@ public interface ColsColumnsSelectionDsl { * `df.`[`select`][DataFrame.select]` { Type::myColumnGroup.`[`cols`][SingleColumn.cols]`<`[`String`][String]`>(1`[`..`][Int.rangeTo]`3) }` * */ - private interface KPropertyColsRangeDocs + private typealias KPropertyColsRangeDocs = Nothing /** @include [KPropertyColsRangeDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") @@ -1094,7 +1094,7 @@ public interface ColsColumnsSelectionDsl { * * `df.`[`select`][DataFrame.select]` { "pathTo"["myColGroup"].`[`cols`][ColumnPath.cols]`<`[`String`][String]`>(0`[`..`][Int.rangeTo]`1) }` */ - private interface ColumnPathColsRangeDocs + private typealias ColumnPathColsRangeDocs = Nothing /** @include [ColumnPathColsRangeDocs] */ @Suppress("INAPPLICABLE_JVM_NAME") diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt index 0226d3507e..0114be719a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsAtAnyDepth.kt @@ -54,13 +54,13 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { public interface Grammar { /** [**`colsAtAnyDepth`**][ColumnsSelectionDsl.colsAtAnyDepth] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colsAtAnyDepth`**][ColumnsSelectionDsl.colsAtAnyDepth] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsAtAnyDepth`**][ColumnsSelectionDsl.colsAtAnyDepth] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -112,7 +112,7 @@ public interface ColsAtAnyDepthColumnsSelectionDsl { private interface CommonAtAnyDepthDocs { /** Example argument */ - interface Examples + typealias Examples = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt index 65b3a52e55..9d0582030c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsInGroups.kt @@ -53,13 +53,13 @@ public interface ColsInGroupsColumnsSelectionDsl { public interface Grammar { /** [**`colsInGroups`**][ColumnsSelectionDsl.colsInGroups] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colsInGroups`**][ColumnsSelectionDsl.colsInGroups] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsInGroups`**][ColumnsSelectionDsl.colsInGroups] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -105,7 +105,7 @@ public interface ColsInGroupsColumnsSelectionDsl { private interface ColsInGroupsDocs { /** Example argument to use */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt index 9eba937201..bc4910ccdd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOf.kt @@ -79,13 +79,13 @@ public interface ColsOfColumnsSelectionDsl { public interface Grammar { /** [**colsOf**][ColumnsSelectionDsl.colsOf] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colsOf`**][ColumnsSelectionDsl.colsOf] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsOf`**][ColumnsSelectionDsl.colsOf] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -125,10 +125,10 @@ public interface ColsOfColumnsSelectionDsl { private interface CommonColsOfDocs { /** @return A [ColumnSet] containing the columns of given type that were included by [filter\]. */ - interface Return + typealias Return = Nothing /** @param [filter\] an optional filter function that takes a column of type [C\] and returns `true` if the column should be included. */ - interface FilterParam + typealias FilterParam = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt index 4621420587..436d9c81ec 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/colsOfKind.kt @@ -57,13 +57,13 @@ public interface ColsOfKindColumnsSelectionDsl { public interface Grammar { /** [**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsOfKind`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -101,7 +101,7 @@ public interface ColsOfKindColumnsSelectionDsl { private interface CommonColsOfKindDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt index e02f55dee1..a84b3190f6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnNameFilters.kt @@ -62,22 +62,22 @@ public interface ColumnNameFiltersColumnsSelectionDsl { public interface Grammar { /** [**`nameContains`**][ColumnsSelectionDsl.nameContains] */ - public interface PlainDslNameContains + public typealias PlainDslNameContains = Nothing /** __`name`__`(`[**`Starts`**][ColumnsSelectionDsl.nameStartsWith]`|`[**`Ends`**][ColumnsSelectionDsl.nameEndsWith]`)`**`With`** */ - public interface PlainDslNameStartsEndsWith + public typealias PlainDslNameStartsEndsWith = Nothing /** __`.`__[**`nameContains`**][ColumnsSelectionDsl.nameContains] */ - public interface ColumnSetNameContains + public typealias ColumnSetNameContains = Nothing /** __`.name`__`(`[**`Starts`**][ColumnsSelectionDsl.nameStartsWith]`|`[**`Ends`**][ColumnsSelectionDsl.nameEndsWith]`)`**`With`** */ - public interface ColumnSetNameStartsEndsWith + public typealias ColumnSetNameStartsEndsWith = Nothing /**__`.`__[**`colsNameContains`**][ColumnsSelectionDsl.colsNameContains] */ - public interface ColumnGroupNameContains + public typealias ColumnGroupNameContains = Nothing /** __`.colsName`__`(`[**`Starts`**][ColumnsSelectionDsl.colsNameStartsWith]`|`[**`Ends`**][ColumnsSelectionDsl.colsNameEndsWith]`)`**`With`** */ - public interface ColumnGroupNameStartsWith + public typealias ColumnGroupNameStartsWith = Nothing } // region nameContains @@ -120,13 +120,13 @@ public interface ColumnNameFiltersColumnsSelectionDsl { private interface CommonNameContainsDocs { // Example to give - interface EXAMPLE + typealias EXAMPLE = Nothing // [text\] or [regex\] - interface ARGUMENT + typealias ARGUMENT = Nothing // Optional extra params. - interface EXTRA_PARAMS + typealias EXTRA_PARAMS = Nothing } /** @@ -137,7 +137,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * } */ @ExcludeFromSources - private interface NameContainsTextDocs + private typealias NameContainsTextDocs = Nothing /** * @include [NameContainsTextDocs] @@ -206,7 +206,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { /** * @include [CommonNameContainsDocs] * @set [CommonNameContainsDocs.ARGUMENT] [regex\] */ - private interface NameContainsRegexDocs + private typealias NameContainsRegexDocs = Nothing /** * @include [NameContainsRegexDocs] @@ -302,24 +302,23 @@ public interface ColumnNameFiltersColumnsSelectionDsl { private interface CommonNameStartsEndsDocs { // "Starts" or "Ends" - interface CAPITAL_TITLE + typealias CAPITAL_TITLE = Nothing // "starting" or "ending" - interface NOUN + typealias NOUN = Nothing // "startsWith" or "endsWith" - interface OPERATION_NAME + typealias OPERATION_NAME = Nothing // "nameStartsWith" or "nameEndsWith" - interface NAME_OPERATION_NAME + typealias NAME_OPERATION_NAME = Nothing // "colsNameStartsWith" or "colsNameEndsWith" - interface COLS_NAME_OPERATION_NAME + typealias COLS_NAME_OPERATION_NAME = Nothing // [prefix\] or [suffix\] - interface ARGUMENT - - interface EXAMPLE + typealias ARGUMENT = Nothing + typealias EXAMPLE = Nothing } // region nameStartsWith @@ -337,7 +336,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameContains\] */ @ExcludeFromSources - private interface CommonNameStartsWithDocs + private typealias CommonNameStartsWithDocs = Nothing /** * @include [CommonNameStartsWithDocs] @@ -418,7 +417,7 @@ public interface ColumnNameFiltersColumnsSelectionDsl { * @see [nameContains\] */ @ExcludeFromSources - private interface CommonNameEndsWithDocs + private typealias CommonNameEndsWithDocs = Nothing /** * @include [CommonNameEndsWithDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt index d4446cdc3d..2756c166c5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/columnRange.kt @@ -40,7 +40,7 @@ public interface ColumnRangeColumnsSelectionDsl { public interface Grammar { /** [**`..`**][ColumnsSelectionDsl.rangeTo] */ - public interface PlainDslName + public typealias PlainDslName = Nothing } /** @@ -70,7 +70,7 @@ public interface ColumnRangeColumnsSelectionDsl { private interface CommonRangeOfColumnsDocs { /** Examples key */ - interface Example + typealias Example = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt index 20bb6e142d..360cdefb0e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt @@ -80,7 +80,7 @@ import kotlinx.datetime.Instant as DeprecatedInstant * See also [parse] — a specialized form of the [convert] operation that parses [String] columns * into other types without requiring explicit type specification. */ -internal interface SeeAlsoParse +internal typealias SeeAlsoParse = Nothing /** * Converts the values in the specified [columns\] either to a supported target type @@ -120,7 +120,7 @@ internal interface ConvertDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetConvertOperationArg]} */ - interface ConvertSelectingOptions + typealias ConvertSelectingOptions = Nothing /** * List of types, supported in [convert to][Convert.to] operation: @@ -137,7 +137,7 @@ internal interface ConvertDocs { * To convert [Char]->[Int] the way it is written, use [parse()][parse] instead, or, * in either case, use [String] as intermediary type. */ - interface SupportedTypes + typealias SupportedTypes = Nothing /** * ## Convert Operation Grammar @@ -213,19 +213,19 @@ internal interface ConvertDocs { * {@include [Indent]} * `| `__`.`__[**`toDataFrames`**][Convert.toDataFrames]`()` */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [convert][convert]} */ @ExcludeFromSources -private interface SetConvertOperationArg +private typealias SetConvertOperationArg = Nothing /** * {@include [ConvertDocs]} * ### This Convert Overload */ @ExcludeFromSources -private interface CommonConvertDocs +private typealias CommonConvertDocs = Nothing /** * @include [CommonConvertDocs] @@ -418,11 +418,11 @@ public fun Convert.to(columnConverter: DataFrame.(DataColumn) /** [Convert per row col][Convert.perRowCol] to provide a new value for every selected cell giving its column. */ @ExcludeFromSources -private interface SeeAlsoConvertPerRowCol +private typealias SeeAlsoConvertPerRowCol = Nothing /** [Convert as column][Convert.asColumn] to convert using a column converter */ @ExcludeFromSources -private interface SeeAlsoConvertAsColumn +private typealias SeeAlsoConvertAsColumn = Nothing /** * Converts values in columns previously selected by [convert] using the specified [rowConverter], @@ -519,7 +519,7 @@ public inline fun Convert.asColumn( /** [Convert with][Convert.with] to provide a new value for every selected cell * giving its row and its previous value. */ @ExcludeFromSources -private interface SeeAlsoConvertWith +private typealias SeeAlsoConvertWith = Nothing /** * Converts values in the columns previously selected with [convert] @@ -766,7 +766,7 @@ public fun DataColumn.convertToDouble(): DataColumn = con * @return A new [DataColumn] with the [Double] values. */ @ExcludeFromSources -private interface DataColumnStringConvertToDoubleDoc +private typealias DataColumnStringConvertToDoubleDoc = Nothing /** @include [DataColumnStringConvertToDoubleDoc] */ @JvmName("convertToDoubleFromString") diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt index 4ef9458740..77170bd7ad 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt @@ -59,7 +59,7 @@ internal interface CorrDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetCorrOperationArg]} */ - interface SelectingOptions + typealias SelectingOptions = Nothing /** * ## Corr Operation Grammar @@ -75,19 +75,19 @@ internal interface CorrDocs { * {@include [Indent]} *`| `__`.`__[**`withItself`**][Corr.withItself]`()` */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [corr][corr]} */ @ExcludeFromSources -private interface SetCorrOperationArg +private typealias SetCorrOperationArg = Nothing /** * {@include [CorrDocs]} * ### This Corr Overload */ @ExcludeFromSources -private interface CommonCorrDocs +private typealias CommonCorrDocs = Nothing internal fun AnyCol.isSuitableForCorr() = isSubtypeOf() || type() == typeOf() @@ -208,14 +208,14 @@ public fun DataFrame.corr(vararg columns: ColumnReference): Corr = { * ### This `explode` overload */ @ExcludeFromSources -internal interface ExplodeDocs +internal typealias ExplodeDocs = Nothing /** * {@include [ExplodeDocs]} @@ -139,7 +139,7 @@ public fun DataFrame.explode(vararg columns: KProperty, dropEmpty: * ### This `explode` overload */ @ExcludeFromSources -internal interface ExplodeDataRowDocs +internal typealias ExplodeDataRowDocs = Nothing /** * {@include [ExplodeDataRowDocs]} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/expr.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/expr.kt index a030d8fa31..27965a5d8f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/expr.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/expr.kt @@ -39,7 +39,7 @@ public interface ExprColumnsSelectionDsl { public interface Grammar { /** [**`expr`**][ColumnsSelectionDsl.expr] */ - public interface PlainDslName + public typealias PlainDslName = Nothing } } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt index 4b69ec5486..b98e9577f4 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/filter.kt @@ -128,7 +128,7 @@ public interface FilterColumnsSelectionDsl { public interface Grammar { /** __`.`__[**`filter`**][ColumnsSelectionDsl.filter] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt index fe18afea75..fb6010b522 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/first.kt @@ -123,13 +123,13 @@ public interface FirstColumnsSelectionDsl { public interface Grammar { /** [**`first`**][ColumnsSelectionDsl.first] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`first`**][ColumnsSelectionDsl.first] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`firstCol`**][ColumnsSelectionDsl.firstCol] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -163,7 +163,7 @@ public interface FirstColumnsSelectionDsl { private interface CommonFirstDocs { /** Examples key */ - interface Examples + typealias Examples = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt index cde6796d5b..a216bdead0 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/flatten.kt @@ -42,14 +42,13 @@ import kotlin.reflect.KProperty @ExcludeFromSources @Suppress("ClassName") private interface FlattenDocs { - interface FLATTEN_PARAM - - interface GROUPS + typealias FLATTEN_PARAM = Nothing + typealias GROUPS = Nothing /** * @include [SelectingColumns] {@set [SelectingColumns.OPERATION] [flatten][flatten]} */ - interface FlattenSelectingOptions + typealias FlattenSelectingOptions = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt index fd1390ec2a..58149fedb4 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt @@ -93,7 +93,7 @@ internal interface FormatDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetFormatOperationArg]} */ - interface FormatSelectingColumns + typealias FormatSelectingColumns = Nothing /** * ## Format Operation Grammar @@ -141,7 +141,7 @@ internal interface FormatDocs { */ @ExportAsHtml @ExcludeFromSources - interface ForHtml + typealias ForHtml = Nothing /** * ## Formatting DSL Grammar @@ -178,61 +178,60 @@ internal interface FormatDocs { * * `| `[**`linear`**][FormattingDsl.linear]**`(`**`value: `[Number][Number]**`,`**` from: `[Pair][Pair]`<`[Number][Number]`, `[RgbColor][RgbColor]`>`**`,`**` to: `[Pair][Pair]`<`[Number][Number]`, `[RgbColor][RgbColor]`>`**`)`** */ - interface FormattingDslGrammarDef + typealias FormattingDslGrammarDef = Nothing /** * `cellFormatter: `{@include [FormattingDslGrammarRef]}`.(cell: C) -> `[CellAttributes][CellAttributes]`?` */ - interface CellFormatterDef + typealias CellFormatterDef = Nothing /** * `rowColFormatter: `{@include [FormattingDslGrammarRef]}`.(row: `[DataRow][DataRow]`, col: `[ColumnWithPath][ColumnWithPath]`) -> `[CellAttributes][CellAttributes]`?` */ - interface RowColFormatterDef + typealias RowColFormatterDef = Nothing /** * `cellAttributes: `[CellAttributes][CellAttributes] */ - interface CellAttributesDef + typealias CellAttributesDef = Nothing /** * `color: `[RgbColor][RgbColor] */ - interface RgbColorDef + typealias RgbColorDef = Nothing /** [cellFormatter][CellFormatterDef] */ @ExcludeFromSources - interface CellFormatterRef + typealias CellFormatterRef = Nothing /** [rowColFormatter][RowColFormatterDef] */ @ExcludeFromSources - interface RowColFormatterRef + typealias RowColFormatterRef = Nothing /** [FormattingDsl][FormattingDslGrammarDef] */ @ExcludeFromSources - interface FormattingDslGrammarRef + typealias FormattingDslGrammarRef = Nothing /** [cellAttributes][CellAttributesDef] */ @ExcludeFromSources - interface CellAttributesRef + typealias CellAttributesRef = Nothing /** [color][RgbColorDef] */ @ExcludeFromSources - interface RgbColorRef + typealias RgbColorRef = Nothing } } /** {@set [SelectingColumns.OPERATION] [format][format]} */ @ExcludeFromSources -private interface SetFormatOperationArg +private typealias SetFormatOperationArg = Nothing /** * @include [FormatDocs] * ### This Format Overload */ @ExcludeFromSources -private interface CommonFormatDocs - +private typealias CommonFormatDocs = Nothing // endregion // region DataFrame format @@ -406,7 +405,7 @@ public fun FormatClause.where(filter: RowValueFilter): Format * ### Examples using [at] */ @ExcludeFromSources -private interface CommonFormatAtDocs +private typealias CommonFormatAtDocs = Nothing /** * @include [CommonFormatAtDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt index 97ba869cff..bbeaadbfff 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCol.kt @@ -65,13 +65,13 @@ public interface FrameColColumnsSelectionDsl { public interface Grammar { /** [**`frameCol`**][ColumnsSelectionDsl.frameCol] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`frameCol`**][ColumnsSelectionDsl.frameCol] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`frameCol`**][ColumnsSelectionDsl.frameCol] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -120,31 +120,31 @@ public interface FrameColColumnsSelectionDsl { private interface CommonFrameColDocs { // Example argument, can be either {@include [SingleExample]} or {@include [DoubleExample]} - interface EXAMPLE + typealias EXAMPLE = Nothing /** * `df.`[select][DataFrame.select]` { {@get [CommonFrameColDocs.RECEIVER]}`[frameCol][frameCol]`({@get [CommonFrameColDocs.ARG]}) \}` */ - interface SingleExample + typealias SingleExample = Nothing /** * `df.`[select][DataFrame.select]` { {@get [CommonFrameColDocs.RECEIVER]}`[frameCol][frameCol]`({@get [CommonFrameColDocs.ARG]}) \}` * * `df.`[select][DataFrame.select]` { {@get [CommonFrameColDocs.RECEIVER]}`[frameCol][frameCol]`<`[String][String]`>({@get [CommonFrameColDocs.ARG]}) \}` */ - interface DoubleExample + typealias DoubleExample = Nothing // Receiver argument for the example(s) - interface RECEIVER + typealias RECEIVER = Nothing // Argument for the example(s) - interface ARG + typealias ARG = Nothing // Optional note - interface NOTE + typealias NOTE = Nothing /** @param [C\] The type of the frame column. */ - interface FrameColumnTypeParam + typealias FrameColumnTypeParam = Nothing } // region reference @@ -156,7 +156,7 @@ public interface FrameColColumnsSelectionDsl { * @param [col\] The [ColumnAccessor] pointing to the value column. * @include [CommonFrameColDocs.FrameColumnTypeParam] */ - private interface FrameColReferenceDocs + private typealias FrameColReferenceDocs = Nothing /** * @include [FrameColReferenceDocs] {@set [CommonFrameColDocs.RECEIVER]} @@ -226,7 +226,7 @@ public interface FrameColColumnsSelectionDsl { * {@set [CommonFrameColDocs.EXAMPLE] {@include [CommonFrameColDocs.DoubleExample]}} * @param [name\] The name of the value column. */ - private interface FrameColNameDocs + private typealias FrameColNameDocs = Nothing /** * @include [FrameColNameDocs] {@set [CommonFrameColDocs.RECEIVER]} @@ -326,7 +326,7 @@ public interface FrameColColumnsSelectionDsl { * {@set [CommonFrameColDocs.EXAMPLE] {@include [CommonFrameColDocs.DoubleExample]}} * @param [path\] The path to the value column. */ - private interface FrameColPathDocs + private typealias FrameColPathDocs = Nothing /** * @include [FrameColPathDocs] {@set [CommonFrameColDocs.RECEIVER]} @@ -427,7 +427,7 @@ public interface FrameColColumnsSelectionDsl { * @param [property\] The [KProperty] reference to the value column. * @include [CommonFrameColDocs.FrameColumnTypeParam] */ - private interface FrameColKPropertyDocs + private typealias FrameColKPropertyDocs = Nothing /** * @include [FrameColKPropertyDocs] {@set [CommonFrameColDocs.RECEIVER]} @@ -548,7 +548,7 @@ public interface FrameColColumnsSelectionDsl { * @param [index\] The index of the value column. * @throws [IndexOutOfBoundsException\] if the index is out of bounds. */ - private interface FrameColIndexDocs + private typealias FrameColIndexDocs = Nothing /** * @include [FrameColIndexDocs] {@set [CommonFrameColDocs.RECEIVER] `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Int][Int]`>().} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt index f6da5e1d78..af902bd472 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/frameCols.kt @@ -56,13 +56,13 @@ public interface FrameColsColumnsSelectionDsl { public interface Grammar { /** [**`frameCols`**][ColumnsSelectionDsl.colGroups] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`frameCols`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`frameCols`**][ColumnsSelectionDsl.colGroups] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -98,7 +98,7 @@ public interface FrameColsColumnsSelectionDsl { private interface CommonFrameColsDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt index 3e505c9885..f2f931f643 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/gather.kt @@ -95,19 +95,19 @@ internal interface GatherDocs { * {@include [Indent]} * `| `__`.`__[**`valuesInto`**][Gather.valuesInto]**`(`**`valueColumn: `[`String`][String]**`)`** */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [gather][gather]} */ @ExcludeFromSources -private interface SetGatherOperationArg +private typealias SetGatherOperationArg = Nothing /** * {@include [GatherDocs]} * ### This Gather Overload */ @ExcludeFromSources -private interface CommonGatherDocs +private typealias CommonGatherDocs = Nothing /** * @include [CommonGatherDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/generateCode.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/generateCode.kt index cfc96719a5..4d91bec432 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/generateCode.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/generateCode.kt @@ -44,23 +44,23 @@ import org.jetbrains.kotlinx.dataframe.util.GENERATE_INTERFACES private interface CommonGenerateCodeDocs { // "interfaces" or "data classes" - interface TYPES + typealias TYPES = Nothing // "DataFrameSchema" or "DataFrame" - interface RECEIVER + typealias RECEIVER = Nothing // "Useful when statement" or "How to use" - interface USEFUL_WHEN + typealias USEFUL_WHEN = Nothing } @ExcludeFromSources private interface Params { /** @param markerName The base name to use for generated data schema declarations (markers). */ - interface MarkerName + typealias MarkerName = Nothing /** @include [MarkerName] If not specified, it generates a name from type [T]. */ - interface MarkerNameOptional + typealias MarkerNameOptional = Nothing /** * @param extensionProperties Whether to generate [extension properties (column accessors)][ExtensionPropertiesApi] @@ -69,13 +69,13 @@ private interface Params { * the compiler plugin, notebooks, and older Gradle/KSP plugin generate them automatically. * Default is `false`. */ - interface ExtensionProperties + typealias ExtensionProperties = Nothing /** @param visibility Visibility modifier for the generated declarations (markers). Default is [MarkerVisibility.IMPLICIT_PUBLIC]. */ - interface Visibility + typealias Visibility = Nothing /** @param useFqNames If `true`, fully qualified type names will be used in generated code. Default is `false`. */ - interface UseFqNames + typealias UseFqNames = Nothing /** * @param nameNormalizer Strategy for converting column names (with spaces, underscores, etc.) @@ -84,7 +84,7 @@ private interface Params { * using the [@ColumnName][ColumnName] annotation. * Default is [NameNormalizer.default][NameNormalizer.Companion.default]. */ - interface NameNormalizer + typealias NameNormalizer = Nothing } // endregion diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt index 6357f00e5e..4da71f869a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/group.kt @@ -55,7 +55,7 @@ internal interface GroupDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetGroupOperationArg]} */ - interface GroupSelectingOptions + typealias GroupSelectingOptions = Nothing /** * ## Group Operation Grammar @@ -75,19 +75,19 @@ internal interface GroupDocs { * __`.`__[**`into`**][GroupClause.into]` { column: `[`ColumnsSelectionDsl`][ColumnsSelectionDsl]`.(`[`ColumnWithPath`][ColumnWithPath]`) -> `[`AnyColumnReference`][AnyColumnReference]` }` * */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [group][group]} */ @ExcludeFromSources -private interface SetGroupOperationArg +private typealias SetGroupOperationArg = Nothing /** * {@include [GroupDocs]} * ### This Group Overload */ @ExcludeFromSources -private interface CommonGroupDocs +private typealias CommonGroupDocs = Nothing /** * @include [CommonGroupDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt index 6e364189a6..7f456484c8 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt @@ -173,13 +173,13 @@ internal interface GroupByDocs { * * Check out [PivotGroupBy Grammar][PivotGroupByDocs.Grammar] for more information. */ - interface Grammar + typealias Grammar = Nothing /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetGroupByOperationArg]} */ - interface GroupBySelectingOptions + typealias GroupBySelectingOptions = Nothing /** * ### [GroupBy] aggregation statistics @@ -192,7 +192,7 @@ internal interface GroupByDocs { * * [median][Grouped.median]/[medianOf][Grouped.medianOf]/[medianFor][Grouped.medianFor] * * [percentile][Grouped.percentile]/[percentileOf][Grouped.percentileOf]/[percentileFor][Grouped.percentileFor] */ - interface AggregationStatistics + typealias AggregationStatistics = Nothing /** * ### [GroupBy] transformations @@ -214,7 +214,7 @@ internal interface GroupByDocs { * * For more information: {@include [DocumentationUrls.GroupByTransformation]} */ - interface Transformation + typealias Transformation = Nothing /** * ### [GroupBy] reducing @@ -249,7 +249,7 @@ internal interface GroupByDocs { * * For more information: {@include [DocumentationUrls.GroupByReducing]} */ - interface Reducing + typealias Reducing = Nothing /** * ### [GroupBy] aggregation @@ -285,7 +285,7 @@ internal interface GroupByDocs { * * For more information: {@include [DocumentationUrls.GroupByAggregation]} */ - interface Aggregation + typealias Aggregation = Nothing /** * ### [GroupBy] pivoting @@ -294,19 +294,19 @@ internal interface GroupByDocs { * * @include [PivotGroupByDocs.CommonDescription] */ - interface Pivoting + typealias Pivoting = Nothing } /** {@set [SelectingColumns.OPERATION] [groupBy][groupBy]} */ @ExcludeFromSources -private interface SetGroupByOperationArg +private typealias SetGroupByOperationArg = Nothing /** * {@include [GroupByDocs]} * ### This `groupBy` Overload */ @ExcludeFromSources -private interface CommonGroupByDocs +private typealias CommonGroupByDocs = Nothing /** * @include [CommonGroupByDocs] @@ -363,15 +363,14 @@ public fun DataFrame.groupBy(vararg cols: AnyColumnReference, moveToTop: * @include [PivotGroupByDocs.CommonDescription] */ @ExcludeFromSources -private interface GroupByForPivotDocs +private typealias GroupByForPivotDocs = Nothing /** * {@include [GroupByForPivotDocs]} * ### This `groupBy` Overload */ @ExcludeFromSources -private interface CommonGroupByForPivotDocs - +private typealias CommonGroupByForPivotDocs = Nothing // region Pivot /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt index c0454a6edd..2df51e87af 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/insert.kt @@ -60,7 +60,7 @@ internal interface InsertDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetInsertOperationArg]} */ - interface InsertSelectingOptions + typealias InsertSelectingOptions = Nothing /** * ## Insert Operation Grammar @@ -84,12 +84,12 @@ internal interface InsertDocs { * {@include [Indent]} * `| `__`.`__[**`at`**][InsertClause.at]**`(`**`position: `[`Int`][Int]**`)`** */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [insert][insert]} */ @ExcludeFromSources -private interface SetInsertOperationArg +private typealias SetInsertOperationArg = Nothing /** * Inserts the given [column] into this [DataFrame]. diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt index 9b11a758bf..c446db96cd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/last.kt @@ -120,13 +120,13 @@ public interface LastColumnsSelectionDsl { public interface Grammar { /** [**`last`**][ColumnsSelectionDsl.last] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`last`**][ColumnsSelectionDsl.last] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`lastCol`**][ColumnsSelectionDsl.lastCol] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -159,7 +159,7 @@ public interface LastColumnsSelectionDsl { private interface CommonLastDocs { /** Examples key */ - interface Examples + typealias Examples = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt index cd4aed1adb..ab54a3a6ec 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/move.kt @@ -61,7 +61,7 @@ internal interface Move { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetMoveOperationArg]} */ - interface MoveSelectingOptions + typealias MoveSelectingOptions = Nothing /** * ## Move Operation Grammar @@ -95,19 +95,19 @@ internal interface Move { * {@include [Indent]} * `| `__`.`__[**`toEnd`**][MoveClause.toEnd]**`()`** */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [move][move]} */ @ExcludeFromSources -private interface SetMoveOperationArg +private typealias SetMoveOperationArg = Nothing /** * {@include [Move]} * ### This Move Overload */ @ExcludeFromSources -private interface CommonMoveDocs +private typealias CommonMoveDocs = Nothing /** * @include [CommonMoveDocs] @@ -165,19 +165,19 @@ internal interface MoveTo { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetMoveToOperationArg]} */ - interface MoveToSelectingOptions + typealias MoveToSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [moveTo][moveTo]} */ @ExcludeFromSources -private interface SetMoveToOperationArg +private typealias SetMoveToOperationArg = Nothing /** * {@include [MoveTo]} * ### This MoveTo Overload */ @ExcludeFromSources -private interface CommonMoveToDocs +private typealias CommonMoveToDocs = Nothing /** * @include [CommonMoveToDocs] @@ -289,19 +289,19 @@ internal interface MoveToStart { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetMoveToStartOperationArg]} */ - interface MoveToStartSelectingOptions + typealias MoveToStartSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [moveToStart][moveToStart]} */ @ExcludeFromSources -private interface SetMoveToStartOperationArg +private typealias SetMoveToStartOperationArg = Nothing /** * {@include [MoveToStart]} * ### This MoveToStart Overload */ @ExcludeFromSources -private interface CommonMoveToStartDocs +private typealias CommonMoveToStartDocs = Nothing @Deprecated(MOVE_TO_LEFT, ReplaceWith(MOVE_TO_LEFT_REPLACE), DeprecationLevel.ERROR) public fun DataFrame.moveToLeft(columns: ColumnsSelector): DataFrame = move(columns).toStart() @@ -386,19 +386,19 @@ internal interface MoveToEnd { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetMoveToEndOperationArg]} */ - interface MoveToEndSelectingOptions + typealias MoveToEndSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [moveToEnd][moveToEnd]} */ @ExcludeFromSources -private interface SetMoveToEndOperationArg +private typealias SetMoveToEndOperationArg = Nothing /** * {@include [MoveToEnd]} * ### This MoveToEnd Overload */ @ExcludeFromSources -private interface CommonMoveToEndDocs +private typealias CommonMoveToEndDocs = Nothing @Deprecated(MOVE_TO_RIGHT, ReplaceWith(MOVE_TO_RIGHT_REPLACE), DeprecationLevel.ERROR) public fun DataFrame.moveToRight(columns: ColumnsSelector): DataFrame = move(columns).toEnd() @@ -711,7 +711,7 @@ public fun MoveClause.toTop( * ### This After Overload */ @ExcludeFromSources -internal interface MoveAfter +internal typealias MoveAfter = Nothing /** * {@include [MoveAfter]} @@ -768,7 +768,7 @@ public fun MoveClause.after(column: KProperty<*>): DataFrame = a * ### This Before Overload */ @ExcludeFromSources -internal interface MoveBefore +internal typealias MoveBefore = Nothing /** * {@include [MoveBefore]} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/none.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/none.kt index 29c32bb6ca..9124153145 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/none.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/none.kt @@ -64,7 +64,7 @@ public interface NoneColumnsSelectionDsl { public interface Grammar { /** [**`none`**][ColumnsSelectionDsl.none] */ - public interface PlainDslName + public typealias PlainDslName = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt index 5f056d6283..38463271e4 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt @@ -298,13 +298,13 @@ internal interface PivotGroupByDocs { * * For more information: {@include [DocumentationUrls.PivotGroupBy]} */ - interface CommonDescription + typealias CommonDescription = Nothing - interface Grammar + typealias Grammar = Nothing - interface Reducing + typealias Reducing = Nothing - interface Aggregation + typealias Aggregation = Nothing } public interface PivotGroupBy : Aggregatable { diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt index 35e8bbebd0..0da7c1004a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/remove.kt @@ -32,18 +32,18 @@ import kotlin.reflect.KProperty * * For more information: {@include [DocumentationUrls.Remove]} */ -internal interface Remove +internal typealias Remove = Nothing /** {@set [SelectingColumns.OPERATION] [remove][remove]} */ @ExcludeFromSources -private interface SetRemoveOperationArg +private typealias SetRemoveOperationArg = Nothing /** * {@include [Remove]} * ### This Remove Overload */ @ExcludeFromSources -private interface CommonRemoveDocs +private typealias CommonRemoveDocs = Nothing /** * @include [CommonRemoveDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt index 48e44fd628..65afd236e2 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/rename.kt @@ -59,7 +59,7 @@ internal interface RenameDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetRenameOperationArg]} */ - interface RenameSelectingOptions + typealias RenameSelectingOptions = Nothing /** * ## Rename Operation Grammar @@ -78,19 +78,19 @@ internal interface RenameDocs { * {@include [Indent]} * `| `__`.`__[**`toCamelCase`**][RenameClause.toCamelCase]**`()`** */ - interface Grammar + typealias Grammar = Nothing } /** {@set [SelectingColumns.OPERATION] [rename][rename]} */ @ExcludeFromSources -private interface SetRenameOperationArg +private typealias SetRenameOperationArg = Nothing /** * {@include [RenameDocs]} * ### This Rename Overload */ @ExcludeFromSources -private interface CommonRenameDocs +private typealias CommonRenameDocs = Nothing /** * Renames columns in the [DataFrame]. @@ -426,16 +426,16 @@ public interface RenameColumnsSelectionDsl { public interface Grammar { /** [**named**][ColumnsSelectionDsl.named] */ - public interface InfixNamedName + public typealias InfixNamedName = Nothing /** [**into**][ColumnsSelectionDsl.into] */ - public interface InfixIntoName + public typealias InfixIntoName = Nothing /** __`.`__[**named**][ColumnsSelectionDsl.named] */ - public interface NamedName + public typealias NamedName = Nothing /** __`.`__[**into**][ColumnsSelectionDsl.into] */ - public interface IntoName + public typealias IntoName = Nothing } /** @@ -466,64 +466,61 @@ public interface RenameColumnsSelectionDsl { @Suppress("ClassName") private interface CommonRenameDocs { - interface RECEIVER - - interface RECEIVER_TYPE + typealias RECEIVER = Nothing + typealias RECEIVER_TYPE = Nothing /** "named" or "into" */ - interface FUNCTION_NAME + typealias FUNCTION_NAME = Nothing /** "newName" or "nameOf" */ - interface PARAM_NAME - - interface PARAM - - interface PARAM_TYPE + typealias PARAM_NAME = Nothing + typealias PARAM = Nothing + typealias PARAM_TYPE = Nothing /** * @set [RECEIVER] columnA * @set [RECEIVER_TYPE] ColumnReference */ - interface ColumnReferenceReceiver + typealias ColumnReferenceReceiver = Nothing /** * @set [RECEIVER] "columnA" * @set [RECEIVER_TYPE] String */ - interface StringReceiver + typealias StringReceiver = Nothing /** * @set [RECEIVER] Type::columnA * @set [RECEIVER_TYPE] KProperty */ - interface KPropertyReceiver + typealias KPropertyReceiver = Nothing /** * @set [PARAM] columnB * @set [PARAM_NAME] nameOf * @set [PARAM_TYPE] ColumnReference */ - interface ColumnReferenceParam + typealias ColumnReferenceParam = Nothing /** * @set [PARAM] "columnB" * @set [PARAM_NAME] newName * @set [PARAM_TYPE] String */ - interface StringParam + typealias StringParam = Nothing /** * @set [PARAM] Type::columnB * @set [PARAM_NAME] nameOf * @set [PARAM_TYPE] KProperty */ - interface KPropertyParam + typealias KPropertyParam = Nothing /** @set [CommonRenameDocs.FUNCTION_NAME] named */ - interface NamedFunctionName + typealias NamedFunctionName = Nothing /** @set [CommonRenameDocs.FUNCTION_NAME] into */ - interface IntoFunctionName + typealias IntoFunctionName = Nothing } // region named diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt index 882b7bb74d..19edb0f23a 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt @@ -44,19 +44,19 @@ internal interface Select { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetSelectOperationArg]} */ - interface SelectSelectingOptions + typealias SelectSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [select][select]} */ @ExcludeFromSources -private interface SetSelectOperationArg +private typealias SetSelectOperationArg = Nothing /** * {@include [Select]} * ### This Select Overload */ @ExcludeFromSources -private interface CommonSelectDocs +private typealias CommonSelectDocs = Nothing /** * @include [CommonSelectDocs] @@ -129,7 +129,7 @@ public interface SelectColumnsSelectionDsl { public interface Grammar { /** __`.`__[**`select`**][ColumnsSelectionDsl.select] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -172,7 +172,7 @@ public interface SelectColumnsSelectionDsl { */ private interface CommonSelectDocs { - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt index 73602a3bde..ae92138082 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/simplify.kt @@ -37,7 +37,7 @@ public interface SimplifyColumnsSelectionDsl { public interface Grammar { /** __`.`__[**`simplify`**][ColumnsSelectionDsl.simplify] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt index c01a990ae1..ec7e8b2840 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/single.kt @@ -88,13 +88,13 @@ public interface SingleColumnsSelectionDsl { public interface Grammar { /** [**`single`**][ColumnsSelectionDsl.single] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`single`**][ColumnsSelectionDsl.single] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`singleCol`**][ColumnsSelectionDsl.singleCol] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -126,7 +126,7 @@ public interface SingleColumnsSelectionDsl { private interface CommonSingleDocs { /** Examples key */ - interface Examples + typealias Examples = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt index f4901dea1b..bb7e05607c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/sort.kt @@ -96,7 +96,7 @@ public fun > DataColumn.sortDesc(): ValueColumn = * a lambda of type `(`[T][T\]`, `[T][T\]`) -> `[Int][Int]. * @return The sorted [DataColumn] [this\] of the same type as the receiver. */ -private interface CommonDataColumnSortWithDocs +private typealias CommonDataColumnSortWithDocs = Nothing /** @include [CommonDataColumnSortWithDocs] */ public fun > C.sortWith(comparator: Comparator): C = diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt index 1a95b426b3..eff681f9e5 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/take.kt @@ -83,22 +83,22 @@ public interface TakeColumnsSelectionDsl { public interface Grammar { /** [**`take`**][ColumnsSelectionDsl.take]`(`[**`Last`**][ColumnsSelectionDsl.takeLast]`)` */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`take`**][ColumnsSelectionDsl.take]`(`[**`Last`**][ColumnSet.takeLast]`)` */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`take`**][ColumnsSelectionDsl.takeCols]`(`[**`Last`**][ColumnsSelectionDsl.takeLastCols]`)`[**`Cols`**][ColumnsSelectionDsl.takeCols] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing /** [**`take`**][ColumnsSelectionDsl.takeWhile]`(`[**`Last`**][ColumnsSelectionDsl.takeLastWhile]`)`[**`While`**][ColumnsSelectionDsl.takeWhile] */ - public interface PlainDslWhileName + public typealias PlainDslWhileName = Nothing /** __`.`__[**`take`**][ColumnsSelectionDsl.takeWhile]`(`[**`Last`**][ColumnsSelectionDsl.takeLastWhile]`)`[**`While`**][ColumnsSelectionDsl.takeWhile] */ - public interface ColumnSetWhileName + public typealias ColumnSetWhileName = Nothing /** __`.`__[**`take`**][ColumnsSelectionDsl.takeColsWhile]`(`[**`Last`**][ColumnsSelectionDsl.takeLastColsWhile]`)`[**`ColsWhile`**][ColumnsSelectionDsl.takeColsWhile] */ - public interface ColumnGroupWhileName + public typealias ColumnGroupWhileName = Nothing } // region take @@ -110,7 +110,7 @@ public interface TakeColumnsSelectionDsl { * @set [CommonTakeAndDropDocs.NOUN] take * @set [CommonTakeAndDropDocs.FIRST_OR_LAST] first */ - private interface CommonTakeFirstDocs + private typealias CommonTakeFirstDocs = Nothing /** * @include [CommonTakeFirstDocs] @@ -181,7 +181,7 @@ public interface TakeColumnsSelectionDsl { * @set [CommonTakeAndDropDocs.NOUN] take * @set [CommonTakeAndDropDocs.FIRST_OR_LAST] last */ - private interface CommonTakeLastDocs + private typealias CommonTakeLastDocs = Nothing /** * @include [CommonTakeLastDocs] @@ -252,7 +252,7 @@ public interface TakeColumnsSelectionDsl { * @set [CommonTakeAndDropWhileDocs.NOUN] take * @set [CommonTakeAndDropWhileDocs.FIRST_OR_LAST] first */ - private interface CommonTakeFirstWhileDocs + private typealias CommonTakeFirstWhileDocs = Nothing /** * @include [CommonTakeFirstWhileDocs] @@ -325,7 +325,7 @@ public interface TakeColumnsSelectionDsl { * @set [CommonTakeAndDropWhileDocs.NOUN] take * @set [CommonTakeAndDropWhileDocs.FIRST_OR_LAST] last */ - private interface CommonTakeLastWhileDocs + private typealias CommonTakeLastWhileDocs = Nothing /** * @include [CommonTakeLastWhileDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt index 682423fc77..33127f62ac 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/typeConversions.kt @@ -181,7 +181,7 @@ public fun ColumnGroup.asDataFrame(): DataFrame = this * @param [C\] The type of the (group) column. * @return A [SingleColumn]`<`[DataRow][DataRow]`<`[C][C\]`>>`. */ -private interface SingleColumnAsColumnGroupDocs +private typealias SingleColumnAsColumnGroupDocs = Nothing /** @include [SingleColumnAsColumnGroupDocs] */ @Suppress("UNCHECKED_CAST") @@ -276,7 +276,7 @@ public enum class Infer { * @param [infer\] [An enum][Infer] that indicates how [DataColumn.type] should be calculated. * Either [None], [Nulls], or [Type]. */ - internal interface ParamDoc + internal typealias ParamDoc = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt index ce94a93ca7..1cc5a25f08 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ungroup.kt @@ -33,19 +33,19 @@ internal interface UngroupDocs { * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetUngroupOperationArg]} */ - interface UngroupSelectingOptions + typealias UngroupSelectingOptions = Nothing } /** {@set [SelectingColumns.OPERATION] [ungroup][ungroup]} */ @ExcludeFromSources -private interface SetUngroupOperationArg +private typealias SetUngroupOperationArg = Nothing /** * {@include [UngroupDocs]} * ### This Ungroup Overload */ @ExcludeFromSources -private interface CommonUngroupDocs +private typealias CommonUngroupDocs = Nothing /** * @include [CommonUngroupDocs] diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt index ecbced9ec9..7294059146 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/update.kt @@ -63,7 +63,7 @@ public class Update( */ @Suppress("ClassName") @ExcludeFromSources - internal interface UPDATE_OPERATION + internal typealias UPDATE_OPERATION = Nothing /** * ## {@get [UPDATE_OPERATION]} Operation Grammar @@ -105,7 +105,7 @@ public class Update( * * {@set [UPDATE_OPERATION] [**`update`**][update]}{@comment The default name of the `update` operation function name.} */ - public interface Grammar + public typealias Grammar = Nothing /** * The columns to update need to be selected. See {@get [Columns.SELECTING_COLUMNS]} @@ -115,27 +115,26 @@ public class Update( // Optional argument that can be set to redirect where the [Selecting Columns] link points to @Suppress("ClassName") - public interface SELECTING_COLUMNS + public typealias SELECTING_COLUMNS = Nothing } /** * {@comment Version of [SelectingColumns] with correctly filled in examples} * @include [SelectingColumns] {@include [SetSelectingColumnsOperationArg]} */ - public interface UpdateSelectingOptions + public typealias UpdateSelectingOptions = Nothing /** @param [columns\] The [Columns Selector][ColumnsSelector] used to select the columns of this [DataFrame] to update. */ - internal interface DslParam + internal typealias DslParam = Nothing /** @param [columns\] The [Column References][ColumnReference] of this [DataFrame] to update. */ - internal interface ColumnAccessorsParam + internal typealias ColumnAccessorsParam = Nothing /** @param [columns\] The [KProperties][KProperty] corresponding to columns of this [DataFrame] to update. */ - internal interface KPropertiesParam + internal typealias KPropertiesParam = Nothing /** @param [columns\] The [Strings][String] corresponding to the names of columns belonging to this [DataFrame] to update. */ - internal interface ColumnNamesParam - + internal typealias ColumnNamesParam = Nothing // endregion } @@ -143,7 +142,7 @@ public class Update( /** {@set [SelectingColumns.OPERATION] [update][update]} */ @ExcludeFromSources -private interface SetSelectingColumnsOperationArg +private typealias SetSelectingColumnsOperationArg = Nothing /** * @include [Update] {@comment Description of the update operation.} @@ -152,7 +151,7 @@ private interface SetSelectingColumnsOperationArg * ### This Update Overload */ @ExcludeFromSources -private interface CommonUpdateFunctionDoc +private typealias CommonUpdateFunctionDoc = Nothing /** * ## Optional @@ -160,7 +159,7 @@ private interface CommonUpdateFunctionDoc * into `df.`[update][update]`(...) { ... }` */ @ExcludeFromSources -private interface UpdateWithNote +private typealias UpdateWithNote = Nothing /** * @include [CommonUpdateFunctionDoc] @@ -229,7 +228,7 @@ public fun Update.where(predicate: RowValueFilter): Update, an [IntRange], or just `vararg` indices. */ - interface RowIndicesParam + typealias RowIndicesParam = Nothing } /** @@ -278,7 +277,7 @@ public inline fun Update.perRowCol(crossinline expression: RowColum /** [Update per row col][Update.perRowCol] to provide a new value for every selected cell giving its row and column. */ @ExcludeFromSources -private interface SeeAlsoUpdatePerRowCol +private typealias SeeAlsoUpdatePerRowCol = Nothing /** * ## Update Expression @@ -308,7 +307,7 @@ public inline fun Update.with(crossinline expression: Updat /** [Update with][Update.with] to provide a new value for every selected cell giving its row * and its previous value. */ @ExcludeFromSources -private interface SeeAlsoUpdateWith +private typealias SeeAlsoUpdateWith = Nothing /** ## As Frame * @@ -333,12 +332,12 @@ public fun Update>.asFrame(expression: DataFrameExpressi * ### This Per Col Overload */ @ExcludeFromSources -private interface CommonUpdatePerColDoc +private typealias CommonUpdatePerColDoc = Nothing /** Provide a new value for every selected cell per column using a [Map][Map]`<`[colName: String][String]`, value: C>` * or [DataRow][DataRow] as Map. */ @ExcludeFromSources -private interface UpdatePerColMap +private typealias UpdatePerColMap = Nothing /** * @include [CommonUpdatePerColDoc] @@ -353,7 +352,7 @@ private interface UpdatePerColMap * @throws [IllegalArgumentException] if a value for a selected cell's column is not defined in [values\]. */ @ExcludeFromSources -private interface CommonUpdatePerColMapDoc +private typealias CommonUpdatePerColMapDoc = Nothing /** * @include [CommonUpdatePerColMapDoc] @@ -399,7 +398,7 @@ public fun Update.perCol(valueSelector: ColumnExpression): Da /** [Update per col][Update.perCol] to provide a new value for every selected cell giving its column. */ @ExcludeFromSources -private interface SeeAlsoUpdatePerCol +private typealias SeeAlsoUpdatePerCol = Nothing /** Chains up two row value filters together. */ internal infix fun RowValueFilter?.and(other: RowValueFilter): RowValueFilter { @@ -521,10 +520,10 @@ public fun DataFrame.update( private interface CommonSpecificWithDoc { /** Arg for the resulting value */ - private interface FIRST + private typealias FIRST = Nothing /** Arg for the function call */ - private interface SECOND + private typealias SECOND = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt index 42f44b9617..67b207c23c 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCol.kt @@ -65,13 +65,13 @@ public interface ValueColColumnsSelectionDsl { public interface Grammar { /** [**`valueCol`**][ColumnsSelectionDsl.valueCol] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`valueCol`**][ColumnsSelectionDsl.valueCol] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`valueCol`**][ColumnsSelectionDsl.valueCol] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -120,31 +120,31 @@ public interface ValueColColumnsSelectionDsl { private interface CommonValueColDocs { // Example argument, can be either {@include [SingleExample]} or {@include [DoubleExample]} - interface EXAMPLE + typealias EXAMPLE = Nothing /** * `df.`[select][DataFrame.select]` { {@get [CommonValueColDocs.RECEIVER]}`[valueCol][valueCol]`({@get [CommonValueColDocs.ARG]}) \}` */ - interface SingleExample + typealias SingleExample = Nothing /** * `df.`[select][DataFrame.select]` { {@get [CommonValueColDocs.RECEIVER]}`[valueCol][valueCol]`({@get [CommonValueColDocs.ARG]}) \}` * * `df.`[select][DataFrame.select]` { {@get [CommonValueColDocs.RECEIVER]}`[valueCol][valueCol]`<`[String][String]`>({@get [CommonValueColDocs.ARG]}) \}` */ - interface DoubleExample + typealias DoubleExample = Nothing // Receiver argument for the example(s) - interface RECEIVER + typealias RECEIVER = Nothing // Argument for the example(s) - interface ARG + typealias ARG = Nothing // Optional note - interface NOTE + typealias NOTE = Nothing /** @param [C\] The type of the value column. */ - interface ValueColumnTypeParam + typealias ValueColumnTypeParam = Nothing } // region reference @@ -156,7 +156,7 @@ public interface ValueColColumnsSelectionDsl { * @param [col\] The [ColumnAccessor] pointing to the value column. * @include [CommonValueColDocs.ValueColumnTypeParam] */ - private interface ValueColReferenceDocs + private typealias ValueColReferenceDocs = Nothing /** * @include [ValueColReferenceDocs] {@set [CommonValueColDocs.RECEIVER]} @@ -214,7 +214,7 @@ public interface ValueColColumnsSelectionDsl { * {@set [CommonValueColDocs.EXAMPLE] {@include [CommonValueColDocs.DoubleExample]}} * @param [name\] The name of the value column. */ - private interface ValueColNameDocs + private typealias ValueColNameDocs = Nothing /** * @include [ValueColNameDocs] {@set [CommonValueColDocs.RECEIVER]} @@ -318,7 +318,7 @@ public interface ValueColColumnsSelectionDsl { * {@set [CommonValueColDocs.EXAMPLE] {@include [CommonValueColDocs.DoubleExample]}} * @param [path\] The path to the value column. */ - private interface ValueColPathDocs + private typealias ValueColPathDocs = Nothing /** * @include [ValueColPathDocs] {@set [CommonValueColDocs.RECEIVER]} @@ -423,7 +423,7 @@ public interface ValueColColumnsSelectionDsl { * @param [property\] The [KProperty] reference to the value column. * @include [CommonValueColDocs.ValueColumnTypeParam] */ - private interface ValueColKPropertyDocs + private typealias ValueColKPropertyDocs = Nothing /** * @include [ValueColKPropertyDocs] {@set [CommonValueColDocs.RECEIVER]} @@ -483,7 +483,7 @@ public interface ValueColColumnsSelectionDsl { * @param [index\] The index of the value column. * @throws [IndexOutOfBoundsException\] if the index is out of bounds. */ - private interface ValueColIndexDocs + private typealias ValueColIndexDocs = Nothing /** * @include [ValueColIndexDocs] {@set [CommonValueColDocs.RECEIVER] `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Int][Int]`>().} diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt index 137cab3659..287046df7d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/valueCols.kt @@ -56,13 +56,13 @@ public interface ValueColsColumnsSelectionDsl { public interface Grammar { /** [**`valueCols`**][ColumnsSelectionDsl.valueCols] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`valueCols`**][ColumnsSelectionDsl.valueCols] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`valueCols`**][ColumnsSelectionDsl.valueCols] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -98,7 +98,7 @@ public interface ValueColsColumnsSelectionDsl { private interface CommonValueColsDocs { /** Example argument */ - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt index 1b203687c3..bd5d3a00dd 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/withoutNulls.kt @@ -49,13 +49,13 @@ public interface WithoutNullsColumnsSelectionDsl { public interface Grammar { /** [**`withoutNulls`**][ColumnsSelectionDsl.withoutNulls] */ - public interface PlainDslName + public typealias PlainDslName = Nothing /** __`.`__[**`withoutNulls`**][ColumnsSelectionDsl.withoutNulls] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsWithoutNulls`**][ColumnsSelectionDsl.colsWithoutNulls] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } /** @@ -84,7 +84,7 @@ public interface WithoutNullsColumnsSelectionDsl { */ private interface CommonWithoutNullsDocs { - interface EXAMPLE + typealias EXAMPLE = Nothing } /** diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt index e4122591de..42c9c86dea 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/AccessApi.kt @@ -25,7 +25,7 @@ internal interface AccessApi { * - {@include [ColumnAccessorsApiLink]} * - {@include [StringApiLink]} */ - interface AnyApiLinks + typealias AnyApiLinks = Nothing /** * String API. @@ -37,10 +37,10 @@ internal interface AccessApi { * For example: {@comment This works if you include the test module when running KoDEx} * @sample [org.jetbrains.kotlinx.dataframe.samples.api.ApiLevels.strings] */ - interface StringApi + typealias StringApi = Nothing /** [String API][StringApi] */ - interface StringApiLink + typealias StringApiLink = Nothing /** * Column Accessors API. @@ -52,10 +52,10 @@ internal interface AccessApi { * For example: {@comment This works if you include the test module when running KoDEx} * @sample [org.jetbrains.kotlinx.dataframe.samples.api.ApiLevels.accessors3] */ - interface ColumnAccessorsApi + typealias ColumnAccessorsApi = Nothing /** [Column Accessors API][AccessApi.ColumnAccessorsApi] */ - interface ColumnAccessorsApiLink + typealias ColumnAccessorsApiLink = Nothing /** * KProperties API. @@ -69,10 +69,10 @@ internal interface AccessApi { * For example: {@comment This works if you include the test module when running KoDEx} * @sample [org.jetbrains.kotlinx.dataframe.samples.api.ApiLevels.kproperties1] */ - interface KPropertiesApi + typealias KPropertiesApi = Nothing /** [KProperties API][KPropertiesApi] */ - interface KPropertiesApiLink + typealias KPropertiesApiLink = Nothing /** * Extension Properties API. @@ -84,11 +84,11 @@ internal interface AccessApi { * For example: {@comment This works if you include the test module when running KoDEx} * @sample [org.jetbrains.kotlinx.dataframe.samples.api.ApiLevels.extensionProperties1] */ - interface ExtensionPropertiesApi + typealias ExtensionPropertiesApi = Nothing /** [Extension Properties API][ExtensionPropertiesApi] */ - interface ExtensionPropertiesApiLink + typealias ExtensionPropertiesApiLink = Nothing } /** [Access API][AccessApi] */ -internal interface AccessApiLink +internal typealias AccessApiLink = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnExpression.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnExpression.kt index 1ccf317e71..cbe7f2338f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnExpression.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnExpression.kt @@ -24,8 +24,8 @@ internal interface ColumnExpression { * * See {@include [ColumnExpressionLink]} for more information. */ - interface CommonDocs + typealias CommonDocs = Nothing } /** [Column Expression][ColumnExpression] */ -internal interface ColumnExpressionLink +internal typealias ColumnExpressionLink = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnPathCreation.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnPathCreation.kt index 52ca600ced..6f7f56e8ae 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnPathCreation.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ColumnPathCreation.kt @@ -6,4 +6,4 @@ package org.jetbrains.kotlinx.dataframe.documentation * If the specified path is partially or fully missing — that is, if any segment of the path * does not correspond to an existing column or column group — all missing parts will be created automatically. */ -internal interface ColumnPathCreation +internal typealias ColumnPathCreation = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt index 2dca1ae4d5..9bc3902138 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt @@ -43,17 +43,17 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnSet internal interface CommonTakeAndDropDocs { /** Title, like "Take Last" */ - interface TITLE + typealias TITLE = Nothing /** Operation, like "takeLast" */ - interface OPERATION + typealias OPERATION = Nothing /** Operation, like "take" */ - interface NOUN + typealias NOUN = Nothing /** like "first" */ - interface FIRST_OR_LAST + typealias FIRST_OR_LAST = Nothing /** Example argument to use */ - interface EXAMPLE + typealias EXAMPLE = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropWhileDocs.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropWhileDocs.kt index 41a3e2226a..e7a66602ba 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropWhileDocs.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropWhileDocs.kt @@ -46,17 +46,17 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath internal interface CommonTakeAndDropWhileDocs { /** Title, like "Take Last" */ - interface TITLE + typealias TITLE = Nothing /** Operation, like "takeLast" */ - interface OPERATION + typealias OPERATION = Nothing /** Operation, like "take" */ - interface NOUN + typealias NOUN = Nothing /** like "last" */ - interface FIRST_OR_LAST + typealias FIRST_OR_LAST = Nothing /** Example argument to use */ - interface EXAMPLE + typealias EXAMPLE = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt index 12a74b9bf1..981962978d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt @@ -5,154 +5,154 @@ package org.jetbrains.kotlinx.dataframe.documentation internal interface DocumentationUrls { /** https://kotlin.github.io/dataframe */ - interface Url + typealias Url = Nothing /** [See Access APIs on the documentation website.]({@include [Url]}/apilevels.html) */ interface AccessApis { /** [See String API on the documentation website.]({@include [Url]}/stringapi.html) */ - interface StringApi + typealias StringApi = Nothing /** [See Column Accessors API on the documentation website.]({@include [Url]}/columnaccessorsapi.html) */ - interface ColumnAccessorsApi + typealias ColumnAccessorsApi = Nothing /** [See KProperties API on the documentation website.]({@include [Url]}/kpropertiesapi.html) */ - interface KPropertiesApi + typealias KPropertiesApi = Nothing /** [See Extension Properties API on the documentation website.]({@include [Url]}/extensionpropertiesapi.html) */ - interface ExtensionPropertiesApi + typealias ExtensionPropertiesApi = Nothing } /** [See Column Selectors on the documentation website.]({@include [Url]}/columnselectors.html) */ - interface ColumnSelectors + typealias ColumnSelectors = Nothing /** [See Extension Properties API on the documentation website.]({@include [Url]}/extensionpropertiesapi.html) */ - interface ExtensionPropertiesApi + typealias ExtensionPropertiesApi = Nothing /** [See Compiler Plugin on the documentation website.]({@include [Url]}/compiler-plugin.html) */ - interface CompilerPlugin + typealias CompilerPlugin = Nothing interface DataRow { /** [See Row Expressions on the documentation website.]({@include [Url]}/datarow.html#row-expressions) */ - interface RowExpressions + typealias RowExpressions = Nothing /** [See Row Conditions on the documentation website.]({@include [Url]}/datarow.html#row-conditions) */ - interface RowConditions + typealias RowConditions = Nothing } /** [See `drop` on the documentation website.]({@include [Url]}/drop.html) */ interface Drop { /** [See `dropNulls` on the documentation website.]({@include [Url]}/drop.html#dropnulls) */ - interface DropNulls + typealias DropNulls = Nothing /** [See `dropNaNs` on the documentation website.]({@include [Url]}/drop.html#dropnans) */ - interface DropNaNs + typealias DropNaNs = Nothing /** [See `dropNA` on the documentation website.]({@include [Url]}/drop.html#dropna) */ - interface DropNA + typealias DropNA = Nothing } /** [See `fill` on the documentation website.]({@include [Url]}/fill.html) */ interface Fill { /** [See `fillNulls` on the documentation website.]({@include [Url]}/fill.html#fillnulls) */ - interface FillNulls + typealias FillNulls = Nothing /** [See `fillNaNs` on the documentation website.]({@include [Url]}/fill.html#fillnans) */ - interface FillNaNs + typealias FillNaNs = Nothing /** [See `fillNA` on the documentation website.]({@include [Url]}/fill.html#fillna) */ - interface FillNA + typealias FillNA = Nothing } /** [See `NaN` and `NA` on the documentation website.]({@include [Url]}/nanAndNa.html) */ interface NanAndNa { /** [See `NaN` on the documentation website.]({@include [Url]}/nanAndNa.html#nan) */ - interface NaN + typealias NaN = Nothing /** [See `NA` on the documentation website.]({@include [Url]}/nanAndNa.html#na) */ - interface NA + typealias NA = Nothing } /** [See `select` on the documentation website.]({@include [Url]}/select.html) */ - interface Select + typealias Select = Nothing /** [See `update` on the documentation website.]({@include [Url]}/update.html) */ - interface Update + typealias Update = Nothing /** [See `remove` on the documentation website.]({@include [Url]}/remove.html) */ - interface Remove + typealias Remove = Nothing /** See `distinct` on the documentation website. */ - interface Distinct + typealias Distinct = Nothing /** See `flatten` on the documentation website. */ - interface Flatten + typealias Flatten = Nothing /** See `cumSum` on the documentation website. */ - interface CumSum + typealias CumSum = Nothing /** [See `describe` on the documentation website.]({@include [Url]}/describe.html) */ - interface Describe + typealias Describe = Nothing /** [See `move` on the documentation website.]({@include [Url]}/move.html) */ - interface Move + typealias Move = Nothing /** [See `group` on the documentation website.]({@include [Url]}/group.html) */ - interface Group + typealias Group = Nothing /** [See `group` on the documentation website.]({@include [Url]}/ungroup.html) */ - interface Ungroup + typealias Ungroup = Nothing /** [See `convert` on the documentation website.]({@include [Url]}/convert.html) */ - interface Convert + typealias Convert = Nothing /** [See `convert` on the documentation website.]({@include [Url]}/corr.html) */ - interface Corr + typealias Corr = Nothing /** [See `add` on the documentation website.]({@include [Url]}/add.html) */ - interface Add + typealias Add = Nothing /** [See `gather` on the documentation website.]({@include [Url]}/gather.html) */ - interface Gather + typealias Gather = Nothing /** [See `filter` on the documentation website.]({@include [Url]}/filter.html) */ - interface Filter + typealias Filter = Nothing /** [See `count` on the documentation website.]({@include [Url]}/count.html) */ - interface Count + typealias Count = Nothing /** [See `countDistinct` on the documentation website.]({@include [Url]}/countdistinct.html) */ - interface CountDistinct + typealias CountDistinct = Nothing /** [See `explode` on the documentation website.]({@include [Url]}/explode.html) */ - interface Explode + typealias Explode = Nothing /** [See `Data Schemas/Data Classes Generation` on the documentation website.]({@include [Url]}/dataschemagenerationmethods.html) */ - interface DataSchemaGeneration + typealias DataSchemaGeneration = Nothing /** [See `format` on the documentation website.]({@include [Url]}/format.html) */ - interface Format + typealias Format = Nothing /** [See `insert` on the documentation website.]({@include [Url]}/insert.html) */ - interface Insert + typealias Insert = Nothing /** [See `rename` on the documentation website.]({@include [Url]}/rename.html) */ - interface Rename + typealias Rename = Nothing /** [See `groupBy` on the documentation website.]({@include [Url]}/groupby.html) */ - interface GroupBy + typealias GroupBy = Nothing /** [See "`GroupBy` Transformation" on the documentation website.]({@include [Url]}/groupby.html#transformation) */ - interface GroupByTransformation + typealias GroupByTransformation = Nothing /** [See "`GroupBy` Reducing" on the documentation website.]({@include [Url]}/groupby.html#reducing) */ - interface GroupByReducing + typealias GroupByReducing = Nothing /** [See "`GroupBy` Aggregation" on the documentation website.]({@include [Url]}/groupby.html#aggregation) */ - interface GroupByAggregation + typealias GroupByAggregation = Nothing /** [See "`pivot` + `groupBy`" on the documentation website.]({@include [Url]}/groupby.html#pivot-groupby) */ - interface PivotGroupBy + typealias PivotGroupBy = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammar.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammar.kt index da2328f4a8..6066451683 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammar.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammar.kt @@ -27,7 +27,7 @@ package org.jetbrains.kotlinx.dataframe.documentation * Always use your common sense reading it and if you're unsure, try out the function yourself or check * the source code :). */ -public interface DslGrammar +public typealias DslGrammar = Nothing /** [(What is this notation?)][DslGrammar] */ -internal interface DslGrammarLink +internal typealias DslGrammarLink = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt index 3f4da0d86d..136ed24eb7 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DslGrammarTemplateColumnsSelectionDsl.kt @@ -63,33 +63,31 @@ public interface DslGrammarTemplateColumnsSelectionDsl { // region parts // Can be set to nothing to disable the definitions part - public interface DEFINITIONS_PART + public typealias DEFINITIONS_PART = Nothing // Can be set to nothing to disable the plain dsl part - public interface PLAIN_DSL_PART + public typealias PLAIN_DSL_PART = Nothing // Can be set to nothing to disable the column set part - public interface COLUMN_SET_PART + public typealias COLUMN_SET_PART = Nothing // Can be set to nothing to disable the column group part - public interface COLUMN_GROUP_PART - + public typealias COLUMN_GROUP_PART = Nothing // endregion // region Template arguments // What to put in definitions part aside from the default part. - public interface DEFINITIONS + public typealias DEFINITIONS = Nothing // What to put in the plain dsl part. Does not need indents. - public interface PLAIN_DSL_FUNCTIONS + public typealias PLAIN_DSL_FUNCTIONS = Nothing // What to put in the column set part. Needs indents. - public interface COLUMN_SET_FUNCTIONS + public typealias COLUMN_SET_FUNCTIONS = Nothing // What to put in the column group part. Needs indents. - public interface COLUMN_GROUP_FUNCTIONS - + public typealias COLUMN_GROUP_FUNCTIONS = Nothing // endregion // region Definitions for at the top of the template @@ -97,153 +95,151 @@ public interface DslGrammarTemplateColumnsSelectionDsl { /** * `columnGroupReference: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ - public interface ColumnGroupNoSingleColumnDef + public typealias ColumnGroupNoSingleColumnDef = Nothing /** `colSelector: `[`ColumnSelector`][ColumnSelector] */ - public interface ColumnSelectorDef + public typealias ColumnSelectorDef = Nothing /** `colsSelector: `[`ColumnsSelector`][ColumnsSelector] */ - public interface ColumnsSelectorDef + public typealias ColumnsSelectorDef = Nothing /** * `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ - public interface ColumnDef + public typealias ColumnDef = Nothing /** * `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ - public interface ColumnGroupDef + public typealias ColumnGroupDef = Nothing /** `columnNoAccessor: `[`String`][String]` | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath] */ - public interface ColumnNoAccessorDef + public typealias ColumnNoAccessorDef = Nothing /** `columnOrSet: `{@include [ColumnRef]}` | `{@include [ColumnSetRef]} */ - public interface ColumnOrColumnSetDef + public typealias ColumnOrColumnSetDef = Nothing /** `columnSet: `[`ColumnSet`][ColumnSet]`<*>` */ - public interface ColumnSetDef + public typealias ColumnSetDef = Nothing /** `columnsResolver: `[`ColumnsResolver`][ColumnsResolver] */ - public interface ColumnsResolverDef + public typealias ColumnsResolverDef = Nothing /** `condition: `[`ColumnFilter`][ColumnFilter] */ - public interface ConditionDef + public typealias ConditionDef = Nothing /** `expression: `{@include [ColumnExpressionLink]} */ - public interface ColumnExpressionDef + public typealias ColumnExpressionDef = Nothing /** `ignoreCase: `[`Boolean`][Boolean] */ - public interface IgnoreCaseDef + public typealias IgnoreCaseDef = Nothing /** `index: `[`Int`][Int] */ - public interface IndexDef + public typealias IndexDef = Nothing /** `indexRange: `[`IntRange`][IntRange] */ - public interface IndexRangeDef + public typealias IndexRangeDef = Nothing /** `infer: `[`Infer`][org.jetbrains.kotlinx.dataframe.api.Infer] */ - public interface InferDef + public typealias InferDef = Nothing /** `kind: `[`ColumnKind`][ColumnKind] */ - public interface ColumnKindDef + public typealias ColumnKindDef = Nothing /** `kType: `[`KType`][kotlin.reflect.KType] */ - public interface KTypeDef + public typealias KTypeDef = Nothing /** `name: `[`String`][String] */ - public interface NameDef + public typealias NameDef = Nothing /** `number: `[`Int`][Int] */ - public interface NumberDef + public typealias NumberDef = Nothing /** `regex: `[`Regex`][Regex] */ - public interface RegexDef + public typealias RegexDef = Nothing /** * `singleColumn: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>>` */ - public interface SingleColumnDef + public typealias SingleColumnDef = Nothing /** `T: Column type` */ - public interface ColumnTypeDef + public typealias ColumnTypeDef = Nothing /** `text: `[`String`][String] */ - public interface TextDef - + public typealias TextDef = Nothing // endregion // region References to the definitions /** [`columnGroupReference`][ColumnGroupNoSingleColumnDef] */ - public interface ColumnGroupNoSingleColumnRef + public typealias ColumnGroupNoSingleColumnRef = Nothing /** [`colSelector`][ColumnSelectorDef] */ - public interface ColumnSelectorRef + public typealias ColumnSelectorRef = Nothing /** [`colsSelector`][ColumnsSelectorDef] */ - public interface ColumnsSelectorRef + public typealias ColumnsSelectorRef = Nothing /** [`column`][ColumnDef] */ - public interface ColumnRef + public typealias ColumnRef = Nothing /** [`columnGroup`][ColumnGroupDef] */ - public interface ColumnGroupRef + public typealias ColumnGroupRef = Nothing /** [`columnNoAccessor`][ColumnNoAccessorDef] */ - public interface ColumnNoAccessorRef + public typealias ColumnNoAccessorRef = Nothing /** [`columnOrSet`][ColumnOrColumnSetDef] */ - public interface ColumnOrColumnSetRef + public typealias ColumnOrColumnSetRef = Nothing /** [`columnSet`][ColumnSetDef] */ - public interface ColumnSetRef + public typealias ColumnSetRef = Nothing /** [`columnsResolver`][ColumnsResolverDef] */ - public interface ColumnsResolverRef + public typealias ColumnsResolverRef = Nothing /** [`condition`][ConditionDef] */ - public interface ConditionRef + public typealias ConditionRef = Nothing /** [`expression`][ColumnExpressionDef] */ - public interface ColumnExpressionRef + public typealias ColumnExpressionRef = Nothing /** [`ignoreCase`][IgnoreCaseDef] */ - public interface IgnoreCaseRef + public typealias IgnoreCaseRef = Nothing /** [`index`][IndexDef] */ - public interface IndexRef + public typealias IndexRef = Nothing /** [`indexRange`][IndexRangeDef] */ - public interface IndexRangeRef + public typealias IndexRangeRef = Nothing /** [`infer`][InferDef] */ - public interface InferRef + public typealias InferRef = Nothing /** [`kind`][ColumnKindDef] */ - public interface ColumnKindRef + public typealias ColumnKindRef = Nothing /** [`kType`][KTypeDef] */ - public interface KTypeRef + public typealias KTypeRef = Nothing /** [`name`][NameDef] */ - public interface NameRef + public typealias NameRef = Nothing /** [`number`][NumberDef] */ - public interface NumberRef + public typealias NumberRef = Nothing /** [`regex`][RegexDef] */ - public interface RegexRef + public typealias RegexRef = Nothing /** [`singleColumn`][SingleColumnDef] */ - public interface SingleColumnRef + public typealias SingleColumnRef = Nothing /** [`T`][ColumnTypeDef] */ - public interface ColumnTypeRef + public typealias ColumnTypeRef = Nothing /** [`text`][TextDef] */ - public interface TextRef - + public typealias TextRef = Nothing // endregion } @@ -283,9 +279,9 @@ public interface DslGrammarTemplateColumnsSelectionDsl { public interface UsageTemplateExample { /** __`.`__[**`example`**][ColumnsSelectionDsl.first] */ - public interface ColumnSetName + public typealias ColumnSetName = Nothing /** __`.`__[**`colsExample`**][ColumnsSelectionDsl.first] */ - public interface ColumnGroupName + public typealias ColumnGroupName = Nothing } } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt index 0fadcc0f7d..1adfe5816d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt @@ -18,10 +18,10 @@ internal interface ExpressionsGivenColumn { * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ - interface OPERATION + typealias OPERATION = Nothing /** {@set [OPERATION] operation} */ - interface SetDefaultOperationArg + typealias SetDefaultOperationArg = Nothing /** Provide a new value for every selected cell given its column using a [column expression][DfColumnExpression]. */ interface ColumnExpression { @@ -36,9 +36,9 @@ internal interface ExpressionsGivenColumn { * `df.`{@get [OPERATION]}` { `[count][DataColumn.count]` { it > 10 } }` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Column Expression][ColumnExpression] */ - interface ColumnExpressionLink + typealias ColumnExpressionLink = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt index ba2ce38fcd..ef43303838 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrameExpression as DfDataFrameExpress */ internal interface ExpressionsGivenDataFrame { - interface OPERATION + typealias OPERATION = Nothing /** Provide a new value for every selected dataframe using a [dataframe expression][DfDataFrameExpression]. */ interface DataFrameExpression { @@ -25,9 +25,9 @@ internal interface ExpressionsGivenDataFrame { * * {@get [OPERATION]}` { `[select][DataFrame.select]` { lastName } }` */ - interface WithExample + typealias WithExample = Nothing } /** [DataFrame Expression][DataFrameExpression] */ - interface DataFrameExpressionLink + typealias DataFrameExpressionLink = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt index f1ea4131e6..ebe09df992 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRow.kt @@ -38,12 +38,11 @@ internal interface ExpressionsGivenRow { * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ - interface OPERATION - + typealias OPERATION = Nothing // Using ` notation to not create double `` when including /** {@set [OPERATION] `operation`} */ - interface SetDefaultOperationArg + typealias SetDefaultOperationArg = Nothing /** * [update with][org.jetbrains.kotlinx.dataframe.api.Update.with]-, @@ -53,7 +52,7 @@ internal interface ExpressionsGivenRow { * [RowExpression][DfRowExpression] that provides access to * the modified/generated value of the preceding row ([AddDataRow.newValue]). */ - interface AddDataRowNote + typealias AddDataRowNote = Nothing /** Provide a new value for every selected cell given its row using a [row expression][DfRowExpression]. */ interface RowExpression { @@ -68,11 +67,11 @@ internal interface ExpressionsGivenRow { * `df.`{@get [OPERATION]}` { 2021 - age }` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Row Expression][RowExpression.WithExample] */ - interface RowExpressionLink + typealias RowExpressionLink = Nothing /** Provide a new value for every selected cell given its row and its previous value using a * [row value expression][DfRowValueExpression]. @@ -89,12 +88,12 @@ internal interface ExpressionsGivenRow { * `df.`{@get [OPERATION]}` { it.uppercase() }` * {@include [SetDefaultOperationArg]} */ - interface WithExample + typealias WithExample = Nothing } /** [Row Value Expression][RowValueExpression.WithExample] */ - interface RowValueExpressionLink + typealias RowValueExpressionLink = Nothing } /** [Row Expression][ExpressionsGivenRow] */ -internal interface RowExpressionsLink +internal typealias RowExpressionsLink = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt index 939a3e7468..73f5dcccf3 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenRowAndColumn.kt @@ -15,12 +15,11 @@ internal interface ExpressionsGivenRowAndColumn { * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ - interface OPERATION - + typealias OPERATION = Nothing // Using ` notation to not create double `` when including /** {@set [OPERATION] `operation`} */ - interface SetDefaultOperationArg + typealias SetDefaultOperationArg = Nothing /** Provide a new value for every selected cell given both its row and column using a [row-column expression][DfRowColumnExpression]. */ interface RowColumnExpression { @@ -38,9 +37,9 @@ internal interface ExpressionsGivenRowAndColumn { * * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Row Column Expression][RowColumnExpression] */ - interface RowColumnExpressionLink + typealias RowColumnExpressionLink = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExtensionPropertiesAPI.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExtensionPropertiesAPI.kt index 024af0daf9..dfd2df9ee6 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExtensionPropertiesAPI.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExtensionPropertiesAPI.kt @@ -40,4 +40,4 @@ import org.jetbrains.kotlinx.dataframe.DataFrame * * For more information, see: {@include [DocumentationUrls.ExtensionPropertiesApi]} */ -internal interface ExtensionPropertiesAPIDocs +internal typealias ExtensionPropertiesAPIDocs = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/Issues.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/Issues.kt index b0ef115be9..44cc89317d 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/Issues.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/Issues.kt @@ -5,5 +5,5 @@ package org.jetbrains.kotlinx.dataframe.documentation internal interface Issues { /** [#KT-68546](https://youtrack.jetbrains.com/issue/KT-68546/Conflicting-overloads-in-non-generic-interface-K2-2.0.0) */ - interface ConflictingOverloadsK2Link + typealias ConflictingOverloadsK2Link = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NA.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NA.kt index 24bac60cbb..1a5c786f07 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NA.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NA.kt @@ -23,4 +23,4 @@ import org.jetbrains.kotlinx.dataframe.api.fillNA * * @see NaN */ -internal interface NA +internal typealias NA = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NaN.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NaN.kt index 11e2ef0ea9..71c9ab5d1f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NaN.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/NaN.kt @@ -15,4 +15,4 @@ import org.jetbrains.kotlinx.dataframe.api.fillNaNs * * @see NA */ -internal interface NaN +internal typealias NaN = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/RowFilterDescription.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/RowFilterDescription.kt index 71bfbe9fb4..617364b480 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/RowFilterDescription.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/RowFilterDescription.kt @@ -10,4 +10,4 @@ import org.jetbrains.kotlinx.dataframe.RowFilter * It allows you to define conditions using the row's values directly, * including through [extension properties][ExtensionPropertiesAPIDocs] for convenient and type-safe access. */ -internal interface RowFilterDescription +internal typealias RowFilterDescription = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingColumns.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingColumns.kt index 506d1748d1..ca29909a5f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingColumns.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingColumns.kt @@ -21,7 +21,7 @@ import kotlin.reflect.KProperty /** [Selecting Columns][SelectingColumns] */ @ExcludeFromSources -internal interface SelectingColumnsLink +internal typealias SelectingColumnsLink = Nothing /** * ## Selecting Columns @@ -44,20 +44,19 @@ internal interface SelectingColumns { * This can include [column groups][ColumnGroup] and nested columns. */ @ExcludeFromSources - interface ColumnGroupsAndNestedColumnsMention + typealias ColumnGroupsAndNestedColumnsMention = Nothing /* * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ @ExcludeFromSources - interface OPERATION - + typealias OPERATION = Nothing // Using ` notation to not create double `` when including /** {@set [OPERATION] `operation`} */ @ExcludeFromSources - interface SetDefaultOperationArg + typealias SetDefaultOperationArg = Nothing /** * Select or express columns using the {@include [ColumnsSelectionDslLink]}. @@ -94,12 +93,12 @@ internal interface SelectingColumns { * * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Columns Selection DSL][Dsl.WithExample] */ @ExcludeFromSources - interface DslLink + typealias DslLink = Nothing /** * Select or express a single column using the Column Selection DSL. @@ -134,12 +133,12 @@ internal interface SelectingColumns { * `df.`{@get [OPERATION]}` { `[colsOf][ColumnsSelectionDsl.colsOf]`<`[Double][Double]`>().`[first][ColumnsSelectionDsl.first]`() }` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Column Selection DSL][DslSingle.WithExample] */ @ExcludeFromSources - interface DslSingleLink + typealias DslSingleLink = Nothing /** * Select columns using their [column names][String] @@ -155,12 +154,12 @@ internal interface SelectingColumns { * `df.`{@get [OPERATION]}`("length", "age")` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Column names][ColumnNames.WithExample] */ @ExcludeFromSources - interface ColumnNamesLink + typealias ColumnNamesLink = Nothing /** * Select columns using [column accessors][ColumnReference] @@ -180,12 +179,12 @@ internal interface SelectingColumns { * `df.`{@get [OPERATION]}`(length, age)` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Column references][ColumnAccessors.WithExample] */ @ExcludeFromSources - interface ColumnAccessorsLink + typealias ColumnAccessorsLink = Nothing /** Select columns using [KProperties][KProperty] ({@include [AccessApi.KPropertiesApiLink]}). */ interface KProperties { @@ -201,10 +200,10 @@ internal interface SelectingColumns { * `df.`{@get [OPERATION]}`(Person::length, Person::age)` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [KProperties][KProperties.WithExample] */ @ExcludeFromSources - interface KPropertiesLink + typealias KPropertiesLink = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingRows.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingRows.kt index 1337f9bddf..078bea504f 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingRows.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/SelectingRows.kt @@ -33,19 +33,19 @@ internal interface SelectingRows { * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ - interface FIRST_OPERATION + typealias FIRST_OPERATION = Nothing /* * The key for a @set that will define the operation name for the examples below. * Make sure to [alias][your examples]. */ - interface SECOND_OPERATION + typealias SECOND_OPERATION = Nothing /** {@set [FIRST_OPERATION] operation}{@set [SECOND_OPERATION] where} */ - interface SetDefaultOperationArg + typealias SetDefaultOperationArg = Nothing /** [Entire-Row Condition][EntireRowCondition.WithExample] */ - interface RowConditionLink + typealias RowConditionLink = Nothing /** Filter or find rows to operate on using a [row filter][RowFilter]. */ interface EntireRowCondition { @@ -60,11 +60,11 @@ internal interface SelectingRows { * `df.`{@get [FIRST_OPERATION]}` { `[diff][diff]` { age } == 0 }` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } /** [Row-Value Condition][RowValueCondition.WithExample] */ - interface RowValueConditionLink + typealias RowValueConditionLink = Nothing /** Filter or find rows to operate on after [selecting columns][SelectingColumns] using a * [row value filter][RowValueFilter]. @@ -81,9 +81,9 @@ internal interface SelectingRows { * `df.`{@get [FIRST_OPERATION]}` { `[cols][ColumnsSelectionDsl.cols]`(1..5) }.`{@get [SECOND_OPERATION]}` { `[index][index]`() > 4 && city != "Paris" }` * @include [SetDefaultOperationArg] */ - interface WithExample + typealias WithExample = Nothing } } /** [Row Condition][SelectingRows] */ -internal interface RowConditionLink +internal typealias RowConditionLink = Nothing diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/TakeAndDropColumnsSelectionDslGrammar.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/TakeAndDropColumnsSelectionDslGrammar.kt index 6ba622a049..5f68cce459 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/TakeAndDropColumnsSelectionDslGrammar.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/TakeAndDropColumnsSelectionDslGrammar.kt @@ -39,26 +39,26 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe internal interface TakeAndDropColumnsSelectionDslGrammar { // Like "Take"/"Drop" - interface TITLE + typealias TITLE = Nothing // Operation, like "take"/"drop" - interface OPERATION + typealias OPERATION = Nothing /** [**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}]`(`[**`Last`**][ColumnsSelectionDsl.{@get [OPERATION]}Last]`)` */ - interface PlainDslName + typealias PlainDslName = Nothing /** __`.`__[**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}]`(`[**`Last`**][ColumnSet.{@get [OPERATION]}Last]`)` */ - interface ColumnSetName + typealias ColumnSetName = Nothing /** __`.`__[**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}Cols]`(`[**`Last`**][ColumnsSelectionDsl.{@get [OPERATION]}LastCols]`)`[**`Cols`**][ColumnsSelectionDsl.{@get [OPERATION]}Cols] */ - interface ColumnGroupName + typealias ColumnGroupName = Nothing /** [**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}While]`(`[**`Last`**][ColumnsSelectionDsl.{@get [OPERATION]}LastWhile]`)`[**`While`**][ColumnsSelectionDsl.{@get [OPERATION]}While] */ - interface PlainDslWhileName + typealias PlainDslWhileName = Nothing /** __`.`__[**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}While]`(`[**`Last`**][ColumnsSelectionDsl.{@get [OPERATION]}LastWhile]`)`[**`While`**][ColumnsSelectionDsl.{@get [OPERATION]}While] */ - interface ColumnSetWhileName + typealias ColumnSetWhileName = Nothing /** __`.`__[**\`{@get [OPERATION]}\`**][ColumnsSelectionDsl.{@get [OPERATION]}ColsWhile]`(`[**`Last`**][ColumnsSelectionDsl.{@get [OPERATION]}LastColsWhile]`)`[**`ColsWhile`**][ColumnsSelectionDsl.{@get [OPERATION]}ColsWhile] */ - interface ColumnGroupWhileName + typealias ColumnGroupWhileName = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/UnifyingNumbers.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/UnifyingNumbers.kt index 969d62b16b..2617bd379e 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/UnifyingNumbers.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/UnifyingNumbers.kt @@ -54,5 +54,5 @@ public interface UnifyingNumbers { */ @ExcludeFromSources @ExportAsHtml - private interface Graph + private typealias Graph = Nothing } diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt index fa69966c13..d8a7e50215 100644 --- a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt +++ b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/utils.kt @@ -20,31 +20,31 @@ import kotlin.annotation.AnnotationTarget.VALUE_PARAMETER * */ @ExcludeFromSources -internal interface LineBreak +internal typealias LineBreak = Nothing /**   */ @ExcludeFromSources -internal interface QuarterIndent +internal typealias QuarterIndent = Nothing /**    */ @ExcludeFromSources -internal interface HalfIndent +internal typealias HalfIndent = Nothing /**      */ @ExcludeFromSources -internal interface Indent +internal typealias Indent = Nothing /**          */ @ExcludeFromSources -internal interface DoubleIndent +internal typealias DoubleIndent = Nothing /**              */ @ExcludeFromSources -internal interface TripleIndent +internal typealias TripleIndent = Nothing /**                  */ @ExcludeFromSources -internal interface QuadrupleIndent +internal typealias QuadrupleIndent = Nothing /** * Any `Documentable` annotated with this annotation will be excluded from the generated sources by diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonReadDelimDocs.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonReadDelimDocs.kt index 5e84a29a2b..002131ab6a 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonReadDelimDocs.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonReadDelimDocs.kt @@ -60,7 +60,7 @@ internal interface CommonReadDelimDocs { * @set [FUNCTION_NAME] readCsv * @set [OLD_FUNCTION_NAME] readCSV */ - interface CsvDocs + typealias CsvDocs = Nothing /** * @include [CommonReadDelimDocs] @@ -70,7 +70,7 @@ internal interface CommonReadDelimDocs { * @set [FUNCTION_NAME] readTsv * @set [OLD_FUNCTION_NAME] readTSV */ - interface TsvDocs + typealias TsvDocs = Nothing /** * @include [CommonReadDelimDocs] @@ -80,7 +80,7 @@ internal interface CommonReadDelimDocs { * @set [FUNCTION_NAME] readDelim * @set [OLD_FUNCTION_NAME] readDelim{@comment cannot differentiate between old and new} */ - interface DelimDocs + typealias DelimDocs = Nothing /** * @include [DelimParams.HEADER] @@ -98,35 +98,35 @@ internal interface CommonReadDelimDocs { * @include [DelimParams.TRIM_INSIDE_QUOTED] * @include [DelimParams.PARSE_PARALLEL] */ - interface CommonReadParams + typealias CommonReadParams = Nothing // something like "File" or "File/URL" - interface DATA_TITLE + typealias DATA_TITLE = Nothing // something like "file" or "file or url" - interface DATA + typealias DATA = Nothing // Like "CSV" or "TSV", capitalized - interface FILE_TYPE_TITLE + typealias FILE_TYPE_TITLE = Nothing // Like "CSV" or "TSV" - interface FILE_TYPE + typealias FILE_TYPE = Nothing // like "csv" or "txt" - interface FILE_EXTENSION + typealias FILE_EXTENSION = Nothing // Function name, like "readCsv" - interface FUNCTION_NAME + typealias FUNCTION_NAME = Nothing // Old function name, like "readCSV" - interface OLD_FUNCTION_NAME + typealias OLD_FUNCTION_NAME = Nothing // A link to the main function, set by ReadDelim itself - interface FUNCTION_LINK + typealias FUNCTION_LINK = Nothing // A link to the str function, set by ReadDelim itself - interface STR_FUNCTION_LINK + typealias STR_FUNCTION_LINK = Nothing // A link to the old function, set by ReadDelim itself - interface OLD_FUNCTION_LINK + typealias OLD_FUNCTION_LINK = Nothing } diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonWriteDelimDocs.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonWriteDelimDocs.kt index b20dca9b19..99247d943e 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonWriteDelimDocs.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/CommonWriteDelimDocs.kt @@ -44,7 +44,7 @@ internal interface CommonWriteDelimDocs { * @set [FUNCTION_NAME] writeCsv * @set [TO_STR_FUNCTION_NAME] toCsvStr */ - interface CsvDocs + typealias CsvDocs = Nothing /** * @include [CommonWriteDelimDocs] @@ -54,7 +54,7 @@ internal interface CommonWriteDelimDocs { * @set [FUNCTION_NAME] writeTsv * @set [TO_STR_FUNCTION_NAME] toTsvStr */ - interface TsvDocs + typealias TsvDocs = Nothing /** * @include [CommonWriteDelimDocs] @@ -64,7 +64,7 @@ internal interface CommonWriteDelimDocs { * @set [FUNCTION_NAME] writeDelim * @set [TO_STR_FUNCTION_NAME] toDelimStr */ - interface DelimDocs + typealias DelimDocs = Nothing /** * @include [DelimParams.INCLUDE_HEADER] @@ -75,35 +75,35 @@ internal interface CommonWriteDelimDocs { * @include [DelimParams.HEADER_COMMENTS] * @include [DelimParams.RECORD_SEPARATOR] */ - interface CommonWriteParams + typealias CommonWriteParams = Nothing // something like "Write" or "Convert" - interface WRITE_OR_CONVERT + typealias WRITE_OR_CONVERT = Nothing // Like "CSV" or "TSV", capitalized - interface FILE_TYPE_TITLE + typealias FILE_TYPE_TITLE = Nothing // something like "File" or "String" - interface DATA_TITLE + typealias DATA_TITLE = Nothing // something like "file" or "text" - interface DATA + typealias DATA = Nothing // Like "CSV" or "TSV" - interface FILE_TYPE + typealias FILE_TYPE = Nothing // like "csv" or "txt" - interface FILE_EXTENSION + typealias FILE_EXTENSION = Nothing // Function name, like "readCsv" - interface FUNCTION_NAME + typealias FUNCTION_NAME = Nothing // Function name, like "toCsvStr" - interface TO_STR_FUNCTION_NAME + typealias TO_STR_FUNCTION_NAME = Nothing // A link to the main function, set by WriteDelim itself - interface FUNCTION_LINK + typealias FUNCTION_LINK = Nothing // A link to the str function, set by WriteDelim itself - interface TO_STR_FUNCTION_LINK + typealias TO_STR_FUNCTION_LINK = Nothing } diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DelimParams.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DelimParams.kt index 479df33a3a..08b3a48c03 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DelimParams.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DelimParams.kt @@ -22,40 +22,40 @@ internal object DelimParams { * @param path The file path to read. * Can also be compressed as `.gz` or `.zip`, see [Compression][Compression]. */ - interface PATH_READ + typealias PATH_READ = Nothing /** * @param file The file to read. * Can also be compressed as `.gz` or `.zip`, see [Compression][Compression]. */ - interface FILE_READ + typealias FILE_READ = Nothing /** * @param url The URL from which to fetch the data. * Can also be compressed as `.gz` or `.zip`, see [Compression][Compression]. */ - interface URL_READ + typealias URL_READ = Nothing /** * @param fileOrUrl The file path or URL to read the data from. * Can also be compressed as `.gz` or `.zip`, see [Compression][Compression]. */ - interface FILE_OR_URL_READ + typealias FILE_OR_URL_READ = Nothing /** @param inputStream Represents the file to read. */ - interface INPUT_STREAM_READ + typealias INPUT_STREAM_READ = Nothing /** @param text The raw data to read in the form of a [String]. */ - interface TEXT_READ + typealias TEXT_READ = Nothing /** @param file The file to write to. */ - interface FILE_WRITE + typealias FILE_WRITE = Nothing /** @param path The path pointing to a file to write to. */ - interface PATH_WRITE + typealias PATH_WRITE = Nothing /** @param writer The [Appendable] to write to. */ - interface WRITER_WRITE + typealias WRITER_WRITE = Nothing /** * @param delimiter The field delimiter character. Default: ','. diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DocumentationUrls.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DocumentationUrls.kt index 85a8981f33..8f8e419d59 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DocumentationUrls.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/DocumentationUrls.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlinx.dataframe.documentationCsv internal interface DocumentationUrls { /** [Deephaven CSV](https://github.com/deephaven/deephaven-csv) */ - interface Deephaven + typealias Deephaven = Nothing /** [Apache Commons CSV](https://commons.apache.org/proper/commons-csv/) */ - interface ApacheCsv + typealias ApacheCsv = Nothing } diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/utils.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/utils.kt index 618ef51009..d9f775ef58 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/utils.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentationCsv/utils.kt @@ -20,31 +20,31 @@ import kotlin.annotation.AnnotationTarget.VALUE_PARAMETER * */ @ExcludeFromSources -internal interface LineBreak +internal typealias LineBreak = Nothing /**   */ @ExcludeFromSources -internal interface QuarterIndent +internal typealias QuarterIndent = Nothing /**    */ @ExcludeFromSources -internal interface HalfIndent +internal typealias HalfIndent = Nothing /**      */ @ExcludeFromSources -internal interface Indent +internal typealias Indent = Nothing /**          */ @ExcludeFromSources -internal interface DoubleIndent +internal typealias DoubleIndent = Nothing /**              */ @ExcludeFromSources -internal interface TripleIndent +internal typealias TripleIndent = Nothing /**                  */ @ExcludeFromSources -internal interface QuadrupleIndent +internal typealias QuadrupleIndent = Nothing /** * Any `Documentable` annotated with this annotation will be excluded from the generated sources by diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/util.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/util.kt index 17f7f0aaf3..a42570765e 100644 --- a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/util.kt +++ b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/util.kt @@ -6,7 +6,7 @@ import org.jetbrains.kotlinx.dataframe.documentationCsv.ExcludeFromSources /** [\["", "NA", "N/A", "null", "NULL", "None", "none", "NIL", "nil"\]][DEFAULT_DELIM_NULL_STRINGS] */ @ExcludeFromSources -internal interface DefaultNullStringsContentLink +internal typealias DefaultNullStringsContentLink = Nothing /** * Default strings that are considered null when reading CSV / TSV / delim files: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d6a7a4cf1c..aefca8e75b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] ksp = "2.2.21-2.0.4" -kotlinJupyter = "0.15.0-629" +kotlinJupyter = "0.15.1-711" ktlint = "12.3.0"