Add support for Char type

Author: OptimumCode

json-schema-validator-objects/src/commonMain/kotlin/io/github/optimumcode/json/schema/objects/wrapper/Wrappers.kt

@@ -14,12 +14,28 @@ import kotlin.jvm.JvmOverloads
 
 @ExperimentalApi
 public class WrappingConfiguration internal constructor(
+  /**
+   * If set to `false` an exception is thrown when wrapping a [Set].
+   * If set to `true`, [Set] is wrapped the same way as [List]
+   */
   public val allowSets: Boolean = false,
+  /**
+   * If set to `false` the [Char] is converted to [String].
+   * If set to `true` the [Char] is converted to a codepoint (and then to [Long])
+   */
+  public val charAsCodepoint: Boolean = false,
 )
 
 @ExperimentalApi
 @JvmOverloads
-public fun wrappingConfiguration(allowSets: Boolean = false): WrappingConfiguration = WrappingConfiguration(allowSets)
+public fun wrappingConfiguration(
+  allowSets: Boolean = false,
+  charAsCodepoint: Boolean = false,
+): WrappingConfiguration =
+  WrappingConfiguration(
+    allowSets = allowSets,
+    charAsCodepoint = charAsCodepoint,
+  )
 
 /**
  * Returns an [AbstractElement] produced by converting the [obj] value.
@@ -36,6 +52,7 @@ public fun wrappingConfiguration(allowSets: Boolean = false): WrappingConfigurat
  * * [Float]
  * * [Double]
  * * [Boolean]
+ * * [Char]
  * * `null`
  *
  * ## Structures:
@@ -47,6 +64,7 @@ public fun wrappingConfiguration(allowSets: Boolean = false): WrappingConfigurat
  * Please be aware that in order to have consistent verification results
  * the [Set] must be one of the ORDERED types, e.g. [LinkedHashSet].
  */
+@JvmOverloads
 @ExperimentalApi
 public fun wrapAsElement(
   obj: Any?,
@@ -62,11 +80,13 @@ public fun wrapAsElement(
     obj is Set<*> && configuration.allowSets ->
       ListWrapper(obj.map { wrapAsElement(it, configuration) })
 
-    obj is String || obj is Number || obj is Boolean -> PrimitiveWrapper(numberToSupportedTypeOrOriginal(obj))
+    isPrimitive(obj) -> PrimitiveWrapper(convertToSupportedType(obj, configuration))
     else -> error("unsupported type to wrap: ${obj::class}")
   }
 }
 
+private fun isPrimitive(obj: Any): Boolean = obj is String || obj is Number || obj is Boolean || obj is Char
+
 /**
  * Returns `true` if the [value] is an integer ([Byte], [Short], [Int], [Long]).
  * Otherwise, returns `false`.
@@ -76,9 +96,17 @@ public fun wrapAsElement(
  */
 internal expect fun isInteger(value: Number): Boolean
 
-private fun numberToSupportedTypeOrOriginal(obj: Any): Any =
+private fun convertToSupportedType(
+  obj: Any,
+  configuration: WrappingConfiguration,
+): Any =
   when {
-    obj !is Number -> obj
+    obj !is Number ->
+      if (obj is Char) {
+        if (configuration.charAsCodepoint) obj.code.toLong() else obj.toString()
+      } else {
+        obj
+      }
     obj is Long -> obj
     isInteger(obj) -> obj.toLong()
     obj is Double -> obj

json-schema-validator-objects/src/commonTest/kotlin/io/github/optimumcode/json/schema/objects/wrapper/WrappersTest.kt

@@ -36,6 +36,7 @@ class WrappersTest : FunSpec() {
       listOf<Any>() to ArrayElement::class,
       emptyArray<Any>() to ArrayElement::class,
       "test" to PrimitiveElement::class,
+      't' to PrimitiveElement::class,
       42 to PrimitiveElement::class,
       42L to PrimitiveElement::class,
       42.2 to PrimitiveElement::class,
@@ -76,7 +77,7 @@ class WrappersTest : FunSpec() {
       }
     }
 
-    test("primitive wrapper for number") {
+    test("primitive wrapper for integer number") {
       wrapAsElement(42).shouldBeInstanceOf<PrimitiveElement> { el ->
         assertSoftly {
           "isString".asClue { el.isString.shouldBeFalse() }
@@ -90,6 +91,20 @@ class WrappersTest : FunSpec() {
       }
     }
 
+    test("primitive wrapper for floating number") {
+      wrapAsElement(42.5).shouldBeInstanceOf<PrimitiveElement> { el ->
+        assertSoftly {
+          "isString".asClue { el.isString.shouldBeFalse() }
+          "isNumber".asClue { el.isNumber.shouldBeTrue() }
+          "isBoolean".asClue { el.isBoolean.shouldBeFalse() }
+          "isNull".asClue { el.isNull.shouldBeFalse() }
+          "content".asClue { el.content shouldBe "42.5" }
+          "longOrNull".asClue { el.longOrNull.shouldBeNull() }
+          "doubleOrNull".asClue { el.doubleOrNull shouldBe 42.5 }
+        }
+      }
+    }
+
     test("primitive wrapper for string") {
       wrapAsElement("42").shouldBeInstanceOf<PrimitiveElement> { el ->
         assertSoftly {
@@ -104,6 +119,35 @@ class WrappersTest : FunSpec() {
       }
     }
 
+    test("primitive wrapper for char") {
+      wrapAsElement('4').shouldBeInstanceOf<PrimitiveElement> { el ->
+        assertSoftly {
+          "isString".asClue { el.isString.shouldBeTrue() }
+          "isNumber".asClue { el.isNumber.shouldBeFalse() }
+          "isBoolean".asClue { el.isBoolean.shouldBeFalse() }
+          "isNull".asClue { el.isNull.shouldBeFalse() }
+          "content".asClue { el.content shouldBe "4" }
+          "longOrNull".asClue { el.longOrNull.shouldBeNull() }
+          "doubleOrNull".asClue { el.doubleOrNull.shouldBeNull() }
+        }
+      }
+    }
+
+    test("primitive wrapper for char as codepoint") {
+      wrapAsElement('4', wrappingConfiguration(charAsCodepoint = true))
+        .shouldBeInstanceOf<PrimitiveElement> { el ->
+          assertSoftly {
+            "isString".asClue { el.isString.shouldBeFalse() }
+            "isNumber".asClue { el.isNumber.shouldBeTrue() }
+            "isBoolean".asClue { el.isBoolean.shouldBeFalse() }
+            "isNull".asClue { el.isNull.shouldBeFalse() }
+            "content".asClue { el.content shouldBe "52" }
+            "longOrNull".asClue { el.longOrNull shouldBe 52L }
+            "doubleOrNull".asClue { el.doubleOrNull.shouldBeNull() }
+          }
+        }
+    }
+
     test("object wrapper") {
       wrapAsElement(
         buildMap {