Take a default identifier when compiling a schema (#468)

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

Author: jviotti

DEPENDENCIES

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

src/compiler/compile.cc

@@ -107,14 +107,15 @@ auto compile(const sourcemeta::core::JSON &schema,
              const sourcemeta::core::SchemaResolver &resolver,
              const Compiler &compiler,
              const sourcemeta::core::SchemaFrame &frame, const Mode mode,
-             const std::optional<std::string> &default_dialect) -> Template {
+             const std::optional<std::string> &default_dialect,
+             const std::optional<std::string> &default_id) -> Template {
   assert(is_schema(schema));
 
   const std::string base{sourcemeta::core::URI::canonicalize(
       sourcemeta::core::identify(
           schema, resolver,
           sourcemeta::core::SchemaIdentificationStrategy::Strict,
-          default_dialect)
+          default_dialect, default_id)
           .value_or(""))};
 
   assert(frame.locations().contains(
@@ -271,21 +272,22 @@ auto compile(const sourcemeta::core::JSON &schema,
              const sourcemeta::core::SchemaWalker &walker,
              const sourcemeta::core::SchemaResolver &resolver,
              const Compiler &compiler, const Mode mode,
-             const std::optional<std::string> &default_dialect) -> Template {
+             const std::optional<std::string> &default_dialect,
+             const std::optional<std::string> &default_id) -> Template {
   assert(is_schema(schema));
 
   // Make sure the input schema is bundled, otherwise we won't be able to
   // resolve remote references here
-  const sourcemeta::core::JSON result{
-      sourcemeta::core::bundle(schema, walker, resolver, default_dialect)};
+  const sourcemeta::core::JSON result{sourcemeta::core::bundle(
+      schema, walker, resolver, default_dialect, default_id)};
 
   // Perform framing to resolve references later on
   sourcemeta::core::SchemaFrame frame{
       sourcemeta::core::SchemaFrame::Mode::References};
-  frame.analyse(result, walker, resolver, default_dialect);
+  frame.analyse(result, walker, resolver, default_dialect, default_id);
 
   return compile(result, walker, resolver, compiler, frame, mode,
-                 default_dialect);
+                 default_dialect, default_id);
 }
 
 auto compile(const Context &context, const SchemaContext &schema_context,

src/compiler/include/sourcemeta/blaze/compiler.h

@@ -143,13 +143,13 @@ auto SOURCEMETA_BLAZE_COMPILER_EXPORT default_schema_compiler(
 ///
 /// // Evaluate or encode
 /// ```
-auto SOURCEMETA_BLAZE_COMPILER_EXPORT
-compile(const sourcemeta::core::JSON &schema,
-        const sourcemeta::core::SchemaWalker &walker,
-        const sourcemeta::core::SchemaResolver &resolver,
-        const Compiler &compiler, const Mode mode = Mode::FastValidation,
-        const std::optional<std::string> &default_dialect = std::nullopt)
-    -> Template;
+auto SOURCEMETA_BLAZE_COMPILER_EXPORT compile(
+    const sourcemeta::core::JSON &schema,
+    const sourcemeta::core::SchemaWalker &walker,
+    const sourcemeta::core::SchemaResolver &resolver, const Compiler &compiler,
+    const Mode mode = Mode::FastValidation,
+    const std::optional<std::string> &default_dialect = std::nullopt,
+    const std::optional<std::string> &default_id = std::nullopt) -> Template;
 
 /// @ingroup compiler
 ///
@@ -160,14 +160,14 @@ compile(const sourcemeta::core::JSON &schema,
 /// behavior.
 ///
 /// Don't use this function unless you know what you are doing.
-auto SOURCEMETA_BLAZE_COMPILER_EXPORT
-compile(const sourcemeta::core::JSON &schema,
-        const sourcemeta::core::SchemaWalker &walker,
-        const sourcemeta::core::SchemaResolver &resolver,
-        const Compiler &compiler, const sourcemeta::core::SchemaFrame &frame,
-        const Mode mode = Mode::FastValidation,
-        const std::optional<std::string> &default_dialect = std::nullopt)
-    -> Template;
+auto SOURCEMETA_BLAZE_COMPILER_EXPORT compile(
+    const sourcemeta::core::JSON &schema,
+    const sourcemeta::core::SchemaWalker &walker,
+    const sourcemeta::core::SchemaResolver &resolver, const Compiler &compiler,
+    const sourcemeta::core::SchemaFrame &frame,
+    const Mode mode = Mode::FastValidation,
+    const std::optional<std::string> &default_dialect = std::nullopt,
+    const std::optional<std::string> &default_id = std::nullopt) -> Template;
 
 /// @ingroup compiler
 ///

test/evaluator/evaluator_test.cc

@@ -19,6 +19,12 @@ static auto test_resolver(std::string_view identifier)
         "https://example.com/vocab/custom": true
       }
     })JSON");
+  } else if (identifier == "https://example.com/schema") {
+    return sourcemeta::core::parse_json(R"JSON({
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://example.com/schema",
+      "type": "string"
+    })JSON");
   } else {
     return sourcemeta::core::schema_official_resolver(identifier);
   }
@@ -42,6 +48,36 @@ TEST(Evaluator, unknown_vocabulary_required) {
   }
 }
 
+TEST(Evaluator, without_default_id) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$ref": "schema"
+  })JSON")};
+
+  EXPECT_THROW(sourcemeta::blaze::compile(
+                   schema, sourcemeta::core::schema_official_walker,
+                   test_resolver, sourcemeta::blaze::default_schema_compiler,
+                   sourcemeta::blaze::Mode::FastValidation),
+               sourcemeta::core::SchemaResolutionError);
+}
+
+TEST(Evaluator, with_default_id) {
+  const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$ref": "schema"
+  })JSON")};
+
+  const auto compiled_schema{sourcemeta::blaze::compile(
+      schema, sourcemeta::core::schema_official_walker, test_resolver,
+      sourcemeta::blaze::default_schema_compiler,
+      sourcemeta::blaze::Mode::FastValidation, std::nullopt,
+      "https://example.com/default")};
+
+  const sourcemeta::core::JSON instance{"foo"};
+  EVALUATE_WITH_TRACE(compiled_schema, instance, 1)
+  EXPECT_TRUE(result);
+}
+
 TEST(Evaluator, boolean_true) {
   const sourcemeta::core::JSON schema{true};