Improve bundling-related invalid JSON errors

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

Author: jviotti

src/core/jsonschema/bundle.cc

@@ -105,14 +105,16 @@ auto bundle_schema(sourcemeta::core::JSON &root, const std::string &container,
     sourcemeta::core::JSON copy{remote.value()};
 
     if (!sourcemeta::core::is_schema(copy)) {
-      throw sourcemeta::core::SchemaResolutionError(
-          identifier, "The JSON document is not a valid JSON Schema");
+      throw sourcemeta::core::SchemaReferenceError(
+          identifier, key.second,
+          "The JSON document is not a valid JSON Schema");
     }
 
     const auto dialect{sourcemeta::core::dialect(copy, default_dialect)};
     if (!dialect.has_value()) {
-      throw sourcemeta::core::SchemaResolutionError(
-          identifier, "The JSON document is not a valid JSON Schema");
+      throw sourcemeta::core::SchemaReferenceError(
+          identifier, key.second,
+          "The JSON document is not a valid JSON Schema");
     }
 
     if (copy.is_object()) {

test/jsonschema/jsonschema_bundle_test.cc

@@ -168,7 +168,7 @@ TEST(JSONSchema_bundle, target_no_dialect) {
   EXPECT_THROW(
       sourcemeta::core::bundle(
           document, sourcemeta::core::schema_official_walker, test_resolver),
-      sourcemeta::core::SchemaResolutionError);
+      sourcemeta::core::SchemaReferenceError);
 }
 
 TEST(JSONSchema_bundle, target_array) {
@@ -182,5 +182,5 @@ TEST(JSONSchema_bundle, target_array) {
   EXPECT_THROW(
       sourcemeta::core::bundle(
           document, sourcemeta::core::schema_official_walker, test_resolver),
-      sourcemeta::core::SchemaResolutionError);
+      sourcemeta::core::SchemaReferenceError);
 }