Skip to content

Apply discriminator before unevaluated keywords #220

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
davishmcclurg merged 1 commit into from
Jun 19, 2025
Merged

Apply discriminator before unevaluated keywords #220

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
3 changes: 1 addition & 2 deletions lib/json_schemer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class InvalidEcmaRegexp < StandardError; end
VOCABULARIES = {
'https://json-schema.org/draft/2020-12/vocab/core' => Draft202012::Vocab::CORE,
'https://json-schema.org/draft/2020-12/vocab/applicator' => Draft202012::Vocab::APPLICATOR,
'https://spec.openapis.org/oas/3.1/vocab/base' => OpenAPI31::Vocab::BASE,
'https://json-schema.org/draft/2020-12/vocab/unevaluated' => Draft202012::Vocab::UNEVALUATED,
'https://json-schema.org/draft/2020-12/vocab/validation' => Draft202012::Vocab::VALIDATION,
'https://json-schema.org/draft/2020-12/vocab/format-annotation' => Draft202012::Vocab::FORMAT_ANNOTATION,
Expand All @@ -97,8 +98,6 @@ class InvalidEcmaRegexp < StandardError; end
'json-schemer://draft7' => Draft7::Vocab::ALL,
'json-schemer://draft6' => Draft6::Vocab::ALL,
'json-schemer://draft4' => Draft4::Vocab::ALL,

'https://spec.openapis.org/oas/3.1/vocab/base' => OpenAPI31::Vocab::BASE,
'json-schemer://openapi30' => OpenAPI30::Vocab::BASE
}
VOCABULARY_ORDER = VOCABULARIES.transform_values.with_index { |_vocabulary, index| index }
Expand Down
40 changes: 36 additions & 4 deletions test/open_api_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ def test_discriminator_specification_example
assert_equal([['enum', '/components/schemas/Cat/allOf/1/properties/huntingSkill']], schemer.validate(invalid_hunting_skill).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['required', '/components/schemas/Dog/allOf/1']], schemer.validate(missing_pack_size).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['format', '/components/schemas/Dog/allOf/1/properties/packSize']], schemer.validate(invalid_pack_size).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['required', '/components/schemas/Pet'], ['discriminator', '/components/schemas/Pet']], schemer.validate(missing_pet_type).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['required', '/components/schemas/Pet'], ['required', '/components/schemas/Cat/allOf/1']], schemer.validate(missing_name).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['discriminator', '/components/schemas/Pet'], ['required', '/components/schemas/Pet']], schemer.validate(missing_pet_type).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['required', '/components/schemas/Cat/allOf/1'], ['required', '/components/schemas/Pet']], schemer.validate(missing_name).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['discriminator', '/components/schemas/Pet']], schemer.validate(invalid_pet_type).map { |error| error.values_at('type', 'schema_pointer') })
end

Expand Down Expand Up @@ -408,7 +408,7 @@ def test_all_of_discriminator_subclass_schemas_work_on_their_own
assert(schemer.valid?(CAT))
assert(schemer.valid?(MISTY))
assert_equal(['/components/schemas/Cat/allOf/1/properties/name'], schemer.validate(INVALID_CAT).map { |error| error.fetch('schema_pointer') })
assert_equal([['required', '/components/schemas/Pet'], ['discriminator', '/components/schemas/Pet']], schemer.validate({}).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['discriminator', '/components/schemas/Pet'], ['required', '/components/schemas/Pet']], schemer.validate({}).map { |error| error.values_at('type', 'schema_pointer') })
end

def test_all_of_discriminator_with_non_discriminator_ref
Expand Down Expand Up @@ -448,7 +448,7 @@ def test_all_of_discriminator_with_non_discriminator_ref
refute(schemer.valid?(CAT))
assert(schemer.valid?(CAT.merge('other' => 'y')))
assert_equal(['/components/schemas/Other', '/components/schemas/Cat/allOf/2/properties/name'], schemer.validate(INVALID_CAT).map { |error| error.fetch('schema_pointer') })
assert_equal([['required', '/components/schemas/Pet'], ['discriminator', '/components/schemas/Pet'], ['required', '/components/schemas/Other']], schemer.validate({}).map { |error| error.values_at('type', 'schema_pointer') })
assert_equal([['discriminator', '/components/schemas/Pet'], ['required', '/components/schemas/Pet'], ['required', '/components/schemas/Other']], schemer.validate({}).map { |error| error.values_at('type', 'schema_pointer') })
end

def test_all_of_discriminator_with_remote_ref
Expand Down Expand Up @@ -1416,4 +1416,36 @@ def test_openapi30
assert(document.valid?)
assert(schemer.valid_schema?)
end

def test_discriminator_unevaluated_properties
schema = {
'oneOf' => [
{ '$ref' => '#/definitions/Cat' },
],
'unevaluatedProperties' => false,
'discriminator' => {
'propertyName' => 'petType',
'mapping' => {
'cat' => '#/definitions/Cat',
},
},
'definitions' => {
'Cat' => {
'properties' => {
'name' => { 'type' => 'string' },
'petType' => { 'const' => 'cat' },
},
},
},
}

valid = { 'petType' => 'cat', 'name' => 'a' }
invalid = { 'petType' => 'cat', 'uneval' => 'a' }

assert(JSONSchemer.schema(schema, meta_schema: JSONSchemer.openapi31).valid?(valid))
refute(JSONSchemer.schema(schema, meta_schema: JSONSchemer.openapi31).valid?(invalid))

assert(JSONSchemer.schema(schema, meta_schema: JSONSchemer.openapi30).valid?(valid))
assert(JSONSchemer.schema(schema, meta_schema: JSONSchemer.openapi30).valid?(invalid))
end
end