[WIP] Implement support for custom reachability checks

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/core/jsonschema/frame.cc

@@ -1457,7 +1457,14 @@ auto SchemaFrame::populate_reachability(const Location &base,
     }
 
     for (const auto &pointer_reference : has_non_pointer_location) {
-      const bool is_reachable = has_non_orphan.contains(pointer_reference);
+      const auto &pointer{pointer_reference.get()};
+      bool is_reachable{false};
+      if (pointer == base.pointer) {
+        is_reachable = true;
+      } else if (pointer.starts_with(base.pointer)) {
+        is_reachable = has_non_orphan.contains(pointer_reference);
+      }
+
       cache.emplace(pointer_reference, is_reachable);
       if (!is_reachable) {
         unreachable_pointers.push_back(pointer_reference);
@@ -1474,12 +1481,20 @@ auto SchemaFrame::populate_reachability(const Location &base,
         continue;
       }
 
-      const auto any_non_orphan{
-          std::ranges::any_of(locations, [](const Location *location) {
-            return location->type != LocationType::Pointer && !location->orphan;
-          })};
-      cache.emplace(pointer_reference, any_non_orphan);
-      if (!any_non_orphan) {
+      const auto &pointer{pointer_reference.get()};
+      bool is_reachable{false};
+      if (pointer == base.pointer) {
+        is_reachable = true;
+      } else if (pointer.starts_with(base.pointer)) {
+        is_reachable =
+            std::ranges::any_of(locations, [](const Location *location) {
+              return location->type != LocationType::Pointer &&
+                     !location->orphan;
+            });
+      }
+
+      cache.emplace(pointer_reference, is_reachable);
+      if (!is_reachable) {
         unreachable_pointers.push_back(pointer_reference);
       }
     }
@@ -1651,13 +1666,10 @@ auto SchemaFrame::populate_reachability(const Location &base,
         }
 
         const auto &source_parent{potential_source.source_pointer->initial()};
-        bool source_parent_reachable{source_parent.empty()};
-        if (!source_parent_reachable) {
-          const auto reachability_iterator{
-              cache.find(std::cref(source_parent))};
-          source_parent_reachable = reachability_iterator != cache.end() &&
-                                    reachability_iterator->second;
-        }
+        const auto reachability_iterator{cache.find(std::cref(source_parent))};
+        const bool source_parent_reachable{reachability_iterator !=
+                                               cache.end() &&
+                                           reachability_iterator->second};
 
         if (source_parent_reachable) {
           became_reachable = true;

test/jsonschema/jsonschema_frame_2020_12_test.cc

@@ -112,6 +112,12 @@ TEST(JSONSchema_frame_2020_12, anonymous_with_nested_schema_resource) {
                                   frame.root());
   EXPECT_FRAME_LOCATION_REACHABLE(frame, Static, "https://example.com",
                                   frame.root());
+
+  EXPECT_FRAME_LOCATION_NON_REACHABLE(frame, Static, "", "https://example.com");
+  EXPECT_FRAME_LOCATION_REACHABLE(frame, Static, "#/additionalProperties",
+                                  "https://example.com");
+  EXPECT_FRAME_LOCATION_REACHABLE(frame, Static, "https://example.com",
+                                  "https://example.com");
 }
 
 TEST(JSONSchema_frame_2020_12, empty_schema) {