Skip to content
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

Fix output relative locations to be consistent #938

Merged
merged 3 commits into from
Aug 20, 2020
Merged

Fix output relative locations to be consistent #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ffae94
Fix output instance relative location to be of non-URI fragment-encod…
ssilverman May 23, 2020
f1f5f63
Update output examples to use non-URI JSON pointers for non-absolute …
ssilverman May 24, 2020
cf59d7a
Update the output schema with json-pointer replacing uri-reference
ssilverman May 25, 2020
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
62 changes: 31 additions & 31 deletions jsonschema-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2716,7 +2716,7 @@ https://example.com/schemas/common#/$defs/count/minimum
<section title="Instance Location">
<t>
The location of the JSON value within the instance being validated. The
value MUST be expressed as a URI fragment-encoded JSON Pointer.
value MUST be expressed as a JSON Pointer.
</t>
<t>
The JSON key for this information is "instanceLocation".
Expand Down Expand Up @@ -2869,34 +2869,34 @@ https://example.com/schemas/common#/$defs/count/minimum
"valid": false,
"errors": [
{
"keywordLocation": "#",
"instanceLocation": "#",
"keywordLocation": "",
"instanceLocation": "",
"error": "A subschema had errors."
},
{
"keywordLocation": "#/items/$ref",
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "#/1",
"instanceLocation": "/1",
"error": "A subschema had errors."
},
{
"keywordLocation": "#/items/$ref/required",
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "#/1",
"instanceLocation": "/1",
"error": "Required property 'y' not found."
},
{
"keywordLocation": "#/items/$ref/additionalProperties",
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "#/1/z",
"instanceLocation": "/1/z",
"error": "Additional property 'z' found but was invalid."
},
{
"keywordLocation": "#/minItems",
"instanceLocation": "#",
"keywordLocation": "/minItems",
"instanceLocation": "",
"error": "Expected at least 3 items but found 2"
}
]
Expand Down Expand Up @@ -2936,38 +2936,38 @@ https://example.com/schemas/common#/$defs/count/minimum
<![CDATA[
{
"valid": false,
"keywordLocation": "#",
"instanceLocation": "#",
"keywordLocation": "",
"instanceLocation": "",
"errors": [
{
"valid": false,
"keywordLocation": "#/items/$ref",
"keywordLocation": "/items/$ref",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point",
"instanceLocation": "#/1",
"instanceLocation": "/1",
"errors": [
{
"valid": false,
"keywordLocation": "#/items/$ref/required",
"keywordLocation": "/items/$ref/required",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point/required",
"instanceLocation": "#/1",
"instanceLocation": "/1",
"error": "Required property 'y' not found."
},
{
"valid": false,
"keywordLocation": "#/items/$ref/additionalProperties",
"keywordLocation": "/items/$ref/additionalProperties",
"absoluteKeywordLocation":
"https://example.com/polygon#/$defs/point/additionalProperties",
"instanceLocation": "#/1/z",
"instanceLocation": "/1/z",
"error": "Additional property 'z' found but was invalid."
}
]
},
{
"valid": false,
"keywordLocation": "#/minItems",
"instanceLocation": "#",
"keywordLocation": "/minItems",
"instanceLocation": "",
"error": "Expected at least 3 items but found 2"
}
]
Expand Down Expand Up @@ -3019,28 +3019,28 @@ https://example.com/schemas/common#/$defs/count/minimum
// result
{
"valid": false,
"keywordLocation": "#",
"instanceLocation": "#",
"keywordLocation": "",
"instanceLocation": "",
"errors": [
{
"valid": true,
"keywordLocation": "#/type",
"instanceLocation": "#"
"keywordLocation": "/type",
"instanceLocation": ""
},
{
"valid": true,
"keywordLocation": "#/properties",
"instanceLocation": "#"
"keywordLocation": "/properties",
"instanceLocation": ""
},
{
"valid": false,
"keywordLocation": "#/additionalProperties",
"instanceLocation": "#",
"keywordLocation": "/additionalProperties",
"instanceLocation": "",
"errors": [
{
"valid": false,
"keywordLocation": "#/additionalProperties",
"instanceLocation": "#/disallowedProp",
"keywordLocation": "/additionalProperties",
"instanceLocation": "/disallowedProp",
"error": "Additional property 'disallowedProp' found but was invalid."
}
]
Expand Down
4 changes: 2 additions & 2 deletions output/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"valid": { "type": "boolean" },
"keywordLocation": {
"type": "string",
"format": "uri-reference"
"format": "json-pointer"
},
"absoluteKeywordLocation": {
"type": "string",
"format": "uri"
},
"instanceLocation": {
"type": "string",
"format": "uri-reference"
"format": "json-pointer"
},
"errors": {
"$ref": "#/$defs/outputUnitArray"
Expand Down