Update content keywords to only apply to string instances

Author: jdesrosiers

annotations/tests/content.json

@@ -1,6 +1,6 @@
 [
   {
-    "title": "`contentMediaType` is an annotation",
+    "title": "`contentMediaType` is an annotation for string instances",
     "schema": {
       "contentMediaType": "application/json"
     },
@@ -14,11 +14,21 @@
             "expected": ["application/json"]
           }
         ]
+      },
+      {
+        "instance": 42,
+        "assertions": [
+          {
+            "location": "#",
+            "keyword": "contentMediaType",
+            "expected": []
+          }
+        ]
       }
     ]
   },
   {
-    "title": "`contentEncoding` is an annotation",
+    "title": "`contentEncoding` is an annotation for string instances",
     "schema": {
       "contentEncoding": "base64"
     },
@@ -32,13 +42,24 @@
             "expected": ["base64"]
           }
         ]
+      },
+      {
+        "instance": 42,
+        "assertions": [
+          {
+            "location": "#",
+            "keyword": "contentEncoding",
+            "expected": []
+          }
+        ]
       }
     ]
   },
   {
-    "title": "`contentSchema` is an annotation",
+    "title": "`contentSchema` is an annotation for string instances",
     "schema": {
       "$id": "https://annotations.json-schema.org/test/contentSchema-is-an-annotation",
+      "contentMediaType": "application/json",
       "contentSchema": { "type": "number" }
     },
     "subjects": [
@@ -51,6 +72,35 @@
             "expected": ["https://annotations.json-schema.org/test/contentSchema-is-an-annotation#/contentSchema"]
           }
         ]
+      },
+      {
+        "instance": 42,
+        "assertions": [
+          {
+            "location": "#",
+            "keyword": "contentSchema",
+            "expected": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "title": "`contentSchema` requires `contentMediaType`",
+    "schema": {
+      "$id": "https://annotations.json-schema.org/test/contentSchema-is-an-annotation",
+      "contentSchema": { "type": "number" }
+    },
+    "subjects": [
+      {
+        "instance": "42",
+        "assertions": [
+          {
+            "location": "#",
+            "keyword": "contentSchema",
+            "expected": []
+          }
+        ]
       }
     ]
   }

lib/keywords/contentEncoding.js

@@ -1,10 +1,18 @@
 import * as Browser from "@hyperjump/browser";
+import * as Instance from "../instance.js";
 
 
 const id = "https://json-schema.org/keyword/contentEncoding";
 
 const compile = (schema) => Browser.value(schema);
 const interpret = () => true;
-const annotation = (contentEncoding) => contentEncoding;
+
+const annotation = (contentEncoding, instance) => {
+  if (Instance.typeOf(instance) !== "string") {
+    return;
+  }
+
+  return contentEncoding;
+};
 
 export default { id, compile, interpret, annotation };

lib/keywords/contentMediaType.js

@@ -1,10 +1,18 @@
 import * as Browser from "@hyperjump/browser";
+import * as Instance from "../instance.js";
 
 
 const id = "https://json-schema.org/keyword/contentMediaType";
 
 const compile = (schema) => Browser.value(schema);
 const interpret = () => true;
-const annotation = (contentMediaType) => contentMediaType;
+
+const annotation = (contentMediaType, instance) => {
+  if (Instance.typeOf(instance) !== "string") {
+    return;
+  }
+
+  return contentMediaType;
+};
 
 export default { id, compile, interpret, annotation };

lib/keywords/contentSchema.js

@@ -1,10 +1,25 @@
 import { canonicalUri } from "../schema.js";
+import * as Browser from "@hyperjump/browser";
+import * as Instance from "../instance.js";
+import { getKeywordName } from "../keywords.js";
 
 
 const id = "https://json-schema.org/keyword/contentSchema";
 
-const compile = (contentSchema) => canonicalUri(contentSchema);
+const compile = async (contentSchema, _ast, parentSchema) => {
+  const contentMediaTypeKeyword = getKeywordName(contentSchema.document.dialectId, "https://json-schema.org/keyword/contentMediaType");
+  const contentMediaType = await Browser.step(contentMediaTypeKeyword, parentSchema);
+  return Browser.value(contentMediaType) && canonicalUri(contentSchema);
+};
+
 const interpret = () => true;
-const annotation = (contentSchema) => contentSchema;
+
+const annotation = (contentSchema, instance) => {
+  if (Instance.typeOf(instance) !== "string") {
+    return;
+  }
+
+  return contentSchema;
+};
 
 export default { id, compile, interpret, annotation };