Inctoduce abstraction for validated elements

Author: OptimumCode

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/FormatValidator.kt

@@ -1,5 +1,6 @@
 package io.github.optimumcode.json.schema
 
+import io.github.optimumcode.json.schema.model.AbstractElement
 import kotlinx.serialization.json.JsonElement
 import kotlin.jvm.JvmStatic
 
@@ -16,7 +17,7 @@ public interface FormatValidator {
    * @param element JSON element to validate against the expected format
    * @return the result of the validation
    */
-  public fun validate(element: JsonElement): FormatValidationResult
+  public fun validate(element: AbstractElement): FormatValidationResult
 
   public companion object {
     @Suppress("ktlint:standard:function-naming", "FunctionName")

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/JsonSchema.kt

@@ -6,6 +6,7 @@ import io.github.optimumcode.json.schema.internal.DefaultAssertionContext
 import io.github.optimumcode.json.schema.internal.DefaultReferenceResolver
 import io.github.optimumcode.json.schema.internal.IsolatedLoader
 import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
+import io.github.optimumcode.json.schema.internal.wrapper.wrap
 import kotlinx.serialization.json.JsonElement
 import kotlin.jvm.JvmOverloads
 import kotlin.jvm.JvmStatic
@@ -31,7 +32,7 @@ public class JsonSchema internal constructor(
   ): Boolean {
     val context = DefaultAssertionContext(JsonPointer.ROOT, referenceResolver)
     return DelegateOutputCollector(errorCollector).use {
-      assertion.validate(value, context, this)
+      assertion.validate(value.wrap(), context, this)
     }
   }
 
@@ -49,7 +50,7 @@ public class JsonSchema internal constructor(
     val context = DefaultAssertionContext(JsonPointer.ROOT, referenceResolver)
     val collector = outputCollectorProvider.get()
     collector.use {
-      assertion.validate(value, context, this)
+      assertion.validate(value.wrap(), context, this)
     }
     return collector.output
   }

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/extension/ExternalAssertion.kt

@@ -1,7 +1,7 @@
 package io.github.optimumcode.json.schema.extension
 
 import io.github.optimumcode.json.schema.ErrorCollector
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 /**
  * This interface allows you to implement your own schema assertion.
@@ -25,7 +25,7 @@ public interface ExternalAssertion {
    * @return `true` if element is valid against assertion. Otherwise, returns `false`
    */
   public fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: ExternalAssertionContext,
     errorCollector: ErrorCollector,
   ): Boolean

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/BooleanSchemaAssertion.kt

@@ -3,13 +3,13 @@ package io.github.optimumcode.json.schema.internal
 import io.github.optimumcode.json.pointer.JsonPointer
 import io.github.optimumcode.json.schema.OutputCollector
 import io.github.optimumcode.json.schema.ValidationError
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 internal class FalseSchemaAssertion(
   private val path: JsonPointer,
 ) : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {
@@ -28,7 +28,7 @@ internal class FalseSchemaAssertion(
 
 internal object TrueSchemaAssertion : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/JsonSchemaAssertion.kt

@@ -1,7 +1,7 @@
 package io.github.optimumcode.json.schema.internal
 
 import io.github.optimumcode.json.schema.OutputCollector
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 internal interface JsonSchemaAssertion {
   /**
@@ -20,7 +20,7 @@ internal interface JsonSchemaAssertion {
    * @return `true` if element is valid against assertion. Otherwise, returns `false`
    */
   fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/JsonSchemaRoot.kt

@@ -3,7 +3,7 @@ package io.github.optimumcode.json.schema.internal
 import com.eygraber.uri.Uri
 import io.github.optimumcode.json.pointer.JsonPointer
 import io.github.optimumcode.json.schema.OutputCollector
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 internal class JsonSchemaRoot(
   private val scopeId: Uri,
@@ -12,7 +12,7 @@ internal class JsonSchemaRoot(
   private val canBeReferencedRecursively: Boolean,
 ) : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/RecursiveRefSchemaAssertion.kt

@@ -5,14 +5,14 @@ import io.github.optimumcode.json.pointer.plus
 import io.github.optimumcode.json.pointer.relative
 import io.github.optimumcode.json.schema.AbsoluteLocation
 import io.github.optimumcode.json.schema.OutputCollector
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 internal class RecursiveRefSchemaAssertion(
   private val basePath: JsonPointer,
   private val refId: RefId,
 ) : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/RefSchemaAssertion.kt

@@ -6,7 +6,7 @@ import io.github.optimumcode.json.pointer.plus
 import io.github.optimumcode.json.pointer.relative
 import io.github.optimumcode.json.schema.AbsoluteLocation
 import io.github.optimumcode.json.schema.OutputCollector
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
 
 internal class RefSchemaAssertion(
   private val basePath: JsonPointer,
@@ -17,7 +17,7 @@ internal class RefSchemaAssertion(
   private lateinit var refAbsolutePath: Uri
 
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/factories/ExternalAssertionFactoryAdapter.kt

@@ -7,6 +7,7 @@ import io.github.optimumcode.json.schema.extension.ExternalAssertionFactory
 import io.github.optimumcode.json.schema.internal.AssertionContext
 import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
 import io.github.optimumcode.json.schema.internal.LoadingContext
+import io.github.optimumcode.json.schema.model.AbstractElement
 import kotlinx.serialization.json.JsonElement
 
 internal class ExternalAssertionFactoryAdapter(
@@ -25,7 +26,7 @@ private class ExternalAssertionAdapter(
   private val externalAssertion: ExternalAssertion,
 ) : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean =

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/factories/array/AdditionalItemsAssertion.kt

@@ -5,8 +5,8 @@ import io.github.optimumcode.json.schema.AnnotationKey
 import io.github.optimumcode.json.schema.OutputCollector
 import io.github.optimumcode.json.schema.internal.AssertionContext
 import io.github.optimumcode.json.schema.internal.JsonSchemaAssertion
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
+import io.github.optimumcode.json.schema.model.AbstractElement
+import io.github.optimumcode.json.schema.model.ArrayElement
 
 internal class AdditionalItemsAssertion(
   private val location: JsonPointer,
@@ -16,12 +16,12 @@ internal class AdditionalItemsAssertion(
   private val returnIfNoIndex: Boolean,
 ) : JsonSchemaAssertion {
   override fun validate(
-    element: JsonElement,
+    element: AbstractElement,
     context: AssertionContext,
     errorCollector: OutputCollector<*>,
   ): Boolean {
     return errorCollector.updateKeywordLocation(location).use {
-      if (element !is JsonArray) {
+      if (element !is ArrayElement) {
         return@use true
       }
       val lastProcessedIndex: Int =