Drop annotations from contains that were emitted to non-matching items (#447)

Fixes: sourcemeta/blaze#446
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/compiler/compile_output_simple.cc

@@ -65,32 +65,23 @@ auto SimpleOutput::operator()(
     const auto &keyword{evaluate_path.back().to_property()};
     // To ease the output
     if (keyword == "anyOf" || keyword == "oneOf" || keyword == "not" ||
-        keyword == "if") {
-      this->mask.emplace(evaluate_path, true);
-    } else if (keyword == "contains") {
-      this->mask.emplace(evaluate_path, false);
+        keyword == "if" || keyword == "contains") {
+      this->mask.emplace(evaluate_path, instance_location);
     }
   } else if (type == EvaluationType::Post &&
-             this->mask.contains(evaluate_path)) {
-    this->mask.erase(evaluate_path);
+             this->mask.contains({evaluate_path, instance_location})) {
+    this->mask.erase({evaluate_path, instance_location});
   }
 
   if (result) {
     return;
   }
 
-  if (std::any_of(this->mask.cbegin(), this->mask.cend(),
-                  [&evaluate_path](const auto &entry) {
-                    return evaluate_path.starts_with(entry.first) &&
-                           !entry.second;
-                  })) {
-    return;
-  }
-
   if (type == EvaluationType::Post && !this->annotations_.empty()) {
     for (auto iterator = this->annotations_.begin();
          iterator != this->annotations_.end();) {
-      if (iterator->first.evaluate_path.starts_with_initial(evaluate_path)) {
+      if (iterator->first.evaluate_path.starts_with_initial(evaluate_path) &&
+          iterator->first.instance_location == instance_location) {
         iterator = this->annotations_.erase(iterator);
       } else {
         iterator++;

src/compiler/include/sourcemeta/blaze/compiler_output.h

@@ -19,6 +19,7 @@
 #include <string>      // std::string
 #include <string_view> // std::string_view
 #include <tuple>       // std::tie
+#include <utility>     // std::pair
 #include <vector>      // std::vector
 
 namespace sourcemeta::blaze {
@@ -126,7 +127,9 @@ class SOURCEMETA_BLAZE_COMPILER_EXPORT SimpleOutput {
   const sourcemeta::core::JSON &instance_;
   const sourcemeta::core::WeakPointer base_;
   container_type output;
-  std::map<sourcemeta::core::WeakPointer, bool> mask;
+  std::set<
+      std::pair<sourcemeta::core::WeakPointer, sourcemeta::core::WeakPointer>>
+      mask;
   std::map<Location, std::vector<sourcemeta::core::JSON>> annotations_;
 #if defined(_MSC_VER)
 #pragma warning(default : 4251)

test/compiler/compiler_output_simple_test.cc

@@ -803,6 +803,36 @@ TEST(Compiler_output_simple, annotations_success_9) {
                           0, sourcemeta::core::JSON{true});
 }
 
+TEST(Compiler_output_simple, annotations_success_10) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "contains": { "type": "number", "title": "Test" }
+  })JSON")};
+
+  const auto schema_template{sourcemeta::blaze::compile(
+      schema, sourcemeta::core::schema_official_walker,
+      sourcemeta::core::schema_official_resolver,
+      sourcemeta::blaze::default_schema_compiler,
+      sourcemeta::blaze::Mode::Exhaustive)};
+
+  const sourcemeta::core::JSON instance{
+      sourcemeta::core::parse_json("[ \"foo\", 42, true ]")};
+
+  sourcemeta::blaze::SimpleOutput output{instance};
+  sourcemeta::blaze::Evaluator evaluator;
+  const auto result{
+      evaluator.validate(schema_template, instance, std::ref(output))};
+  EXPECT_TRUE(result);
+
+  EXPECT_ANNOTATION_COUNT(output, 2);
+
+  EXPECT_ANNOTATION_ENTRY(output, "", "/contains", "#/contains", 1);
+  EXPECT_ANNOTATION_ENTRY(output, "/1", "/contains/title", "#/contains/title",
+                          1);
+  EXPECT_ANNOTATION_VALUE(output, "/1", "/contains/title", "#/contains/title",
+                          0, sourcemeta::core::JSON{"Test"});
+}
+
 TEST(Compiler_output_simple, annotations_failure_1) {
   const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
     "$schema": "https://json-schema.org/draft/2020-12/schema",