Skip to content

Don't try to workaround top-level $ref on reidentify #2017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Don't try to workaround top-level $ref on reidentify #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions src/core/jsonschema/jsonschema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,44 +188,6 @@ auto sourcemeta::core::reidentify(JSON &schema,
assert(is_schema(schema));
assert(schema.is_object());
schema.assign(id_keyword(base_dialect), JSON{new_identifier});

if (schema.defines("$ref")) {
// Workaround top-level `$ref` with `allOf`
if (base_dialect == "http://json-schema.org/draft-07/schema#" ||
base_dialect == "http://json-schema.org/draft-07/hyper-schema#" ||
base_dialect == "http://json-schema.org/draft-06/schema#" ||
base_dialect == "http://json-schema.org/draft-06/hyper-schema#" ||
base_dialect == "http://json-schema.org/draft-04/schema#" ||
base_dialect == "http://json-schema.org/draft-04/hyper-schema#") {
// Note that if the schema already has an `allOf`, we can safely
// remove it, as it was by definition ignored by `$ref` already
if (schema.defines("allOf")) {
schema.erase("allOf");
}

schema.assign("allOf", JSON::make_array());
auto conjunction{JSON::make_object()};
conjunction.assign("$ref", schema.at("$ref"));
schema.at("allOf").push_back(std::move(conjunction));
schema.erase("$ref");
}

// Workaround top-level `$ref` with `extends`
if (base_dialect == "http://json-schema.org/draft-03/schema#" ||
base_dialect == "http://json-schema.org/draft-03/hyper-schema#") {
// Note that if the schema already has an `extends`, we can safely
// remove it, as it was by definition ignored by `$ref` already
if (schema.defines("extends")) {
schema.erase("extends");
}

schema.assign("extends", JSON::make_object());
schema.at("extends").assign("$ref", schema.at("$ref"));
schema.erase("$ref");
}
}

assert(identify(schema, base_dialect).has_value());
}

auto sourcemeta::core::dialect(
Expand Down
5 changes: 3 additions & 2 deletions test/jsonschema/jsonschema_identify_draft3_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ TEST(JSONSchema_identify_draft3, reidentify_set_with_top_level_ref) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-03/schema#",
"extends": { "$ref": "https://example.com/schema" }
"$ref": "https://example.com/schema"
})JSON");

EXPECT_EQ(document, expected);
Expand All @@ -247,7 +247,8 @@ TEST(JSONSchema_identify_draft3,
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-03/schema#",
"extends": { "$ref": "https://example.com/schema" }
"$ref": "https://example.com/schema",
"extends": { "type": "string" }
})JSON");

EXPECT_EQ(document, expected);
Expand Down
5 changes: 3 additions & 2 deletions test/jsonschema/jsonschema_identify_draft4_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ TEST(JSONSchema_identify_draft4, reidentify_set_with_top_level_ref) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-04/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema"
})JSON");

EXPECT_EQ(document, expected);
Expand All @@ -246,7 +246,8 @@ TEST(JSONSchema_identify_draft4, reidentify_set_with_top_level_ref_and_allof) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-04/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema",
"allOf": [ { "type": "string" } ]
})JSON");

EXPECT_EQ(document, expected);
Expand Down
5 changes: 3 additions & 2 deletions test/jsonschema/jsonschema_identify_draft6_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ TEST(JSONSchema_identify_draft6, reidentify_set_with_top_level_ref) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"$id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-06/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema"
})JSON");

EXPECT_EQ(document, expected);
Expand All @@ -246,7 +246,8 @@ TEST(JSONSchema_identify_draft6, reidentify_set_with_top_level_ref_and_allof) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"$id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-06/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema",
"allOf": [ { "type": "string" } ]
})JSON");

EXPECT_EQ(document, expected);
Expand Down
5 changes: 3 additions & 2 deletions test/jsonschema/jsonschema_identify_draft7_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ TEST(JSONSchema_identify_draft7, reidentify_set_with_top_level_ref) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"$id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-07/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema"
})JSON");

EXPECT_EQ(document, expected);
Expand All @@ -246,7 +246,8 @@ TEST(JSONSchema_identify_draft7, reidentify_set_with_top_level_ref_and_allof) {
const sourcemeta::core::JSON expected = sourcemeta::core::parse_json(R"JSON({
"$id": "https://example.com/my-new-id",
"$schema": "http://json-schema.org/draft-07/schema#",
"allOf": [ { "$ref": "https://example.com/schema" } ]
"$ref": "https://example.com/schema",
"allOf": [ { "type": "string" } ]
})JSON");

EXPECT_EQ(document, expected);
Expand Down
Loading