Fix linter rules to compile using the current default identifier (#469)

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

Author: jviotti

src/linter/valid_default.cc

@@ -40,7 +40,7 @@ auto ValidDefault::condition(
                                               location.dialect)};
   const auto schema_template{compile(subschema, walker, resolver,
                                      this->compiler_, Mode::FastValidation,
-                                     location.dialect)};
+                                     location.dialect, location.base)};
   const auto &instance{schema.at("default")};
   Evaluator evaluator;
   const std::string ref{"$ref"};

src/linter/valid_examples.cc

@@ -48,7 +48,7 @@ auto ValidExamples::condition(
                                               location.dialect)};
   const auto schema_template{compile(subschema, walker, resolver,
                                      this->compiler_, Mode::FastValidation,
-                                     location.dialect)};
+                                     location.dialect, location.base)};
 
   Evaluator evaluator;
   std::size_t cursor{0};

test/linter/linter_valid_default_test.cc

@@ -351,3 +351,79 @@ TEST(Linter, valid_default_9) {
 
   EXPECT_EQ(schema, expected);
 }
+
+TEST(Linter, valid_default_10) {
+  sourcemeta::core::SchemaTransformer bundle;
+  bundle.add<sourcemeta::blaze::ValidDefault>(
+      sourcemeta::blaze::default_schema_compiler);
+
+  auto schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "default": 10, "$ref": "ref.json" }
+  })JSON")};
+
+  auto resolver = [](const std::string_view identifier)
+      -> std::optional<sourcemeta::core::JSON> {
+    if (identifier == "https://example.com/ref.json") {
+      return sourcemeta::core::parse_json(R"JSON({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "$id": "https://example.com/ref.json",
+        "type": "integer"
+      })JSON");
+    }
+
+    return sourcemeta::core::schema_official_resolver(identifier);
+  };
+
+  const auto result = bundle.apply(
+      schema, sourcemeta::core::schema_official_walker, resolver,
+      transformer_callback_error, std::nullopt, "https://example.com/root");
+
+  EXPECT_TRUE(result);
+
+  const auto expected{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "default": 10, "$ref": "ref.json" }
+  })JSON")};
+
+  EXPECT_EQ(schema, expected);
+}
+
+TEST(Linter, valid_default_11) {
+  sourcemeta::core::SchemaTransformer bundle;
+  bundle.add<sourcemeta::blaze::ValidDefault>(
+      sourcemeta::blaze::default_schema_compiler);
+
+  auto schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "default": 10,
+    "$ref": "ref.json"
+  })JSON")};
+
+  auto resolver = [](const std::string_view identifier)
+      -> std::optional<sourcemeta::core::JSON> {
+    if (identifier == "https://example.com/ref.json") {
+      return sourcemeta::core::parse_json(R"JSON({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "$id": "https://example.com/ref.json",
+        "type": "integer"
+      })JSON");
+    }
+
+    return sourcemeta::core::schema_official_resolver(identifier);
+  };
+
+  const auto result = bundle.apply(
+      schema, sourcemeta::core::schema_official_walker, resolver,
+      transformer_callback_error, std::nullopt, "https://example.com/root");
+
+  EXPECT_TRUE(result);
+
+  const auto expected{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "default": 10,
+    "$ref": "ref.json"
+  })JSON")};
+
+  EXPECT_EQ(schema, expected);
+}

test/linter/linter_valid_examples_test.cc

@@ -390,3 +390,79 @@ TEST(Linter, valid_examples_10) {
 
   EXPECT_EQ(schema, expected);
 }
+
+TEST(Linter, valid_examples_11) {
+  sourcemeta::core::SchemaTransformer bundle;
+  bundle.add<sourcemeta::blaze::ValidDefault>(
+      sourcemeta::blaze::default_schema_compiler);
+
+  auto schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "examples": [ 10 ], "$ref": "ref.json" }
+  })JSON")};
+
+  auto resolver = [](const std::string_view identifier)
+      -> std::optional<sourcemeta::core::JSON> {
+    if (identifier == "https://example.com/ref.json") {
+      return sourcemeta::core::parse_json(R"JSON({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "$id": "https://example.com/ref.json",
+        "type": "integer"
+      })JSON");
+    }
+
+    return sourcemeta::core::schema_official_resolver(identifier);
+  };
+
+  const auto result = bundle.apply(
+      schema, sourcemeta::core::schema_official_walker, resolver,
+      transformer_callback_error, std::nullopt, "https://example.com/root");
+
+  EXPECT_TRUE(result);
+
+  const auto expected{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "examples": [ 10 ], "$ref": "ref.json" }
+  })JSON")};
+
+  EXPECT_EQ(schema, expected);
+}
+
+TEST(Linter, valid_examples_12) {
+  sourcemeta::core::SchemaTransformer bundle;
+  bundle.add<sourcemeta::blaze::ValidDefault>(
+      sourcemeta::blaze::default_schema_compiler);
+
+  auto schema{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "examples": [ 10 ], "$ref": "ref.json" },
+    "$ref": "ref.json"
+  })JSON")};
+
+  auto resolver = [](const std::string_view identifier)
+      -> std::optional<sourcemeta::core::JSON> {
+    if (identifier == "https://example.com/ref.json") {
+      return sourcemeta::core::parse_json(R"JSON({
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "$id": "https://example.com/ref.json",
+        "type": "integer"
+      })JSON");
+    }
+
+    return sourcemeta::core::schema_official_resolver(identifier);
+  };
+
+  const auto result = bundle.apply(
+      schema, sourcemeta::core::schema_official_walker, resolver,
+      transformer_callback_error, std::nullopt, "https://example.com/root");
+
+  EXPECT_TRUE(result);
+
+  const auto expected{sourcemeta::core::parse_json(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "items": { "examples": [ 10 ], "$ref": "ref.json" },
+    "$ref": "ref.json"
+  })JSON")};
+
+  EXPECT_EQ(schema, expected);
+}