Merge branch 'main' into modularise-clang-tidy-config

Author: bavulapati

src/core/json/include/sourcemeta/core/json_auto.h

@@ -42,7 +42,7 @@ template <typename Key, typename Value, typename Hash> class FlatMap {
   FlatMap(std::initializer_list<value_type> entries) {
     this->data.reserve(entries.size());
     for (auto &&entry : entries) {
-      this->assign(std::move(entry.first), std::move(entry.second));
+      this->emplace(std::move(entry.first), std::move(entry.second));
     }
   }
 
@@ -55,7 +55,7 @@ template <typename Key, typename Value, typename Hash> class FlatMap {
     return this->hasher(key);
   }
 
-  auto assign(key_type &&key, mapped_type &&value) -> hash_type {
+  auto emplace(key_type &&key, mapped_type &&value) -> hash_type {
     const auto key_hash{this->hash(key)};
 
     if (this->hasher.is_perfect(key_hash)) {
@@ -78,7 +78,7 @@ template <typename Key, typename Value, typename Hash> class FlatMap {
     return key_hash;
   }
 
-  auto assign(const key_type &key, const mapped_type &value) -> hash_type {
+  auto emplace(const key_type &key, const mapped_type &value) -> hash_type {
     const auto key_hash{this->hash(key)};
 
     if (this->hasher.is_perfect(key_hash)) {

src/core/json/include/sourcemeta/core/json_object.h

@@ -801,12 +801,12 @@ auto JSON::push_back_if_unique(JSON &&value)
 
 auto JSON::assign(const JSON::String &key, const JSON &value) -> void {
   assert(this->is_object());
-  this->data_object.data.assign(key, value);
+  this->data_object.data.emplace(key, value);
 }
 
 auto JSON::assign(const JSON::String &key, JSON &&value) -> void {
   assert(this->is_object());
-  this->data_object.data.assign(key, std::move(value));
+  this->data_object.data.emplace(key, std::move(value));
 }
 
 auto JSON::assign_if_missing(const JSON::String &key, const JSON &value)

src/core/json/json_value.cc

@@ -17,6 +17,7 @@
 #include <sourcemeta/core/jsonpointer_walker.h>
 // NOLINTEND(misc-include-cleaner)
 
+#include <cassert>     // assert
 #include <functional>  // std::reference_wrapper
 #include <memory>      // std::allocator
 #include <ostream>     // std::basic_ostream
@@ -582,6 +583,15 @@ auto to_json(const T &value) -> JSON {
   return JSON{to_string(value)};
 }
 
+/// @ingroup jsonpointer
+/// Deserialise a Pointer from JSON
+template <typename T>
+  requires std::is_same_v<T, Pointer>
+auto from_json(const JSON &value) -> T {
+  assert(value.is_string());
+  return to_pointer(value.to_string());
+}
+
 } // namespace sourcemeta::core
 
 #endif

src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h

@@ -183,10 +183,13 @@ auto bundle(sourcemeta::core::JSON &schema, const SchemaWalker &walker,
              vocabularies.contains("http://json-schema.org/draft-03/schema#") ||
              vocabularies.contains(
                  "http://json-schema.org/draft-02/hyper-schema#") ||
+             vocabularies.contains("http://json-schema.org/draft-02/schema#") ||
              vocabularies.contains(
                  "http://json-schema.org/draft-01/hyper-schema#") ||
+             vocabularies.contains("http://json-schema.org/draft-01/schema#") ||
              vocabularies.contains(
-                 "http://json-schema.org/draft-00/hyper-schema#")) {
+                 "http://json-schema.org/draft-00/hyper-schema#") ||
+             vocabularies.contains("http://json-schema.org/draft-00/schema#")) {
     frame.analyse(schema, walker, resolver, default_dialect);
     if (frame.standalone()) {
       return;

src/core/jsonschema/bundle.cc

@@ -383,7 +383,24 @@ auto sourcemeta::core::vocabularies(const SchemaResolver &resolver,
   }
 
   /*
-   * (1) If the base dialect is pre-vocabularies, then the
+   * (1) If the dialect is pre-vocabularies, then the
+   * dialect itself is conceptually the only vocabulary
+   */
+
+  // This is an exhaustive list of all official dialects in the pre-vocabulary
+  // world
+  if (dialect == "http://json-schema.org/draft-07/schema#" ||
+      dialect == "http://json-schema.org/draft-06/schema#" ||
+      dialect == "http://json-schema.org/draft-04/schema#" ||
+      dialect == "http://json-schema.org/draft-03/schema#" ||
+      dialect == "http://json-schema.org/draft-02/schema#" ||
+      dialect == "http://json-schema.org/draft-01/schema#" ||
+      dialect == "http://json-schema.org/draft-00/schema#") {
+    return {{dialect, true}};
+  }
+
+  /*
+   * (2) If the base dialect is pre-vocabularies, then the
    * base dialect itself is conceptually the only vocabulary
    */
 
@@ -403,7 +420,7 @@ auto sourcemeta::core::vocabularies(const SchemaResolver &resolver,
   }
 
   /*
-   * (2) If the dialect is vocabulary aware, then fetch such dialect
+   * (3) If the dialect is vocabulary aware, then fetch such dialect
    */
 
   const std::optional<sourcemeta::core::JSON> maybe_schema_dialect{
@@ -421,7 +438,7 @@ auto sourcemeta::core::vocabularies(const SchemaResolver &resolver,
          schema_dialect.at("$id").to_string() == dialect);
 
   /*
-   * (3) Retrieve the vocabularies explicitly or implicitly declared by the
+   * (4) Retrieve the vocabularies explicitly or implicitly declared by the
    * dialect
    */
 

src/core/jsonschema/jsonschema.cc

@@ -46,98 +46,7 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME alterschema
     linter/unsatisfiable_min_properties.h
     linter/content_media_type_without_encoding.h
     linter/content_schema_without_media_type.h
-    linter/drop_non_array_keywords_applicator_2019_09.h
-    linter/drop_non_array_keywords_applicator_2020_12.h
-    linter/drop_non_array_keywords_content_2019_09.h
-    linter/drop_non_array_keywords_content_2020_12.h
-    linter/drop_non_array_keywords_draft0.h
-    linter/drop_non_array_keywords_draft1.h
-    linter/drop_non_array_keywords_draft2.h
-    linter/drop_non_array_keywords_draft3.h
-    linter/drop_non_array_keywords_draft4.h
-    linter/drop_non_array_keywords_draft6.h
-    linter/drop_non_array_keywords_draft7.h
-    linter/drop_non_array_keywords_format_2019_09.h
-    linter/drop_non_array_keywords_format_2020_12.h
-    linter/drop_non_array_keywords_unevaluated_2020_12.h
-    linter/drop_non_array_keywords_validation_2019_09.h
-    linter/drop_non_array_keywords_validation_2020_12.h
-    linter/drop_non_boolean_keywords_applicator_2019_09.h
-    linter/drop_non_boolean_keywords_applicator_2020_12.h
-    linter/drop_non_boolean_keywords_content_2019_09.h
-    linter/drop_non_boolean_keywords_content_2020_12.h
-    linter/drop_non_boolean_keywords_draft0.h
-    linter/drop_non_boolean_keywords_draft1.h
-    linter/drop_non_boolean_keywords_draft2.h
-    linter/drop_non_boolean_keywords_draft3.h
-    linter/drop_non_boolean_keywords_draft4.h
-    linter/drop_non_boolean_keywords_draft6.h
-    linter/drop_non_boolean_keywords_draft7.h
-    linter/drop_non_boolean_keywords_format_2019_09.h
-    linter/drop_non_boolean_keywords_format_2020_12.h
-    linter/drop_non_boolean_keywords_unevaluated_2020_12.h
-    linter/drop_non_boolean_keywords_validation_2019_09.h
-    linter/drop_non_boolean_keywords_validation_2020_12.h
-    linter/drop_non_null_keywords_applicator_2019_09.h
-    linter/drop_non_null_keywords_applicator_2020_12.h
-    linter/drop_non_null_keywords_content_2019_09.h
-    linter/drop_non_null_keywords_content_2020_12.h
-    linter/drop_non_null_keywords_draft0.h
-    linter/drop_non_null_keywords_draft1.h
-    linter/drop_non_null_keywords_draft2.h
-    linter/drop_non_null_keywords_draft3.h
-    linter/drop_non_null_keywords_draft4.h
-    linter/drop_non_null_keywords_draft6.h
-    linter/drop_non_null_keywords_draft7.h
-    linter/drop_non_null_keywords_format_2019_09.h
-    linter/drop_non_null_keywords_format_2020_12.h
-    linter/drop_non_null_keywords_unevaluated_2020_12.h
-    linter/drop_non_null_keywords_validation_2019_09.h
-    linter/drop_non_null_keywords_validation_2020_12.h
-    linter/drop_non_numeric_keywords_applicator_2019_09.h
-    linter/drop_non_numeric_keywords_applicator_2020_12.h
-    linter/drop_non_numeric_keywords_content_2019_09.h
-    linter/drop_non_numeric_keywords_content_2020_12.h
-    linter/drop_non_numeric_keywords_draft0.h
-    linter/drop_non_numeric_keywords_draft1.h
-    linter/drop_non_numeric_keywords_draft2.h
-    linter/drop_non_numeric_keywords_draft3.h
-    linter/drop_non_numeric_keywords_draft4.h
-    linter/drop_non_numeric_keywords_draft6.h
-    linter/drop_non_numeric_keywords_draft7.h
-    linter/drop_non_numeric_keywords_format_2019_09.h
-    linter/drop_non_numeric_keywords_format_2020_12.h
-    linter/drop_non_numeric_keywords_unevaluated_2020_12.h
-    linter/drop_non_numeric_keywords_validation_2019_09.h
-    linter/drop_non_numeric_keywords_validation_2020_12.h
-    linter/drop_non_object_keywords_applicator_2019_09.h
-    linter/drop_non_object_keywords_applicator_2020_12.h
-    linter/drop_non_object_keywords_content_2019_09.h
-    linter/drop_non_object_keywords_content_2020_12.h
-    linter/drop_non_object_keywords_draft0.h
-    linter/drop_non_object_keywords_draft1.h
-    linter/drop_non_object_keywords_draft2.h
-    linter/drop_non_object_keywords_draft3.h
-    linter/drop_non_object_keywords_draft4.h
-    linter/drop_non_object_keywords_draft6.h
-    linter/drop_non_object_keywords_draft7.h
-    linter/drop_non_object_keywords_format_2019_09.h
-    linter/drop_non_object_keywords_format_2020_12.h
-    linter/drop_non_object_keywords_unevaluated_2020_12.h
-    linter/drop_non_object_keywords_validation_2019_09.h
-    linter/drop_non_object_keywords_validation_2020_12.h
-    linter/drop_non_string_keywords_applicator_2019_09.h
-    linter/drop_non_string_keywords_applicator_2020_12.h
-    linter/drop_non_string_keywords_draft0.h
-    linter/drop_non_string_keywords_draft1.h
-    linter/drop_non_string_keywords_draft2.h
-    linter/drop_non_string_keywords_draft3.h
-    linter/drop_non_string_keywords_draft4.h
-    linter/drop_non_string_keywords_draft6.h
-    linter/drop_non_string_keywords_draft7.h
-    linter/drop_non_string_keywords_unevaluated_2020_12.h
-    linter/drop_non_string_keywords_validation_2019_09.h
-    linter/drop_non_string_keywords_validation_2020_12.h
+    linter/non_applicable_type_specific_keywords.h
     linter/unnecessary_allof_ref_wrapper.h
     linter/duplicate_allof_branches.h
     linter/duplicate_anyof_branches.h