Add missing overloads for DataRow.containsKey()

Author: nikitinas

src/main/kotlin/org/jetbrains/kotlinx/dataframe/DataRow.kt

@@ -34,7 +34,6 @@ public interface DataRow<out T> {
     public fun getColumnGroup(columnName: String): AnyRow = get(columnName) as AnyRow
     public fun getOrNull(name: String): Any?
     public fun <R> getValueOrNull(column: ColumnReference<R>): R?
-    public fun containsKey(name: String): Boolean
 
     // endregion
 

src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt

@@ -82,7 +82,7 @@ public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGro
 
 // region containsColumn
 
-public fun ColumnsContainer<*>.containsColumn(column: Column): Boolean = containsColumn(column.path())
+public fun <C> ColumnsContainer<*>.containsColumn(column: ColumnReference<C>): Boolean = getColumnOrNull(column) != null
 public fun ColumnsContainer<*>.containsColumn(column: KProperty<*>): Boolean = containsColumn(column.columnName)
 
 public operator fun ColumnsContainer<*>.contains(column: Column): Boolean = containsColumn(column)

src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataRowApi.kt

@@ -2,6 +2,7 @@ package org.jetbrains.kotlinx.dataframe.api
 
 import org.jetbrains.kotlinx.dataframe.AnyFrame
 import org.jetbrains.kotlinx.dataframe.AnyRow
+import org.jetbrains.kotlinx.dataframe.Column
 import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.DataRow
@@ -33,13 +34,28 @@ public inline fun <reified R> AnyRow.namedValuesOf(): List<NameValuePair<R>> =
 public fun AnyRow.namedValues(): List<NameValuePair<Any?>> =
     values().zip(columnNames()) { value, name -> NameValuePair(name, value) }
 
+// region getValue
+
 public fun <T> AnyRow.getValue(columnName: String): T = get(columnName) as T
 public fun <T> AnyRow.getValue(column: ColumnReference<T>): T = get(column)
 public fun <T> AnyRow.getValue(column: KProperty<T>): T = get(column)
 
 public fun <T> AnyRow.getValueOrNull(columnName: String): T? = getOrNull(columnName) as T?
 public fun <T> AnyRow.getValueOrNull(column: KProperty<T>): T? = getValueOrNull<T>(column.columnName)
 
+// endregion
+
+// region contains
+
+public fun AnyRow.containsKey(columnName: String): Boolean = owner.containsColumn(columnName)
+public fun AnyRow.containsKey(column: Column): Boolean = owner.containsColumn(column)
+public fun AnyRow.containsKey(column: KProperty<*>): Boolean = owner.containsColumn(column)
+
+public operator fun AnyRow.contains(column: Column): Boolean = containsKey(column)
+public operator fun AnyRow.contains(column: KProperty<*>): Boolean = containsKey(column)
+
+// endregion
+
 @OptIn(ExperimentalTypeInference::class)
 @OverloadResolutionByLambdaReturnType
 public fun <T> DataRow<T>.diff(expression: RowExpression<T, Double>): Double? = prev()?.let { p -> expression(this, this) - expression(p, p) }

src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/DataRowImpl.kt

@@ -54,8 +54,6 @@ internal open class DataRowImpl<T>(private val index: Int, private val df: DataF
         ColumnAccessTracker.registerColumnAccess(name)
         return df.getColumnOrNull(name)?.get(index)
     }
-
-    override fun containsKey(name: String): Boolean = df.containsColumn(name)
 }
 
 internal val <T> DataRow<T>.owner: DataFrame<T> get() = df()

src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/contains.kt

@@ -41,4 +41,24 @@ class ContainsTests {
         val df = dataFrameOf("a")(1, 2).group("a").into("g")
         (a in df) shouldBe true
     }
+
+    @Test
+    fun `row contains key`() {
+        val a by column<Int>()
+        val b by column<Int>()
+        data class A(val a: Int, val b: Int)
+
+        val df = dataFrameOf("a")(1, 2)
+        val row = df[0]
+
+        row.containsKey("a") shouldBe true
+        row.containsKey(a) shouldBe true
+        row.containsKey(A::a) shouldBe true
+        (A::a in row) shouldBe true
+        (a in row) shouldBe true
+
+        row.containsKey("b") shouldBe false
+        row.containsKey(b) shouldBe false
+        row.containsKey(A::b) shouldBe false
+    }
 }