Upgrade Core and Blaze

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

Author: jviotti

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core fe9ef27a95281775fe3a98b9fb8eb4c51837af0a
-blaze https://github.com/sourcemeta/blaze fa1310cb51cd7d1afbd08dc47dab5307b0122526
+core https://github.com/sourcemeta/core f8a406692eb8080c84cd016ec4968e391461b1c1
+blaze https://github.com/sourcemeta/blaze 22d0e8a03d1de54c44599426d8537386fcf2a617
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

config.cmake.in

@@ -10,7 +10,7 @@ endif()
 
 include(CMakeFindDependencyMacro)
 find_dependency(Core COMPONENTS json uri jsonpointer numeric regex io)
-find_dependency(Blaze COMPONENTS foundation bundle alterschema)
+find_dependency(Blaze COMPONENTS foundation bundle alterschema canonicalizer)
 
 foreach(component ${JSONBINPACK_COMPONENTS})
   if(component STREQUAL "runtime")

src/compiler/CMakeLists.txt

@@ -32,3 +32,5 @@ target_link_libraries(sourcemeta_jsonbinpack_compiler PUBLIC
   sourcemeta::blaze::foundation)
 target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE
   sourcemeta::blaze::alterschema)
+target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE
+  sourcemeta::blaze::canonicalizer)

src/compiler/compiler.cc

@@ -3,6 +3,7 @@
 #include <sourcemeta/core/numeric.h>
 
 #include <sourcemeta/blaze/alterschema.h>
+#include <sourcemeta/blaze/canonicalizer.h>
 #include <sourcemeta/core/jsonpointer.h>
 
 #include "encoding.h"
@@ -24,13 +25,8 @@ auto canonicalize(sourcemeta::core::JSON &schema,
                   const sourcemeta::blaze::SchemaWalker &walker,
                   const sourcemeta::blaze::SchemaResolver &resolver,
                   const std::string_view default_dialect) -> void {
-  sourcemeta::blaze::SchemaTransformer canonicalizer;
-  sourcemeta::blaze::add(canonicalizer,
-                         sourcemeta::blaze::AlterSchemaMode::Canonicalizer);
-  [[maybe_unused]] const auto result =
-      canonicalizer.apply(schema, walker, make_resolver(resolver),
-                          transformer_callback_noop, default_dialect);
-  assert(result.first);
+  sourcemeta::blaze::canonicalize(schema, walker, make_resolver(resolver),
+                                  default_dialect);
 }
 
 auto make_encoding(sourcemeta::core::JSON &document,
@@ -62,7 +58,8 @@ auto compile(sourcemeta::core::JSON &schema,
              const sourcemeta::blaze::SchemaWalker &walker,
              const sourcemeta::blaze::SchemaResolver &resolver,
              const std::string_view default_dialect) -> void {
-  canonicalize(schema, walker, resolver, default_dialect);
+  sourcemeta::jsonbinpack::canonicalize(schema, walker, resolver,
+                                        default_dialect);
 
   sourcemeta::blaze::SchemaTransformer mapper;