Skip to content

Commit 78b4cde

Browse files
gregsdennisgregsdennis
committed
fix URIs and remove location props from root node on basic
1 parent d7feae6 commit 78b4cde

File tree

1 file changed

+28
-33
lines changed

1 file changed

+28
-33
lines changed

‎jsonschema-core.xml‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,7 +3036,9 @@ https://example.com/schemas/common#/$defs/count/minimum
30363036
<t>
30373037
The root output unit contains "valid" for the overall result and "nested"
30383038
for the list of specific results. All other information is explicitly
3039-
omitted from the root output unit.
3039+
omitted from the root output unit. If the root schema produces errors or
3040+
annotations, then the output node for the root MUST be present within the
3041+
root output unit's "nested" list with those errors or annotations.
30403042
</t>
30413043
<t>
30423044
Output units which do not contain errors or annotations SHOULD be excluded
@@ -3049,23 +3051,20 @@ https://example.com/schemas/common#/$defs/count/minimum
30493051
// failing results
30503052
{
30513053
"valid": false,
3052-
"evaluationPath": "",
3053-
"schemaLocation": "https://json-schema.org/schemas/example#",
3054-
"instanceLocation": "",
30553054
"nested": [
30563055
{
30573056
"valid": false,
3058-
"evaluationPath": "/properties/foo/0",
3059-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3057+
"evaluationPath": "/properties/foo/allOf/0",
3058+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
30603059
"instanceLocation": "/foo",
30613060
"errors": {
30623061
"required": "Required properties [\"unspecified-prop\"] were not present"
30633062
}
30643063
},
30653064
{
30663065
"valid": false,
3067-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3068-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3066+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3067+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
30693068
"instanceLocation": "/foo/foo-prop",
30703069
"errors": {
30713070
"const": "Expected \"1\""
@@ -3086,9 +3085,6 @@ https://example.com/schemas/common#/$defs/count/minimum
30863085
// passing results
30873086
{
30883087
"valid": true,
3089-
"evaluationPath": "",
3090-
"schemaLocation": "https://json-schema.org/schemas/example#",
3091-
"instanceLocation": "",
30923088
"nested": [
30933089
{
30943090
"valid": true,
@@ -3105,8 +3101,8 @@ https://example.com/schemas/common#/$defs/count/minimum
31053101
},
31063102
{
31073103
"valid": true,
3108-
"evaluationPath": "/properties/foo/1",
3109-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3104+
"evaluationPath": "/properties/foo/allOf/1",
3105+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
31103106
"instanceLocation": "/foo",
31113107
"annotations": {
31123108
"title": "foo-title",
@@ -3132,8 +3128,8 @@ https://example.com/schemas/common#/$defs/count/minimum
31323128
},
31333129
{
31343130
"valid": true,
3135-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3136-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3131+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3132+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
31373133
"instanceLocation": "/foo/foo-prop",
31383134
"annotations": {
31393135
"title": "foo-prop-title"
@@ -3166,8 +3162,7 @@ https://example.com/schemas/common#/$defs/count/minimum
31663162
All output units are included in this format.
31673163
</t>
31683164
<t>
3169-
The location properties of the output unit MAY be omitted from the
3170-
root node.
3165+
The location properties of the root output unit MAY be omitted.
31713166
</t>
31723167
<figure>
31733168
<artwork>
@@ -3187,32 +3182,32 @@ https://example.com/schemas/common#/$defs/count/minimum
31873182
"nested": [
31883183
{
31893184
"valid": false,
3190-
"evaluationPath": "/properties/foo/0",
3191-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3185+
"evaluationPath": "/properties/foo/allOf/0",
3186+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
31923187
"instanceLocation": "/foo",
31933188
"errors": {
31943189
"required": "Required properties [\"unspecified-prop\"] were not present"
31953190
}
31963191
},
31973192
{
31983193
"valid": false,
3199-
"evaluationPath": "/properties/foo/1",
3200-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3194+
"evaluationPath": "/properties/foo/allOf/1",
3195+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
32013196
"instanceLocation": "/foo",
32023197
"nested": [
32033198
{
32043199
"valid": false,
3205-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3206-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3200+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3201+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
32073202
"instanceLocation": "/foo/foo-prop",
32083203
"errors": {
32093204
"const": "Expected \"1\""
32103205
}
32113206
},
32123207
{
32133208
"valid": true,
3214-
"evaluationPath": "/properties/foo/1/additionalProperties/other-prop",
3215-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/additionalProperties/other-prop",
3209+
"evaluationPath": "/properties/foo/allOf/1/additionalProperties",
3210+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/additionalProperties",
32163211
"instanceLocation": "/foo/other-prop"
32173212
}
32183213
]
@@ -3269,14 +3264,14 @@ https://example.com/schemas/common#/$defs/count/minimum
32693264
"nested": [
32703265
{
32713266
"valid": true,
3272-
"evaluationPath": "/properties/foo/0",
3273-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3267+
"evaluationPath": "/properties/foo/allOf/0",
3268+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
32743269
"instanceLocation": "/foo"
32753270
},
32763271
{
32773272
"valid": true,
3278-
"evaluationPath": "/properties/foo/1",
3279-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3273+
"evaluationPath": "/properties/foo/allOf/1",
3274+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
32803275
"instanceLocation": "/foo",
32813276
"annotations": {
32823277
"title": "foo-title",
@@ -3290,17 +3285,17 @@ https://example.com/schemas/common#/$defs/count/minimum
32903285
"nested": [
32913286
{
32923287
"valid": true,
3293-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3294-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3288+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3289+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
32953290
"instanceLocation": "/foo/foo-prop",
32963291
"annotations": {
32973292
"title": "foo-prop-title"
32983293
}
32993294
},
33003295
{
33013296
"valid": true,
3302-
"evaluationPath": "/properties/foo/1/additionalProperties/unspecified-prop",
3303-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/additionalProperties/unspecified-prop",
3297+
"evaluationPath": "/properties/foo/allOf/1/additionalProperties",
3298+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/additionalProperties",
33043299
"instanceLocation": "/foo/unspecified-prop"
33053300
}
33063301
]

0 commit comments

Comments
 (0)