Fixed ByteArrayParcel implementation

chRyNaN · Sep 12, 2022 · 245a081 · 245a081
1 parent 48b87e8
commit 245a081
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 70 deletions.
diff --git a/parcelable-core/build.gradle.kts b/parcelable-core/build.gradle.kts
@@ -19,7 +19,11 @@ kotlin {
         android()
         jvm()
         js(BOTH) {
-            browser()
+            browser {
+                testTask {
+                    useKarma { useFirefox() }
+                }
+            }
             nodejs()
         }
         ios()
@@ -31,6 +35,11 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
             }
         }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
         val iosMain by sourceSets.getting
         val iosSimulatorArm64Main by sourceSets.getting
         iosSimulatorArm64Main.dependsOn(iosMain)

diff --git a/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/ByteArrayParcel.kt b/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/ByteArrayParcel.kt
@@ -1,7 +1,5 @@
 package com.chrynan.parcelable.core
 
-import kotlin.experimental.and
-
 /**
  * A [Parcel] implementation that stores its underlying data into a [ByteArray].
  *
@@ -118,43 +116,43 @@ class ByteArrayParcel internal constructor(initial: ByteArray = byteArrayOf()) :
     override fun writeShort(value: Short) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeInt(value: Int) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeLong(value: Long) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeFloat(value: Float) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeDouble(value: Double) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeChar(value: Char) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun writeString(value: String) {
         data.add(dataPosition, value.toByteArray())
 
-        dataPosition
+        dataPosition++
     }
 
     override fun recycle() {
@@ -172,7 +170,7 @@ class ByteArrayParcel internal constructor(initial: ByteArray = byteArrayOf()) :
         }
 
         data.forEach { dataItemArray ->
-            byteList.size.toByteArray().forEach {
+            dataItemArray.size.toByteArray().forEach {
                 byteList.add(it)
             }
 
@@ -186,22 +184,25 @@ class ByteArrayParcel internal constructor(initial: ByteArray = byteArrayOf()) :
 
     private fun setDataFromByteArray(value: ByteArray) {
         data.clear()
+        dataPosition = 0
 
         if (value.size >= 4) {
-            val size = value.copyOfRange(fromIndex = 0, toIndex = 4).toIntValue()
+            val dataListSize = value.copyOfRange(fromIndex = 0, toIndex = 4).toIntValue()
 
-            if (size > 0) {
+            if (dataListSize > 0) {
                 var i = 4
 
                 while (i < value.size) {
-                    val s = value.copyOfRange(fromIndex = i, toIndex = i + 4).toIntValue()
+                    val subListSize = value.copyOfRange(fromIndex = i, toIndex = i + 4).toIntValue()
 
                     i += 4
 
-                    if (s > 0) {
-                        data.add(value.copyOfRange(fromIndex = i, toIndex = i + s))
+                    if (subListSize > 0) {
+                        data.add(value.copyOfRange(fromIndex = i, toIndex = i + subListSize))
 
-                        i += s
+                        i += subListSize
+                    } else {
+                        data.add(byteArrayOf())
                     }
                 }
             }
@@ -212,35 +213,9 @@ class ByteArrayParcel internal constructor(initial: ByteArray = byteArrayOf()) :
 
     private fun Short.toByteArray(): ByteArray = toInt().toByteArray()
 
-    private fun Int.toByteArray(): ByteArray {
-        val size = Int.SIZE_BYTES
-        val result = ByteArray(size)
-        var l = this
-
-        for (i in size - 1 downTo 0) {
-            result[i] = (l and 0xFF).toByte()
-            l = l shr size
-        }
-
-        return result
-    }
-
-    private fun Long.toByteArray(): ByteArray {
-        val size = Long.SIZE_BYTES
-        val result = ByteArray(size)
-        var l = this
-
-        for (i in size - 1 downTo 0) {
-            result[i] = (l and 0xFF).toByte()
-            l = l shr size
-        }
-
-        return result
-    }
-
     private fun Float.toByteArray(): ByteArray = toRawBits().toByteArray()
 
-    private fun Double.toByteArray(): ByteArray = toRawBits().toByteArray()
+    private fun Double.toByteArray(): ByteArray = toBits().toByteArray()
 
     @Suppress("DEPRECATION")
     private fun Char.toByteArray(): ByteArray = toInt().toByteArray()
@@ -251,28 +226,6 @@ class ByteArrayParcel internal constructor(initial: ByteArray = byteArrayOf()) :
 
     private fun ByteArray.toShortValue(): Short = toIntValue().toShort()
 
-    private fun ByteArray.toIntValue(): Int {
-        var result = 0
-
-        for (i in 0 until Int.SIZE_BYTES) {
-            result = result shl Int.SIZE_BYTES
-            result = (result or (this[i] and 0xFF.toByte()).toInt())
-        }
-
-        return result
-    }
-
-    private fun ByteArray.toLongValue(): Long {
-        var result = 0L
-
-        for (i in 0 until Long.SIZE_BYTES) {
-            result = result shl Long.SIZE_BYTES
-            result = (result or (this[i] and 0xFF.toByte()).toLong())
-        }
-
-        return result
-    }
-
     private fun ByteArray.toFloatValue(): Float = Float.fromBits(toIntValue())
 
     private fun ByteArray.toDoubleValue(): Double = Double.fromBits(toLongValue())

diff --git a/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/NumberUtils.kt b/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/NumberUtils.kt
@@ -0,0 +1,66 @@
+package com.chrynan.parcelable.core
+
+import kotlin.experimental.and
+
+/**
+ * Converts this [Int] value into a [ByteArray] representation.
+ */
+internal fun Int.toByteArray(): ByteArray {
+    val result = ByteArray(Int.SIZE_BYTES)
+    var value = this
+
+    for (i in Int.SIZE_BYTES - 1 downTo 0) {
+        result[i] = (value and 0xFF).toByte()
+        value = value shr Byte.SIZE_BITS
+    }
+
+    return result
+}
+
+/**
+ * Converts this [Long] value into a [ByteArray] representation.
+ */
+internal fun Long.toByteArray(): ByteArray {
+    val result = ByteArray(Long.SIZE_BYTES)
+    var value = this
+
+    for (i in 0 until Long.SIZE_BYTES) {
+        result[Long.SIZE_BYTES - i - 1] = (value and 0xFF).toByte()
+        value = value ushr Byte.SIZE_BITS
+    }
+
+    return result
+}
+
+/**
+ * Converts this [ByteArray] representation of a [Long] value into a [Long] value.
+ */
+internal fun ByteArray.toLongValue(): Long {
+    require(this.size == Long.SIZE_BYTES) { "ByteArray must have a size of 8 to convert to a Long." }
+
+    var result = 0L
+
+    for (i in 0 until Long.SIZE_BYTES) {
+        result = result shl Byte.SIZE_BITS
+        result = (result or (this[i].toLong() and 0xFF))
+    }
+
+    return result
+}
+
+/**
+ * Converts this [ByteArray] representation of an [Int] value into an [Int] value.
+ *
+ * **Note:** This function is not safe for use outside this library as it doesn't expose, make guarantees about, or
+ * provide a way to change the endianness ordering.
+ */
+internal fun ByteArray.toIntValue(): Int {
+    var result = 0
+
+    for (i in 0 until Int.SIZE_BYTES) {
+        result = result shl Byte.SIZE_BITS
+        result = (result or (this[i] and 0xFF.toByte()).toInt())
+    }
+
+    return result
+}
diff --git a/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/Parcelable.kt b/parcelable-core/src/commonMain/kotlin/com/chrynan/parcelable/core/Parcelable.kt
@@ -68,7 +68,8 @@ sealed class Parcelable(internal val configuration: ParcelableConfiguration) : S
      * @return The decoded value of [T].
      */
     fun <T> decodeFromParcel(parcel: Parcel, deserializer: DeserializationStrategy<T>): T {
-        val decoder = ParcelDecoder(serializersModule = serializersModule, input = parcel)
+        val newParcel = Parcel(parcel.toByteArray())
+        val decoder = ParcelDecoder(serializersModule = serializersModule, input = newParcel)
         return decoder.decodeSerializableValue(deserializer)
     }
 }

diff --git a/parcelable-core/src/commonTest/kotlin/com.chrynan.parcelable.core/NumberUtilsTest.kt b/parcelable-core/src/commonTest/kotlin/com.chrynan.parcelable.core/NumberUtilsTest.kt
@@ -0,0 +1,16 @@
+package com.chrynan.parcelable.core
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class NumberUtilsTest {
+
+    @Test
+    fun longConversionShouldWork() {
+        val longValue = 500_000L
+
+        val byteArray = longValue.toByteArray()
+
+        assertEquals(expected = longValue, actual = byteArray.toLongValue())
+    }
+}
diff --git a/...e-compose/src/androidMain/kotlin/com.chrynan.parcelable.sample.compose/AndroidJsonText.kt b/...e-compose/src/androidMain/kotlin/com.chrynan.parcelable.sample.compose/AndroidJsonText.kt
@@ -27,7 +27,7 @@ actual fun AnnotatedString.Builder.appendJsonText(
                 JsonGrammar.Token.PUNCTUATION -> builder.pushStyle(SpanStyle(color = colors.punctuationColor))
                 JsonGrammar.Token.STRING -> builder.pushStyle(SpanStyle(color = colors.stringColor))
                 JsonGrammar.Token.NUMBER -> builder.pushStyle(SpanStyle(color = colors.numberColor))
-                JsonGrammar.Token.PROPERTY -> builder.pushStyle(SpanStyle())
+                JsonGrammar.Token.PROPERTY -> builder.pushStyle(SpanStyle(color = colors.propertyColor))
                 JsonGrammar.Token.NULL -> builder.pushStyle(SpanStyle(color = colors.nullColor))
                 else -> {}
             }

diff --git a/sample-compose/src/commonMain/kotlin/com.chrynan.parcelable.sample.compose/MainView.kt b/sample-compose/src/commonMain/kotlin/com.chrynan.parcelable.sample.compose/MainView.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import com.chrynan.parcelable.compose.rememberSavable
 import com.chrynan.parcelable.core.Parcel
-import com.chrynan.parcelable.core.encodeToParcel
 import com.chrynan.parcelable.sample.core.ExpectedModel
 import com.chrynan.parcelable.sample.core.Model
 import com.chrynan.parcelable.sample.core.SerializerUtils

diff --git a/sample-compose/src/jvmMain/kotlin/com.chrynan.parcelable.sample.compose/JvmJsonText.kt b/sample-compose/src/jvmMain/kotlin/com.chrynan.parcelable.sample.compose/JvmJsonText.kt
@@ -27,7 +27,7 @@ actual fun AnnotatedString.Builder.appendJsonText(
                 JsonGrammar.Token.PUNCTUATION -> builder.pushStyle(SpanStyle(color = colors.punctuationColor))
                 JsonGrammar.Token.STRING -> builder.pushStyle(SpanStyle(color = colors.stringColor))
                 JsonGrammar.Token.NUMBER -> builder.pushStyle(SpanStyle(color = colors.numberColor))
-                JsonGrammar.Token.PROPERTY -> builder.pushStyle(SpanStyle())
+                JsonGrammar.Token.PROPERTY -> builder.pushStyle(SpanStyle(color = colors.propertyColor))
                 JsonGrammar.Token.NULL -> builder.pushStyle(SpanStyle(color = colors.nullColor))
                 else -> {}
             }