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 277dcfa984d2a1ba3ef3d643361a69f2a0bddbc3
-blaze https://github.com/sourcemeta/blaze 079b9d438b37ee40966730c79a498abda84c04f8
+core https://github.com/sourcemeta/core 7745054cc2334341799207eabd6cc13986023db8
+blaze https://github.com/sourcemeta/blaze 93f98104ac0d2a62b3e0023077818cc7511fb6da
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/compiler/encoding.h

@@ -11,16 +11,17 @@ constexpr auto ENCODING_V1{"tag:sourcemeta.com,2024:jsonbinpack/encoding/v1"};
 inline auto make_resolver(const sourcemeta::blaze::SchemaResolver &fallback)
     -> auto {
   return [&fallback](std::string_view identifier)
-             -> std::optional<sourcemeta::core::JSON> {
+             -> sourcemeta::blaze::SchemaResolverResult {
     if (identifier == ENCODING_V1) {
-      return sourcemeta::core::parse_json(R"JSON({
+      static const auto schema{sourcemeta::core::parse_json(R"JSON({
         "$id": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
         "$schema": "https://json-schema.org/draft/2020-12/schema",
         "$vocabulary": {
           "https://json-schema.org/draft/2020-12/vocab/core": true,
           "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1": true
         }
-      })JSON");
+      })JSON")};
+      return schema;
     } else {
       return fallback(identifier);
     }

test/compiler/canonicalizer_test.cc

@@ -3,16 +3,16 @@
 #include <sourcemeta/core/test.h>
 #include <sourcemeta/jsonbinpack/compiler.h>
 
-#include <optional> // std::optional
-#include <string>   // std::string
+#include <string> // std::string
 
 static auto test_resolver(std::string_view identifier)
-    -> std::optional<sourcemeta::core::JSON> {
+    -> sourcemeta::blaze::SchemaResolverResult {
   if (identifier == "https://jsonbinpack.sourcemeta.com/draft/unknown") {
-    return sourcemeta::core::parse_json(R"JSON({
+    static const auto schema{sourcemeta::core::parse_json(R"JSON({
         "$schema": "https://jsonbinpack.sourcemeta.com/draft/unknown",
         "$id": "https://jsonbinpack.sourcemeta.com/draft/unknown"
-      })JSON");
+      })JSON")};
+    return schema;
   } else {
     return sourcemeta::blaze::schema_resolver(identifier);
   }