Update kotest to v6.2.0

README.md

@@ -0,0 +1,3 @@
+# Matrix
+
+TODO

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 
 # Main
 
-gradle = "9.5.0" # https://gradle.org/releases/
+gradle = "9.5.1" # https://gradle.org/releases/
 
-kotlin = "2.3.21" # https://kotlinlang.org/docs/releases.html#release-details
+kotlin = "2.4.0" # https://kotlinlang.org/docs/releases.html#release-details
 
 ktlint-library = "1.8.0" # https://github.com/pinterest/ktlint
 ktlint-plugin = "14.2.0" # https://github.com/JLLeitschuh/ktlint-gradle
@@ -13,9 +13,9 @@ memoize = "0.1" # https://gitea.davygora.duckdns.org/yura/-/packages/maven/org.d
 
 # Test
 
-kotest = "6.1.11" # https://mvnrepository.com/artifact/io.kotest/kotest-runner-junit5
+kotest = "6.2.0" # https://mvnrepository.com/artifact/io.kotest/kotest-runner-junit5
-junit = "6.0.3" # https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
+junit = "6.1.0" # https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter
-mockk = "1.14.9" # https://mvnrepository.com/artifact/io.mockk/mockk
+mockk = "1.14.11" # https://mvnrepository.com/artifact/io.mockk/mockk
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/<unknown>/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

renovate.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["config:recommended"],
+  "labels": ["dependencies"],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ]
+}

src/main/kotlin/org/duckdns/davygora/matrix/impl/MatrixExtentions.kt

@@ -0,0 +1,24 @@
+package org.duckdns.davygora.matrix.impl
+
+import org.duckdns.davygora.matrix.Matrix
+import org.duckdns.davygora.matrix.MutableMatrix
+import org.duckdns.davygora.matrix.storage.toMatrixStorage
+import org.duckdns.davygora.matrix.util.toListChecked
+
+inline fun <reified T> mutableMatrixOf(
+    xSize: Int,
+    ySize: Int,
+    vararg matrix: T,
+) = ArrayMatrix(xSize, ySize, matrix.asList().toMatrixStorage()) as MutableMatrix<T>
+
+inline fun <reified T> matrixOf(
+    xSize: Int,
+    ySize: Int,
+    vararg matrix: T,
+) = mutableMatrixOf(xSize, ySize, *matrix) as Matrix<T>
+
+inline fun <reified T> Iterable<Any>.toMatrix() = ArrayMatrix.create(this.map { it.toListChecked<T>() })
+
+inline fun <reified T> Array<Any>.toMatrix() = this.asList().toMatrix<T>()
+
+inline fun <reified T> Sequence<Any>.toMatrix() = this.toList().toMatrix<T>()

src/main/kotlin/org/duckdns/davygora/matrix/storage/BooleanStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class BooleanStorage(
-    val data: BooleanArray,
+    override val data: BooleanArray,
 ) : MatrixStorage<Boolean> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/ByteStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class ByteStorage(
-    val data: ByteArray,
+    override val data: ByteArray,
 ) : MatrixStorage<Byte> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/CharStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class CharStorage(
-    val data: CharArray,
+    override val data: CharArray,
 ) : MatrixStorage<Char> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/DoubleStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class DoubleStorage(
-    val data: DoubleArray,
+    override val data: DoubleArray,
 ) : MatrixStorage<Double> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/FloatStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class FloatStorage(
-    val data: FloatArray,
+    override val data: FloatArray,
 ) : MatrixStorage<Float> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/IntStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class IntStorage(
-    val data: IntArray,
+    override val data: IntArray,
 ) : MatrixStorage<Int> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/LongStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class LongStorage(
-    val data: LongArray,
+    override val data: LongArray,
 ) : MatrixStorage<Long> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/MatrixStorage.kt

@@ -1,6 +1,8 @@
 package org.duckdns.davygora.matrix.storage
 
 sealed interface MatrixStorage<T> {
+    val data: Any
+
     val size: Int
 
     operator fun get(index: Int): T
@@ -12,8 +14,18 @@ sealed interface MatrixStorage<T> {
 }
 
 @Suppress("UNCHECKED_CAST")
-inline fun <reified T> List<T>.toMatrixStorage() =
+inline fun <reified T> List<T>.toMatrixStorage(): MatrixStorage<T> {
-    when (T::class) {
+    firstNotNullOfOrNull { it }
+
+    val elementClass =
+        firstOrNull()
+            ?.let { first -> first::class }
+            ?.takeIf { clazz ->
+                all { it == null || it::class == clazz }
+            }
+            ?: T::class
+
+    return when (elementClass) {
         Boolean::class -> (this as List<Boolean>).toBooleanArray().toMatrixStorage()
         Byte::class -> (this as List<Byte>).toByteArray().toMatrixStorage()
         Char::class -> (this as List<Char>).toCharArray().toMatrixStorage()
@@ -24,3 +36,4 @@ inline fun <reified T> List<T>.toMatrixStorage() =
         Short::class -> (this as List<Short>).toShortArray().toMatrixStorage()
         else -> this.toTypedArray().toMatrixStorage()
     } as MatrixStorage<T>
+}

src/main/kotlin/org/duckdns/davygora/matrix/storage/ObjectStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class ObjectStorage<T>(
-    val data: Array<T>,
+    override val data: Array<T>,
 ) : MatrixStorage<T> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/storage/ShortStorage.kt

@@ -2,7 +2,7 @@ package org.duckdns.davygora.matrix.storage
 
 @JvmInline
 value class ShortStorage(
-    val data: ShortArray,
+    override val data: ShortArray,
 ) : MatrixStorage<Short> {
     override val size get() = data.size
 

src/main/kotlin/org/duckdns/davygora/matrix/util/IterableUtils.kt

@@ -0,0 +1,22 @@
+package org.duckdns.davygora.matrix.util
+
+@Suppress("UNCHECKED_CAST")
+inline fun <reified T> Any.toListChecked(): List<T> =
+    when (this) {
+        is List<*> -> this
+        is Collection<*> -> toList()
+        is Iterable<*> -> toList()
+        is Sequence<*> -> toList()
+        is Array<*> -> asList()
+        is BooleanArray -> asList()
+        is ByteArray -> asList()
+        is CharArray -> asList()
+        is DoubleArray -> asList()
+        is FloatArray -> asList()
+        is IntArray -> asList()
+        is LongArray -> asList()
+        is ShortArray -> asList()
+        else -> error("Unsupported type: ${this::class}")
+    }.also { list ->
+        require(list.all { it is T })
+    } as List<T>

src/test/kotlin/org/duckdns/davygora/matrix/storage/MatrixStorageTest.kt

@@ -0,0 +1,50 @@
+package org.duckdns.davygora.matrix.storage
+
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.datatest.withData
+import io.kotest.matchers.shouldBe
+import kotlin.reflect.KClass
+
+class MatrixStorageTest :
+    FunSpec({
+        val testCases: Map<String, Triple<List<*>, KClass<*>, KClass<*>>> =
+            mapOf(
+                "boolean" to Triple(listOf(true, false), BooleanStorage::class, BooleanArray::class),
+                "byte" to Triple((0..100).map { it.toByte() }, ByteStorage::class, ByteArray::class),
+                "char" to Triple(('a'..'z') + ('A'..'Z') + ('0'..'9'), CharStorage::class, CharArray::class),
+                "double" to Triple((0..100).map { it.toDouble() }, DoubleStorage::class, DoubleArray::class),
+                "float" to Triple((0..100).map { it.toFloat() }, FloatStorage::class, FloatArray::class),
+                "int" to Triple((0..100).map { it }, IntStorage::class, IntArray::class),
+                "long" to Triple((0..100).map { it.toLong() }, LongStorage::class, LongArray::class),
+                "short" to Triple((0..100).map { it.toShort() }, ShortStorage::class, ShortArray::class),
+                "object" to Triple((0..100).map { first -> Pair(first, (0..100).random()) }, ObjectStorage::class, Array<Any>::class),
+            )
+
+        context("list of elements of a given type should produce corresponding storage, size, get and set should work") {
+            withData(
+                testCases,
+            ) { (allowedValues, storageClass, dataClass) ->
+
+                // Arrange
+
+                val size = (10..1000).random()
+                val list = List(size) { allowedValues.random() }
+                val newList = List(size) { allowedValues.random() }
+
+                // Act
+
+                val storage = list.toMatrixStorage()
+
+                // Assert
+
+                storage::class shouldBe storageClass
+                storage.data::class shouldBe dataClass
+
+                storage.size shouldBe size
+                list.forEachIndexed { index, value -> storage[index] shouldBe value }
+
+                newList.forEachIndexed { index, value -> storage[index] = value }
+                newList.forEachIndexed { index, value -> storage[index] shouldBe value }
+            }
+        }
+    })