fix gradle

Author: AndreiKingsley

build.gradle.kts

@@ -47,7 +47,14 @@ allprojects {
 }
 
 
-val published = listOf("ggdsl-api", "ggdsl-dataframe", "ggdsl-dataframe-lets-plot", "ggdsl-echarts", "ggdsl-lets-plot")
+val published = listOf(
+    "ggdsl-api",
+    "ggdsl-dataframe",
+    "ggdsl-dataframe-lets-plot",
+    "ggdsl-echarts",
+    "ggdsl-lets-plot",
+    "ggdsl-util"
+)
 
 configure(subprojects.filter { it.name in published }) {
     apply(from = project.rootProject.file("gradle/publish.gradle"))

ggdsl-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/Integration.kt

@@ -67,7 +67,7 @@ internal class Integration : JupyterIntegration() {
         return when(this) {
             is org.jetbrains.letsPlot.intern.Plot -> frontendContext.getHtml(this)
             is GGBunch -> frontendContext.getHtml(this)
-            else -> TODO()
+            else -> error("Unsupported Figure")
         }
     }
 

ggdsl-util/build.gradle.kts

@@ -8,13 +8,17 @@ repositories {
 }
 
 val serialization_version: String by project
+val lets_plot_kotlin_version: String by project
 
 dependencies {
     implementation(kotlin("stdlib"))
     testImplementation(kotlin("test"))
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+    testImplementation("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:$lets_plot_kotlin_version")
+    testImplementation(project(":ggdsl-lets-plot"))
 }
 
+
 tasks {
     compileKotlin {
         kotlinOptions.jvmTarget = "1.8"

ggdsl-util/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/specSerialization.kt

@@ -58,15 +58,16 @@ private fun deserializeAny(json: JsonElement): Any? {
 }
 
 private fun deserializePrimitive(json: JsonPrimitive): Any? {
-    if (json is JsonNull) return null
-    return if (json.isString) {
-        json.content
-    } else {
-        json.booleanOrNull ?:
-        json.intOrNull ?:
-        json.longOrNull ?:
-        json.doubleOrNull ?:
-        error("Unknown JSON primitive type: [$json]")
+    return when {
+        json is JsonNull -> null
+        json.isString -> json.content
+        else -> {
+            json.booleanOrNull ?:
+            json.intOrNull ?:
+            json.longOrNull ?:
+            json.doubleOrNull ?:
+            error("Unknown JSON primitive type: [$json]")
+        }
     }
 }
 

ggdsl-util/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/SpecSerializationTest.kt

@@ -1,6 +1,37 @@
 package org.jetbrains.kotlinx.ggdsl.util.serialization
 
+import org.jetbrains.kotlinx.ggdsl.dsl.*
+import org.jetbrains.kotlinx.ggdsl.dsl.column.columnPointer
+import org.jetbrains.kotlinx.ggdsl.ir.Plot
+import org.jetbrains.kotlinx.ggdsl.letsplot.layers.points
+import org.jetbrains.kotlinx.ggdsl.letsplot.translator.toLetsPlot
+import org.jetbrains.kotlinx.ggdsl.letsplot.util.symbol.Symbol
+import org.jetbrains.kotlinx.ggdsl.letsplot.x
+import org.jetbrains.kotlinx.ggdsl.util.color.Color
+import org.jetbrains.letsPlot.intern.toSpec
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 internal class SpecSerializationTest {
-    //TODO
+    @Test
+    fun testSimpleCase() = doTest(
+        plot(dataOf {
+            "origin" to listOf("x", "y", "z")
+            "mpg" to listOf(1.3, 8.1, 5.0)
+        }) {
+            x(columnPointer<String>("origin"))
+            points {
+                y(columnPointer<Double>("mpg").scaled(continuousPos(limits = 1.0 to 5.0)))
+                symbol(Symbol.CIRCLE_FILLED)
+                fillColor(Color.RED)
+            }
+        }
+    )
+
+    private fun doTest(plot: Plot) {
+        val spec = plot.toLetsPlot().toSpec()
+        val serializedSpec = serializeSpec(spec)
+        val deserializedSpec = deserializeSpec(serializedSpec)
+        assertEquals(spec, deserializedSpec)
+    }
 }