Optimize error transformation

Author: OptimumCode

src/commonMain/kotlin/io/github/optimumcode/json/schema/OutputCollector.kt

@@ -6,11 +6,29 @@ import io.github.optimumcode.json.schema.ValidationOutput.Verbose
 
 internal typealias OutputErrorTransformer<T> = OutputCollector<T>.(ValidationError) -> ValidationError?
 
+private val NO_TRANSFORMATION: OutputErrorTransformer<*> = { it }
+
 public sealed class OutputCollector<T> private constructor(
-  protected open val parent: OutputCollector<T>? = null,
-  protected val transformer: OutputErrorTransformer<T> = { it },
+  parent: OutputCollector<T>? = null,
+  transformer: OutputErrorTransformer<T> = NO_TRANSFORMATION,
 ) : ErrorCollector {
   public abstract val output: T
+  private val transformerFunc: OutputErrorTransformer<T> =
+    parent?.let { p ->
+      when {
+        transformer === NO_TRANSFORMATION && p.transformerFunc === NO_TRANSFORMATION
+        -> NO_TRANSFORMATION
+        transformer === NO_TRANSFORMATION
+        -> p.transformerFunc
+        p.transformerFunc === NO_TRANSFORMATION
+        -> transformer
+        else -> {
+          { err ->
+            transformer(err)?.let { p.transformError(it) }
+          }
+        }
+      }
+    } ?: transformer
 
   internal abstract fun updateLocation(path: JsonPointer): OutputCollector<T>
 
@@ -29,17 +47,7 @@ public sealed class OutputCollector<T> private constructor(
       reportErrors()
     }
 
-  internal fun transformError(error: ValidationError): ValidationError? {
-    return transformer(error)?.let {
-      parent.let { p ->
-        if (p == null) {
-          it
-        } else {
-          p.transformError(it)
-        }
-      }
-    }
-  }
+  protected fun transformError(error: ValidationError): ValidationError? = transformerFunc(error)
 
   internal data object Empty : OutputCollector<Nothing>() {
     override val output: Nothing
@@ -58,8 +66,8 @@ public sealed class OutputCollector<T> private constructor(
 
   internal class DelegateOutputCollector(
     private val errorCollector: ErrorCollector,
-    override val parent: DelegateOutputCollector? = null,
-    transformer: OutputErrorTransformer<Nothing> = { it },
+    private val parent: DelegateOutputCollector? = null,
+    transformer: OutputErrorTransformer<Nothing> = NO_TRANSFORMATION,
   ) : OutputCollector<Nothing>(parent, transformer) {
     private val reportedErrors = mutableListOf<ValidationError>()
 
@@ -85,12 +93,12 @@ public sealed class OutputCollector<T> private constructor(
         ?: reportedErrors.forEach(errorCollector::onError)
     }
 
-    override fun childCollector(): OutputCollector<Nothing> = DelegateOutputCollector(errorCollector, this, transformer)
+    override fun childCollector(): OutputCollector<Nothing> = DelegateOutputCollector(errorCollector, this)
   }
 
   public class Flag private constructor(
-    override val parent: Flag? = null,
-    transformer: OutputErrorTransformer<ValidationOutput.Flag> = { it },
+    private val parent: Flag? = null,
+    transformer: OutputErrorTransformer<ValidationOutput.Flag> = NO_TRANSFORMATION,
   ) : OutputCollector<ValidationOutput.Flag>(parent, transformer) {
     private var valid: Boolean = true
     override val output: ValidationOutput.Flag
@@ -128,8 +136,8 @@ public sealed class OutputCollector<T> private constructor(
   public class Detailed private constructor(
     private val location: JsonPointer = JsonPointer.ROOT,
     private val keywordLocation: JsonPointer = JsonPointer.ROOT,
-    override val parent: Detailed? = null,
-    transformer: OutputErrorTransformer<ValidationOutput.Detailed> = { it },
+    private val parent: Detailed? = null,
+    transformer: OutputErrorTransformer<ValidationOutput.Detailed> = NO_TRANSFORMATION,
   ) : OutputCollector<ValidationOutput.Detailed>(parent, transformer) {
     private val errors: MutableList<ValidationOutput.Detailed> = mutableListOf()
 
@@ -189,8 +197,8 @@ public sealed class OutputCollector<T> private constructor(
   public class Verbose private constructor(
     private val location: JsonPointer = JsonPointer.ROOT,
     private val keywordLocation: JsonPointer = JsonPointer.ROOT,
-    override val parent: Verbose? = null,
-    transformer: OutputErrorTransformer<ValidationOutput.Verbose> = { it },
+    private val parent: Verbose? = null,
+    transformer: OutputErrorTransformer<ValidationOutput.Verbose> = NO_TRANSFORMATION,
   ) : OutputCollector<ValidationOutput.Verbose>(parent, transformer) {
     private val errors: MutableList<ValidationOutput.Verbose> = mutableListOf()
 

src/commonMain/kotlin/io/github/optimumcode/json/schema/ValidationError.kt

@@ -26,5 +26,10 @@ public data class ValidationError(
   /**
    * The absolute path to triggered assertion if the $ref was used
    */
-  val absoluteLocation: Uri? = null,
+  val absoluteLocation: AbsoluteLocation? = null,
+)
+
+public data class AbsoluteLocation(
+  val uri: Uri,
+  val path: JsonPointer,
 )

src/commonMain/kotlin/io/github/optimumcode/json/schema/ValidationOutput.kt

@@ -1,6 +1,5 @@
 package io.github.optimumcode.json.schema
 
-import com.eygraber.uri.Uri
 import io.github.optimumcode.json.pointer.JsonPointer
 import kotlin.jvm.JvmField
 
@@ -21,7 +20,7 @@ public sealed class ValidationOutput private constructor(
     valid: Boolean,
     public val keywordLocation: JsonPointer,
     public val instanceLocation: JsonPointer,
-    public val absoluteKeywordLocation: Uri? = null,
+    public val absoluteKeywordLocation: AbsoluteLocation? = null,
     public val error: String? = null,
     public val errors: List<Detailed> = emptyList(),
   ) : ValidationOutput(valid)
@@ -30,7 +29,7 @@ public sealed class ValidationOutput private constructor(
     valid: Boolean,
     public val keywordLocation: JsonPointer,
     public val instanceLocation: JsonPointer,
-    public val absoluteKeywordLocation: Uri? = null,
+    public val absoluteKeywordLocation: AbsoluteLocation? = null,
     public val error: String? = null,
     public val errors: List<Verbose> = emptyList(),
     public val annotations: List<Verbose> = emptyList(),

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

@@ -3,6 +3,7 @@ package io.github.optimumcode.json.schema.internal
 import io.github.optimumcode.json.pointer.JsonPointer
 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
 
@@ -23,9 +24,7 @@ internal class RecursiveRefSchemaAssertion(
           it.copy(
             schemaPath = basePath + relativePath,
             absoluteLocation =
-              it.absoluteLocation ?: absoluteLocation.buildUpon()
-                .encodedFragment(it.schemaPath.toString())
-                .build(),
+              it.absoluteLocation ?: AbsoluteLocation(absoluteLocation, it.schemaPath),
           )
         }.use {
           refAssertion.validate(

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

@@ -4,6 +4,7 @@ import com.eygraber.uri.Uri
 import io.github.optimumcode.json.pointer.JsonPointer
 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
 
@@ -30,9 +31,7 @@ internal class RefSchemaAssertion(
       it.copy(
         schemaPath = basePath + refIdPath.relative(it.schemaPath),
         absoluteLocation =
-          it.absoluteLocation ?: refAbsolutePath.buildUpon()
-            .encodedFragment(it.schemaPath.toString())
-            .build(),
+          it.absoluteLocation ?: AbsoluteLocation(refAbsolutePath, it.schemaPath),
       )
     }.use {
       refAssertion.validate(

src/commonTest/kotlin/io/github/optimumcode/json/schema/assertions/ref/JsonSchemaRefValidationTest.kt

@@ -2,6 +2,7 @@ package io.github.optimumcode.json.schema.assertions.ref
 
 import com.eygraber.uri.Uri
 import io.github.optimumcode.json.pointer.JsonPointer
+import io.github.optimumcode.json.schema.AbsoluteLocation
 import io.github.optimumcode.json.schema.JsonSchema
 import io.github.optimumcode.json.schema.ValidationError
 import io.github.optimumcode.json.schema.base.KEY
@@ -60,9 +61,7 @@ class JsonSchemaRefValidationTest : FunSpec() {
               objectPath = JsonPointer("/size"),
               message = "-1 must be greater or equal to 0",
               absoluteLocation =
-                Uri.parse(
-                  "#/definitions/positiveInteger/minimum",
-                ),
+                AbsoluteLocation(Uri.EMPTY, JsonPointer("/definitions/positiveInteger/minimum")),
             ),
           )
         }
@@ -129,9 +128,7 @@ class JsonSchemaRefValidationTest : FunSpec() {
               objectPath = JsonPointer("/other/size"),
               message = "-1 must be greater or equal to 0",
               absoluteLocation =
-                Uri.parse(
-                  "#/definitions/positiveInteger/minimum",
-                ),
+                AbsoluteLocation(Uri.EMPTY, JsonPointer("/definitions/positiveInteger/minimum")),
             ),
           )
         }
@@ -172,9 +169,7 @@ class JsonSchemaRefValidationTest : FunSpec() {
               objectPath = JsonPointer("/size"),
               message = "element is not a integer",
               absoluteLocation =
-                Uri.parse(
-                  "#/definitions/A/definitions/B/type",
-                ),
+                AbsoluteLocation(Uri.EMPTY, JsonPointer("/definitions/A/definitions/B/type")),
             ),
           )
         }

src/commonTest/kotlin/io/github/optimumcode/json/schema/base/JsonSchemaLoaderTest.kt

@@ -2,6 +2,7 @@ package io.github.optimumcode.json.schema.base
 
 import com.eygraber.uri.Uri
 import io.github.optimumcode.json.pointer.JsonPointer
+import io.github.optimumcode.json.schema.AbsoluteLocation
 import io.github.optimumcode.json.schema.ErrorCollector
 import io.github.optimumcode.json.schema.FormatBehavior.ANNOTATION_AND_ASSERTION
 import io.github.optimumcode.json.schema.FormatValidationResult
@@ -74,7 +75,11 @@ class JsonSchemaLoaderTest : FunSpec() {
                 schemaPath = JsonPointer("/properties/anotherName/\$ref/type"),
                 objectPath = JsonPointer("/anotherName"),
                 message = "element is not a string",
-                absoluteLocation = Uri.parse("https://test.com#/properties/name/type"),
+                absoluteLocation =
+                  AbsoluteLocation(
+                    Uri.parse("https://test.com"),
+                    JsonPointer("/properties/name/type"),
+                  ),
               ),
             )
           }
@@ -350,7 +355,11 @@ class JsonSchemaLoaderTest : FunSpec() {
             schemaPath = JsonPointer("/properties/foobar/\$ref/type"),
             objectPath = JsonPointer("/foobar"),
             message = "element is not a integer",
-            absoluteLocation = Uri.parse("myproject/enums/foo#/type"),
+            absoluteLocation =
+              AbsoluteLocation(
+                Uri.parse("myproject/enums/foo"),
+                JsonPointer("/type"),
+              ),
           ),
         )
       }