Merge branch 'master' into devcrocod/serialization-patch0

Author: devcrocod

core/build.gradle.kts

@@ -130,7 +130,10 @@ val samplesTest = tasks.register<Test>("samplesTest") {
     ignoreFailures = true
 
     testClassesDirs = fileTree("${layout.buildDirectory.get().asFile.path}/classes/testWithOutputs/kotlin")
-    classpath = files("${layout.buildDirectory.get().asFile.path}/classes/testWithOutputs/kotlin") + configurations["samplesRuntimeClasspath"] + sourceSets["main"].runtimeClasspath
+    classpath =
+        files("${layout.buildDirectory.get().asFile.path}/classes/testWithOutputs/kotlin") +
+        configurations["samplesRuntimeClasspath"] +
+        sourceSets["main"].runtimeClasspath
 }
 
 val clearSamplesOutputs by tasks.creating {
@@ -209,14 +212,17 @@ val kotlinTestSources: FileCollection = kotlin.sourceSets.test.get().kotlin.sour
 
 fun pathOf(vararg parts: String) = parts.joinToString(File.separator)
 
+// Include both test and main sources for cross-referencing, Exclude generated sources
+val processKDocsMainSources = (kotlinMainSources + kotlinTestSources)
+    .filterNot { pathOf("build", "generated") in it.path }
+
 // Task to generate the processed documentation
-val processKDocsMain by creatingProcessDocTask(
-    sources = (kotlinMainSources + kotlinTestSources) // Include both test and main sources for cross-referencing
-        .filterNot { pathOf("build", "generated") in it.path }, // Exclude generated sources
-) {
+val processKDocsMain by creatingProcessDocTask(processKDocsMainSources) {
     target = file(generatedSourcesFolderName)
     arguments += ARG_DOC_PROCESSOR_LOG_NOT_FOUND to false
-
+    exportAsHtml {
+        dir = file("../docs/StardustDocs/snippets")
+    }
     task {
         group = "KDocs"
         doLast {
@@ -248,9 +254,11 @@ tasks.withType<Jar> {
                         pathOf("src", "test", "kotlin") in it.path ||
                             pathOf("src", "test", "java") in it.path
                     } // filter out test sources again
-                    .plus(kotlinMainSources.filter {
-                        pathOf("build", "generated") in it.path
-                    }) // Include generated sources (which were excluded above)
+                    .plus(
+                        kotlinMainSources.filter {
+                            pathOf("build", "generated") in it.path
+                        },
+                    ), // Include generated sources (which were excluded above)
             )
         }
     }
@@ -363,7 +371,7 @@ tasks.test {
         excludes.set(
             listOf(
                 "org.jetbrains.kotlinx.dataframe.jupyter.*",
-                "org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests"
+                "org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests",
             )
         )
     }

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

@@ -2,10 +2,13 @@ package org.jetbrains.kotlinx.dataframe.api
 
 import org.jetbrains.kotlinx.dataframe.AnyCol
 import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
+import org.jetbrains.kotlinx.dataframe.impl.isNothing
+import org.jetbrains.kotlinx.dataframe.impl.projectTo
 import org.jetbrains.kotlinx.dataframe.type
 import org.jetbrains.kotlinx.dataframe.typeClass
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
+import kotlin.reflect.KTypeProjection
 import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.isSubtypeOf
 import kotlin.reflect.typeOf
@@ -16,7 +19,8 @@ public fun AnyCol.isFrameColumn(): Boolean = kind() == ColumnKind.Frame
 
 public fun AnyCol.isValueColumn(): Boolean = kind() == ColumnKind.Value
 
-public fun AnyCol.isSubtypeOf(type: KType): Boolean = this.type.isSubtypeOf(type) && (!this.type.isMarkedNullable || type.isMarkedNullable)
+public fun AnyCol.isSubtypeOf(type: KType): Boolean =
+    this.type.isSubtypeOf(type) && (!this.type.isMarkedNullable || type.isMarkedNullable)
 
 public inline fun <reified T> AnyCol.isSubtypeOf(): Boolean = isSubtypeOf(typeOf<T>())
 
@@ -26,9 +30,23 @@ public fun AnyCol.isNumber(): Boolean = isSubtypeOf<Number?>()
 
 public fun AnyCol.isList(): Boolean = typeClass == List::class
 
-public fun AnyCol.isComparable(): Boolean = isSubtypeOf<Comparable<*>?>()
+/**
+ * Returns `true` if [this] column is comparable, i.e. its type is a subtype of [Comparable] and its
+ * type argument is not [Nothing].
+ */
+public fun AnyCol.isComparable(): Boolean =
+    isSubtypeOf<Comparable<*>?>() &&
+        type().projectTo(Comparable::class).arguments[0].let {
+            it != KTypeProjection.STAR &&
+                it.type?.isNothing != true
+        }
 
 @PublishedApi
 internal fun AnyCol.isPrimitive(): Boolean = typeClass.isPrimitive()
 
-internal fun KClass<*>.isPrimitive(): Boolean = isSubclassOf(Number::class) || this == String::class || this == Char::class || this == Array::class || isSubclassOf(Collection::class)
+internal fun KClass<*>.isPrimitive(): Boolean =
+    isSubclassOf(Number::class) ||
+        this == String::class ||
+        this == Char::class ||
+        this == Array::class ||
+        isSubclassOf(Collection::class)