Skip to content

Commit 742221a

Browse files
gregsdennisgregsdennis
committed
fix URIs and remove location props from root node on basic
1 parent e1344cc commit 742221a

File tree

1 file changed

+28
-33
lines changed

1 file changed

+28
-33
lines changed

‎jsonschema-core.xml

+28-33
Original file line numberDiff line numberDiff line change
@@ -3090,7 +3090,9 @@ https://example.com/schemas/common#/$defs/count/minimum
30903090
<t>
30913091
The root output unit contains "valid" for the overall result and "nested"
30923092
for the list of specific results. All other information is explicitly
3093-
omitted from the root output unit.
3093+
omitted from the root output unit. If the root schema produces errors or
3094+
annotations, then the output node for the root MUST be present within the
3095+
root output unit's "nested" list with those errors or annotations.
30943096
</t>
30953097
<t>
30963098
Output units which do not contain errors or annotations SHOULD be excluded
@@ -3103,23 +3105,20 @@ https://example.com/schemas/common#/$defs/count/minimum
31033105
// failing results
31043106
{
31053107
"valid": false,
3106-
"evaluationPath": "",
3107-
"schemaLocation": "https://json-schema.org/schemas/example#",
3108-
"instanceLocation": "",
31093108
"nested": [
31103109
{
31113110
"valid": false,
3112-
"evaluationPath": "/properties/foo/0",
3113-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3111+
"evaluationPath": "/properties/foo/allOf/0",
3112+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
31143113
"instanceLocation": "/foo",
31153114
"errors": {
31163115
"required": "Required properties [\"unspecified-prop\"] were not present"
31173116
}
31183117
},
31193118
{
31203119
"valid": false,
3121-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3122-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3120+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3121+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
31233122
"instanceLocation": "/foo/foo-prop",
31243123
"errors": {
31253124
"const": "Expected \"1\""
@@ -3140,9 +3139,6 @@ https://example.com/schemas/common#/$defs/count/minimum
31403139
// passing results
31413140
{
31423141
"valid": true,
3143-
"evaluationPath": "",
3144-
"schemaLocation": "https://json-schema.org/schemas/example#",
3145-
"instanceLocation": "",
31463142
"nested": [
31473143
{
31483144
"valid": true,
@@ -3159,8 +3155,8 @@ https://example.com/schemas/common#/$defs/count/minimum
31593155
},
31603156
{
31613157
"valid": true,
3162-
"evaluationPath": "/properties/foo/1",
3163-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3158+
"evaluationPath": "/properties/foo/allOf/1",
3159+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
31643160
"instanceLocation": "/foo",
31653161
"annotations": {
31663162
"title": "foo-title",
@@ -3186,8 +3182,8 @@ https://example.com/schemas/common#/$defs/count/minimum
31863182
},
31873183
{
31883184
"valid": true,
3189-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3190-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3185+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3186+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
31913187
"instanceLocation": "/foo/foo-prop",
31923188
"annotations": {
31933189
"title": "foo-prop-title"
@@ -3220,8 +3216,7 @@ https://example.com/schemas/common#/$defs/count/minimum
32203216
All output units are included in this format.
32213217
</t>
32223218
<t>
3223-
The location properties of the output unit MAY be omitted from the
3224-
root node.
3219+
The location properties of the root output unit MAY be omitted.
32253220
</t>
32263221
<figure>
32273222
<artwork>
@@ -3241,32 +3236,32 @@ https://example.com/schemas/common#/$defs/count/minimum
32413236
"nested": [
32423237
{
32433238
"valid": false,
3244-
"evaluationPath": "/properties/foo/0",
3245-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3239+
"evaluationPath": "/properties/foo/allOf/0",
3240+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
32463241
"instanceLocation": "/foo",
32473242
"errors": {
32483243
"required": "Required properties [\"unspecified-prop\"] were not present"
32493244
}
32503245
},
32513246
{
32523247
"valid": false,
3253-
"evaluationPath": "/properties/foo/1",
3254-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3248+
"evaluationPath": "/properties/foo/allOf/1",
3249+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
32553250
"instanceLocation": "/foo",
32563251
"nested": [
32573252
{
32583253
"valid": false,
3259-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3260-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3254+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3255+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
32613256
"instanceLocation": "/foo/foo-prop",
32623257
"errors": {
32633258
"const": "Expected \"1\""
32643259
}
32653260
},
32663261
{
32673262
"valid": true,
3268-
"evaluationPath": "/properties/foo/1/additionalProperties/other-prop",
3269-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/additionalProperties/other-prop",
3263+
"evaluationPath": "/properties/foo/allOf/1/additionalProperties",
3264+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/additionalProperties",
32703265
"instanceLocation": "/foo/other-prop"
32713266
}
32723267
]
@@ -3323,14 +3318,14 @@ https://example.com/schemas/common#/$defs/count/minimum
33233318
"nested": [
33243319
{
33253320
"valid": true,
3326-
"evaluationPath": "/properties/foo/0",
3327-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/0",
3321+
"evaluationPath": "/properties/foo/allOf/0",
3322+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/0",
33283323
"instanceLocation": "/foo"
33293324
},
33303325
{
33313326
"valid": true,
3332-
"evaluationPath": "/properties/foo/1",
3333-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1",
3327+
"evaluationPath": "/properties/foo/allOf/1",
3328+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1",
33343329
"instanceLocation": "/foo",
33353330
"annotations": {
33363331
"title": "foo-title",
@@ -3344,17 +3339,17 @@ https://example.com/schemas/common#/$defs/count/minimum
33443339
"nested": [
33453340
{
33463341
"valid": true,
3347-
"evaluationPath": "/properties/foo/1/properties/foo-prop",
3348-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/properties/foo-prop",
3342+
"evaluationPath": "/properties/foo/allOf/1/properties/foo-prop",
3343+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/properties/foo-prop",
33493344
"instanceLocation": "/foo/foo-prop",
33503345
"annotations": {
33513346
"title": "foo-prop-title"
33523347
}
33533348
},
33543349
{
33553350
"valid": true,
3356-
"evaluationPath": "/properties/foo/1/additionalProperties/unspecified-prop",
3357-
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/1/additionalProperties/unspecified-prop",
3351+
"evaluationPath": "/properties/foo/allOf/1/additionalProperties",
3352+
"schemaLocation": "https://json-schema.org/schemas/example#/properties/foo/allOf/1/additionalProperties",
33583353
"instanceLocation": "/foo/unspecified-prop"
33593354
}
33603355
]

0 commit comments

Comments
 (0)