Skip to content

Merge draft-next to master #1251

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 21 commits into from
Jul 8, 2022
Merged

Merge draft-next to master #1251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2bf8f62
Allow contains to apply to objects as well as arrays
jdesrosiers Apr 19, 2021
bd68d1b
Move contains to "other" applicator section
jdesrosiers Apr 20, 2021
ccb8e04
Clarify that "length" applies to objects as well as arrays
jdesrosiers Apr 20, 2021
364b4b8
Add change log for bhutton-next
jdesrosiers May 14, 2021
1e18deb
Add to change log "contains" applies to objects
jdesrosiers May 14, 2021
86e0504
Document new branching process (#1115)
handrews Aug 11, 2021
daf73dd
Add Code of Conduct badge
Relequestual Aug 27, 2021
1fc9d6b
Add "contains" to keywords that effect "unevaluatedProperties"
jdesrosiers Oct 14, 2021
907d7f7
Support for IRI references (#1137)
jakubklimek Nov 5, 2021
d651307
update schema identifiers to "draft/next" everywhere, so implementati…
karenetheridge Nov 19, 2021
47c6d33
Remove bookending requirement for dynamicRef (#1139)
jdesrosiers Dec 3, 2021
ec88920
Add repo status
Relequestual Dec 20, 2021
e2aa1f6
fix broken reference
karenetheridge Jan 7, 2022
a5b8287
Add README instructions on how to install xml2rfc
jviotti Dec 29, 2021
f9f6e40
Add the "all" target to the list of PHONY targets
jviotti Dec 29, 2021
9d41963
Allow the XML2RFC GNU Make variable to be overridden by the caller
jviotti Dec 29, 2021
73f58fa
Add propertyDependencies keyword
jdesrosiers Oct 21, 2021
7a58f76
output - change property names in declarations
gregsdennis Jun 22, 2022
942158c
output - apply new property names to output examples
gregsdennis Jun 22, 2022
efcfd04
adds cref for further clarification on evaluation path in output node
gregsdennis Jun 27, 2022
29805af
Update CONTRIBUTING.md with the new branching strategy
jdesrosiers Jul 8, 2022
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
Prev Previous commit
Next Next commit
output - apply new property names to output examples
  • Loading branch information
@gregsdennis @jdesrosiers
gregsdennis authored and jdesrosiers committed Jun 30, 2022
commit 942158c8b8c8e6dd1936bf3d658c48904f9f05b4
52 changes: 26 additions & 26 deletions jsonschema-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2963,35 +2963,35 @@ https://example.com/schemas/common#/$defs/count/minimum
<![CDATA[
{
"valid": false,
"errors": [
"nested": [
{
"keywordLocation": "",
"evaluationPath": "",
"instanceLocation": "",
"error": "A subschema had errors."
},
{
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "/1",
"error": "A subschema had errors."
},
{
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/required",
"schemaLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "/1",
"error": "Required property 'y' not found."
},
{
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/additionalProperties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "/1/z",
"error": "Additional property 'z' found but was invalid."
},
{
"keywordLocation": "/minItems",
"evaluationPath": "/minItems",
"instanceLocation": "",
"error": "Expected at least 3 items but found 2"
}
Expand Down Expand Up @@ -3032,28 +3032,28 @@ https://example.com/schemas/common#/$defs/count/minimum
<![CDATA[
{
"valid": false,
"keywordLocation": "",
"evaluationPath": "",
"instanceLocation": "",
"errors": [
"nested": [
{
"valid": false,
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "/1",
"errors": [
"nested": [
{
"valid": false,
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/required",
"schemaLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "/1",
"error": "Required property 'y' not found."
},
{
"valid": false,
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/additionalProperties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "/1/z",
"error": "Additional property 'z' found but was invalid."
Expand All @@ -3062,7 +3062,7 @@ https://example.com/schemas/common#/$defs/count/minimum
},
{
"valid": false,
"keywordLocation": "/minItems",
"evaluationPath": "/minItems",
"instanceLocation": "",
"error": "Expected at least 3 items but found 2"
}
Expand Down Expand Up @@ -3115,27 +3115,27 @@ https://example.com/schemas/common#/$defs/count/minimum
// result
{
"valid": false,
"keywordLocation": "",
"evaluationPath": "",
"instanceLocation": "",
"errors": [
"nested": [
{
"valid": true,
"keywordLocation": "/type",
"evaluationPath": "/type",
"instanceLocation": ""
},
{
"valid": true,
"keywordLocation": "/properties",
"evaluationPath": "/properties",
"instanceLocation": ""
},
{
"valid": false,
"keywordLocation": "/additionalProperties",
"evaluationPath": "/additionalProperties",
"instanceLocation": "",
"errors": [
"nested": [
{
"valid": false,
"keywordLocation": "/additionalProperties",
"evaluationPath": "/additionalProperties",
"instanceLocation": "/disallowedProp",
"error": "Additional property 'disallowedProp' found but was invalid."
}
Expand Down
76 changes: 38 additions & 38 deletions output/verbose-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
{
"valid": false,
"keywordLocation": "",
"evaluationPath": "",
"instanceLocation": "",
"errors": [
"nested": [
{
"valid": true,
"keywordLocation": "/$defs",
"evaluationPath": "/$defs",
"instanceLocation": ""
},
{
"valid": true,
"keywordLocation": "/type",
"evaluationPath": "/type",
"instanceLocation": ""
},
{
"valid": false,
"keywordLocation": "/items",
"evaluationPath": "/items",
"instanceLocation": "",
"errors": [
"nested": [
{
"valid": true,
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/items/$ref",
"instanceLocation": "/0",
"annotations": [
"nested": [
{
"valid": true,
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "/0",
"annotations": [
"nested": [
{
"valid": true,
"keywordLocation": "/items/$ref/type",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/type",
"schemaLocation":
"https://example.com/polygon#/$defs/point/type",
"instanceLocation": "/0"
},
{
"valid": true,
"keywordLocation": "/items/$ref/properties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/properties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/properties",
"instanceLocation": "/0"
},
{
"valid": true,
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/required",
"schemaLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "/0"
},
{
"valid": true,
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/additionalProperties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "/0"
}
Expand All @@ -66,50 +66,50 @@
},
{
"valid": false,
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/items/$ref",
"instanceLocation": "/1",
"errors": [
"nested": [
{
"valid": false,
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref",
"schemaLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "/1",
"errors": [
"nested": [
{
"valid": true,
"keywordLocation": "/items/$ref/type",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/type",
"schemaLocation":
"https://example.com/polygon#/$defs/point/type",
"instanceLocation": "/1"
},
{
"valid": true,
"keywordLocation": "/items/$ref/properties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/properties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/properties",
"instanceLocation": "/1"
},
{
"valid": false,
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/required",
"schemaLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "/1"
},
{
"valid": false,
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/additionalProperties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "/1",
"errors": [
"nested": [
{
"valid": false,
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"evaluationPath": "/items/$ref/additionalProperties",
"schemaLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "/1/z"
}
Expand All @@ -123,7 +123,7 @@
},
{
"valid": false,
"keywordLocation": "/minItems",
"evaluationPath": "/minItems",
"instanceLocation": ""
}
]
Expand Down