Merge pull request #1095 from Kotlin/jupyter-module

Splitting off Jupyter yet again

Author: Jolanrensen

build.gradle.kts

@@ -19,7 +19,6 @@ plugins {
         alias(kotlin.jvm)
         alias(publisher)
         alias(serialization) apply false
-        alias(jupyter.api) apply false
         alias(dokka)
         alias(kover)
         alias(ktlint)
@@ -50,20 +49,21 @@ configurations {
 }
 
 dependencies {
-    api(project(":core"))
-    api(project(":dataframe-arrow"))
-    api(project(":dataframe-excel"))
-    api(project(":dataframe-openapi"))
-    api(project(":dataframe-jdbc"))
-    api(project(":dataframe-csv"))
+    api(projects.core)
+    api(projects.dataframeArrow)
+    api(projects.dataframeExcel)
+    api(projects.dataframeOpenapi)
+    api(projects.dataframeJdbc)
+    api(projects.dataframeCsv)
 
-    kover(project(":core"))
-    kover(project(":dataframe-arrow"))
-    kover(project(":dataframe-excel"))
-    kover(project(":dataframe-openapi"))
-    kover(project(":dataframe-jdbc"))
-    kover(project(":dataframe-csv"))
-    kover(project(":plugins:kotlin-dataframe"))
+    kover(projects.core)
+    kover(projects.dataframeArrow)
+    kover(projects.dataframeExcel)
+    kover(projects.dataframeOpenapi)
+    kover(projects.dataframeJdbc)
+    kover(projects.dataframeCsv)
+    kover(projects.plugins.kotlinDataframe)
+    kover(projects.dataframeJupyter)
 }
 
 enum class Version : Comparable<Version> {

core/README.md

@@ -9,10 +9,9 @@ or [:dataframe-jdbc](../dataframe-jdbc), however, this is has not happened yet f
 
 At the moment, these integrations are still part of the `:core` module:
 
-- csv/tsv
+- (deprecated) csv/tsv
 - html
 - json
-- jupyter
 
 ### Korro code samples
 
@@ -36,10 +35,10 @@ We can also generate "normal" DataFrame samples for the website. This can be don
 [OtherSamples class](./src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/OtherSamples.kt). Generated
 HTML files will be stored in [docs/StardustDocs/snippets/manual](../docs/StardustDocs/snippets/manual).
 
-### KDoc Preprocesor
+### KoDEx
 
-The code you're working on needs to be edited in [src](src), but the KDocs are processed by the
-[KDoc Preprocessor](https://github.com/Jolanrensen/docProcessorGradlePlugin) when the project is published (or the task
+The code you're working on needs to be edited in [src](src), but the KDocs are processed by
+[KoDEx](https://github.com/Jolanrensen/kodex) when the project is published (or the task
 is run manually). The generated sources with adjusted KDocs will be overwritten
 in [generated-sources](generated-sources).
 See the [KDoc Preprocessing Guide](../KDOC_PREPROCESSING.md) for more information.

core/api/core.api

@@ -12,7 +12,6 @@ plugins {
         alias(kotlin.jvm)
         alias(publisher)
         alias(serialization)
-        alias(jupyter.api)
         alias(korro)
         alias(kover)
         alias(ktlint)
@@ -35,13 +34,10 @@ plugins {
 
 group = "org.jetbrains.kotlinx"
 
-val jupyterApiTCRepo: String by project
-
 repositories {
     mavenLocal()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
-    maven(jupyterApiTCRepo)
 }
 
 kotlin.sourceSets {
@@ -65,7 +61,7 @@ dependencies {
 
     api(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
-    kotlinCompilerPluginClasspathSamples(project(":plugins:expressions-converter"))
+    kotlinCompilerPluginClasspathSamples(projects.plugins.expressionsConverter)
 
     api(libs.commonsCsv)
     implementation(libs.commonsIo)
@@ -86,8 +82,8 @@ dependencies {
     testImplementation(libs.jsoup)
     testImplementation(libs.sl4jsimple)
 
-    // for JupyterCodegenTests and samples.api
-    testImplementation(project(":dataframe-csv"))
+    // for samples.api
+    testImplementation(projects.dataframeCsv)
 }
 
 val samplesImplementation by configurations.getting {
@@ -391,10 +387,6 @@ tasks.test {
     }
 }
 
-tasks.processJupyterApiResources {
-    libraryProducers = listOf("org.jetbrains.kotlinx.dataframe.jupyter.Integration")
-}
-
 kotlinPublications {
     publication {
         publicationName = "core"

core/build.gradle.kts

@@ -1,7 +1,7 @@
 package org.jetbrains.kotlinx.dataframe.api
 
-import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
 import org.jetbrains.kotlinx.dataframe.DataFrame
+import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
 import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
 import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
 import org.jetbrains.kotlinx.dataframe.impl.codeGen.from

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

@@ -1,12 +1,5 @@
-package org.jetbrains.dataframe.impl.codeGen
+package org.jetbrains.kotlinx.dataframe.codeGen
 
-import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
-import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
-import org.jetbrains.kotlinx.dataframe.codeGen.ExtensionsCodeGenerator
-import org.jetbrains.kotlinx.dataframe.codeGen.Marker
-import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
-import org.jetbrains.kotlinx.dataframe.codeGen.MarkersExtractor
-import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
 import org.jetbrains.kotlinx.dataframe.impl.codeGen.CodeGeneratorImpl
 import org.jetbrains.kotlinx.dataframe.impl.codeGen.FullyQualifiedNames
 import org.jetbrains.kotlinx.dataframe.impl.codeGen.ShortNames

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeGenerator.kt

@@ -1,8 +1,5 @@
 package org.jetbrains.kotlinx.dataframe.codeGen
 
-import org.jetbrains.kotlinx.jupyter.api.Code
-import org.jetbrains.kotlinx.jupyter.api.VariableName
-
 /**
  * Class representing generated code declarations for a [Marker].
  *
@@ -28,3 +25,6 @@ public data class CodeWithConverter(val declarations: Code, val converter: (Vari
             else -> declarations + "\n" + converter(name)
         }
 }
+
+public typealias Code = String
+public typealias VariableName = String

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeWithConverter.kt

@@ -270,13 +270,16 @@ internal fun <C : Comparable<C>> Sequence<C?>.indexOfMax(): Int {
     return maxIndex
 }
 
-internal fun KClass<*>.createStarProjectedType(nullable: Boolean): KType =
-    if (this == Nothing::class) {
+internal fun createStarProjectedType(klass: KClass<*>, nullable: Boolean): KType =
+    if (klass == Nothing::class) {
         nothingType(nullable) // would be Void otherwise
     } else {
-        this.starProjectedType.let { if (nullable) it.withNullability(true) else it }
+        klass.starProjectedType.let { if (nullable) it.withNullability(true) else it }
     }
 
+@JvmName("createStarProjectedTypeExt")
+internal fun KClass<*>.createStarProjectedType(nullable: Boolean): KType = createStarProjectedType(this, nullable)
+
 internal fun KType.isSubtypeWithNullabilityOf(type: KType) =
     this.isSubtypeOf(type) && (!this.isMarkedNullable || type.isMarkedNullable)
 

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/Utils.kt

@@ -1,16 +1,6 @@
 package org.jetbrains.kotlinx.dataframe.impl.codeGen
 
 import com.squareup.kotlinpoet.buildCodeBlock
-import org.jetbrains.dataframe.impl.codeGen.CodeGenResult
-import org.jetbrains.dataframe.impl.codeGen.CodeGenerator
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.Enum
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.NoFields
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.None
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.TypeAlias
-import org.jetbrains.dataframe.impl.codeGen.InterfaceGenerationMode.WithFields
-import org.jetbrains.dataframe.keywords.HardKeywords
-import org.jetbrains.dataframe.keywords.ModifierKeywords
 import org.jetbrains.kotlinx.dataframe.ColumnsContainer
 import org.jetbrains.kotlinx.dataframe.ColumnsScope
 import org.jetbrains.kotlinx.dataframe.DataColumn
@@ -20,10 +10,19 @@ import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
 import org.jetbrains.kotlinx.dataframe.api.ColumnSelectionDsl
 import org.jetbrains.kotlinx.dataframe.api.DataSchemaEnum
 import org.jetbrains.kotlinx.dataframe.codeGen.BaseField
+import org.jetbrains.kotlinx.dataframe.codeGen.Code
+import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenResult
+import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
 import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
 import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
 import org.jetbrains.kotlinx.dataframe.codeGen.ExtensionsCodeGenerator
 import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.Enum
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.NoFields
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.None
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.TypeAlias
+import org.jetbrains.kotlinx.dataframe.codeGen.InterfaceGenerationMode.WithFields
 import org.jetbrains.kotlinx.dataframe.codeGen.IsolatedMarker
 import org.jetbrains.kotlinx.dataframe.codeGen.Marker
 import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
@@ -33,8 +32,9 @@ import org.jetbrains.kotlinx.dataframe.codeGen.ValidFieldName
 import org.jetbrains.kotlinx.dataframe.codeGen.toNullable
 import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.impl.toSnakeCase
+import org.jetbrains.kotlinx.dataframe.keywords.HardKeywords
+import org.jetbrains.kotlinx.dataframe.keywords.ModifierKeywords
 import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
-import org.jetbrains.kotlinx.jupyter.api.Code
 
 private fun renderNullability(nullable: Boolean) = if (nullable) "?" else ""
 

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt

@@ -1,10 +1,9 @@
-package org.jetbrains.dataframe.impl.codeGen
+package org.jetbrains.kotlinx.dataframe.impl.codeGen
 
 import org.jetbrains.kotlinx.dataframe.AnyFrame
 import org.jetbrains.kotlinx.dataframe.AnyRow
+import org.jetbrains.kotlinx.dataframe.codeGen.Code
 import org.jetbrains.kotlinx.dataframe.codeGen.CodeWithConverter
-import org.jetbrains.kotlinx.dataframe.impl.codeGen.ReplCodeGeneratorImpl
-import org.jetbrains.kotlinx.jupyter.api.Code
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty