Skip to content

602 #605

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

Closed
bcherny wants to merge 2 commits into from
+798 −183
Closed

602 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1252285
add test cases
bcherny Jun 24, 2024
db7188d
add normalizer step to simplify intersection+schema types
bcherny Jun 24, 2024
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
21 changes: 21 additions & 0 deletions src/normalizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,27 @@ function isArrayType(schema: LinkedJSONSchema) {
return schema.items !== undefined || hasType(schema, 'array') || hasType(schema, 'any')
}

rules.set('Simplify intersection+schemas to intersection', schema => {
if (schema.allOf && (schema.properties || schema.patternProperties || schema.required)) {
const newCase: LinkedJSONSchema = {
[Parent]: schema,
properties: schema.properties,
additionalProperties: schema.additionalProperties,
patternProperties: schema.patternProperties,
required: schema.required,
}
if (schema.allOf.some(_ => _.additionalProperties === false)) {
newCase.additionalProperties = false
}
schema.allOf.push(newCase)
delete schema.properties
delete schema.patternProperties
delete schema.required
delete schema.type
// leave additionalProperties as-is
}
})

rules.set('Remove `type=["null"]` if `enum=[null]`', schema => {
if (
Array.isArray(schema.enum) &&
Expand Down
Loading