Skip to content

Commit 1519a37

Browse files
committed
chore: draft-future has been renamed to draft-next
Refs: json-schema-org/JSON-Schema-Test-Suite#522 Also, update JSON-Schema-Test-Suite to latest.
1 parent 365753d commit 1519a37

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

src/known-keywords.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const knownKeywords = [
2424

2525
// Order is important, newer first!
2626
const schemaDrafts = [
27-
...['draft/future'], // not recommended to use, might change / break in an unexpected way
27+
...['draft/next'], // not recommended to use, might change / break in an unexpected way
2828
...['draft/2020-12', 'draft/2019-09'], // new
2929
...['draft-07', 'draft-06', 'draft-04', 'draft-03'], // historic
3030
]

test/JSON-Schema-Test-Suite

test/json-schema.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ const unsupported = new Set([
9999
'rules/format.json/validation of JSON-pointer URI fragment strings',
100100
'issues/33_json_schema_latest.json/use latest json schema as v4 (#33)',
101101

102-
// draft-future only, object contains
103-
'draft-future/contains.json',
104-
'draft-future/maxContains.json',
105-
'draft-future/unevaluatedProperties.json/unevaluatedProperties depends on adjacent contains',
106-
'draft-future/unevaluatedProperties.json/unevaluatedProperties depends on multiple nested contains',
102+
// draft-next only, object contains
103+
'draft-next/contains.json',
104+
'draft-next/maxContains.json',
105+
'draft-next/unevaluatedProperties.json/unevaluatedProperties depends on adjacent contains',
106+
'draft-next/unevaluatedProperties.json/unevaluatedProperties depends on multiple nested contains',
107107
])
108108
const unsupportedMask = []
109109

@@ -147,7 +147,7 @@ processTestDir(testsDir, 'draft7')
147147
processTestDir(testsDir, 'draft3', { extraFormats: true })
148148
processTestDir(testsDir, 'draft2019-09')
149149
processTestDir(testsDir, 'draft2020-12')
150-
processTestDir(testsDir, 'draft-future')
150+
processTestDir(testsDir, 'draft-next')
151151

152152
/** extra tests not (yet) merged upstream **/
153153
processTestDir('', 'extra-tests', { contentValidation: true })

test/util/json-schema-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { validator, parser } = require('../../')
55

66
const schemaVersions = new Map(
77
Object.entries({
8-
'draft-future': 'http://json-schema.org/draft/future/schema#',
8+
'draft-next': 'http://json-schema.org/draft/next/schema#',
99
'draft2020-12': 'http://json-schema.org/draft/2020-12/schema#',
1010
'draft2019-09': 'http://json-schema.org/draft/2019-09/schema#',
1111
draft7: 'http://json-schema.org/draft-07/schema#',

test/util/schemas.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,38 @@ module.exports = [
2121
require('./../schemas/json-schema-draft-06.json'),
2222
require('./../schemas/json-schema-draft-04.json'),
2323
require('./../schemas/json-schema-draft-03.json'),
24-
// future, use latest available for refs to draft/future for now (until future schema becomes available)
24+
// next, use latest available for refs to draft/next for now (until next schema becomes available)
2525
{
2626
...require('./../schemas/json-schema-draft-2020-12/meta/core.json'),
27-
$id: 'https://json-schema.org/draft/future/meta/core',
27+
$id: 'https://json-schema.org/draft/next/meta/core',
2828
},
2929
{
3030
...require('./../schemas/json-schema-draft-2020-12/meta/applicator.json'),
31-
$id: 'https://json-schema.org/draft/future/meta/applicator',
31+
$id: 'https://json-schema.org/draft/next/meta/applicator',
3232
},
3333
{
3434
...require('./../schemas/json-schema-draft-2020-12/meta/unevaluated.json'),
35-
$id: 'https://json-schema.org/draft/future/meta/unevaluated',
35+
$id: 'https://json-schema.org/draft/next/meta/unevaluated',
3636
},
3737
{
3838
...require('./../schemas/json-schema-draft-2020-12/meta/validation.json'),
39-
$id: 'https://json-schema.org/draft/future/meta/validation',
39+
$id: 'https://json-schema.org/draft/next/meta/validation',
4040
},
4141
{
4242
...require('./../schemas/json-schema-draft-2020-12/meta/meta-data.json'),
43-
$id: 'https://json-schema.org/draft/future/meta/meta-data',
43+
$id: 'https://json-schema.org/draft/next/meta/meta-data',
4444
},
4545
{
4646
...require('./../schemas/json-schema-draft-2020-12/meta/format-annotation.json'),
47-
$id: 'https://json-schema.org/draft/future/meta/format-annotation',
47+
$id: 'https://json-schema.org/draft/next/meta/format-annotation',
4848
},
4949
{
5050
...require('./../schemas/json-schema-draft-2020-12/meta/content.json'),
51-
$id: 'https://json-schema.org/draft/future/meta/content',
51+
$id: 'https://json-schema.org/draft/next/meta/content',
5252
},
5353
{
5454
...require('./../schemas/json-schema-draft-2020-12/schema.json'),
55-
$id: 'https://json-schema.org/draft/future/schema',
55+
$id: 'https://json-schema.org/draft/next/schema',
5656
},
5757
// remote
5858
{
@@ -78,6 +78,7 @@ module.exports = [
7878
require('./../JSON-Schema-Test-Suite/remotes/tree.json'),
7979
require('./../JSON-Schema-Test-Suite/remotes/ref-and-defs.json'),
8080
require('./../JSON-Schema-Test-Suite/remotes/ref-and-definitions.json'),
81+
require('./../JSON-Schema-Test-Suite/remotes/extendible-dynamic-ref.json'),
8182
require('./../JSON-Schema-Test-Suite/remotes/draft2019-09/metaschema-no-validation.json'),
8283
require('./../JSON-Schema-Test-Suite/remotes/draft2020-12/metaschema-no-validation.json'),
8384
require('./../JSON-Schema-Test-Suite/remotes/draft2020-12/format-assertion-false.json'),

0 commit comments

Comments
 (0)