Forbid "$schema" in subschemas

This modifies the meta-schemas to explicitly forbid "$schema"
in subschemas, and adds "$vocabularies".

Author: handrews

hyper-schema.json

@@ -1,53 +1,63 @@
 {
     "$schema": "http://json-schema.org/draft-06/hyper-schema#",
     "$id": "http://json-schema.org/draft-06/hyper-schema#",
+    "$vocabularies": [
+        "http://json-schema.org/draft-06/schema#",
+        "http://json-schema.org/draft-06/hyper-schema#"
+    ],
     "title": "JSON Hyper-Schema",
     "definitions": {
         "schemaArray": {
             "allOf": [
                 { "$ref": "http://json-schema.org/draft-06/schema#/definitions/schemaArray" },
                 {
-                    "items": { "$ref": "#" }
+                    "items": { "$ref": "#/definitions/subschema" }
                 }
             ]
+        },
+        "subschema": {
+            "allOf": [
+                { "$ref": "#" },
+                { "properties": { "$schema": false } }
+            ]
         }
     },
     "allOf": [ { "$ref": "http://json-schema.org/draft-06/schema#" } ],
     "properties": {
-        "additionalItems": { "$ref": "#" },
-        "additionalProperties": { "$ref": "#"},
+        "additionalItems": { "$ref": "#/definitions/subschema" },
+        "additionalProperties": { "$ref": "#/definitions/subschema"},
         "dependencies": {
             "additionalProperties": {
                 "anyOf": [
-                    { "$ref": "#" },
+                    { "$ref": "#/definitions/subschema" },
                     { "type": "array" }
                 ]
             }
         },
         "items": {
             "anyOf": [
-                { "$ref": "#" },
+                { "$ref": "#/definitions/subschema" },
                 { "$ref": "#/definitions/schemaArray" }
             ]
         },
         "definitions": {
-            "additionalProperties": { "$ref": "#" }
+            "additionalProperties": { "$ref": "#/definitions/subschema" }
         },
         "patternProperties": {
-            "additionalProperties": { "$ref": "#" }
+            "additionalProperties": { "$ref": "#/definitions/subschema" }
         },
         "properties": {
-            "additionalProperties": { "$ref": "#" }
+            "additionalProperties": { "$ref": "#/definitions/subschema" }
         },
-        "if": {"$ref": "#"},
-        "then": {"$ref": "#"},
-        "else": {"$ref": "#"},
+        "if": {"$ref": "#/definitions/subschema"},
+        "then": {"$ref": "#/definitions/subschema"},
+        "else": {"$ref": "#/definitions/subschema"},
         "allOf": { "$ref": "#/definitions/schemaArray" },
         "anyOf": { "$ref": "#/definitions/schemaArray" },
         "oneOf": { "$ref": "#/definitions/schemaArray" },
-        "not": { "$ref": "#" },
-        "contains": { "$ref": "#" },
-        "propertyNames": { "$ref": "#" },
+        "not": { "$ref": "#/definitions/subschema" },
+        "contains": { "$ref": "#/definitions/subschema" },
+        "propertyNames": { "$ref": "#/definitions/subschema" },
 
         "base": {
             "type": "string"

links.json

@@ -1,6 +1,10 @@
 {
     "$schema": "http://json-schema.org/draft-06/hyper-schema#",
     "$id": "http://json-schema.org/draft-06/links#",
+    "$vocabularies": [
+        "http://json-schema.org/draft-06/schema#",
+        "http://json-schema.org/draft-06/hyper-schema#"
+    ],
     "title": "Link Description Object",
     "type": "object",
     "required": [ "href" ],
@@ -21,7 +25,7 @@
         },
         "hrefSchema": {
             "allOf": [
-                { "$ref": "http://json-schema.org/draft-06/hyper-schema#" }
+                { "$ref": "http://json-schema.org/draft-06/hyper-schema#/definitions/subschema" }
             ]
         },
         "hrefRequired": {
@@ -53,7 +57,7 @@
         },
         "targetSchema": {
             "allOf": [
-                { "$ref": "http://json-schema.org/draft-06/hyper-schema#" }
+                { "$ref": "http://json-schema.org/draft-06/hyper-schema#/definitions/subschema" }
             ]
         },
         "targetHints": { },
@@ -62,7 +66,7 @@
         },
         "headerSchema": {
             "allOf": [
-                { "$ref": "http://json-schema.org/draft-06/hyper-schema#" }
+                { "$ref": "http://json-schema.org/draft-06/hyper-schema#/definitions/subschema" }
             ]
         },
         "submissionEncType": {
@@ -71,7 +75,7 @@
         },
         "submissionSchema": {
             "allOf": [
-                { "$ref": "http://json-schema.org/draft-06/hyper-schema#" }
+                { "$ref": "http://json-schema.org/draft-06/hyper-schema#/definitions/subschema" }
             ]
         },
         "$comment": {

schema.json

@@ -1,12 +1,15 @@
 {
     "$schema": "http://json-schema.org/draft-06/schema#",
     "$id": "http://json-schema.org/draft-06/schema#",
+    "$vocabularies": [
+        "http://json-schema.org/draft-06/schema#"
+    ],
     "title": "Core schema meta-schema",
     "definitions": {
         "schemaArray": {
             "type": "array",
             "minItems": 1,
-            "items": { "$ref": "#" }
+            "items": { "$ref": "#/definitions/subschema" }
         },
         "nonNegativeInteger": {
             "type": "integer",
@@ -34,6 +37,12 @@
             "items": { "type": "string" },
             "uniqueItems": true,
             "default": []
+        },
+        "subschema": {
+            "allOf": [
+                { "$ref": "#" },
+                { "properties": { "$schema": false } }
+            ]
         }
     },
     "type": ["object", "boolean"],
@@ -46,6 +55,13 @@
             "type": "string",
             "format": "uri"
         },
+        "$vocabularies": {
+            "type": "array",
+            "items": {
+                  "type": "string",
+                  "format": "uri"
+            }
+        },
         "$ref": {
             "type": "string",
             "format": "uri-reference"
@@ -90,10 +106,10 @@
             "type": "string",
             "format": "regex"
         },
-        "additionalItems": { "$ref": "#" },
+        "additionalItems": { "$ref": "#/definitions/subschema" },
         "items": {
             "anyOf": [
-                { "$ref": "#" },
+                { "$ref": "#/definitions/subschema" },
                 { "$ref": "#/definitions/schemaArray" }
             ],
             "default": {}
@@ -104,37 +120,37 @@
             "type": "boolean",
             "default": false
         },
-        "contains": { "$ref": "#" },
+        "contains": { "$ref": "#/definitions/subschema" },
         "maxProperties": { "$ref": "#/definitions/nonNegativeInteger" },
         "minProperties": { "$ref": "#/definitions/nonNegativeIntegerDefault0" },
         "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": { "$ref": "#" },
+        "additionalProperties": { "$ref": "#/definitions/subschema" },
         "definitions": {
             "type": "object",
-            "additionalProperties": { "$ref": "#" },
+            "additionalProperties": { "$ref": "#/definitions/subschema" },
             "default": {}
         },
         "properties": {
             "type": "object",
-            "additionalProperties": { "$ref": "#" },
+            "additionalProperties": { "$ref": "#/definitions/subschema" },
             "default": {}
         },
         "patternProperties": {
             "type": "object",
-            "additionalProperties": { "$ref": "#" },
+            "additionalProperties": { "$ref": "#/definitions/subschema" },
             "propertyNames": { "format": "regex" },
             "default": {}
         },
         "dependencies": {
             "type": "object",
             "additionalProperties": {
                 "anyOf": [
-                    { "$ref": "#" },
+                    { "$ref": "#/definitions/subschema" },
                     { "$ref": "#/definitions/stringArray" }
                 ]
             }
         },
-        "propertyNames": { "$ref": "#" },
+        "propertyNames": { "$ref": "#/definitions/subschema" },
         "const": {},
         "enum": {
             "type": "array",
@@ -155,13 +171,13 @@
         "format": { "type": "string" },
         "contentMediaType": { "type": "string" },
         "contentEncoding": { "type": "string" },
-        "if": {"$ref": "#"},
-        "then": {"$ref": "#"},
-        "else": {"$ref": "#"},
+        "if": {"$ref": "#/definitions/subschema"},
+        "then": {"$ref": "#/definitions/subschema"},
+        "else": {"$ref": "#/definitions/subschema"},
         "allOf": { "$ref": "#/definitions/schemaArray" },
         "anyOf": { "$ref": "#/definitions/schemaArray" },
         "oneOf": { "$ref": "#/definitions/schemaArray" },
-        "not": { "$ref": "#" }
+        "not": { "$ref": "#/definitions/subschema" }
     },
     "default": {}
 }