Skip to content

Commit 6f33e91

Browse files
handrewshandrews
committed
Allow boolean schemas everywhere, including root
This is an option for implementing issue #101, this time not just for subschemas but for all schemas including the root schema. The meta-schema changes will be added after PR #168 is approved, at which point the changes for this will be much simpler.
1 parent f36d132 commit 6f33e91

File tree

2 files changed

+39
-16
lines changed

2 files changed

+39
-16
lines changed

‎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
@@ -327,8 +327,7 @@
327327

328328
<section title="items">
329329
<t>
330-
The value of "items" MUST be either an object or an array of objects.
331-
Each object MUST be a valid JSON Schema.
330+
The value of "items" MUST be either a valid JSON Schema or an array of valid JSON Schemas.
332331
</t>
333332
<t>
334333
If absent, it can be considered present with an empty schema.
@@ -350,8 +349,7 @@
350349

351350
<section title="additionalItems">
352351
<t>
353-
The value of "additionalItems" MUST be a boolean or an object.
354-
If it is an object, the object MUST be a valid JSON Schema.
352+
The value of "additionalItems" MUST be a valid JSON Schema.
355353
</t>
356354
<t>
357355
If absent, it can be considered present with an empty schema.
@@ -466,7 +464,7 @@
466464
<section title="properties">
467465
<t>
468466
The value of "properties" MUST be an object. Each value of this object
469-
MUST be an object, and each object MUST be a valid JSON Schema.
467+
MUST be a valid JSON Schema.
470468
</t>
471469
<t>
472470
If absent, it can be considered the same as an empty object.
@@ -487,7 +485,7 @@
487485
The value of "patternProperties" MUST be an object. Each property name
488486
of this object SHOULD be a valid regular expression, according to the
489487
ECMA 262 regular expression dialect. Each property value of this object
490-
MUST be an object, and each object MUST be a valid JSON Schema.
488+
MUST be a valid JSON Schema.
491489
</t>
492490
<t>
493491
If absent, it can be considered the same as an empty object.
@@ -506,8 +504,7 @@
506504

507505
<section title="additionalProperties">
508506
<t>
509-
The value of "additionalProperties" MUST be a boolean or an
510-
object. If it is an object, the object MUST be a valid JSON Schema.
507+
The value of "additionalProperties" MUST be a valid JSON Schema.
511508
</t>
512509
<t>
513510
If "additionalProperties" is absent, it may be considered present with
@@ -535,12 +532,11 @@
535532
</t>
536533
<t>
537534
This keyword's value MUST be an object. Each property specifies a dependency.
538-
Each dependency value MUST be an object or an array.
535+
Each dependency value MUST be an array or a valid JSON Schema.
539536
</t>
540537
<t>
541-
If the dependency value is an object, it MUST be a valid JSON Schema. If the
542-
dependency key is a property in the instance, the dependency value must validate
543-
against the entire instance.
538+
If the dependency value is a subschema, and the dependency key is a property
539+
in the instance, the entire instance must validate against the dependency value.
544540
</t>
545541
<t>
546542
If the dependency value is an array, each element in the array,

0 commit comments

Comments
 (0)