Skip to content

Fix unnecessary_allof_wrapper_modern conflict on canonicalise #1877

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
Jul 25, 2025
Merged

Fix unnecessary_allof_wrapper_modern conflict on canonicalise #1877

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
11 changes: 11 additions & 0 deletions src/extension/alterschema/linter/unnecessary_allof_wrapper_draft.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ class UnnecessaryAllOfWrapperDraft final : public SchemaTransformRule {

for (const auto &entry : schema.at("allOf").as_array()) {
if (entry.is_object()) {
// It is dangerous to extract type-specific keywords from a schema that
// declares a type into another schema that also declares a type if
// the types are different. As we might lead to those type-keywords
// getting incorrectly removed if they don't apply to the target type
if (schema.defines("type") && entry.defines("type") &&
// TODO: Ideally we also check for intersection of types in type
// arrays or whether one is contained in the other
schema.at("type") != entry.at("type")) {
continue;
}

for (const auto &subentry : entry.as_object()) {
if (subentry.first != "$ref" && !schema.defines(subentry.first)) {
return true;
Expand Down
18 changes: 18 additions & 0 deletions src/extension/alterschema/linter/unnecessary_allof_wrapper_modern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,27 @@ class UnnecessaryAllOfWrapperModern final : public SchemaTransformRule {
return false;
}

const auto has_validation{contains_any(
vocabularies,
{"https://json-schema.org/draft/2020-12/vocab/validation",
"https://json-schema.org/draft/2019-09/vocab/validation"})};

for (const auto &entry : schema.at("allOf").as_array()) {
if (entry.is_object()) {
// It is dangerous to extract type-specific keywords from a schema that
// declares a type into another schema that also declares a type if
// the types are different. As we might lead to those type-keywords
// getting incorrectly removed if they don't apply to the target type
if (has_validation && schema.defines("type") && entry.defines("type") &&
// TODO: Ideally we also check for intersection of types in type
// arrays or whether one is contained in the other
schema.at("type") != entry.at("type")) {
continue;
}

for (const auto &subentry : entry.as_object()) {
// TODO: Have another rule that removes a keyword if its exactly
// equal to an instance of the same keyword outside the wrapper
if (!schema.defines(subentry.first)) {
return true;
}
Expand Down
79 changes: 79 additions & 0 deletions test/alterschema/alterschema_lint_2019_09_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,85 @@ TEST(AlterSchema_lint_2019_09, duplicate_allof_branches_1) {
EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2019_09, duplicate_allof_branches_2) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2019_09, duplicate_allof_branches_3) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"allOf": [
{ "type": "number" },
{ "type": "number" },
{ "type": "string" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2019_09, duplicate_allof_branches_4) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" },
{ "type": "number" },
{ "type": "string" },
{ "type": "string" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2019_09, duplicate_anyof_branches_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
Expand Down
79 changes: 79 additions & 0 deletions test/alterschema/alterschema_lint_2020_12_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,85 @@ TEST(AlterSchema_lint_2020_12, duplicate_allof_branches_1) {
EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2020_12, duplicate_allof_branches_2) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2020_12, duplicate_allof_branches_3) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{ "type": "number" },
{ "type": "number" },
{ "type": "string" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2020_12, duplicate_allof_branches_4) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" },
{ "type": "number" },
{ "type": "string" },
{ "type": "string" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_2020_12, duplicate_anyof_branches_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
Expand Down
79 changes: 79 additions & 0 deletions test/alterschema/alterschema_lint_draft4_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,85 @@ TEST(AlterSchema_lint_draft4, duplicate_allof_branches_1) {
EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft4, duplicate_allof_branches_2) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft4, duplicate_allof_branches_3) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"allOf": [
{ "type": "number" },
{ "type": "number" },
{ "type": "string" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft4, duplicate_allof_branches_4) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" },
{ "type": "number" },
{ "type": "string" },
{ "type": "string" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft4, duplicate_anyof_branches_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-04/schema#",
Expand Down
79 changes: 79 additions & 0 deletions test/alterschema/alterschema_lint_draft6_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,85 @@ TEST(AlterSchema_lint_draft6, duplicate_allof_branches_1) {
EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft6, duplicate_allof_branches_2) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft6, duplicate_allof_branches_3) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"allOf": [
{ "type": "number" },
{ "type": "number" },
{ "type": "string" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft6, duplicate_allof_branches_4) {
auto document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"allOf": [
{ "type": "number" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" },
{ "type": "number" },
{ "type": "string" },
{ "type": "string" },
{ "type": "string" },
{ "type": "number" },
{ "type": "number" }
]
})JSON");

LINT_AND_FIX_FOR_STATIC_ANALYSIS(document);

const auto expected = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"type": "number",
"multipleOf": 1,
"allOf": [
{ "type": "string", "minLength": 0 }
]
})JSON");

EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft6, duplicate_anyof_branches_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
Expand Down
Loading
Loading