🎨 improve code readability by simplifying conditional expressions and comments

Author: techouse

qs-kotlin/src/main/kotlin/io/github/techouse/qskotlin/Decoder.kt

@@ -122,9 +122,10 @@ internal object Decoder {
                             if (obj.containsKey(key) && obj[key] is List<*>) {
                                 (obj[key] as List<*>).size
                             } else 0,
-                        ),
-                        { v: Any? -> options.getDecoder((v as String?), charset) },
-                    )
+                        )
+                    ) { v: Any? ->
+                        options.getDecoder((v as String?), charset)
+                    }
             }
 
             if (
@@ -135,10 +136,8 @@ internal object Decoder {
             ) {
                 value =
                     Utils.interpretNumericEntities(
-                        when (value) {
-                            is Iterable<*> -> value.joinToString(",") { it.toString() }
-                            else -> value.toString()
-                        }
+                        if (value is Iterable<*>) value.joinToString(",") { it.toString() }
+                        else value.toString()
                     )
             }
 
@@ -299,14 +298,11 @@ internal object Decoder {
         maxDepth: Int,
         strictDepth: Boolean,
     ): List<String> {
-        // Apply dot→bracket *before* splitting, but when depth == 0 we do NOT split at all and do
+        // Apply dot→bracket *before* splitting, but when depth == 0, we do NOT split at all and do
         // NOT throw.
-        val key =
-            if (allowDots) {
-                originalKey.replace(DOT_TO_BRACKET) { "[${it.groupValues[1]}]" }
-            } else {
-                originalKey
-            }
+        val key: String =
+            if (allowDots) originalKey.replace(DOT_TO_BRACKET) { "[${it.groupValues[1]}]" }
+            else originalKey
 
         // Depth 0 semantics: use the original key as a single segment; never throw.
         if (maxDepth <= 0) {
@@ -330,13 +326,13 @@ internal object Decoder {
         }
 
         if (open >= 0) {
-            // When depth > 0, strictDepth can apply to remainder.
+            // When depth > 0, strictDepth can apply to the remainder.
             if (strictDepth) {
                 throw IndexOutOfBoundsException(
                     "Input depth exceeded depth option of $maxDepth and strictDepth is true"
                 )
             }
-            // Stash remainder as a single segment (qs behavior).
+            // Stash the remainder as a single segment.
             segments.add("[" + key.substring(open) + "]")
         }
 

qs-kotlin/src/main/kotlin/io/github/techouse/qskotlin/Encoder.kt

@@ -19,7 +19,7 @@ internal object Encoder {
     /**
      * Encodes the given data into a query string format.
      *
-     * @param data The data to encode, can be any type.
+     * @param data The data to encode; can be any type.
      * @param undefined If true, will not encode undefined values.
      * @param sideChannel A mutable map for tracking cyclic references.
      * @param prefix An optional prefix for the encoded string.
@@ -126,10 +126,7 @@ internal object Encoder {
             return when {
                 (encoder != null) -> {
                     val keyValue: String =
-                        when {
-                            encodeValuesOnly -> prefix
-                            else -> encoder(prefix, null, null)
-                        }
+                        if (encodeValuesOnly) prefix else encoder(prefix, null, null)
 
                     "${formatter(keyValue)}=${formatter(encoder(obj, null, null))}"
                 }
@@ -180,17 +177,11 @@ internal object Encoder {
                 }
             }
 
-        val encodedPrefix: String =
-            when {
-                encodeDotInKeys -> prefix.replace(".", "%2E")
-                else -> prefix
-            }
+        val encodedPrefix: String = if (encodeDotInKeys) prefix.replace(".", "%2E") else prefix
 
         val adjustedPrefix: String =
-            when {
-                (commaRoundTrip && obj is Iterable<*> && obj.count() == 1) -> "$encodedPrefix[]"
-                else -> encodedPrefix
-            }
+            if ((commaRoundTrip && obj is Iterable<*> && obj.count() == 1)) "$encodedPrefix[]"
+            else encodedPrefix
 
         if (allowEmptyLists && obj is Iterable<*> && !obj.iterator().hasNext()) {
             return "$adjustedPrefix[]"
@@ -239,16 +230,12 @@ internal object Encoder {
             }
 
             val encodedKey: String =
-                when {
-                    (allowDots && encodeDotInKeys) -> key.toString().replace(".", "%2E")
-                    else -> key.toString()
-                }
+                if ((allowDots && encodeDotInKeys)) key.toString().replace(".", "%2E")
+                else key.toString()
 
             val keyPrefix: String =
-                when {
-                    obj is Iterable<*> -> generateArrayPrefix(adjustedPrefix, encodedKey)
-                    else -> "$adjustedPrefix${if (allowDots) ".$encodedKey" else "[$encodedKey]"}"
-                }
+                if (obj is Iterable<*>) generateArrayPrefix(adjustedPrefix, encodedKey)
+                else "$adjustedPrefix${if (allowDots) ".$encodedKey" else "[$encodedKey]"}"
 
             // Record the current container in this frame so children can detect cycles.
             if (obj is Map<*, *> || obj is Iterable<*>) {