Skip to content

Commit 6624c1a

Browse files
authored
Merge pull request #417 from handrews/relptr-fmt
Add a relative-json-pointer format
2 parents 6b06b2d + 9e1cde2 commit 6624c1a

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

jsonschema-validation.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<!ENTITY RFC6570 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6570.xml">
1717
<!ENTITY RFC6901 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.6901.xml">
1818
<!ENTITY RFC7159 SYSTEM "http://xml.resource.org/public/rfc/bibxml/reference.RFC.7159.xml">
19+
<!ENTITY I-D.luff-relative-json-pointer SYSTEM "https://xml2rfc.tools.ietf.org/public/rfc/bibxml3/reference.I-D.draft-luff-relative-json-pointer-00.xml">
1920
]>
2021
<?rfc toc="yes"?>
2122
<?rfc symrefs="yes"?>
@@ -1062,15 +1063,24 @@
10621063
</t>
10631064
</section>
10641065

1065-
<section title="json-pointer">
1066+
<section title="JSON Pointers">
10661067
<t>
1067-
This attribute applies to string instances.
1068+
These attributes apply to string instances.
10681069
</t>
10691070
<t>
1070-
A string instance is valid against this attribute if it
1071-
is a valid JSON string representation of a JSON Pointer,
1072-
according to
1073-
<xref target="RFC6901">RFC 6901, section 5</xref>
1071+
<list style="hanging">
1072+
<t hangText="json-pointer">
1073+
A string instance is valid against this attribute if it
1074+
is a valid JSON string representation of a JSON Pointer,
1075+
according to <xref target="RFC6901">RFC 6901, section 5</xref>.
1076+
</t>
1077+
<t hangText="relative-json-pointer">
1078+
A string instance is valid against this attribute if it is a valid
1079+
<xref target="I-D.luff-relative-json-pointer">Relative JSON Pointer</xref>.
1080+
</t>
1081+
</list>
1082+
To allow for both absolute and relative JSON Pointers, use "anyOf" or
1083+
"oneOf" to indicate support for either format.
10741084
</t>
10751085
</section>
10761086
<section title="regex">
@@ -1255,6 +1265,7 @@
12551265
&RFC6901;
12561266
&RFC7159;
12571267
&RFC5322;
1268+
&I-D.luff-relative-json-pointer;
12581269
<reference anchor="ecma262"
12591270
target="http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf">
12601271
<front>

links.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"type": "string",
1616
"anyOf": [
1717
{ "format": "json-pointer" },
18-
{ "pattern": "^[0-9]" }
18+
{ "format": "relative-json-pointer" }
1919
]
2020
}
2121
},
@@ -42,7 +42,7 @@
4242
"type": "string",
4343
"anyOf": [
4444
{ "format": "json-pointer" },
45-
{ "pattern": "^[0-9]" }
45+
{ "format": "relative-json-pointer" }
4646
]
4747
},
4848
"title": {

0 commit comments

Comments
 (0)