Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Commit 148196e

Browse files
committed
Add documents for draft 2020-12
1 parent fd4f35a commit 148196e

26 files changed

+133
-86
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ DEPENDENCIES
247247
github-pages
248248

249249
BUNDLED WITH
250-
1.16.1
250+
2.2.7

draft/preview/2020-12-rc-1/jsonschema-core.html renamed to draft/2020-12/json-schema-core.html

Lines changed: 63 additions & 51 deletions
Large diffs are not rendered by default.

draft/preview/2020-12-rc-1/jsonschema-validation.html renamed to draft/2020-12/json-schema-validation.html

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451

452452
<meta name="dct.creator" content="Wright, A., Ed., Andrews, H., Ed., and B. Hutton, Ed." />
453453
<meta name="dct.identifier" content="urn:ietf:id:draft-bhutton-json-schema-validation-00" />
454-
<meta name="dct.issued" scheme="ISO8601" content="2020-01" />
454+
<meta name="dct.issued" scheme="ISO8601" content="2020-28" />
455455
<meta name="dct.abstract" content="JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation. This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like. " />
456456
<meta name="description" content="JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation. This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like. " />
457457

@@ -475,7 +475,7 @@
475475
<td class="right">H. Andrews, Ed.</td>
476476
</tr>
477477
<tr>
478-
<td class="left">Expires: June 4, 2021</td>
478+
<td class="left">Expires: August 1, 2021</td>
479479
<td class="right"></td>
480480
</tr>
481481
<tr>
@@ -484,7 +484,7 @@
484484
</tr>
485485
<tr>
486486
<td class="left"></td>
487-
<td class="right">December 1, 2020</td>
487+
<td class="right">January 28, 2020</td>
488488
</tr>
489489

490490

@@ -497,15 +497,14 @@
497497
<h1 id="rfc.abstract"><a href="#rfc.abstract">Abstract</a></h1>
498498
<p>JSON Schema (application/schema+json) has several purposes, one of which is JSON instance validation. This document specifies a vocabulary for JSON Schema to describe the meaning of JSON documents, provide hints for user interfaces working with JSON data, and to make assertions about what a valid document must look like. </p>
499499
<h1><a>Note to Readers</a></h1>
500-
<p>This document a pre-release identified as JSON Schema draft 2020-12-rc-1. </p>
501500
<p>The issues list for this draft can be found at <span>&lt;</span><a href="https://github.com/json-schema-org/json-schema-spec/issues">https://github.com/json-schema-org/json-schema-spec/issues</a><span>&gt;</span>. </p>
502501
<p>For additional information, see <span>&lt;</span><a href="https://json-schema.org/">https://json-schema.org/</a><span>&gt;</span>. </p>
503502
<p>To provide feedback, use this issue tracker, the communication methods listed on the homepage, or email the document editors. </p>
504503
<h1 id="rfc.status"><a href="#rfc.status">Status of This Memo</a></h1>
505504
<p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
506505
<p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet-Drafts is at https://datatracker.ietf.org/drafts/current/.</p>
507506
<p>Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."</p>
508-
<p>This Internet-Draft will expire on June 4, 2021.</p>
507+
<p>This Internet-Draft will expire on August 1, 2021.</p>
509508
<h1 id="rfc.copyrightnotice"><a href="#rfc.copyrightnotice">Copyright Notice</a></h1>
510509
<p>Copyright (c) 2020 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
511510
<p>This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.</p>
@@ -777,12 +776,12 @@ <h1 id="rfc.section.6.4.4">
777776
<a href="#rfc.section.6.4.4">6.4.4.</a> maxContains</h1>
778777
<p id="rfc.section.6.4.4.p.1">The value of this keyword MUST be a non-negative integer. </p>
779778
<p id="rfc.section.6.4.4.p.2">If "contains" is not present within the same schema object, then this keyword has no effect. </p>
780-
<p id="rfc.section.6.4.4.p.3">An array instance is valid against "maxContains" if its value is less than or equal to, the array length of the annotation result from an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword where the annotation is an array, or the length of the instance array where the annotation is "true". </p>
779+
<p id="rfc.section.6.4.4.p.3">An instance array is valid against "maxContains" in two ways, depending on the form of the annotation result of an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword. The first way is if the annotation result is an array and the length of that array is less than or equal to the "maxContains" value. The second way is if the annotation result is a boolean "true" and the instance array length is less than or equal to the "maxContains" value. </p>
781780
<h1 id="rfc.section.6.4.5">
782781
<a href="#rfc.section.6.4.5">6.4.5.</a> minContains</h1>
783782
<p id="rfc.section.6.4.5.p.1">The value of this keyword MUST be a non-negative integer. </p>
784783
<p id="rfc.section.6.4.5.p.2">If "contains" is not present within the same schema object, then this keyword has no effect. </p>
785-
<p id="rfc.section.6.4.5.p.3">An array instance is valid against "minContains" if its value is greater than or equal to, the array length of the annotation result from an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword where the annotation is an array, or the length of the instance array where the annotation is "true". </p>
784+
<p id="rfc.section.6.4.5.p.3">An instance array is valid against "minContains" in two ways, depending on the form of the annotation result of an adjacent <a href="#json-schema" class="xref">"contains"</a> keyword. The first way is if the annotation result is an array and the length of that array is greater than or equal to the "minContains" value. The second way is if the annotation result is a boolean "true" and the instance array length is greater than or equal to the "minContains" value. </p>
786785
<p id="rfc.section.6.4.5.p.4">A value of 0 is allowed, but is only useful for setting a range of occurrences from 0 to the value of "maxContains". A value of 0 with no "maxContains" causes "contains" to always pass validation. </p>
787786
<p id="rfc.section.6.4.5.p.5">Omitting this keyword has the same behavior as a value of 1. </p>
788787
<h1 id="rfc.section.6.5">
@@ -1228,13 +1227,7 @@ <h1 id="rfc.appendix.C">
12281227
<li>Clarified the set and meaning of "contentEncoding" values</li>
12291228
<li>Reference ECMA-262, 11th edition for regular expression support</li>
12301229
<li>Split "format" into an annotation only vocabulary and an assertion vocabulary</li>
1231-
<li>
1232-
<li>
1233-
<li>
1234-
<li>
1235-
<li>
1236-
<li>
1237-
<li>
1230+
<li>Clarify "deprecated" when applicable to arrays</li>
12381231
</ul>
12391232
<p> </p>
12401233
</dd>

draft/2020-12/meta/applicator

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/applicator.json

draft/2020-12/meta/content

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/content.json

draft/2020-12/meta/core

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/core.json

draft/2020-12/meta/format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/format.json

draft/2020-12/meta/format-annotation

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/format-annotaion.json

draft/2020-12/meta/format-assertion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/format-assertion.json

draft/2020-12/meta/meta-data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/meta-data.json

draft/2020-12/meta/unevaluated

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/unevaluated.json

draft/2020-12/meta/validation

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/meta/validation.json

draft/2020-12/output/schema

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/output/schema.json

draft/2020-12/output/verbose-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../_includes/draft/2020-12/output/verbose-example.json

draft/preview/2020-12-rc-1/relative-json-pointer.html renamed to draft/2020-12/relative-json-pointer.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@
397397

398398
<meta name="dct.creator" content="Luff, G., Andrews, H., Ed., and B. Hutton, Ed." />
399399
<meta name="dct.identifier" content="urn:ietf:id:draft-bhutton-relative-json-pointer-00" />
400-
<meta name="dct.issued" scheme="ISO8601" content="2020-01" />
400+
<meta name="dct.issued" scheme="ISO8601" content="2020-28" />
401401
<meta name="dct.abstract" content="JSON Pointer is a syntax for specifying locations in a JSON document, starting from the document root. This document defines an extension to the JSON Pointer syntax, allowing relative locations from within the document. " />
402402
<meta name="description" content="JSON Pointer is a syntax for specifying locations in a JSON document, starting from the document root. This document defines an extension to the JSON Pointer syntax, allowing relative locations from within the document. " />
403403

@@ -421,7 +421,7 @@
421421
<td class="right">H. Andrews, Ed.</td>
422422
</tr>
423423
<tr>
424-
<td class="left">Expires: June 4, 2021</td>
424+
<td class="left">Expires: August 1, 2021</td>
425425
<td class="right"></td>
426426
</tr>
427427
<tr>
@@ -430,7 +430,7 @@
430430
</tr>
431431
<tr>
432432
<td class="left"></td>
433-
<td class="right">December 1, 2020</td>
433+
<td class="right">January 28, 2020</td>
434434
</tr>
435435

436436

@@ -446,7 +446,7 @@ <h1 id="rfc.status"><a href="#rfc.status">Status of This Memo</a></h1>
446446
<p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
447447
<p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet-Drafts is at https://datatracker.ietf.org/drafts/current/.</p>
448448
<p>Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."</p>
449-
<p>This Internet-Draft will expire on June 4, 2021.</p>
449+
<p>This Internet-Draft will expire on August 1, 2021.</p>
450450
<h1 id="rfc.copyrightnotice"><a href="#rfc.copyrightnotice">Copyright Notice</a></h1>
451451
<p>Copyright (c) 2020 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
452452
<p>This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.</p>
@@ -505,8 +505,9 @@ <h1 id="rfc.section.3">
505505
<p>The ABNF syntax of a Relative JSON Pointer is: </p>
506506
<pre>
507507

508-
relative-json-pointer = non-negative-integer &lt;json-pointer&gt;
508+
relative-json-pointer = non-negative-integer [index-manipulation] &lt;json-pointer&gt;
509509
relative-json-pointer =/ non-negative-integer "#"
510+
index-manipulation = ("+" / "-") non-negative-integer
510511
non-negative-integer = %x30 / %x31-39 *( %x30-39 )
511512
; "0", or digits without a leading "0"
512513

@@ -566,8 +567,10 @@ <h1 id="rfc.section.5.1">
566567

567568
"0" "baz"
568569
"1/0" "bar"
570+
"0-1" "bar"
569571
"2/highly/nested/objects" true
570572
"0#" 1
573+
"0-1#" 0
571574
"1#" "foo"
572575

573576
</pre>
@@ -629,7 +632,7 @@ <h1 id="rfc.appendix.A">
629632
<p></p>
630633

631634
<dl>
632-
<dt>draft-handrews-relative-json-pointer-03</dt>
635+
<dt>draft-bhutton-relative-json-pointer-00</dt>
633636
<dd style="margin-left: 8">
634637
<ul><li>Add array forward and backward index manipulation</li></ul>
635638
<p> </p>

draft/2020-12/release-notes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: JSON Schema 2020-12 Release Notes
3+
layout: page
4+
---
5+
6+
_NOTE: This page is still being written._
7+
8+
You can find a minimal changelog at the end of the specification documents themselves.

draft/2020-12/schema

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_includes/draft/2020-12/schema.json

draft/2020-12/vocab/applicator.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.10
3+
title: A Vocabulary for Applying Subschemas
4+
---

draft/2020-12/vocab/content.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.8
3+
title: A Vocabulary for the Contents of String-Encoded Data
4+
---

draft/2020-12/vocab/core.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.8
3+
title: The JSON Schema Core Vocabulary
4+
---
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.7
3+
title: A Vocabulary for Semantic Content with "format" as annotations
4+
---
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.7
3+
title: A Vocabulary for Semantic Content with "format" as assertions
4+
---

draft/2020-12/vocab/meta-data.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.9
3+
title: A Vocabulary for Basic Meta-Data Annotations
4+
---

draft/2020-12/vocab/unevaluated.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-core.html#rfc.section.11
3+
title: A Vocabulary for Unevaluated Locations
4+
---

draft/2020-12/vocab/validation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
redirect_to: /draft/2020-12/json-schema-validation.html#rfc.section.6
3+
title: A Vocabulary for Structural Validation
4+
---

work-in-progress/index.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ permalink: /work-in-progress
77
* TOC
88
{:toc}
99

10-
Draft 2020-12 is in the final review period.
11-
Publication is scheduled for 2020-12-08.
12-
13-
At this point, the specification is feature locked, but please do file any issues via Github or reach us immediatly on the JSON Schema Slack.
14-
15-
Spec preview documents:
16-
17-
Core: [https://json-schema.org/draft/preview/2020-12-rc-1/jsonschema-core.html](https://json-schema.org/draft/preview/2020-12-rc-1/jsonschema-core.html)
18-
19-
Validation: [https://json-schema.org/draft/preview/2020-12-rc-1/jsonschema-validation.html](https://json-schema.org/draft/preview/2020-12-rc-1/jsonschema-validation.html)
20-
21-
Relative JSON Pointer: [https://json-schema.org/draft/preview/2020-12-rc-1/relative-json-pointer.html](https://json-schema.org/draft/preview/2020-12-rc-1/relative-json-pointer.html)
22-
23-
HyperSchema is not included in this upcoming draft and is on hiatus.
10+
We're working towards draft 2021-NN.
2411

2512
See the [GitHub repository](https://github.com/json-schema-org/json-schema-spec) for ongoing spec work.

0 commit comments

Comments
 (0)