Fix bugs in annotatedWith

Author: jdesrosiers

annotations/annotated-instance.js

@@ -37,7 +37,7 @@ export const annotate = (instance, keyword, value) => {
 export const annotatedWith = (instance, keyword, dialectId = defaultDialectId) => {
   const instances = [];
 
-  const keywordId = getKeywordId(dialectId, keyword);
+  const keywordId = getKeywordId(keyword, dialectId);
   for (const instancePointer in instance.annotations) {
     if (keywordId in instance.annotations[instancePointer]) {
       instances.push(get(`#${instancePointer}`, instance));

lib/keywords.js

@@ -2,7 +2,14 @@ import { toAbsoluteUri } from "./common.js";
 
 
 const _keywords = {};
-export const getKeyword = (id) => _keywords[toAbsoluteUri(id)];
+export const getKeyword = (id) => {
+  if (id.indexOf("#") !== -1) {
+    const absoluteId = toAbsoluteUri(id);
+    return { ..._keywords[absoluteId], id };
+  }
+
+  return _keywords[id];
+};
 
 export const getKeywordByName = (keyword, dialectId) => {
   const keywordId = getKeywordId(keyword, dialectId);

lib/keywords/requireAllExcept.js

@@ -7,7 +7,7 @@ const id = "https://json-schema.org/keyword/requireAllExcept";
 
 const compile = async (schema, _ast, parentSchema) => {
   const requireAllExcept = await Browser.value(schema);
-  const propertiesKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/properties");
+  const propertiesKeyword = getKeywordName(schema.document.dialectId, "https://json-schema.org/keyword/properties");
   const propertiesSchema = await Browser.step(propertiesKeyword, parentSchema);
   const propertyNames = Browser.typeOf(propertiesSchema) === "object" ? Browser.keys(propertiesSchema) : [];