Merge pull request json-schema-org#938 from ssilverman/output-keyword…

…-relative Fix output relative locations to be consistent. "Raw pointer was intentional and the example showing a fragment is an error, because there's no base URI against which that fragment could be resolved."
karenetheridge · Aug 20, 2020 · 9b32946 · 9b32946
2 parents ed501eb + cf59d7a
commit 9b32946
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/jsonschema-core.xml b/jsonschema-core.xml
@@ -2676,7 +2676,7 @@ https://example.com/schemas/common#/$defs/count/minimum
                 <section title="Instance Location">
                     <t>
                         The location of the JSON value within the instance being validated.  The
-                        value MUST be expressed as a URI fragment-encoded JSON Pointer.
+                        value MUST be expressed as a JSON Pointer.
                     </t>
                     <t>
                         The JSON key for this information is "instanceLocation".
@@ -2829,34 +2829,34 @@ https://example.com/schemas/common#/$defs/count/minimum
   "valid": false,
   "errors": [
     {
-      "keywordLocation": "#",
-      "instanceLocation": "#",
+      "keywordLocation": "",
+      "instanceLocation": "",
       "error": "A subschema had errors."
     },
     {
-      "keywordLocation": "#/items/$ref",
+      "keywordLocation": "/items/$ref",
       "absoluteKeywordLocation":
         "https://example.com/polygon#/$defs/point",
-      "instanceLocation": "#/1",
+      "instanceLocation": "/1",
       "error": "A subschema had errors."
     },
     {
-      "keywordLocation": "#/items/$ref/required",
+      "keywordLocation": "/items/$ref/required",
       "absoluteKeywordLocation":
         "https://example.com/polygon#/$defs/point/required",
-      "instanceLocation": "#/1",
+      "instanceLocation": "/1",
       "error": "Required property 'y' not found."
     },
     {
-      "keywordLocation": "#/items/$ref/additionalProperties",
+      "keywordLocation": "/items/$ref/additionalProperties",
       "absoluteKeywordLocation":
         "https://example.com/polygon#/$defs/point/additionalProperties",
-      "instanceLocation": "#/1/z",
+      "instanceLocation": "/1/z",
       "error": "Additional property 'z' found but was invalid."
     },
     {
-      "keywordLocation": "#/minItems",
-      "instanceLocation": "#",
+      "keywordLocation": "/minItems",
+      "instanceLocation": "",
       "error": "Expected at least 3 items but found 2"
     }
   ]
@@ -2896,38 +2896,38 @@ https://example.com/schemas/common#/$defs/count/minimum
 <![CDATA[
 {
   "valid": false,
-  "keywordLocation": "#",
-  "instanceLocation": "#",
+  "keywordLocation": "",
+  "instanceLocation": "",
   "errors": [
     {
       "valid": false,
-      "keywordLocation": "#/items/$ref",
+      "keywordLocation": "/items/$ref",
       "absoluteKeywordLocation":
         "https://example.com/polygon#/$defs/point",
-      "instanceLocation": "#/1",
+      "instanceLocation": "/1",
       "errors": [
         {
           "valid": false,
-          "keywordLocation": "#/items/$ref/required",
+          "keywordLocation": "/items/$ref/required",
           "absoluteKeywordLocation":
             "https://example.com/polygon#/$defs/point/required",
-          "instanceLocation": "#/1",
+          "instanceLocation": "/1",
           "error": "Required property 'y' not found."
         },
         {
           "valid": false,
-          "keywordLocation": "#/items/$ref/additionalProperties",
+          "keywordLocation": "/items/$ref/additionalProperties",
           "absoluteKeywordLocation":
             "https://example.com/polygon#/$defs/point/additionalProperties",
-          "instanceLocation": "#/1/z",
+          "instanceLocation": "/1/z",
           "error": "Additional property 'z' found but was invalid."
         }
       ]
     },
     {
       "valid": false,
-      "keywordLocation": "#/minItems",
-      "instanceLocation": "#",
+      "keywordLocation": "/minItems",
+      "instanceLocation": "",
       "error": "Expected at least 3 items but found 2"
     }
   ]
@@ -2979,28 +2979,28 @@ https://example.com/schemas/common#/$defs/count/minimum
 // result
 {
   "valid": false,
-  "keywordLocation": "#",
-  "instanceLocation": "#",
+  "keywordLocation": "",
+  "instanceLocation": "",
   "errors": [
     {
       "valid": true,
-      "keywordLocation": "#/type",
-      "instanceLocation": "#"
+      "keywordLocation": "/type",
+      "instanceLocation": ""
     },
     {
       "valid": true,
-      "keywordLocation": "#/properties",
-      "instanceLocation": "#"
+      "keywordLocation": "/properties",
+      "instanceLocation": ""
     },
     {
       "valid": false,
-      "keywordLocation": "#/additionalProperties",
-      "instanceLocation": "#",
+      "keywordLocation": "/additionalProperties",
+      "instanceLocation": "",
       "errors": [
         {
           "valid": false,
-          "keywordLocation": "#/additionalProperties",
-          "instanceLocation": "#/disallowedProp",
+          "keywordLocation": "/additionalProperties",
+          "instanceLocation": "/disallowedProp",
           "error": "Additional property 'disallowedProp' found but was invalid."
         }
       ]

diff --git a/output/schema.json b/output/schema.json
@@ -15,15 +15,15 @@
         "valid": { "type": "boolean" },
         "keywordLocation": {
           "type": "string",
-          "format": "uri-reference"
+          "format": "json-pointer"
         },
         "absoluteKeywordLocation": {
           "type": "string",
           "format": "uri"
         },
         "instanceLocation": {
           "type": "string",
-          "format": "uri-reference"
+          "format": "json-pointer"
         },
         "errors": {
           "$ref": "#/$defs/outputUnitArray"