Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Clarify that we are interested in the data model. #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ioggstream wants to merge 19 commits into json-schema-org:main from ioggstream:patch-1
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f5f6dec
Allow contains to apply to objects as well as arrays
jdesrosiers Apr 19, 2021
408ec65
Move contains to "other" applicator section
jdesrosiers Apr 20, 2021
40669d8
Clarify that "length" applies to objects as well as arrays
jdesrosiers Apr 20, 2021
b5c4108
Add change log for bhutton-next
jdesrosiers May 14, 2021
1cec0c2
Add to change log "contains" applies to objects
jdesrosiers May 14, 2021
1ac6282
Document new branching process (#1115)
handrews Aug 11, 2021
5f783b8
Add Code of Conduct badge
Relequestual Aug 27, 2021
13a58c7
Add "contains" to keywords that effect "unevaluatedProperties"
jdesrosiers Oct 14, 2021
685d84e
Support for IRI references (#1137)
jakubklimek Nov 5, 2021
a06f315
update schema identifiers to "draft/next" everywhere, so implementati...
karenetheridge Nov 19, 2021
c947b03
Remove bookending requirement for dynamicRef (#1139)
jdesrosiers Dec 3, 2021
d4c9fb0
Add repo status
Relequestual Dec 20, 2021
2933e43
fix broken reference
karenetheridge Jan 7, 2022
13003c9
Add README instructions on how to install xml2rfc
jviotti Dec 29, 2021
b959f33
Add the "all" target to the list of PHONY targets
jviotti Dec 29, 2021
7074313
Allow the XML2RFC GNU Make variable to be overridden by the caller
jviotti Dec 29, 2021
89232d9
application/json is the media type of a JSON text
ioggstream Feb 23, 2022
7b501a1
CBOR is a data format
ioggstream Feb 23, 2022
b2e2e61
Reference data-model
ioggstream Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If the pull request would solve a particular issue, reference the issue in the p

Changes that would affect implementation behavior should typically be opened as an issue first.

Pull requests should be made to master.
Pull requests should be made to the default branch, which may be `draft-patch`, `draft-next`, or `master` depending on where we are in the [release process](https://github.com/json-schema-org/community/discussions/7).

Most PRs, including all PRs that impact implementation behavior, will be left open for a minimum of 14 days. Minor wording fixes may be merged more quickly once approved by a project member.

Expand Down Expand Up @@ -78,4 +78,4 @@ Support this project with your organization. Your logo will show up here with a
<a href="https://opencollective.com/json-schema/organization/6/website"><img src="https://opencollective.com/json-schema/organization/6/avatar.svg"></a>
<a href="https://opencollective.com/json-schema/organization/7/website"><img src="https://opencollective.com/json-schema/organization/7/avatar.svg"></a>
<a href="https://opencollective.com/json-schema/organization/8/website"><img src="https://opencollective.com/json-schema/organization/8/avatar.svg"></a>
<a href="https://opencollective.com/json-schema/organization/9/website"><img src="https://opencollective.com/json-schema/organization/9/avatar.svg"></a>
<a href="https://opencollective.com/json-schema/organization/9/website"><img src="https://opencollective.com/json-schema/organization/9/avatar.svg"></a>
4 changes: 2 additions & 2 deletions Makefile
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
XML2RFC=xml2rfc
XML2RFC ?= xml2rfc

OUT = \
jsonschema-core.html jsonschema-core.txt \
Expand All @@ -24,4 +24,4 @@ json-schema.tar.gz: $(OUT)
clean:
rm -f $(OUT) json-schema.tar.gz

.PHONY: clean
.PHONY: clean all
4 changes: 2 additions & 2 deletions README.md
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Welcome to JSON Schema
[![Financial Contributors on Open Collective](https://opencollective.com/json-schema/all/badge.svg?label=financial+contributors)](https://opencollective.com/json-schema)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/json-schema-org/.github/blob/main/CODE_OF_CONDUCT.md) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![Financial Contributors on Open Collective](https://opencollective.com/json-schema/all/badge.svg?label=financial+contributors)](https://opencollective.com/json-schema)

JSON Schema is a vocabulary that allows you to validate, annotate, and manipulate JSON documents.

Expand Down Expand Up @@ -35,7 +35,7 @@ Labels are assigned based on [Sensible Github Labels](https://github.com/Releque
* links.json - JSON Hyper-Schema's Link Description Object meta-schema
* hyper-schema-output.json - The recommended output format for JSON Hyper-Schema links

Type "make" at a shell to build the .txt and .html spec files.
Install "xml2rfc" using "pip" (https://pypi.org/project/xml2rfc/) and type "make" at a shell to build the .txt and .html spec files.

Descriptions of the xml2rfc, I-D documents, and RFC processes:

Expand Down
469 changes: 243 additions & 226 deletions jsonschema-core.xml
View file Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions jsonschema-validation.xml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<section title="Meta-Schema" anchor="meta-schema">
<t>
The current URI for the default JSON Schema dialect meta-schema is
<eref target="https://json-schema.org/draft/2020-12/schema"/>.
<eref target="https://json-schema.org/draft/next/schema"/>.
For schema author convenience, this meta-schema describes a dialect
consisting of all vocabularies
defined in this specification and the JSON Schema Core specification,
Expand Down Expand Up @@ -206,11 +206,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Validation vocabulary, is:
&lt;https://json-schema.org/draft/2020-12/vocab/validation&gt;.
&lt;https://json-schema.org/draft/next/vocab/validation&gt;.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2020-12/meta/validation"/>.
<eref target="https://json-schema.org/draft/next/meta/validation"/>.
</t>

<section title="Validation Keywords for Any Instance Type" anchor="general">
Expand Down Expand Up @@ -413,13 +413,13 @@
then this keyword has no effect.
</t>
<t>
An instance array is valid against "maxContains" in two ways, depending on
the form of the annotation result of an adjacent
An instance array or object is valid against "maxContains" in two ways,
depending on the form of the annotation result of an adjacent
<xref target="json-schema">"contains"</xref> 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.
result is a boolean "true" and the instance length (number of items or
properties) is less than or equal to the "maxContains" value.
</t>
</section>

Expand All @@ -432,13 +432,13 @@
then this keyword has no effect.
</t>
<t>
An instance array is valid against "minContains" in two ways, depending on
the form of the annotation result of an adjacent
An instance array or object is valid against "minContains" in two ways,
depending on the form of the annotation result of an adjacent
<xref target="json-schema">"contains"</xref> 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.
annotation result is a boolean "true" and the instance length (number of
items or properties) is greater than or equal to the "minContains" value.
</t>
<t>
A value of 0 is allowed, but is only useful for setting a range
Expand Down Expand Up @@ -546,18 +546,18 @@

<t>
The current URI for this vocabulary, known as the Format-Annotation vocabulary, is:
&lt;https://json-schema.org/draft/2020-12/vocab/format-annotation&gt;. The current
&lt;https://json-schema.org/draft/next/vocab/format-annotation&gt;. The current
URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2020-12/meta/format-annotation"/>.
<eref target="https://json-schema.org/draft/next/meta/format-annotation"/>.
Implementing support for this vocabulary is REQUIRED.
</t>
<t>
In addition to the Format-Annotation vocabulary, a secondary vocabulary is available
for custom meta-schemas that defines "format" as an assertion. The URI for the
Format-Assertion vocabulary, is:
&lt;https://json-schema.org/draft/2020-12/vocab/format-assertion&gt;. The current
&lt;https://json-schema.org/draft/next/vocab/format-assertion&gt;. The current
URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2020-12/meta/format-assertion"/>.
<eref target="https://json-schema.org/draft/next/meta/format-assertion"/>.
Implementing support for the Format-Assertion vocabulary is OPTIONAL.
</t>
<t>
Expand Down Expand Up @@ -918,11 +918,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Content vocabulary, is:
&lt;https://json-schema.org/draft/2020-12/vocab/content&gt;.
&lt;https://json-schema.org/draft/next/vocab/content&gt;.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2020-12/meta/content"/>.
<eref target="https://json-schema.org/draft/next/meta/content"/>.
</t>
</section>

Expand Down Expand Up @@ -1118,11 +1118,11 @@
</t>
<t>
The current URI for this vocabulary, known as the Meta-Data vocabulary, is:
&lt;https://json-schema.org/draft/2020-12/vocab/meta-data&gt;.
&lt;https://json-schema.org/draft/next/vocab/meta-data&gt;.
</t>
<t>
The current URI for the corresponding meta-schema is:
<eref target="https://json-schema.org/draft/2020-12/meta/meta-data"/>.
<eref target="https://json-schema.org/draft/next/meta/meta-data"/>.
</t>

<section title='"title" and "description"'>
Expand Down
6 changes: 3 additions & 3 deletions meta/applicator.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/applicator",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/applicator",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/applicator": true
"https://json-schema.org/draft/next/vocab/applicator": true
},
"$dynamicAnchor": "meta",

Expand Down
6 changes: 3 additions & 3 deletions meta/content.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/content",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/content",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/content": true
"https://json-schema.org/draft/next/vocab/content": true
},
"$dynamicAnchor": "meta",

Expand Down
24 changes: 12 additions & 12 deletions meta/core.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/core",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/core",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/core": true
"https://json-schema.org/draft/next/vocab/core": true
},
"$dynamicAnchor": "meta",

"title": "Core vocabulary meta-schema",
"type": ["object", "boolean"],
"properties": {
"$id": {
"$ref": "#/$defs/uriReferenceString",
"$ref": "#/$defs/iriReferenceString",
"$comment": "Non-empty fragments not allowed.",
"pattern": "^[^#]*#?$"
},
"$schema": { "$ref": "#/$defs/uriString" },
"$ref": { "$ref": "#/$defs/uriReferenceString" },
"$schema": { "$ref": "#/$defs/iriString" },
"$ref": { "$ref": "#/$defs/iriReferenceString" },
"$anchor": { "$ref": "#/$defs/anchorString" },
"$dynamicRef": { "$ref": "#/$defs/uriReferenceString" },
"$dynamicRef": { "$ref": "#/$defs/iriReferenceString" },
"$dynamicAnchor": { "$ref": "#/$defs/anchorString" },
"$vocabulary": {
"type": "object",
"propertyNames": { "$ref": "#/$defs/uriString" },
"propertyNames": { "$ref": "#/$defs/iriString" },
"additionalProperties": {
"type": "boolean"
}
Expand All @@ -39,13 +39,13 @@
"type": "string",
"pattern": "^[A-Za-z_][-A-Za-z0-9._]*$"
},
"uriString": {
"iriString": {
"type": "string",
"format": "uri"
"format": "iri"
},
"uriReferenceString": {
"iriReferenceString": {
"type": "string",
"format": "uri-reference"
"format": "iri-reference"
}
}
}
6 changes: 3 additions & 3 deletions meta/format-annotation.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/format-annotation",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/format-annotation",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/format-annotation": true
"https://json-schema.org/draft/next/vocab/format-annotation": true
},
"$dynamicAnchor": "meta",

Expand Down
6 changes: 3 additions & 3 deletions meta/format-assertion.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/format-assertion",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/format-assertion",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/format-assertion": true
"https://json-schema.org/draft/next/vocab/format-assertion": true
},
"$dynamicAnchor": "meta",

Expand Down
6 changes: 3 additions & 3 deletions meta/meta-data.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/meta-data",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/meta-data",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/meta-data": true
"https://json-schema.org/draft/next/vocab/meta-data": true
},
"$dynamicAnchor": "meta",

Expand Down
6 changes: 3 additions & 3 deletions meta/unevaluated.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/unevaluated",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/unevaluated",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/unevaluated": true
"https://json-schema.org/draft/next/vocab/unevaluated": true
},
"$dynamicAnchor": "meta",

Expand Down
6 changes: 3 additions & 3 deletions meta/validation.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/meta/validation",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/meta/validation",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/validation": true
"https://json-schema.org/draft/next/vocab/validation": true
},
"$dynamicAnchor": "meta",

Expand Down
4 changes: 2 additions & 2 deletions output/schema.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/output/schema",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/output/schema",
"description": "A schema that validates the minimum requirements for validation output",

"anyOf": [
Expand Down
21 changes: 11 additions & 10 deletions schema.json
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://json-schema.org/draft/2020-12/schema",
"$schema": "https://json-schema.org/draft/next/schema",
"$id": "https://json-schema.org/draft/next/schema",
"$vocabulary": {
"https://json-schema.org/draft/2020-12/vocab/core": true,
"https://json-schema.org/draft/2020-12/vocab/applicator": true,
"https://json-schema.org/draft/2020-12/vocab/unevaluated": true,
"https://json-schema.org/draft/2020-12/vocab/validation": true,
"https://json-schema.org/draft/2020-12/vocab/meta-data": true,
"https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
"https://json-schema.org/draft/2020-12/vocab/content": true
"https://json-schema.org/draft/next/vocab/core": true,
"https://json-schema.org/draft/next/vocab/applicator": true,
"https://json-schema.org/draft/next/vocab/unevaluated": true,
"https://json-schema.org/draft/next/vocab/validation": true,
"https://json-schema.org/draft/next/vocab/meta-data": true,
"https://json-schema.org/draft/next/vocab/format-annotation": true,
"https://json-schema.org/draft/next/vocab/content": true
},
"$dynamicAnchor": "meta",

Expand Down Expand Up @@ -51,7 +51,8 @@
},
"$recursiveRef": {
"$comment": "\"$recursiveRef\" has been replaced by \"$dynamicRef\".",
"$ref": "meta/core#/$defs/uriReferenceString",
"type": "string",
"format": "uri-reference",
"deprecated": true
}
}
Expand Down

AltStyle によって変換されたページ (->オリジナル) /