Merge pull request #968 from karenetheridge/2019-09

Relequestual · web-flow · commit 03fe369b6192 · 2020-08-15T15:26:07.000+01:00
missing updates to existing 2019-09 metaschemas
diff --git 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": "#" },
diff --git a/meta/core.json b/meta/core.json
@@ -33,7 +33,6 @@
         },
         "$recursiveAnchor": {
             "type": "boolean",
-            "const": true,
             "default": false
         },
         "$vocabulary": {
diff --git a/output/schema.json b/output/schema.json
@@ -46,20 +46,20 @@
         },
         {
           "if": {
-            "oneOf": [
+            "anyOf": [
               {
                 "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" }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,20 +46,20 @@`
`46`	`46`	`},`
`47`	`47`	`{`
`48`	`48`	`"if": {`
`49`		`- "oneOf": [`
	`49`	`+ "anyOf": [`
`50`	`50`	`{`
`51`	`51`	`"properties": {`
`52`	`52`	`"keywordLocation": {`
`53`		`- "pattern": "./$ref/."`
	`53`	`+ "pattern": "/\\$ref/"`
`54`	`54`	`}`
`55`		`- }`
	`55`	`+ }`
`56`	`56`	`},`
`57`	`57`	`{`
`58`	`58`	`"properties": {`
`59`	`59`	`"keywordLocation": {`
`60`		`- "pattern": "./$recursiveRef/."`
	`60`	`+ "pattern": "/\\$recursiveRef/"`
`61`	`61`	`}`
`62`		`- }`
	`62`	`+ }`
`63`	`63`	`}`
`64`	`64`	`]`
`65`	`65`	`},`
`@@ -79,8 +79,8 @@`
`79`	`79`	`},`
`80`	`80`	`"required": [ "valid" ]`
`81`	`81`	`},`
`82`		`- "basic": { "$ref": "#/outputUnit" },`
`83`		`- "detailed": { "$ref": "#/outputUnit" },`
`84`		`- "verbose": { "$ref": "#/outputUnit" }`
	`82`	`+ "basic": { "$ref": "#/$defs/outputUnit" },`
	`83`	`+ "detailed": { "$ref": "#/$defs/outputUnit" },`
	`84`	`+ "verbose": { "$ref": "#/$defs/outputUnit" }`
`85`	`85`	`}`
`86`	`86`	`}`