fixing repl tests by allowing isMutable to be set even when dataframe is not bound to an actual property. Also non isOpen DataSchemas are no longer expected to be inherited from.

Author: Jolanrensen

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

@@ -6,13 +6,22 @@ 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.KMutableProperty
 import kotlin.reflect.KProperty
 
 internal interface ReplCodeGenerator {
 
-    fun process(df: AnyFrame, property: KProperty<*>? = null): CodeWithConverter
+    fun process(
+        df: AnyFrame,
+        property: KProperty<*>? = null,
+        isMutable: Boolean = property is KMutableProperty?,
+    ): CodeWithConverter
 
-    fun process(row: AnyRow, property: KProperty<*>? = null): CodeWithConverter
+    fun process(
+        row: AnyRow,
+        property: KProperty<*>? = null,
+        isMutable: Boolean = property is KMutableProperty?,
+    ): CodeWithConverter
 
     fun process(markerClass: KClass<*>): Code
 

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

@@ -19,6 +19,7 @@ import kotlin.reflect.KClass
 import kotlin.reflect.KMutableProperty
 import kotlin.reflect.KProperty
 import kotlin.reflect.KType
+import kotlin.reflect.KVisibility
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.superclasses
 import kotlin.reflect.jvm.jvmErasure
@@ -44,11 +45,12 @@ internal class ReplCodeGeneratorImpl : ReplCodeGenerator {
             else -> null
         }
 
-    override fun process(row: AnyRow, property: KProperty<*>?) = process(row.df(), property)
+    override fun process(row: AnyRow, property: KProperty<*>?, isMutable: Boolean) =
+        process(row.df(), property, isMutable)
 
-    override fun process(df: AnyFrame, property: KProperty<*>?): CodeWithConverter {
+    override fun process(df: AnyFrame, property: KProperty<*>?, isMutable: Boolean): CodeWithConverter {
         var targetSchema = df.schema()
-        var isMutable = false
+        var isMutable = isMutable
 
         if (property != null) {
             val wasProcessedBefore = property in registeredProperties
@@ -77,7 +79,7 @@ internal class ReplCodeGeneratorImpl : ReplCodeGenerator {
             }
         }
 
-        return generate(targetSchema, markerInterfacePrefix, isMutable)
+        return generate(schema = targetSchema, name = markerInterfacePrefix, isOpen = isMutable)
     }
 
     fun generate(
@@ -92,7 +94,9 @@ internal class ReplCodeGeneratorImpl : ReplCodeGenerator {
             extensionProperties = true,
             isOpen = isOpen,
             visibility = MarkerVisibility.IMPLICIT_PUBLIC,
-            knownMarkers = registeredMarkers.values,
+            knownMarkers = registeredMarkers
+                .filterKeys { it.visibility != KVisibility.PRIVATE }
+                .values,
         )
 
         result.newMarkers.forEach {

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ReplCodeGenTests.kt

@@ -26,7 +26,7 @@ class ReplCodeGenTests : BaseTest() {
     val stringName = String::class.simpleName!!
 
     class Test1 {
-        @DataSchema(isOpen = false)
+        @DataSchema
         interface _DataFrameType
 
         @DataSchema(isOpen = false)
@@ -37,10 +37,10 @@ class ReplCodeGenTests : BaseTest() {
     }
 
     class Test2 {
-        @DataSchema(isOpen = false)
+        @DataSchema
         interface _DataFrameType
 
-        @DataSchema(isOpen = false)
+        @DataSchema
         interface _DataFrameType1
 
         @DataSchema(isOpen = false)
@@ -68,13 +68,13 @@ class ReplCodeGenTests : BaseTest() {
     @Test
     fun `process derived markers`() {
         val repl = ReplCodeGenerator.create()
-        val code = repl.process(df).declarations
+        val code = repl.process(df, isMutable = true).declarations
 
         val marker = ReplCodeGeneratorImpl.markerInterfacePrefix
         val markerFull = Test1._DataFrameType::class.qualifiedName!!
 
         val expected = """
-            @DataSchema(isOpen = false)
+            @DataSchema
             interface $marker
             
             val $dfName<$marker>.age: $dataCol<$intName> @JvmName("${marker}_age") get() = this["age"] as $dataCol<$intName>
@@ -100,7 +100,7 @@ class ReplCodeGenTests : BaseTest() {
         code2 shouldBe ""
 
         val df3 = typed.filter { city != null }
-        val code3 = repl.process(df3).declarations
+        val code3 = repl.process(df3, isMutable = false).declarations
         val marker3 = marker + "1"
         val expected3 = """
             @DataSchema(isOpen = false)
@@ -118,7 +118,7 @@ class ReplCodeGenTests : BaseTest() {
         code4 shouldBe ""
 
         val df5 = typed.filter { weight != null }
-        val code5 = repl.process(df5).declarations
+        val code5 = repl.process(df5, isMutable = false).declarations
         val marker5 = marker + "2"
         val expected5 = """
             @DataSchema(isOpen = false)
@@ -149,7 +149,7 @@ class ReplCodeGenTests : BaseTest() {
             
         """.trimIndent()
 
-        val code = repl.process(typed).declarations.trimIndent()
+        val code = repl.process(typed, isMutable = false).declarations.trimIndent()
         code shouldBe expected
     }
 
@@ -176,7 +176,7 @@ class ReplCodeGenTests : BaseTest() {
             val $dfRowName<$marker?>.weight: $intName? @JvmName("Nullable${marker}_weight") get() = this["weight"] as $intName?
         """.trimIndent()
 
-        val code = repl.process(typed).declarations.trimIndent()
+        val code = repl.process(typed, isMutable = false).declarations.trimIndent()
         code shouldBe expected
     }