Skip to content

provide defaults for all keywords and subschemas that lacked them #1006

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 7 commits into from
Jan 27, 2021
Merged

provide defaults for all keywords and subschemas that lacked them #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9eef7bf
provide defaults for all keywords and subschemas that lacked them
karenetheridge Oct 22, 2020
7060428
remove redundant defaults adjacent to $dynamicRef
karenetheridge Jan 20, 2021
3ea4c02
remove misleading/incorrect defaults at top schema level
karenetheridge Jan 21, 2021
a33ef8f
squash - final (?) attempt - move defaults to where they belong, and …
karenetheridge Jan 21, 2021
b5ab09f
squash - these defaults do not make sense here - missing keywords pro…
karenetheridge Jan 21, 2021
5553c05
squash. remove defaults in the wrong place; add $comments for default…
karenetheridge Jan 22, 2021
677f20a
squash - okay, one last time. keep defaults at property level as huma…
karenetheridge Jan 22, 2021
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
10 changes: 2 additions & 8 deletions meta/applicator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
"prefixItems": { "$ref": "#/$defs/schemaArray" },
"items": { "$dynamicRef": "#meta" },
"contains": { "$dynamicRef": "#meta" },
"additionalProperties": {
"$dynamicRef": "#meta",
"default": {}
},
"additionalProperties": { "$dynamicRef": "#meta" },
"properties": {
"type": "object",
"additionalProperties": { "$dynamicRef": "#meta" },
Expand All @@ -32,10 +29,7 @@
"additionalProperties": { "$dynamicRef": "#meta" },
"default": {}
},
"propertyNames": {
"$dynamicRef": "#meta",
"default": {}
},
"propertyNames": { "$dynamicRef": "#meta" },
"if": { "$dynamicRef": "#meta" },
"then": { "$dynamicRef": "#meta" },
"else": { "$dynamicRef": "#meta" },
Expand Down
3 changes: 1 addition & 2 deletions meta/core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
},
"$defs": {
"type": "object",
"additionalProperties": { "$dynamicRef": "#meta" },
"default": {}
"additionalProperties": { "$dynamicRef": "#meta" }
}
},
"$defs": {
Expand Down
7 changes: 4 additions & 3 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"$comment": "\"definitions\" has been replaced by \"$defs\".",
"type": "object",
"additionalProperties": { "$dynamicRef": "#meta" },
"default": {},
"deprecated": true
"deprecated": true,
"default": {}
},
"dependencies": {
"$comment": "\"dependencies\" has been split and replaced by \"dependentSchemas\" and \"dependentRequired\" in order to serve their differing semantics.",
Expand All @@ -41,7 +41,8 @@
{ "$ref": "meta/validation#/$defs/stringArray" }
]
},
"deprecated": true
"deprecated": true,
"default": {}
},
"$recursiveAnchor": {
"$comment": "\"$recursiveAnchor\" has been replaced by \"$dynamicAnchor\".",
Expand Down