From 1155fefb02370ed958cd79e72376a087d1d71976 Mon Sep 17 00:00:00 2001 From: Karen Etheridge Date: Wed, 27 May 2020 16:02:52 -0700 Subject: [PATCH 1/5] fix output schema check for absoluteKeywordLocation property it is possible to have both $ref and $recursiveRef in the traversed schema path (cherry picked from commit 36d9fe5063cf6e1389a72cae10c53d0e92564a20) --- output/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output/schema.json b/output/schema.json index 7cf4c4ac..ec24e0cc 100644 --- a/output/schema.json +++ b/output/schema.json @@ -46,7 +46,7 @@ }, { "if": { - "oneOf": [ + "anyOf": [ { "properties": { "keywordLocation": { From d4ea2dd7ca1d8e113966a1d962cf6f1fbb3abab1 Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Fri, 15 May 2020 03:02:15 -0700 Subject: [PATCH 2/5] Fix patterns and paths in output schema Fix a raw "$" in two patterns and add a missing "$defs" in three paths (cherry picked from commit 1b485461fd15e4b516baceb6af24b116daecce91) --- output/schema.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/output/schema.json b/output/schema.json index ec24e0cc..ac81726c 100644 --- a/output/schema.json +++ b/output/schema.json @@ -50,16 +50,16 @@ { "properties": { "keywordLocation": { - "pattern": ".*/$ref/.*" + "pattern": ".*/\\$ref/.*" } - } + } }, { "properties": { "keywordLocation": { - "pattern": ".*/$recursiveRef/.*" + "pattern": ".*/\\$recursiveRef/.*" } - } + } } ] }, @@ -79,8 +79,8 @@ }, "required": [ "valid" ] }, - "basic": { "$ref": "#/outputUnit" }, - "detailed": { "$ref": "#/outputUnit" }, - "verbose": { "$ref": "#/outputUnit" } + "basic": { "$ref": "#/$defs/outputUnit" }, + "detailed": { "$ref": "#/$defs/outputUnit" }, + "verbose": { "$ref": "#/$defs/outputUnit" } } } From 895e82668af22fe17d395c85a66393ab3ddb03e6 Mon Sep 17 00:00:00 2001 From: Karen Etheridge Date: Wed, 27 May 2020 16:01:10 -0700 Subject: [PATCH 3/5] remove unneeded .* from unanchored patterns (cherry picked from commit 325e3c47c6db77c1affef4b9f15540f16d59cc7f) --- output/schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/output/schema.json b/output/schema.json index ac81726c..bef85935 100644 --- a/output/schema.json +++ b/output/schema.json @@ -50,14 +50,14 @@ { "properties": { "keywordLocation": { - "pattern": ".*/\\$ref/.*" + "pattern": "/\\$ref/" } } }, { "properties": { "keywordLocation": { - "pattern": ".*/\\$recursiveRef/.*" + "pattern": "/\\$recursiveRef/" } } } From e28aeec3946eb436a2d095517f25d39e1a0e78e5 Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Sat, 1 Aug 2020 09:30:20 -0700 Subject: [PATCH 4/5] [900] Add missing "type" to applicator meta-schema (cherry picked from commit 4af51fc99152a88e726f0cf0b292b5a05612cdae) --- meta/applicator.json | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/applicator.json b/meta/applicator.json index a7c4a314..24a1cc4f 100644 --- a/meta/applicator.json +++ b/meta/applicator.json @@ -7,6 +7,7 @@ "$recursiveAnchor": true, "title": "Applicator vocabulary meta-schema", + "type": ["object", "boolean"], "properties": { "additionalItems": { "$recursiveRef": "#" }, "unevaluatedItems": { "$recursiveRef": "#" }, From 8a6c59017791b90253873dedce9d878087f4f49a Mon Sep 17 00:00:00 2001 From: Shawn Silverman Date: Thu, 11 Jun 2020 07:56:55 -0700 Subject: [PATCH 5/5] [954] Fix $recursiveAnchor in schema to match spec The spec allows values of false. This fixes the schema to match the spec. (cherry picked from commit 568e20f14ef562a56cb29eebff3c8180914680de) --- meta/core.json | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/core.json b/meta/core.json index b28fc990..eb708a56 100644 --- a/meta/core.json +++ b/meta/core.json @@ -33,7 +33,6 @@ }, "$recursiveAnchor": { "type": "boolean", - "const": true, "default": false }, "$vocabulary": {