updated base and core meta-schemas

Author: gregsdennis

meta/core.json

@@ -10,37 +10,18 @@
     "type": ["object", "boolean"],
     "properties": {
         "$id": {
-            "type": "string",
-            "format": "uri-reference",
+            "$ref": "#/$defs/uriReferenceString",
             "$comment": "Non-empty fragments not allowed.",
             "pattern": "^[^#]*#?$"
         },
-        "$schema": {
-            "type": "string",
-            "format": "uri"
-        },
-        "$anchor": {
-            "type": "string",
-            "pattern": "^[A-Za-z_][-A-Za-z0-9._]*$"
-        },
-        "$ref": {
-            "type": "string",
-            "format": "uri-reference"
-        },
-        "$dynamicRef": {
-            "type": "string",
-            "format": "uri-reference"
-        },
-        "$dynamicAnchor": {
-            "type": "string",
-            "pattern": "^[A-Za-z_][-A-Za-z0-9._]*$"
-        },
+        "$schema": { "$ref": "#/$defs/uriString" },
+        "$ref": { "$ref": "#/$defs/uriReferenceString" },
+        "$anchor": { "$ref": "#/$defs/anchorString" },
+        "$dynamicRef": { "$ref": "#/$defs/uriReferenceString" },
+        "$dynamicAnchor": { "$ref": "#/$defs/anchorString" },
         "$vocabulary": {
             "type": "object",
-            "propertyNames": {
-                "type": "string",
-                "format": "uri"
-            },
+            "propertyNames": { "$ref": "#/$defs/uriString" },
             "additionalProperties": {
                 "type": "boolean"
             }
@@ -53,5 +34,19 @@
             "additionalProperties": { "$dynamicRef": "#meta" },
             "default": {}
         }
+    },
+    "$defs": {
+        "anchorString": {
+            "type": "string",
+            "pattern": "^[A-Za-z_][-A-Za-z0-9._]*$"
+        },
+        "uriString": {
+            "type": "string",
+            "format": "uri"
+        },
+        "uriReferenceString": {
+            "type": "string",
+            "format": "uri-reference"
+        }
     }
 }

schema.json

@@ -22,22 +22,31 @@
         {"$ref": "meta/content"}
     ],
     "type": ["object", "boolean"],
+    "$comment": "This meta-schema also defines keywords that have appeared in previous drafts in order to prevent incompatible extensions as they remain in common use.",
     "properties": {
         "definitions": {
-            "$comment": "While no longer an official keyword as it is replaced by $defs, this keyword is retained in the meta-schema to prevent incompatible extensions as it remains in common use.",
+            "$comment": "\"definitions\" has been replaced by \"$defs\".",
             "type": "object",
             "additionalProperties": { "$dynamicRef": "#meta" },
             "default": {}
         },
         "dependencies": {
-            "$comment": "\"dependencies\" is no longer a keyword, but schema authors should avoid redefining it to facilitate a smooth transition to \"dependentSchemas\" and \"dependentRequired\"",
+            "$comment": "\"dependencies\" has been split and replaced by \"dependentSchemas\" and \"dependentRequired\" in order to serve their differing semantics.",
             "type": "object",
             "additionalProperties": {
                 "anyOf": [
                     { "$dynamicRef": "#meta" },
                     { "$ref": "meta/validation#/$defs/stringArray" }
                 ]
             }
+        },
+        "$recursiveAnchor": {
+            "$comment": "\"$recursiveAnchor\" has been replaced by \"$dynamicAnchor\".",
+            "$ref": "meta/core#/$defs/anchorString"
+        },
+        "$recursiveRef": {
+            "$comment": "\"$recursiveRef\" has been replaced by \"$dynamicRef\".",
+            "$ref": "meta/core#/$defs/uriReferenceString"
         }
     }
 }