Skip to content

Commit 96000fe

Browse files
handrewshandrews
committed
Allow boolean subschemas everywhere.
This implements issue #101, including root schemas. Also add JSON Reference objects as legal schemas in the meta-schema. Since "$ref" is now only allowed as a JSON Reference where a schema is acceptable, it can now be described in JSON Schema and included in the "anyOf" that defines legal subschemas.
1 parent 7b628d0 commit 96000fe

4 files changed

+228
-205
lines changed

‎hyper-schema.json

+67-68
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,6 @@
22
"$schema": "http://json-schema.org/draft/hyper-schema#",
33
"id": "http://json-schema.org/draft/hyper-schema#",
44
"title": "JSON Hyper-Schema",
5-
"allOf": [
6-
{"$ref": "http://json-schema.org/draft-04/schema#"}
7-
],
8-
"properties": {
9-
"additionalItems": {
10-
"anyOf": [
11-
{"type": "boolean"},
12-
{"$ref": "#"}
13-
]
14-
},
15-
"additionalProperties": {
16-
"anyOf": [
17-
{"type": "boolean"},
18-
{"$ref": "#"}
19-
]
20-
},
21-
"dependencies": {
22-
"additionalProperties": {
23-
"anyOf": [
24-
{"$ref": "#"},
25-
{"type": "array"}
26-
]
27-
}
28-
},
29-
"items": {
30-
"anyOf": [
31-
{"$ref": "#"},
32-
{"$ref": "#/definitions/schemaArray"}
33-
]
34-
},
35-
"definitions": {
36-
"additionalProperties": {"$ref": "#"}
37-
},
38-
"patternProperties": {
39-
"additionalProperties": {"$ref": "#"}
40-
},
41-
"properties": {
42-
"additionalProperties": {"$ref": "#"}
43-
},
44-
"allOf": {"$ref": "#/definitions/schemaArray"},
45-
"anyOf": {"$ref": "#/definitions/schemaArray"},
46-
"oneOf": {"$ref": "#/definitions/schemaArray"},
47-
"not": { "$ref": "#" },
48-
49-
"base": {
50-
"description": "URI Template resolved as for the 'href' keyword in the Link Description Object. The resulting URI Reference is resolved against the current URI base and sets the new URI base for URI references within the instance.",
51-
"type": "string"
52-
},
53-
"links": {
54-
"type": "array",
55-
"items": {"$ref": "#/definitions/linkDescription"}
56-
},
57-
"media": {
58-
"type": "object",
59-
"properties": {
60-
"type": {
61-
"description": "A media type, as described in RFC 2046",
62-
"type": "string"
63-
},
64-
"binaryEncoding": {
65-
"description": "A content encoding scheme, as described in RFC 2045",
66-
"type": "string"
67-
}
68-
}
69-
}
70-
},
715
"definitions": {
726
"schemaArray": {
737
"type": "array",
@@ -92,7 +26,7 @@
9226
},
9327
"targetSchema": {
9428
"description": "JSON Schema describing the link target",
95-
"$ref": "#"
29+
"allOf": [{"$ref": "#"}]
9630
},
9731
"mediaType": {
9832
"description": "media type (as defined by RFC 2046) describing the link target",
@@ -109,7 +43,63 @@
10943
},
11044
"schema": {
11145
"description": "Schema describing the data to submit along with the request",
112-
"$ref": "#"
46+
"allOf": [{"$ref": "#"}]
47+
}
48+
}
49+
},
50+
"hyperSchema": {
51+
"type": "object",
52+
"properties": {
53+
"additionalItems": { "$ref": "#" },
54+
"additionalProperties": { "$ref": "#" },
55+
"dependencies": {
56+
"additionalProperties": {
57+
"anyOf": [
58+
{"$ref": "#"},
59+
{"type": "array"}
60+
]
61+
}
62+
},
63+
"items": {
64+
"anyOf": [
65+
{"$ref": "#"},
66+
{"$ref": "#/definitions/schemaArray"}
67+
]
68+
},
69+
"definitions": {
70+
"additionalProperties": {"$ref": "#"}
71+
},
72+
"patternProperties": {
73+
"additionalProperties": {"$ref": "#"}
74+
},
75+
"properties": {
76+
"additionalProperties": {"$ref": "#"}
77+
},
78+
"allOf": {"$ref": "#/definitions/schemaArray"},
79+
"anyOf": {"$ref": "#/definitions/schemaArray"},
80+
"oneOf": {"$ref": "#/definitions/schemaArray"},
81+
"not": { "$ref": "#" },
82+
83+
"base": {
84+
"description": "URI Template resolved as for the 'href' keyword in the Link Description Object. The resulting URI Reference is resolved against the current URI base and sets the new URI base for URI references within the instance.",
85+
"type": "string"
86+
},
87+
"links": {
88+
"type": "array",
89+
"items": {"$ref": "#/definitions/linkDescription"}
90+
},
91+
"media": {
92+
"type": "object",
93+
"properties": {
94+
"type": {
95+
"description": "A media type, as described in RFC 2046",
96+
"type": "string"
97+
},
98+
"binaryEncoding": {
99+
"description": "A content encoding scheme, as described in RFC 2045",
100+
"type": "string"
101+
}
102+
}
113103
}
114104
}
115105
}
@@ -124,4 +114,13 @@
124114
"href": "{+($ref)}"
125115
}
126116
]
117+
"anyOf": [
118+
{"allOf": [
119+
{"$ref": "#/definitions/hyperSchema"},
120+
{"$ref": "http://json-schema.org/draft/schema#/definitions/schemaObject"}
121+
]},
122+
{"type": "boolean"},
123+
{"$ref": "http://json-schema.org/draft/schema#/definitions/jsonReference"}
124+
],
125+
"default": true
127126
}

‎jsonschema-core.xml

+31-4
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,34 @@
185185
</t>
186186
</section>
187187

188-
<section title="JSON Schema document">
188+
<section title="JSON Schema documents">
189189
<t>
190190
A JSON Schema document, or simply a schema, is a JSON document used to describe an instance.
191191
A schema is itself interpreted as an instance.
192-
A JSON schema MUST be an object.
192+
A JSON Schema MUST be an object or a boolean, where boolean values are equivalent to object schemas as follows.
193193
</t>
194+
<figure>
195+
<preamble>
196+
true:
197+
</preamble>
198+
<artwork>
199+
<![CDATA[
200+
{}
201+
]]>
202+
</artwork>
203+
</figure>
204+
<figure>
205+
<preamble>
206+
false:
207+
</preamble>
208+
<artwork>
209+
<![CDATA[
210+
{
211+
"not": {}
212+
}
213+
]]>
214+
</artwork>
215+
</figure>
194216
<t>
195217
Properties that are used to describe the instance are called keywords, or schema keywords.
196218
The meaning of properties is specified by the vocabulary that the schema is using.
@@ -231,6 +253,9 @@
231253
In this example document, the schema titled "array item" is a subschema,
232254
and the schema titled "root" is the root schema.
233255
</t>
256+
<t>
257+
As with the root schema, a subschema MUST be an object or a boolean.
258+
</t>
234259
</section>
235260

236261
</section>
@@ -299,7 +324,8 @@
299324

300325
<section title="Schema references with $ref">
301326
<t>
302-
Any time a subschema is expected, a schema may instead use an object containing a "$ref" property.
327+
In addition to a boolean value or an object using schema kewyords defined
328+
in the meta-schema, a schema may be represnted by an object containing a "$ref" property.
303329
The value of the $ref is a URI Reference.
304330
Resolved against the current URI base, it identifies the URI of a schema to use.
305331
All other properties in a "$ref" object MUST be ignored.
@@ -323,7 +349,7 @@
323349
<xref target="RFC3986">RFC3986 Section 5.1</xref> defines how to determine the default base URI of a document.
324350
</t>
325351
<t>
326-
Informatively, the initial base URI of a schema is the URI it was found at, or a suitable substitute URI if none is known.
352+
Informatively, the initial base URI of a schema is the URI at which it was found, or a suitable substitute URI if none is known.
327353
</t>
328354
</section>
329355

@@ -660,6 +686,7 @@ User-Agent: so-cool-json-schema/1.0.2 curl/7.43.0
660686
<t hangText="draft-wright-json-schema-01">
661687
<list style="symbols">
662688
<t>Updated intro</t>
689+
<t>Allowed for any schema to be a boolean</t>
663690
</list>
664691
</t>
665692
<t hangText="draft-wright-json-schema-00">

‎jsonschema-validation.xml

+8-12
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@
318318

319319
<section title="items">
320320
<t>
321-
The value of "items" MUST be either an object or an array of objects.
322-
Each object MUST be a valid JSON Schema.
321+
The value of "items" MUST be either a valid JSON Schema or an array of valid JSON Schemas.
323322
</t>
324323
<t>
325324
If absent, it can be considered present with an empty schema.
@@ -341,8 +340,7 @@
341340

342341
<section title="additionalItems">
343342
<t>
344-
The value of "additionalItems" MUST be a boolean or an object.
345-
If it is an object, the object MUST be a valid JSON Schema.
343+
The value of "additionalItems" MUST be a valid JSON Schema.
346344
</t>
347345
<t>
348346
If absent, it can be considered present with an empty schema.
@@ -457,7 +455,7 @@
457455
<section title="properties">
458456
<t>
459457
The value of "properties" MUST be an object. Each value of this object
460-
MUST be an object, and each object MUST be a valid JSON Schema.
458+
MUST be a valid JSON Schema.
461459
</t>
462460
<t>
463461
If absent, it can be considered the same as an empty object.
@@ -478,7 +476,7 @@
478476
The value of "patternProperties" MUST be an object. Each property name
479477
of this object SHOULD be a valid regular expression, according to the
480478
ECMA 262 regular expression dialect. Each property value of this object
481-
MUST be an object, and each object MUST be a valid JSON Schema.
479+
MUST be a valid JSON Schema.
482480
</t>
483481
<t>
484482
If absent, it can be considered the same as an empty object.
@@ -497,8 +495,7 @@
497495

498496
<section title="additionalProperties">
499497
<t>
500-
The value of "additionalProperties" MUST be a boolean or an
501-
object. If it is an object, the object MUST be a valid JSON Schema.
498+
The value of "additionalProperties" MUST be a valid JSON Schema.
502499
</t>
503500
<t>
504501
If "additionalProperties" is absent, it may be considered present with
@@ -526,12 +523,11 @@
526523
</t>
527524
<t>
528525
This keyword's value MUST be an object. Each property specifies a dependency.
529-
Each dependency value MUST be an object or an array.
526+
Each dependency value MUST be an array or a valid JSON Schema.
530527
</t>
531528
<t>
532-
If the dependency value is an object, it MUST be a valid JSON Schema. If the
533-
dependency key is a property in the instance, the dependency value must validate
534-
against the entire instance.
529+
If the dependency value is a subschema, and the dependency key is a property
530+
in the instance, the entire instance must validate against the dependency value.
535531
</t>
536532
<t>
537533
If the dependency value is an array, each element in the array,

0 commit comments

Comments
 (0)