Upgrade JSON Toolkit and AlterSchema

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

.github/workflows/ci.yml

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

DEPENDENCIES

@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 9abbaee71e9e00e95632858d29c7ebe5c2a723b0
-alterschema https://github.com/sourcemeta/alterschema 358df64771979da64e043a416cf340d83a5382ca
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3
+alterschema https://github.com/sourcemeta/alterschema f81f1bb82e08365a2e892f0b5992f6d01213127b
 googletest https://github.com/google/googletest 987e225614755fec7253aa95bf959c09e0d380d7
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
 noa https://github.com/sourcemeta/noa 517e88aef5981b88ac6bb8caff15d17dffcb4320

src/compiler/encoding.h

@@ -4,31 +4,26 @@
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>
 
-#include <future> // std::future
-
 namespace sourcemeta::jsonbinpack {
 
 constexpr auto ENCODING_V1{"tag:sourcemeta.com,2024:jsonbinpack/encoding/v1"};
 
 inline auto
 make_resolver(const sourcemeta::jsontoolkit::SchemaResolver &fallback) -> auto {
   return [&fallback](std::string_view identifier)
-             -> std::future<std::optional<sourcemeta::jsontoolkit::JSON>> {
-    std::promise<std::optional<sourcemeta::jsontoolkit::JSON>> promise;
+             -> std::optional<sourcemeta::jsontoolkit::JSON> {
     if (identifier == ENCODING_V1) {
-      promise.set_value(sourcemeta::jsontoolkit::parse(R"JSON({
+      return sourcemeta::jsontoolkit::parse(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");
     } else {
-      promise.set_value(fallback(identifier).get());
+      return fallback(identifier);
     }
-
-    return promise.get_future();
   };
 }
 

test/compiler/canonicalizer_test.cc

@@ -4,24 +4,19 @@
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>
 
-#include <future>   // std::promise, std::future
 #include <optional> // std::optional
 #include <string>   // std::string
 
 static auto test_resolver(std::string_view identifier)
-    -> std::future<std::optional<sourcemeta::jsontoolkit::JSON>> {
-  std::promise<std::optional<sourcemeta::jsontoolkit::JSON>> promise;
+    -> std::optional<sourcemeta::jsontoolkit::JSON> {
   if (identifier == "https://jsonbinpack.sourcemeta.com/draft/unknown") {
-    promise.set_value(sourcemeta::jsontoolkit::parse(R"JSON({
+    return sourcemeta::jsontoolkit::parse(R"JSON({
         "$schema": "https://jsonbinpack.sourcemeta.com/draft/unknown",
         "$id": "https://jsonbinpack.sourcemeta.com/draft/unknown"
-      })JSON"));
+      })JSON");
   } else {
-    promise.set_value(
-        sourcemeta::jsontoolkit::official_resolver(identifier).get());
+    return sourcemeta::jsontoolkit::official_resolver(identifier);
   }
-
-  return promise.get_future();
 }
 
 TEST(JSONBinPack_Canonicalizer, unsupported_draft) {