FIX ATTEMPT

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

Author: jviotti

src/core/jsonschema/frame.cc

@@ -471,6 +471,8 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
       base_uris;
   std::unordered_map<sourcemeta::core::Pointer, std::vector<JSON::String>>
       base_dialects;
+  std::unordered_map<sourcemeta::core::Pointer, JSON::String>
+      pointer_base_dialects;
 
   for (const auto &path : paths) {
     // Passing paths that overlap is undefined behavior. No path should
@@ -545,6 +547,7 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
 
       // Base dialect
       assert(entry.base_dialect.has_value());
+      pointer_base_dialects.insert({entry.pointer, entry.base_dialect.value()});
 
       // Schema identifier
       std::optional<JSON::String> id{sourcemeta::core::identify(
@@ -826,10 +829,22 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
           const auto maybe_base_entry{this->locations_.find(
               {SchemaReferenceType::Static, current_base})};
 
-          const auto current_base_dialect{
-              maybe_base_entry == this->locations_.cend()
-                  ? root_base_dialect.value()
-                  : maybe_base_entry->second.base_dialect};
+          // Find the base_dialect by walking up the pointer hierarchy
+          std::optional<JSON::String> current_base_dialect;
+          for (auto current_ptr = pointer; !current_base_dialect.has_value();) {
+            auto base_dialect_iter = pointer_base_dialects.find(current_ptr);
+            if (base_dialect_iter != pointer_base_dialects.end()) {
+              current_base_dialect = base_dialect_iter->second;
+            } else if (current_ptr.empty()) {
+              current_base_dialect =
+                  maybe_base_entry == this->locations_.cend()
+                      ? root_base_dialect.value()
+                      : maybe_base_entry->second.base_dialect;
+              break;
+            } else {
+              current_ptr = current_ptr.initial();
+            }
+          }
 
           const auto subschema{subschemas.find(pointer)};
 
@@ -842,7 +857,7 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
                     SchemaFrame::LocationType::Subschema, std::move(result),
                     root_id, current_base, pointer,
                     pointer.resolve_from(nearest_bases.second),
-                    dialects.first.front(), current_base_dialect,
+                    dialects.first.front(), current_base_dialect.value(),
                     {subschema->second.instance_location},
                     subschema->second.parent, false, true);
             } else {
@@ -851,7 +866,7 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
                     SchemaFrame::LocationType::Subschema, std::move(result),
                     root_id, current_base, pointer,
                     pointer.resolve_from(nearest_bases.second),
-                    dialects.first.front(), current_base_dialect, {},
+                    dialects.first.front(), current_base_dialect.value(), {},
                     subschema->second.parent, false, true);
             }
           } else {
@@ -860,7 +875,7 @@ auto SchemaFrame::analyse(const JSON &root, const SchemaWalker &walker,
                   SchemaFrame::LocationType::Pointer, std::move(result),
                   root_id, current_base, pointer,
                   pointer.resolve_from(nearest_bases.second),
-                  dialects.first.front(), current_base_dialect, {},
+                  dialects.first.front(), current_base_dialect.value(), {},
                   dialects.second, false, true);
           }
         }

src/core/jsonschema/walker.cc

@@ -57,13 +57,26 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
       sourcemeta::core::SchemaIdentificationStrategy::Strict,
       maybe_current_dialect)};
   const auto is_schema_resource{level == 0 || id.has_value()};
-  const auto current_dialect{is_schema_resource ? maybe_current_dialect.value()
-                                                : dialect};
-  const auto current_base_dialect{
-      is_schema_resource
-          ? sourcemeta::core::base_dialect(subschema, resolver, current_dialect)
-                .value_or(base_dialect)
-          : base_dialect};
+
+  const auto has_schema_keyword{subschema.is_object() &&
+                                subschema.defines("$schema")};
+  const auto subschema_base_dialect{
+      has_schema_keyword ? sourcemeta::core::base_dialect(subschema, resolver,
+                                                          maybe_current_dialect)
+                               .value_or(base_dialect)
+                         : base_dialect};
+  const auto should_process_schema_without_id{
+      has_schema_keyword && !is_schema_resource &&
+      ref_overrides_adjacent_keywords(subschema_base_dialect)};
+
+  const auto current_dialect{is_schema_resource ||
+                                     should_process_schema_without_id
+                                 ? maybe_current_dialect.value()
+                                 : dialect};
+  const auto current_base_dialect{is_schema_resource ||
+                                          should_process_schema_without_id
+                                      ? subschema_base_dialect
+                                      : base_dialect};
 
   const auto vocabularies{sourcemeta::core::vocabularies(
       resolver, current_base_dialect, current_dialect)};