Skip to content

Don't lint $ref siblings for default/examples in legacy drafts #610

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

Open
staging-devin-ai-integration wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't lint $ref siblings for default/examples in legacy drafts #610

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
8 changes: 8 additions & 0 deletions src/linter/valid_default.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ auto ValidDefault::condition(
return false;
}

if (schema.defines("$ref") &&
!vocabularies.contains(
"https://json-schema.org/draft/2020-12/vocab/meta-data") &&
!vocabularies.contains(
"https://json-schema.org/draft/2019-09/vocab/meta-data")) {
return false;
}

const auto &root_base_dialect{frame.traverse(location.root.value_or(""))
.value_or(location)
.get()
Expand Down
8 changes: 8 additions & 0 deletions src/linter/valid_examples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ auto ValidExamples::condition(
return false;
}

if (schema.defines("$ref") &&
!vocabularies.contains(
"https://json-schema.org/draft/2020-12/vocab/meta-data") &&
!vocabularies.contains(
"https://json-schema.org/draft/2019-09/vocab/meta-data")) {
return false;
}

const auto &root_base_dialect{frame.traverse(location.root.value_or(""))
.value_or(location)
.get()
Expand Down
102 changes: 102 additions & 0 deletions test/linter/linter_valid_default_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,3 +573,105 @@ TEST(Linter, valid_default_12) {

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_default_13) {
sourcemeta::core::SchemaTransformer bundle;
bundle.add<sourcemeta::blaze::ValidDefault>(
sourcemeta::blaze::default_schema_compiler);

auto schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"foo": { "$ref": "#/definitions/helper", "default": 1 }
},
"definitions": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"foo": { "$ref": "#/definitions/helper", "default": 1 }
},
"definitions": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_default_14) {
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/2019-09/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper", "default": 1 }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper" }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_default_15) {
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",
"properties": {
"foo": { "$ref": "#/$defs/helper", "default": 1 }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper" }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}
102 changes: 102 additions & 0 deletions test/linter/linter_valid_examples_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,3 +615,105 @@ TEST(Linter, valid_examples_13) {

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_examples_14) {
sourcemeta::core::SchemaTransformer bundle;
bundle.add<sourcemeta::blaze::ValidExamples>(
sourcemeta::blaze::default_schema_compiler);

auto schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"foo": { "$ref": "#/definitions/helper", "examples": [ 1 ] }
},
"definitions": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"foo": { "$ref": "#/definitions/helper", "examples": [ 1 ] }
},
"definitions": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_examples_15) {
sourcemeta::core::SchemaTransformer bundle;
bundle.add<sourcemeta::blaze::ValidExamples>(
sourcemeta::blaze::default_schema_compiler);

auto schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper", "examples": [ 1 ] }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper" }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}

TEST(Linter, valid_examples_16) {
sourcemeta::core::SchemaTransformer bundle;
bundle.add<sourcemeta::blaze::ValidExamples>(
sourcemeta::blaze::default_schema_compiler);

auto schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper", "examples": [ 1 ] }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

const auto result = bundle.apply(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver, transformer_callback_error);

EXPECT_TRUE(result);

const auto expected{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"foo": { "$ref": "#/$defs/helper" }
},
"$defs": {
"helper": { "type": "string" }
}
})JSON")};

EXPECT_EQ(schema, expected);
}