Merge branch 'refs/heads/master' into checking-notebooks

Author: Jolanrensen

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeJson.kt

@@ -90,7 +90,17 @@ private val valueTypes =
     setOf(Boolean::class, Double::class, Int::class, Float::class, Long::class, Short::class, Byte::class)
 
 internal fun KlaxonJson.encodeValue(col: AnyCol, index: Int): Any? = when {
-    col.isList() -> col[index]?.let { array(it as List<*>) } ?: array()
+    col.isList() -> col[index]?.let { list ->
+        val values = (list as List<*>).map {
+            when (it) {
+                null, is Int, is Double, is Float, is Long, is Boolean, is Short, is Byte -> it
+                // Klaxon default serializers will try to use reflection and can sometimes fail.
+                // We can't have exceptions in Notebook DataFrame renderer
+                else -> it.toString()
+            }
+        }
+        array(values)
+    } ?: array()
     col.typeClass in valueTypes -> {
         val v = col[index]
         if ((v is Double && v.isNaN()) || (v is Float && v.isNaN())) {

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

@@ -3,11 +3,13 @@ package org.jetbrains.kotlinx.dataframe.io
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import com.beust.klaxon.Parser
+import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.matchers.collections.shouldBeIn
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldNotContain
 import io.kotest.matchers.types.instanceOf
+import io.kotest.matchers.types.shouldBeInstanceOf
 import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlinx.dataframe.AnyFrame
 import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -1060,4 +1062,19 @@ class JsonTests {
         val decodedData = contributors[DATA] as JsonArray<*>
         decodedData.size shouldBe nestedFrameRowLimit
     }
+
+    @Test
+    fun `serialize column with list of objects`() {
+        val df = dataFrameOf("col")(Regex(".+").findAll("abc").toList())
+        val json = shouldNotThrowAny { df.toJson() }
+        val list = DataFrame.readJsonStr(json)["col"][0].shouldBeInstanceOf<List<*>>()
+        list[0].shouldBeInstanceOf<String>()
+    }
+
+    @Test
+    fun `serialize column with list of primitives`() {
+        val df = dataFrameOf("col")(listOf(1, 2, 3))
+        val json = df.toJson()
+        DataFrame.readJsonStr(json) shouldBe df
+    }
 }

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

@@ -90,7 +90,17 @@ private val valueTypes =
     setOf(Boolean::class, Double::class, Int::class, Float::class, Long::class, Short::class, Byte::class)
 
 internal fun KlaxonJson.encodeValue(col: AnyCol, index: Int): Any? = when {
-    col.isList() -> col[index]?.let { array(it as List<*>) } ?: array()
+    col.isList() -> col[index]?.let { list ->
+        val values = (list as List<*>).map {
+            when (it) {
+                null, is Int, is Double, is Float, is Long, is Boolean, is Short, is Byte -> it
+                // Klaxon default serializers will try to use reflection and can sometimes fail.
+                // We can't have exceptions in Notebook DataFrame renderer
+                else -> it.toString()
+            }
+        }
+        array(values)
+    } ?: array()
     col.typeClass in valueTypes -> {
         val v = col[index]
         if ((v is Double && v.isNaN()) || (v is Float && v.isNaN())) {

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/json.kt

@@ -3,11 +3,13 @@ package org.jetbrains.kotlinx.dataframe.io
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import com.beust.klaxon.Parser
+import io.kotest.assertions.throwables.shouldNotThrowAny
 import io.kotest.matchers.collections.shouldBeIn
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldNotContain
 import io.kotest.matchers.types.instanceOf
+import io.kotest.matchers.types.shouldBeInstanceOf
 import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlinx.dataframe.AnyFrame
 import org.jetbrains.kotlinx.dataframe.DataFrame
@@ -1060,4 +1062,19 @@ class JsonTests {
         val decodedData = contributors[DATA] as JsonArray<*>
         decodedData.size shouldBe nestedFrameRowLimit
     }
+
+    @Test
+    fun `serialize column with list of objects`() {
+        val df = dataFrameOf("col")(Regex(".+").findAll("abc").toList())
+        val json = shouldNotThrowAny { df.toJson() }
+        val list = DataFrame.readJsonStr(json)["col"][0].shouldBeInstanceOf<List<*>>()
+        list[0].shouldBeInstanceOf<String>()
+    }
+
+    @Test
+    fun `serialize column with list of primitives`() {
+        val df = dataFrameOf("col")(listOf(1, 2, 3))
+        val json = df.toJson()
+        DataFrame.readJsonStr(json) shouldBe df
+    }
 }