Skip to content

Property support the empty enum in 2019-09 and 2020-12 #747

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
jviotti merged 1 commit into from
Apr 22, 2026
Merged

Property support the empty enum in 2019-09 and 2020-12 #747

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
5 changes: 5 additions & 0 deletions src/compiler/default_compiler_draft4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2059,6 +2059,11 @@ auto compiler_draft4_validation_enum(const Context &context,
return {};
}

if (schema_context.schema.at(dynamic_context.keyword).empty()) {
return {make(sourcemeta::blaze::InstructionIndex::AssertionFail, context,
schema_context, dynamic_context, ValueNone{})};
}

if (schema_context.schema.at(dynamic_context.keyword).size() == 1) {
return {
make(sourcemeta::blaze::InstructionIndex::AssertionEqual, context,
Expand Down
8 changes: 8 additions & 0 deletions src/evaluator/evaluator_describe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ auto describe(const bool valid, const Instruction &step,
const sourcemeta::core::JSON &target{get(instance, instance_location)};

if (step.type == sourcemeta::blaze::InstructionIndex::AssertionFail) {
if (keyword == "enum") {
std::ostringstream message;
message << "The " << type_name(target.type())
<< " value was not expected to validate against the empty "
"enumeration";
return message.str();
}

if (keyword == "contains") {
return "The constraints declared for this keyword were not satisfiable";
}
Expand Down
56 changes: 56 additions & 0 deletions test/evaluator/evaluator_2019_09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4819,5 +4819,61 @@
"The object value was not expected to define unevaluated properties"
]
}
},
{
"description": "empty_enum_string",
"schema": { "$schema": "https://json-schema.org/draft/2019-09/schema", "enum": [] },
"instance": "foo",
"valid": false,
"fast": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The string value was not expected to validate against the empty enumeration"
]
},
"exhaustive": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The string value was not expected to validate against the empty enumeration"
]
}
},
{
"description": "empty_enum_integer",
"schema": { "$schema": "https://json-schema.org/draft/2019-09/schema", "enum": [] },
"instance": 42,
"valid": false,
"fast": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The integer value was not expected to validate against the empty enumeration"
]
},
"exhaustive": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The integer value was not expected to validate against the empty enumeration"
]
}
}
]
56 changes: 56 additions & 0 deletions test/evaluator/evaluator_2020_12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4338,5 +4338,61 @@
"The value was expected to be of type object"
]
}
},
{
"description": "empty_enum_string",
"schema": { "$schema": "https://json-schema.org/draft/2020-12/schema", "enum": [] },
"instance": "foo",
"valid": false,
"fast": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The string value was not expected to validate against the empty enumeration"
]
},
"exhaustive": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The string value was not expected to validate against the empty enumeration"
]
}
},
{
"description": "empty_enum_integer",
"schema": { "$schema": "https://json-schema.org/draft/2020-12/schema", "enum": [] },
"instance": 42,
"valid": false,
"fast": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The integer value was not expected to validate against the empty enumeration"
]
},
"exhaustive": {
"pre": [
[ "AssertionFail", "/enum", "#/enum", "" ]
],
"post": [
[ false, "AssertionFail", "/enum", "#/enum", "" ]
],
"descriptions": [
"The integer value was not expected to validate against the empty enumeration"
]
}
}
]
Loading