Improve basic validation error messages

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 7e26abce7a4e31e86a16ef2851702a56773ca527
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 00251a4161434463c24bc18418e3ffd37f998f29
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 4d1dfef7be91ecadd810370b3d8a1d2e591bf574
 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc

src/command_metaschema.cc

@@ -30,9 +30,9 @@ auto intelligence::jsonschema::cli::metaschema(
     const auto dialect{sourcemeta::jsontoolkit::dialect(entry.second)};
     assert(dialect.has_value());
 
+    const auto metaschema{
+        sourcemeta::jsontoolkit::metaschema(entry.second, custom_resolver)};
     if (!cache.contains(dialect.value())) {
-      const auto metaschema{
-          sourcemeta::jsontoolkit::metaschema(entry.second, custom_resolver)};
       const auto metaschema_template{sourcemeta::jsontoolkit::compile(
           metaschema, sourcemeta::jsontoolkit::default_schema_walker,
           custom_resolver, sourcemeta::jsontoolkit::default_schema_compiler)};
@@ -43,7 +43,7 @@ auto intelligence::jsonschema::cli::metaschema(
     if (sourcemeta::jsontoolkit::evaluate(
             cache.at(dialect.value()), entry.second,
             sourcemeta::jsontoolkit::SchemaCompilerEvaluationMode::Fast,
-            pretty_evaluate_callback(error,
+            pretty_evaluate_callback(error, metaschema,
                                      sourcemeta::jsontoolkit::empty_pointer))) {
       log_verbose(options)
           << entry.first.string()

src/command_test.cc

@@ -242,7 +242,7 @@ auto intelligence::jsonschema::cli::test(
           schema_template,
           get_data(test_case, entry.first.parent_path(), verbose),
           sourcemeta::jsontoolkit::SchemaCompilerEvaluationMode::Fast,
-          pretty_evaluate_callback(error, {"$ref"}))};
+          pretty_evaluate_callback(error, schema.value(), {"$ref"}))};
 
       std::ostringstream test_case_description;
       if (test_case.defines("description")) {

src/command_validate.cc

@@ -88,7 +88,7 @@ auto intelligence::jsonschema::cli::validate(
                 schema_template, instance,
                 sourcemeta::jsontoolkit::SchemaCompilerEvaluationMode::Fast,
                 pretty_evaluate_callback(
-                    error, sourcemeta::jsontoolkit::empty_pointer));
+                    error, instance, sourcemeta::jsontoolkit::empty_pointer));
           }
 
           if (subresult) {
@@ -139,7 +139,7 @@ auto intelligence::jsonschema::cli::validate(
         subresult = sourcemeta::jsontoolkit::evaluate(
             schema_template, instance,
             sourcemeta::jsontoolkit::SchemaCompilerEvaluationMode::Fast,
-            pretty_evaluate_callback(error,
+            pretty_evaluate_callback(error, instance,
                                      sourcemeta::jsontoolkit::empty_pointer));
       }
 

src/utils.cc

@@ -176,23 +176,27 @@ auto parse_options(const std::span<const std::string> &arguments,
 }
 
 auto pretty_evaluate_callback(std::ostringstream &output,
+                              const sourcemeta::jsontoolkit::JSON &instance,
                               const sourcemeta::jsontoolkit::Pointer &base)
     -> sourcemeta::jsontoolkit::SchemaCompilerEvaluationCallback {
   output << "error: Schema validation failure\n";
-  return [&output, &base](
+  return [&output, &instance, &base](
              const sourcemeta::jsontoolkit::SchemaCompilerEvaluationType,
              const bool result,
              const sourcemeta::jsontoolkit::SchemaCompilerTemplate::value_type
                  &step,
              const sourcemeta::jsontoolkit::Pointer &evaluate_path,
              const sourcemeta::jsontoolkit::Pointer &instance_location,
-             const sourcemeta::jsontoolkit::JSON &,
-             const sourcemeta::jsontoolkit::JSON &) -> void {
+             const sourcemeta::jsontoolkit::JSON &annotation) -> void {
     if (result) {
       return;
     }
 
-    output << "  " << sourcemeta::jsontoolkit::describe(step) << "\n";
+    output << "  "
+           << sourcemeta::jsontoolkit::describe(result, step, evaluate_path,
+                                                instance_location, instance,
+                                                annotation)
+           << "\n";
     output << "    at instance location \"";
     sourcemeta::jsontoolkit::stringify(instance_location, output);
     output << "\"\n";

src/utils.h

@@ -28,6 +28,7 @@ auto for_each_json(const std::vector<std::string> &arguments,
         std::pair<std::filesystem::path, sourcemeta::jsontoolkit::JSON>>;
 
 auto pretty_evaluate_callback(std::ostringstream &,
+                              const sourcemeta::jsontoolkit::JSON &,
                               const sourcemeta::jsontoolkit::Pointer &)
     -> sourcemeta::jsontoolkit::SchemaCompilerEvaluationCallback;
 

test/test/fail_multi_resolve.sh

@@ -52,7 +52,7 @@ $(realpath "$TMP")/test.json:
   2/4 FAIL First failure
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type object
     at instance location ""
     at evaluate path "/type"
 

test/test/fail_multi_resolve_verbose.sh

@@ -54,7 +54,7 @@ $(realpath "$TMP")/test.json:
   2/4 FAIL First failure
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type object
     at instance location ""
     at evaluate path "/type"
 

test/test/fail_true_resolve_fragment.sh

@@ -40,10 +40,10 @@ $(realpath "$TMP")/test.json:
   1/1 FAIL Fail
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type object
     at instance location ""
     at evaluate path "/type"
-  Mark the current position of the evaluation process for future jumps
+  The object value was expected to validate against the statically referenced schema
     at instance location ""
     at evaluate path ""
 EOF

test/test/fail_true_single_resolve.sh

@@ -47,7 +47,7 @@ $(realpath "$TMP")/test.json:
   2/3 FAIL Unexpected
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type object
     at instance location ""
     at evaluate path "/type"
 EOF

test/test/fail_true_single_resolve_verbose.sh

@@ -49,7 +49,7 @@ $(realpath "$TMP")/test.json:
   2/3 FAIL Unexpected
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type object
     at instance location ""
     at evaluate path "/type"
 

test/validate/fail_2019_09.sh

@@ -30,10 +30,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_2020_12.sh

@@ -30,10 +30,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_draft4.sh

@@ -30,10 +30,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_draft6.sh

@@ -30,10 +30,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_draft7.sh

@@ -30,10 +30,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_jsonl_all.sh

@@ -32,7 +32,7 @@ fail: $(realpath "$TMP")/instance.jsonl (entry #0)
 }
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type array but it was of type object
     at instance location ""
     at evaluate path "/type"
 EOF

test/validate/fail_jsonl_all_verbose.sh

@@ -33,7 +33,7 @@ fail: $(realpath "$TMP")/instance.jsonl (entry #0)
 }
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type array but it was of type object
     at instance location ""
     at evaluate path "/type"
 EOF

test/validate/fail_jsonl_one.sh

@@ -34,7 +34,7 @@ fail: $(realpath "$TMP")/instance.jsonl (entry #1)
 ]
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type object but it was of type array
     at instance location ""
     at evaluate path "/type"
 EOF

test/validate/fail_jsonl_one_verbose.sh

@@ -37,7 +37,7 @@ fail: $(realpath "$TMP")/instance.jsonl (entry #1)
 ]
 
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type object but it was of type array
     at instance location ""
     at evaluate path "/type"
 EOF

test/validate/fail_many.sh

@@ -42,10 +42,10 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/instance_2.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 EOF

test/validate/fail_many_verbose.sh

@@ -44,10 +44,10 @@ ok: $(realpath "$TMP")/instance_1.json
   matches $(realpath "$TMP")/schema.json
 fail: $(realpath "$TMP")/instance_2.json
 error: Schema validation failure
-  The target document is expected to be of the given type
+  The value was expected to be of type string but it was of type integer
     at instance location "/foo"
     at evaluate path "/properties/foo/type"
-  The target is expected to match all of the given assertions
+  The object value was expected to validate against the single defined property subschema
     at instance location ""
     at evaluate path "/properties"
 ok: $(realpath "$TMP")/instance_3.json