Skip to content

Commit 2c1be1d

Browse files
davishmcclurgdavishmcclurg
committed
Remove $vocabulary from vocab meta-schemas
json-schema-org/json-schema-spec#1460
1 parent f0ee4e3 commit 2c1be1d

File tree

4 files changed

+0
-129
lines changed

4 files changed

+0
-129
lines changed

‎lib/json_schemer/draft201909/meta.rb

-18
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ module Meta
5151
CORE = {
5252
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
5353
'$id' => 'https://json-schema.org/draft/2019-09/meta/core',
54-
'$vocabulary' => {
55-
'https://json-schema.org/draft/2019-09/vocab/core' => true
56-
},
5754
'$recursiveAnchor' => true,
5855
'title' => 'Core vocabulary meta-schema',
5956
'type' => ['object', 'boolean'],
@@ -108,9 +105,6 @@ module Meta
108105
APPLICATOR = {
109106
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
110107
'$id' => 'https://json-schema.org/draft/2019-09/meta/applicator',
111-
'$vocabulary' => {
112-
'https://json-schema.org/draft/2019-09/vocab/applicator' => true
113-
},
114108
'$recursiveAnchor' => true,
115109
'title' => 'Applicator vocabulary meta-schema',
116110
'type' => ['object', 'boolean'],
@@ -164,9 +158,6 @@ module Meta
164158
VALIDATION = {
165159
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
166160
'$id' => 'https://json-schema.org/draft/2019-09/meta/validation',
167-
'$vocabulary' => {
168-
'https://json-schema.org/draft/2019-09/vocab/validation' => true
169-
},
170161
'$recursiveAnchor' => true,
171162
'title' => 'Validation vocabulary meta-schema',
172163
'type' => ['object', 'boolean'],
@@ -262,9 +253,6 @@ module Meta
262253
META_DATA = {
263254
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
264255
'$id' => 'https://json-schema.org/draft/2019-09/meta/meta-data',
265-
'$vocabulary' => {
266-
'https://json-schema.org/draft/2019-09/vocab/meta-data' => true
267-
},
268256
'$recursiveAnchor' => true,
269257
'title' => 'Meta-data vocabulary meta-schema',
270258
'type' => ['object', 'boolean'],
@@ -298,9 +286,6 @@ module Meta
298286
FORMAT = {
299287
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
300288
'$id' => 'https://json-schema.org/draft/2019-09/meta/format',
301-
'$vocabulary' => {
302-
'https://json-schema.org/draft/2019-09/vocab/format' => true
303-
},
304289
'$recursiveAnchor' => true,
305290
'title' => 'Format vocabulary meta-schema',
306291
'type' => ['object', 'boolean'],
@@ -312,9 +297,6 @@ module Meta
312297
CONTENT = {
313298
'$schema' => 'https://json-schema.org/draft/2019-09/schema',
314299
'$id' => 'https://json-schema.org/draft/2019-09/meta/content',
315-
'$vocabulary' => {
316-
'https://json-schema.org/draft/2019-09/vocab/content' => true
317-
},
318300
'$recursiveAnchor' => true,
319301
'title' => 'Content vocabulary meta-schema',
320302
'type' => ['object', 'boolean'],

‎lib/json_schemer/draft202012/meta.rb

-24
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ module Meta
9191
CORE = {
9292
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
9393
'$id' => 'https://json-schema.org/draft/2020-12/meta/core',
94-
'$vocabulary' => {
95-
'https://json-schema.org/draft/2020-12/vocab/core' => true
96-
},
9794
'$dynamicAnchor' => 'meta',
9895
'title' => 'Core vocabulary meta-schema',
9996
'type' => ['object', 'boolean'],
@@ -141,9 +138,6 @@ module Meta
141138
APPLICATOR = {
142139
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
143140
'$id' => 'https://json-schema.org/draft/2020-12/meta/applicator',
144-
'$vocabulary' => {
145-
'https://json-schema.org/draft/2020-12/vocab/applicator' => true
146-
},
147141
'$dynamicAnchor' => 'meta',
148142
'title' => 'Applicator vocabulary meta-schema',
149143
'type' => ['object', 'boolean'],
@@ -188,9 +182,6 @@ module Meta
188182
UNEVALUATED = {
189183
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
190184
'$id' => 'https://json-schema.org/draft/2020-12/meta/unevaluated',
191-
'$vocabulary' => {
192-
'https://json-schema.org/draft/2020-12/vocab/unevaluated' => true
193-
},
194185
'$dynamicAnchor' => 'meta',
195186
'title' => 'Unevaluated applicator vocabulary meta-schema',
196187
'type' => ['object', 'boolean'],
@@ -202,9 +193,6 @@ module Meta
202193
VALIDATION = {
203194
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
204195
'$id' => 'https://json-schema.org/draft/2020-12/meta/validation',
205-
'$vocabulary' => {
206-
'https://json-schema.org/draft/2020-12/vocab/validation' => true
207-
},
208196
'$dynamicAnchor' => 'meta',
209197
'title' => 'Validation vocabulary meta-schema',
210198
'type' => ['object', 'boolean'],
@@ -299,9 +287,6 @@ module Meta
299287
META_DATA = {
300288
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
301289
'$id' => 'https://json-schema.org/draft/2020-12/meta/meta-data',
302-
'$vocabulary' => {
303-
'https://json-schema.org/draft/2020-12/vocab/meta-data' => true
304-
},
305290
'$dynamicAnchor' => 'meta',
306291
'title' => 'Meta-data vocabulary meta-schema',
307292
'type' => ['object', 'boolean'],
@@ -334,9 +319,6 @@ module Meta
334319
FORMAT_ANNOTATION = {
335320
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
336321
'$id' => 'https://json-schema.org/draft/2020-12/meta/format-annotation',
337-
'$vocabulary' => {
338-
'https://json-schema.org/draft/2020-12/vocab/format-annotation' => true
339-
},
340322
'$dynamicAnchor' => 'meta',
341323
'title' => 'Format vocabulary meta-schema for annotation results',
342324
'type' => ['object', 'boolean'],
@@ -347,9 +329,6 @@ module Meta
347329
FORMAT_ASSERTION = {
348330
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
349331
'$id' => 'https://json-schema.org/draft/2020-12/meta/format-assertion',
350-
'$vocabulary' => {
351-
'https://json-schema.org/draft/2020-12/vocab/format-assertion' => true
352-
},
353332
'$dynamicAnchor' => 'meta',
354333
'title' => 'Format vocabulary meta-schema for assertion results',
355334
'type' => ['object', 'boolean'],
@@ -360,9 +339,6 @@ module Meta
360339
CONTENT = {
361340
'$schema' => 'https://json-schema.org/draft/2020-12/schema',
362341
'$id' => 'https://json-schema.org/draft/2020-12/meta/content',
363-
'$vocabulary' => {
364-
'https://json-schema.org/draft/2020-12/vocab/content' => true
365-
},
366342
'$dynamicAnchor' => 'meta',
367343
'title' => 'Content vocabulary meta-schema',
368344
'type' => ['object', 'boolean'],

‎test/fixtures/draft2019-09.json

-42
Original file line numberDiff line numberDiff line change
@@ -1691,9 +1691,6 @@
16911691
"root_schema": {
16921692
"$schema": "https://json-schema.org/draft/2019-09/schema",
16931693
"$id": "https://json-schema.org/draft/2019-09/meta/core",
1694-
"$vocabulary": {
1695-
"https://json-schema.org/draft/2019-09/vocab/core": true
1696-
},
16971694
"$recursiveAnchor": true,
16981695
"title": "Core vocabulary meta-schema",
16991696
"type": [
@@ -1765,9 +1762,6 @@
17651762
"root_schema": {
17661763
"$schema": "https://json-schema.org/draft/2019-09/schema",
17671764
"$id": "https://json-schema.org/draft/2019-09/meta/core",
1768-
"$vocabulary": {
1769-
"https://json-schema.org/draft/2019-09/vocab/core": true
1770-
},
17711765
"$recursiveAnchor": true,
17721766
"title": "Core vocabulary meta-schema",
17731767
"type": [
@@ -1839,9 +1833,6 @@
18391833
"root_schema": {
18401834
"$schema": "https://json-schema.org/draft/2019-09/schema",
18411835
"$id": "https://json-schema.org/draft/2019-09/meta/core",
1842-
"$vocabulary": {
1843-
"https://json-schema.org/draft/2019-09/vocab/core": true
1844-
},
18451836
"$recursiveAnchor": true,
18461837
"title": "Core vocabulary meta-schema",
18471838
"type": [
@@ -3459,9 +3450,6 @@
34593450
"root_schema": {
34603451
"$schema": "https://json-schema.org/draft/2019-09/schema",
34613452
"$id": "https://json-schema.org/draft/2019-09/meta/validation",
3462-
"$vocabulary": {
3463-
"https://json-schema.org/draft/2019-09/vocab/validation": true
3464-
},
34653453
"$recursiveAnchor": true,
34663454
"title": "Validation vocabulary meta-schema",
34673455
"type": [
@@ -3597,9 +3585,6 @@
35973585
"root_schema": {
35983586
"$schema": "https://json-schema.org/draft/2019-09/schema",
35993587
"$id": "https://json-schema.org/draft/2019-09/meta/validation",
3600-
"$vocabulary": {
3601-
"https://json-schema.org/draft/2019-09/vocab/validation": true
3602-
},
36033588
"$recursiveAnchor": true,
36043589
"title": "Validation vocabulary meta-schema",
36053590
"type": [
@@ -5316,9 +5301,6 @@
53165301
"root_schema": {
53175302
"$schema": "https://json-schema.org/draft/2019-09/schema",
53185303
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5319-
"$vocabulary": {
5320-
"https://json-schema.org/draft/2019-09/vocab/core": true
5321-
},
53225304
"$recursiveAnchor": true,
53235305
"title": "Core vocabulary meta-schema",
53245306
"type": [
@@ -5392,9 +5374,6 @@
53925374
"root_schema": {
53935375
"$schema": "https://json-schema.org/draft/2019-09/schema",
53945376
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5395-
"$vocabulary": {
5396-
"https://json-schema.org/draft/2019-09/vocab/core": true
5397-
},
53985377
"$recursiveAnchor": true,
53995378
"title": "Core vocabulary meta-schema",
54005379
"type": [
@@ -5468,9 +5447,6 @@
54685447
"root_schema": {
54695448
"$schema": "https://json-schema.org/draft/2019-09/schema",
54705449
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5471-
"$vocabulary": {
5472-
"https://json-schema.org/draft/2019-09/vocab/core": true
5473-
},
54745450
"$recursiveAnchor": true,
54755451
"title": "Core vocabulary meta-schema",
54765452
"type": [
@@ -5544,9 +5520,6 @@
55445520
"root_schema": {
55455521
"$schema": "https://json-schema.org/draft/2019-09/schema",
55465522
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5547-
"$vocabulary": {
5548-
"https://json-schema.org/draft/2019-09/vocab/core": true
5549-
},
55505523
"$recursiveAnchor": true,
55515524
"title": "Core vocabulary meta-schema",
55525525
"type": [
@@ -5620,9 +5593,6 @@
56205593
"root_schema": {
56215594
"$schema": "https://json-schema.org/draft/2019-09/schema",
56225595
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5623-
"$vocabulary": {
5624-
"https://json-schema.org/draft/2019-09/vocab/core": true
5625-
},
56265596
"$recursiveAnchor": true,
56275597
"title": "Core vocabulary meta-schema",
56285598
"type": [
@@ -5696,9 +5666,6 @@
56965666
"root_schema": {
56975667
"$schema": "https://json-schema.org/draft/2019-09/schema",
56985668
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5699-
"$vocabulary": {
5700-
"https://json-schema.org/draft/2019-09/vocab/core": true
5701-
},
57025669
"$recursiveAnchor": true,
57035670
"title": "Core vocabulary meta-schema",
57045671
"type": [
@@ -5772,9 +5739,6 @@
57725739
"root_schema": {
57735740
"$schema": "https://json-schema.org/draft/2019-09/schema",
57745741
"$id": "https://json-schema.org/draft/2019-09/meta/core",
5775-
"$vocabulary": {
5776-
"https://json-schema.org/draft/2019-09/vocab/core": true
5777-
},
57785742
"$recursiveAnchor": true,
57795743
"title": "Core vocabulary meta-schema",
57805744
"type": [
@@ -18218,9 +18182,6 @@
1821818182
"root_schema": {
1821918183
"$schema": "https://json-schema.org/draft/2019-09/schema",
1822018184
"$id": "https://json-schema.org/draft/2019-09/meta/validation",
18221-
"$vocabulary": {
18222-
"https://json-schema.org/draft/2019-09/vocab/validation": true
18223-
},
1822418185
"$recursiveAnchor": true,
1822518186
"title": "Validation vocabulary meta-schema",
1822618187
"type": [
@@ -19023,9 +18984,6 @@
1902318984
"root_schema": {
1902418985
"$schema": "https://json-schema.org/draft/2019-09/schema",
1902518986
"$id": "https://json-schema.org/draft/2019-09/meta/core",
19026-
"$vocabulary": {
19027-
"https://json-schema.org/draft/2019-09/vocab/core": true
19028-
},
1902918987
"$recursiveAnchor": true,
1903018988
"title": "Core vocabulary meta-schema",
1903118989
"type": [

0 commit comments

Comments
 (0)