Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Issue 1010 #1021

Merged
merged 6 commits into from Jan 13, 2021
Merged

Issue 1010 #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
950e785
clarification: minimum/maximum is inclusive
danielpeintner Dec 3, 2020
9bba7a6
fix: add inclusive statement to td-validation.ttl also to make it app…
danielpeintner Dec 3, 2020
e680bfe
feat: tries to add exclusiveMaximum and exclusiveMinimum
danielpeintner Dec 3, 2020
2c953be
included new term definitions in JSON-LD context
vcharpenay Dec 9, 2020
b5cf658
Merge pull request #1 from vcharpenay/issue-1010
danielpeintner Dec 9, 2020
a0c18f5
Merge branch 'master' into issue-1010
sebastiankb Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions context/json-schema-context.jsonld
View file
Open in desktop
Expand Up @@ -19,6 +19,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down
36 changes: 36 additions & 0 deletions context/td-context-1.1.jsonld
View file
Open in desktop
Expand Up @@ -37,6 +37,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down Expand Up @@ -454,6 +460,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down Expand Up @@ -577,6 +589,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down Expand Up @@ -700,6 +718,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down Expand Up @@ -823,6 +847,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down Expand Up @@ -946,6 +976,12 @@
"@id": "jsonschema:writeOnly",
"@type": "xsd:boolean"
},
"exclusiveMaximum": {
"@id": "jsonschema:exclusiveMaximum"
},
"exclusiveMinimum": {
"@id": "jsonschema:exclusiveMinimum"
},
"maximum": {
"@id": "jsonschema:maximum"
},
Expand Down
48 changes: 48 additions & 0 deletions context/td-context.ttl
View file
Open in desktop
Expand Up @@ -89,6 +89,14 @@ _:hasPropertyAffordance-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#ty
_:hasPropertyAffordance-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasPropertyAffordance-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasPropertyAffordance-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasPropertyAffordance-context <http://www.w3.org/ns/json-ld#definition> _:hasPropertyAffordance-exclusiveMaximum .
_:hasPropertyAffordance-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasPropertyAffordance-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasPropertyAffordance-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasPropertyAffordance-context <http://www.w3.org/ns/json-ld#definition> _:hasPropertyAffordance-exclusiveMinimum .
_:hasPropertyAffordance-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasPropertyAffordance-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasPropertyAffordance-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasPropertyAffordance-context <http://www.w3.org/ns/json-ld#definition> _:hasPropertyAffordance-maximum .
_:hasPropertyAffordance-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasPropertyAffordance-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down Expand Up @@ -772,6 +780,14 @@ _:hasInputSchema-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <ht
_:hasInputSchema-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasInputSchema-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasInputSchema-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasInputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasInputSchema-exclusiveMaximum .
_:hasInputSchema-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasInputSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasInputSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasInputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasInputSchema-exclusiveMinimum .
_:hasInputSchema-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasInputSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasInputSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasInputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasInputSchema-maximum .
_:hasInputSchema-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasInputSchema-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down Expand Up @@ -960,6 +976,14 @@ _:hasOutputSchema-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <h
_:hasOutputSchema-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasOutputSchema-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasOutputSchema-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasOutputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasOutputSchema-exclusiveMaximum .
_:hasOutputSchema-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasOutputSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasOutputSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasOutputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasOutputSchema-exclusiveMinimum .
_:hasOutputSchema-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasOutputSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasOutputSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasOutputSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasOutputSchema-maximum .
_:hasOutputSchema-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasOutputSchema-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down Expand Up @@ -1148,6 +1172,14 @@ _:hasSubscriptionSchema-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#ty
_:hasSubscriptionSchema-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasSubscriptionSchema-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasSubscriptionSchema-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasSubscriptionSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasSubscriptionSchema-exclusiveMaximum .
_:hasSubscriptionSchema-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasSubscriptionSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasSubscriptionSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasSubscriptionSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasSubscriptionSchema-exclusiveMinimum .
_:hasSubscriptionSchema-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasSubscriptionSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasSubscriptionSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasSubscriptionSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasSubscriptionSchema-maximum .
_:hasSubscriptionSchema-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasSubscriptionSchema-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down Expand Up @@ -1336,6 +1368,14 @@ _:hasNotificationSchema-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#ty
_:hasNotificationSchema-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasNotificationSchema-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasNotificationSchema-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasNotificationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasNotificationSchema-exclusiveMaximum .
_:hasNotificationSchema-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasNotificationSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasNotificationSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasNotificationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasNotificationSchema-exclusiveMinimum .
_:hasNotificationSchema-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasNotificationSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasNotificationSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasNotificationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasNotificationSchema-maximum .
_:hasNotificationSchema-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasNotificationSchema-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down Expand Up @@ -1524,6 +1564,14 @@ _:hasCancellationSchema-writeOnly <http://www.w3.org/1999/02/22-rdf-syntax-ns#ty
_:hasCancellationSchema-writeOnly <http://www.w3.org/ns/json-ld#term> "writeOnly" .
_:hasCancellationSchema-writeOnly <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#writeOnly> .
_:hasCancellationSchema-writeOnly <http://www.w3.org/ns/json-ld#type> <xsd:boolean> .
_:hasCancellationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasCancellationSchema-exclusiveMaximum .
_:hasCancellationSchema-exclusiveMaximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasCancellationSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#term> "exclusiveMaximum" .
_:hasCancellationSchema-exclusiveMaximum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMaximum> .
_:hasCancellationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasCancellationSchema-exclusiveMinimum .
_:hasCancellationSchema-exclusiveMinimum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasCancellationSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#term> "exclusiveMinimum" .
_:hasCancellationSchema-exclusiveMinimum <http://www.w3.org/ns/json-ld#iri> <https://www.w3.org/2019/wot/json-schema#exclusiveMinimum> .
_:hasCancellationSchema-context <http://www.w3.org/ns/json-ld#definition> _:hasCancellationSchema-maximum .
_:hasCancellationSchema-maximum <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/json-ld#Mapping> .
_:hasCancellationSchema-maximum <http://www.w3.org/ns/json-ld#term> "maximum" .
Expand Down
20 changes: 16 additions & 4 deletions index.html
View file
Open in desktop
Expand Up @@ -1486,20 +1486,32 @@ <h2>Data Schema Vocabulary Definitions</h2>
<section><h3><code>NumberSchema</code></h3><p>Metadata describing data of type <code>number</code>.
This <a href="#dfn-subclass" class="internalDFN" data-link-type="dfn">Subclass</a> is indicated by the
value <code>number</code> assigned to <code>type</code>
in <code>DataSchema</code> instances.</p><table class="def"><thead><tr><th><a>Vocabulary term</a></th><th>Description</th><th>Assignment</th><th>Type</th></tr></thead><tbody><tr class="rfc2119-table-assertion" id="td-vocab-minimum--NumberSchema"><td><code>minimum</code></td><td>Specifies a minimum numeric value. Only
in <code>DataSchema</code> instances.</p><table class="def"><thead><tr><th><a>Vocabulary term</a></th><th>Description</th><th>Assignment</th><th>Type</th></tr></thead><tbody><tr class="rfc2119-table-assertion" id="td-vocab-minimum--NumberSchema"><td><code>minimum</code></td><td>Specifies a minimum numeric value, representing an inclusive lower limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#double"><code>double</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-maximum--NumberSchema"><td><code>maximum</code></td><td>Specifies a maximum numeric value. Only
<tr class="rfc2119-table-assertion" id="td-vocab-exclusiveMinimum--NumberSchema"><td><code>exclusiveMinimum</code></td><td>Specifies a minimum numeric value, representing an exclusive lower limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#double"><code>double</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-maximum--NumberSchema"><td><code>maximum</code></td><td>Specifies a maximum numeric value, representing an inclusive upper limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#double"><code>double</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-exclusiveMaximum--NumberSchema"><td><code>exclusiveMaximum</code></td><td>Specifies a maximum numeric value, representing an exclusive upper limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#double"><code>double</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-multipleOf--NumberSchema"><td><code>multipleOf</code></td><td>Specifies the multipleOf value number. The value must strictly greater than 0. Only applicable for associated number or integer types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#double"><code>double</code></a></td></tr></tbody></table></section>
<section><h3><code>IntegerSchema</code></h3><p>Metadata describing data of type <code>integer</code>.
This <a href="#dfn-subclass" class="internalDFN" data-link-type="dfn">Subclass</a> is indicated by the
value <code>integer</code> assigned to <code>type</code>
in <code>DataSchema</code> instances.</p><table class="def"><thead><tr><th><a>Vocabulary term</a></th><th>Description</th><th>Assignment</th><th>Type</th></tr></thead><tbody><tr class="rfc2119-table-assertion" id="td-vocab-minimum--IntegerSchema"><td><code>minimum</code></td><td>Specifies a minimum numeric value. Only
in <code>DataSchema</code> instances.</p><table class="def"><thead><tr><th><a>Vocabulary term</a></th><th>Description</th><th>Assignment</th><th>Type</th></tr></thead><tbody><tr class="rfc2119-table-assertion" id="td-vocab-minimum--IntegerSchema"><td><code>minimum</code></td><td>Specifies a minimum numeric value, representing an inclusive lower limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#integer"><code>integer</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-exclusiveMinimum--IntegerSchema"><td><code>exclusiveMinimum</code></td><td>Specifies a minimum numeric value, representing an exclusive lower limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#integer"><code>integer</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-maximum--IntegerSchema"><td><code>maximum</code></td><td>Specifies a maximum numeric value, representing an inclusive upper limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#integer"><code>integer</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-maximum--IntegerSchema"><td><code>maximum</code></td><td>Specifies a maximum numeric value. Only
<tr class="rfc2119-table-assertion" id="td-vocab-exclusiveMaximum--IntegerSchema"><td><code>exclusiveMaximum</code></td><td>Specifies a maximum numeric value, representing an exclusive upper limit. Only
applicable for associated number or integer
types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#integer"><code>integer</code></a></td></tr>
<tr class="rfc2119-table-assertion" id="td-vocab-multipleOf--IntegerSchema"><td><code>multipleOf</code></td><td>Specifies the multipleOf value number. The value must strictly greater than 0. Only applicable for associated number or integer types.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#integer"><code>integer</code></a></td></tr></tbody></table></section>
Expand Down