Extend --trace to print out keyword location URIs (#194)

Signed-off-by: Juan Cruz Viotti <[email protected]>

DEPENDENCIES

@@ -4,4 +4,4 @@ jsontoolkit https://github.com/sourcemeta/jsontoolkit 7a398224cc2e76ea9ae8541a87
 hydra https://github.com/sourcemeta/hydra a4a74f3cabd32f2f829f449d67339dac33f9910e
 alterschema https://github.com/sourcemeta/alterschema 92e370ce9c1f0582014b54d43e388ee012dfe13d
 jsonbinpack https://github.com/sourcemeta/jsonbinpack d777179441d3c703e1fda1187742541aa26836b5
-blaze https://github.com/sourcemeta/blaze a5b3c8e4d77a0b88e4a93f304ae75e711b30a2e6
+blaze https://github.com/sourcemeta/blaze 4db8309470369332d3d0658ade9402a37abe418e

src/utils.cc

@@ -191,7 +191,9 @@ auto print(const sourcemeta::blaze::ErrorOutput &output, std::ostream &stream)
 
 auto print(const sourcemeta::blaze::TraceOutput &output, std::ostream &stream)
     -> void {
-  for (const auto &entry : output) {
+  for (auto iterator = output.cbegin(); iterator != output.cend(); iterator++) {
+    const auto &entry{*iterator};
+
     if (entry.evaluate_path.empty()) {
       continue;
     }
@@ -217,6 +219,12 @@ auto print(const sourcemeta::blaze::TraceOutput &output, std::ostream &stream)
     stream << "   at \"";
     sourcemeta::jsontoolkit::stringify(entry.instance_location, stream);
     stream << "\"\n";
+    stream << "   at keyword location \"" << entry.keyword_location << "\"\n";
+
+    // To make it easier to read
+    if (std::next(iterator) != output.cend()) {
+      stream << "\n";
+    }
   }
 }
 

test/metaschema/fail_trace.sh

@@ -23,35 +23,61 @@ test "$CODE" = "1" || exit 1
 cat << 'EOF' > "$TMP/expected-1.txt"
 -> (push) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 <- (pass) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 -> (push) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
+
 -> (push) "/properties/$schema/type"
    at "/$schema"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/$schema/type"
+
 <- (pass) "/properties/$schema/type"
    at "/$schema"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/$schema/type"
+
 -> (push) "/properties/minimum/type"
    at "/minimum"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/minimum/type"
+
 <- (fail) "/properties/minimum/type"
    at "/minimum"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/minimum/type"
+
 <- (fail) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
 EOF
 
 cat << 'EOF' > "$TMP/expected-2.txt"
 -> (push) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 <- (pass) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 -> (push) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
+
 -> (push) "/properties/minimum/type"
    at "/minimum"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/minimum/type"
+
 <- (fail) "/properties/minimum/type"
    at "/minimum"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/minimum/type"
+
 <- (fail) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected-1.txt" || \

test/metaschema/pass_trace.sh

@@ -16,20 +16,35 @@ EOF
 cat << 'EOF' > "$TMP/expected.txt"
 -> (push) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 <- (pass) "/dependencies"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/dependencies"
+
 -> (push) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
+
 -> (push) "/properties/$schema/type"
    at "/$schema"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/$schema/type"
+
 <- (pass) "/properties/$schema/type"
    at "/$schema"
+   at keyword location "http://json-schema.org/draft-04/schema#/properties/$schema/type"
+
 <- (pass) "/properties"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/properties"
+
 -> (push) "/type"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/type"
+
 <- (pass) "/type"
    at ""
+   at keyword location "http://json-schema.org/draft-04/schema#/type"
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"

test/validate/fail_trace.sh

@@ -29,8 +29,11 @@ test "$CODE" = "1" || exit 1
 cat << EOF > "$TMP/expected.txt"
 -> (push) "/properties/foo/type"
    at "/foo"
+   at keyword location "#/properties/foo/type"
+
 <- (fail) "/properties/foo/type"
    at "/foo"
+   at keyword location "#/properties/foo/type"
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"

test/validate/pass_trace.sh

@@ -27,8 +27,11 @@ EOF
 cat << EOF > "$TMP/expected.txt"
 -> (push) "/properties/foo/type"
    at "/foo"
+   at keyword location "#/properties/foo/type"
+
 <- (pass) "/properties/foo/type"
    at "/foo"
+   at keyword location "#/properties/foo/type"
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"