Make use of JSON Schema validation from the new Blaze project

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

CMakeLists.txt

@@ -11,6 +11,7 @@ option(JSONSCHEMA_CONTINUOUS "Perform a continuous JSON Schema CLI release" ON)
 
 find_package(JSONToolkit REQUIRED)
 find_package(AlterSchema REQUIRED)
+find_package(Blaze REQUIRED)
 find_package(JSONBinPack REQUIRED)
 find_package(Hydra REQUIRED)
 add_subdirectory(src)

DEPENDENCIES

@@ -1,6 +1,7 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-noa https://github.com/sourcemeta/noa 517e88aef5981b88ac6bb8caff15d17dffcb4320
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 9abbaee71e9e00e95632858d29c7ebe5c2a723b0
-hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc
-alterschema https://github.com/sourcemeta/alterschema 358df64771979da64e043a416cf340d83a5382ca
-jsonbinpack https://github.com/sourcemeta/jsonbinpack b25d54363f5a88cd23c1af41e4c6025b9c94d0d6
+noa https://github.com/sourcemeta/noa 837e1ff981f8df45d9e2977a50f5da61d8affed4
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3
+hydra https://github.com/sourcemeta/hydra c0d2f53dc52d8febd3092ce873847729b9f447fb
+alterschema https://github.com/sourcemeta/alterschema 36dc1933bbbdbf1f2574c309e41f510f58874838
+jsonbinpack https://github.com/sourcemeta/jsonbinpack b09b7948f90a9e9c30a2c38441f44d1c4b93b45a
+blaze https://github.com/sourcemeta/blaze 43cac42dc486be24addbc2cd0aa646d18e2000f5

cmake/FindBlaze.cmake

@@ -0,0 +1,5 @@
+if(NOT Blaze_FOUND)
+  set(BLAZE_INSTALL OFF CACHE BOOL "disable installation")
+  add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/blaze")
+  set(Blaze_FOUND ON)
+endif()

src/CMakeLists.txt

@@ -25,6 +25,8 @@ target_link_libraries(jsonschema_cli PRIVATE sourcemeta::alterschema::linter)
 target_link_libraries(jsonschema_cli PRIVATE sourcemeta::hydra::httpclient)
 target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsonbinpack::compiler)
 target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsonbinpack::runtime)
+target_link_libraries(jsonschema_cli PRIVATE sourcemeta::blaze::compiler)
+target_link_libraries(jsonschema_cli PRIVATE sourcemeta::blaze::evaluator)
 
 configure_file(configure.h.in configure.h @ONLY)
 target_include_directories(jsonschema_cli PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")

src/command_frame.cc

@@ -40,8 +40,7 @@ auto sourcemeta::jsonschema::cli::frame(
   sourcemeta::jsontoolkit::ReferenceMap references;
   sourcemeta::jsontoolkit::frame(schema, frame, references,
                                  sourcemeta::jsontoolkit::default_schema_walker,
-                                 resolver(options))
-      .wait();
+                                 resolver(options));
 
   const auto output_json = options.contains("json") || options.contains("j");
   if (output_json) {

src/utils.cc

@@ -175,9 +175,8 @@ auto parse_options(const std::span<const std::string> &arguments,
   return options;
 }
 
-auto print(
-    const sourcemeta::jsontoolkit::SchemaCompilerErrorTraceOutput &output,
-    std::ostream &stream) -> void {
+auto print(const sourcemeta::blaze::ErrorTraceOutput &output,
+           std::ostream &stream) -> void {
   stream << "error: Schema validation failure\n";
   for (const auto &entry : output) {
     stream << "  " << entry.message << "\n";

src/utils.h

@@ -5,6 +5,8 @@
 #include <sourcemeta/jsontoolkit/jsonpointer.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>
 
+#include <sourcemeta/blaze/compiler.h>
+
 #include <filesystem> // std::filesystem
 #include <map>        // std::map
 #include <ostream>    // std::ostream
@@ -27,9 +29,8 @@ auto for_each_json(const std::vector<std::string> &arguments,
     -> std::vector<
         std::pair<std::filesystem::path, sourcemeta::jsontoolkit::JSON>>;
 
-auto print(
-    const sourcemeta::jsontoolkit::SchemaCompilerErrorTraceOutput &output,
-    std::ostream &stream) -> void;
+auto print(const sourcemeta::blaze::ErrorTraceOutput &output,
+           std::ostream &stream) -> void;
 
 auto resolver(const std::map<std::string, std::vector<std::string>> &options,
               const bool remote = false)