Exercise to_json() on the Evaluator test suite (#462)

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

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-core https://github.com/sourcemeta/core 2aab6820e4b4ff7062954c7ee4f55aea04112496
+core https://github.com/sourcemeta/core 44f603669e1e0219d251a647b97df8213ffb7e45
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite 48461fc3568972801b40eaccc428a31bce338f6e

src/compiler/compile_json.cc

@@ -13,11 +13,6 @@ template <typename T>
 auto to_json(const T &) -> JSON {
   return JSON{nullptr};
 }
-template <typename T>
-  requires std::is_same_v<T, sourcemeta::blaze::ValueRegex>
-auto to_json(const T &value) -> JSON {
-  return JSON{value.second};
-}
 } // namespace sourcemeta::core
 
 namespace sourcemeta::blaze {

test/compiler/compiler_json_test.cc

@@ -102,3 +102,38 @@ TEST(Compiler_JSON, example_2) {
 
   EXPECT_EQ(result, expected);
 }
+
+TEST(Compiler_JSON, example_3) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "pattern": "^f"
+  })JSON")};
+
+  const auto schema_template{sourcemeta::blaze::compile(
+      schema, sourcemeta::core::schema_official_walker,
+      sourcemeta::core::schema_official_resolver,
+      sourcemeta::blaze::default_schema_compiler)};
+
+  const auto result{sourcemeta::blaze::to_json(schema_template)};
+
+  const sourcemeta::core::JSON expected{sourcemeta::core::parse_json(R"JSON({
+    "dynamic": false,
+    "track": false,
+    "instructions": [
+      {
+        "t": 19,
+        "s": "/pattern",
+        "i": "",
+        "k": "#/pattern",
+        "r": 0,
+        "v": {
+          "t": 9,
+          "v": [ null, "^f" ]
+        },
+        "c": []
+      }
+    ]
+  })JSON")};
+
+  EXPECT_EQ(result, expected);
+}

test/evaluator/evaluator_utils.h

@@ -46,6 +46,7 @@ inline auto FIRST_PROPERTY_IS(const sourcemeta::core::JSON &document,
       sourcemeta::core::schema_official_resolver,                              \
       sourcemeta::blaze::default_schema_compiler,                              \
       sourcemeta::blaze::Mode::FastValidation)};                               \
+  EXPECT_TRUE(sourcemeta::blaze::to_json(compiled_schema).is_object());        \
   EVALUATE_WITH_TRACE(compiled_schema, instance, count)                        \
   EXPECT_TRUE(result);
 
@@ -55,6 +56,7 @@ inline auto FIRST_PROPERTY_IS(const sourcemeta::core::JSON &document,
       sourcemeta::core::schema_official_resolver,                              \
       sourcemeta::blaze::default_schema_compiler,                              \
       sourcemeta::blaze::Mode::FastValidation)};                               \
+  EXPECT_TRUE(sourcemeta::blaze::to_json(compiled_schema).is_object());        \
   EVALUATE_WITH_TRACE(compiled_schema, instance, count)                        \
   EXPECT_FALSE(result);
 
@@ -64,6 +66,7 @@ inline auto FIRST_PROPERTY_IS(const sourcemeta::core::JSON &document,
       sourcemeta::core::schema_official_resolver,                              \
       sourcemeta::blaze::default_schema_compiler,                              \
       sourcemeta::blaze::Mode::Exhaustive)};                                   \
+  EXPECT_TRUE(sourcemeta::blaze::to_json(compiled_schema).is_object());        \
   EVALUATE_WITH_TRACE(compiled_schema, instance, count)                        \
   EXPECT_TRUE(result);
 
@@ -73,6 +76,7 @@ inline auto FIRST_PROPERTY_IS(const sourcemeta::core::JSON &document,
       sourcemeta::core::schema_official_resolver,                              \
       sourcemeta::blaze::default_schema_compiler,                              \
       sourcemeta::blaze::Mode::Exhaustive)};                                   \
+  EXPECT_TRUE(sourcemeta::blaze::to_json(compiled_schema).is_object());        \
   EVALUATE_WITH_TRACE(compiled_schema, instance, count)                        \
   EXPECT_FALSE(result);