Merge pull request #427 from handrews/rewrite

Rewrite the Hyper-Schema spec almost entirely

Author: handrews

hyper-schema-output.json

@@ -0,0 +1,61 @@
+{
+    "$id": "http://json-schema.org/draft-7-wip/hyper-schema-output",
+    "$schema": "http://json-schema.org/draft-07-wip/schema#",
+    "type": "array",
+    "items": {
+        "allOf": [
+            {"$ref": "http://json-schema.org/draft-07/links#/definitions/noRequiredFields" }
+        ],
+        "type": "object",
+        "required": [
+            "contextUri",
+            "contextPointer",
+            "rel",
+            "attachmentPointer"
+        ],
+        "if": { "required": [ "hrefSchema" ] },
+        "then": { "required": [ "hrefInputTemplates", "hrefPrepopulatedInput" ] },
+        "else": { "required": [ "targetUri" ] },
+        "properties": {
+            "contextUri": {
+                "$comment": "The fully resolved URI of the link context, including a fragment if it is possible to construct one for the given media type and instance",
+                "type": "string",
+                "format": "uri"
+            },
+            "contextPointer": {
+                "$comment": "The absolute JSON Pointer to the ___location in the instance that is the context of the link.  If the context resource supports JSON Pointer fragments, this will the string form of the identical JSON Pointer",
+                "type": "string",
+                "format": "json-pointer"
+            },
+            "rel": {
+                "type": "string"
+            },
+            "targetUri": {
+                "$comment": "The fully resolved target URI",
+                "type": "string",
+                "format": "uri"
+            },
+            "hrefInputTemplates": {
+                "$comment": "The list of partially resolved URI Templates, starting with \"href\", followed by applicable \"base\" values from nearest to furthest.",
+                "type": "array",
+                "items": {
+                    "type": "string",
+                    "format": "uri-template"
+                }
+            },
+            "hrefPrepopulatedInput": {
+                "$comment": "The initial data set to be presented with the input form when URI Tempalte input is accepted.",
+                "type": "object",
+                "propertyNames": {
+                    "$comment": "These are all URI Template variable names, specifically the 'varname' production from RFC 6570, Section 2.3",
+                    "pattern": "^(?:\\w|(?:%[a-f\\d]{2}))+(?:\\.(?:\\w|(?:%[a-f\\d]{2})))*$"
+                }
+            },
+            "attachmentPointer": {
+                "$comment": "The absolute JSON Pointer, in string form, of the position to which this resolved link applies",
+                "type": "string",
+                "format": "json-pointer"
+            }
+        }
+    }
+}

hyper-schema.json

@@ -1,18 +1,18 @@
 {
-    "$schema": "http://json-schema.org/draft-06/hyper-schema#",
-    "$id": "http://json-schema.org/draft-06/hyper-schema#",
+    "$schema": "http://json-schema.org/draft-07-wip/hyper-schema#",
+    "$id": "http://json-schema.org/draft-07-wip/hyper-schema#",
     "title": "JSON Hyper-Schema",
     "definitions": {
         "schemaArray": {
             "allOf": [
-                { "$ref": "http://json-schema.org/draft-06/schema#/definitions/schemaArray" },
+                { "$ref": "http://json-schema.org/draft-07-wip/schema#/definitions/schemaArray" },
                 {
                     "items": { "$ref": "#" }
                 }
             ]
         }
     },
-    "allOf": [ { "$ref": "http://json-schema.org/draft-06/schema#" } ],
+    "allOf": [ { "$ref": "http://json-schema.org/draft-07-wip/schema#" } ],
     "properties": {
         "additionalItems": { "$ref": "#" },
         "additionalProperties": { "$ref": "#"},
@@ -50,12 +50,13 @@
         "propertyNames": { "$ref": "#" },
 
         "base": {
-            "type": "string"
+            "type": "string",
+            "format": "uri-template"
         },
         "links": {
             "type": "array",
             "items": {
-                "$ref": "http://json-schema.org/draft-06/links#"
+                "$ref": "http://json-schema.org/draft-07-wip/links#"
             }
         }
     },

jsonschema-core.xml

@@ -19,7 +19,7 @@
 <?rfc rfcedstyle="yes"?>
 <?rfc comments="yes"?>
 <?rfc inline="yes" ?>
-<rfc category="info" docName="draft-wright-json-schema-02" ipr="trust200902">
+<rfc category="info" docName="draft-handrews-json-schema-00" ipr="trust200902">
     <front>
         <title abbrev="JSON Schema">JSON Schema: A Media Type for Describing JSON Documents</title>
 
@@ -986,11 +986,13 @@ User-Agent: product-name/5.4.1 so-cool-json-schema/1.0.2 curl/7.43.0
             </t>
             <t>
                 <list style="hanging">
-                    <t hangText="draft-wright-json-schema-02">
+                    <t hangText="draft-handrews-json-schema-00">
                         <list style="symbols">
                             <t>Reserve "$comment" for non-user-visible notes about the schema</t>
                             <t>Wording improvements around "$id" and fragments</t>
                             <t>Note the challenges of extending meta-schemas with recursive references</t>
+                            <t>Add "application/schema-instance+json" media type</t>
+                            <t>Recommend a "schema" link relation / parameter instead of "profile"</t>
                         </list>
                     </t>
                     <t hangText="draft-wright-json-schema-01">