Upgrade JSON Toolkit to 3ef19daf7ca042544239111c701a51232f3f5576 (#164

)

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

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
       CXX: ${{ matrix.platform.cxx }}
     steps:
       - name: Install ClangFormat
-        run: pip install clang-format==18.1.5
+        run: pip install clang-format==19.1.0
 
       - uses: actions/checkout@v4
       - name: Install dependencies (macOS)

DEPENDENCIES

@@ -1,5 +1,5 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 7e26abce7a4e31e86a16ef2851702a56773ca527
-jsontoolkit https://github.com/sourcemeta/jsontoolkit e86ad1e333c11b6fc2659a0f32ae883ef1040e20
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 3ef19daf7ca042544239111c701a51232f3f5576
 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc
 alterschema https://github.com/sourcemeta/alterschema a31722f04ae2d7e57f2fe5bbb0613670866c0840

src/command_frame.cc

@@ -8,8 +8,9 @@
 #include "command.h"
 #include "utils.h"
 
-static auto enum_to_string(
-    const sourcemeta::jsontoolkit::ReferenceEntryType type) -> std::string {
+static auto
+enum_to_string(const sourcemeta::jsontoolkit::ReferenceEntryType type)
+    -> std::string {
   switch (type) {
     case sourcemeta::jsontoolkit::ReferenceEntryType::Resource:
       return "resource";

src/command_test.cc

@@ -35,8 +35,8 @@ get_schema_object(const sourcemeta::jsontoolkit::URI &identifier,
 }
 
 static auto get_data(const sourcemeta::jsontoolkit::JSON &test_case,
-                     const std::filesystem::path &base,
-                     const bool verbose) -> sourcemeta::jsontoolkit::JSON {
+                     const std::filesystem::path &base, const bool verbose)
+    -> sourcemeta::jsontoolkit::JSON {
   assert(base.is_absolute());
   assert(test_case.is_object());
   assert(test_case.defines("data") || test_case.defines("dataPath"));

src/utils.cc

@@ -271,8 +271,9 @@ auto log_verbose(const std::map<std::string, std::vector<std::string>> &options)
   return null_stream;
 }
 
-auto parse_extensions(const std::map<std::string, std::vector<std::string>>
-                          &options) -> std::set<std::string> {
+auto parse_extensions(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::set<std::string> {
   std::set<std::string> result;
 
   if (options.contains("extension")) {
@@ -296,8 +297,9 @@ auto parse_extensions(const std::map<std::string, std::vector<std::string>>
   return result;
 }
 
-auto parse_ignore(const std::map<std::string, std::vector<std::string>>
-                      &options) -> std::set<std::filesystem::path> {
+auto parse_ignore(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::set<std::filesystem::path> {
   std::set<std::filesystem::path> result;
 
   if (options.contains("ignore")) {

src/utils.h

@@ -38,11 +38,13 @@ auto resolver(const std::map<std::string, std::vector<std::string>> &options,
 auto log_verbose(const std::map<std::string, std::vector<std::string>> &options)
     -> std::ostream &;
 
-auto parse_extensions(const std::map<std::string, std::vector<std::string>>
-                          &options) -> std::set<std::string>;
+auto parse_extensions(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::set<std::string>;
 
-auto parse_ignore(const std::map<std::string, std::vector<std::string>>
-                      &options) -> std::set<std::filesystem::path>;
+auto parse_ignore(
+    const std::map<std::string, std::vector<std::string>> &options)
+    -> std::set<std::filesystem::path>;
 
 } // namespace sourcemeta::jsonschema::cli
 

test/metaschema/fail_directory.sh

@@ -32,7 +32,7 @@ error: Schema validation failure
   The string value "object" was expected to equal one of the following values: "array", "boolean", "integer", "null", "number", "object", and "string"
     at instance location "/type"
     at evaluate path "/properties/type/anyOf/0/\$ref/enum"
-  The value was expected to be of type array but it was of type string
+  The value was expected to consist of an array of at least 1 item
     at instance location "/type"
     at evaluate path "/properties/type/anyOf/1/type"
   The string value was expected to validate against at least one of the 2 given subschemas

test/metaschema/fail_single.sh

@@ -23,7 +23,7 @@ error: Schema validation failure
   The string value "object" was expected to equal one of the following values: "array", "boolean", "integer", "null", "number", "object", and "string"
     at instance location "/type"
     at evaluate path "/properties/type/anyOf/0/\$ref/enum"
-  The value was expected to be of type array but it was of type string
+  The value was expected to consist of an array of at least 1 item
     at instance location "/type"
     at evaluate path "/properties/type/anyOf/1/type"
   The string value was expected to validate against at least one of the 2 given subschemas