Merge pull request #916 from Kotlin/openapi-runtime

Split OpenAPI in module needed for user projects and module needed for code-generation

Author: koperagen

core/build.gradle.kts

@@ -266,8 +266,10 @@ tasks.withType<Jar> {
 }
 
 // modify all publishing tasks to depend on `changeJarTask` so the sources are swapped out with generated sources
-tasks.named { it.startsWith("publish") }.configureEach {
-    dependsOn(processKDocsMain, changeJarTask)
+tasks.configureEach {
+    if (name.startsWith("publish")) {
+        dependsOn(processKDocsMain, changeJarTask)
+    }
 }
 
 // Exclude the generated/processed sources from the IDE

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/Integration.kt

@@ -181,6 +181,7 @@ internal class Integration(private val notebook: Notebook, private val options:
                 "org.jetbrains.kotlinx:dataframe-jdbc:$version",
                 "org.jetbrains.kotlinx:dataframe-arrow:$version",
                 "org.jetbrains.kotlinx:dataframe-openapi:$version",
+                "org.jetbrains.kotlinx:dataframe-openapi-generator:$version",
             )
         }
 

dataframe-openapi-generator/build.gradle.kts

@@ -0,0 +1,53 @@
+plugins {
+    with(libs.plugins) {
+        alias(kotlin.jvm)
+        alias(publisher)
+        alias(serialization)
+        alias(kover)
+        alias(ktlint)
+        alias(jupyter.api)
+    }
+}
+
+group = "org.jetbrains.kotlinx"
+
+val jupyterApiTCRepo: String by project
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven(jupyterApiTCRepo)
+}
+
+dependencies {
+    api(project(":core"))
+    api(project(":dataframe-openapi"))
+
+    implementation(libs.sl4j)
+    implementation(libs.kotlinLogging)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlinpoet)
+    api(libs.swagger) {
+        // Fix for Android
+        exclude("jakarta.validation")
+    }
+
+    testApi(project(":core"))
+    testImplementation(libs.junit)
+    testImplementation(libs.kotestAssertions) {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+    }
+}
+
+kotlinPublications {
+    publication {
+        publicationName = "dataframeOpenApi"
+        artifactId = project.name
+        description = "OpenAPI code generation support for Kotlin Dataframe"
+        packageName = artifactId
+    }
+}
+
+kotlin {
+    explicitApi()
+}

dataframe-openapi/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/DefaultReadOpenApiMethod.kt renamed to dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/DefaultReadOpenApiMethod.kt

@@ -0,0 +1,30 @@
+package org.jetbrains.kotlinx.dataframe.io
+
+import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
+import org.jetbrains.kotlinx.dataframe.codeGen.Marker
+import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
+import org.jetbrains.kotlinx.dataframe.codeGen.ValidFieldName
+
+internal fun AdditionalProperty.Companion.getMarker(typeArguments: List<String>) =
+    Marker(
+        name = AdditionalProperty::class.qualifiedName!!,
+        isOpen = false,
+        fields = listOf(
+            generatedFieldOf(
+                fieldName = ValidFieldName.of(AdditionalProperty<*>::key.name),
+                columnName = AdditionalProperty<*>::key.name,
+                overrides = false,
+                fieldType = FieldType.ValueFieldType(String::class.qualifiedName!!),
+            ),
+            generatedFieldOf(
+                fieldName = ValidFieldName.of(AdditionalProperty<*>::`value`.name),
+                columnName = AdditionalProperty<*>::`value`.name,
+                overrides = false,
+                fieldType = FieldType.ValueFieldType(Any::class.qualifiedName!! + "?"),
+            ),
+        ),
+        superMarkers = emptyList(),
+        visibility = MarkerVisibility.EXPLICIT_PUBLIC,
+        typeParameters = emptyList(),
+        typeArguments = typeArguments,
+    )