@hyperjump/json-schema 0.22.0 → 0.23.0

package/dist/json-schema-cjs.js

@@ -1913,7 +1913,7 @@ const compile$P = (pointer) => {
   return pointer.split("/").slice(1).map(unescape);
 };
 
-const get$1 = (pointer, value = undefined) => {
+const get$2 = (pointer, value = undefined) => {
   const ptr = compile$P(pointer);
 
   const fn = (value) => ptr.reduce(([value, pointer], segment) => {
@@ -2032,7 +2032,7 @@ const applySegment = (value, segment, cursor = "") => {
 
 const isScalar = (value) => value === null || typeof value !== "object";
 
-var lib$3 = { nil: nil$2, append, get: get$1, set, assign, unset, remove };
+var lib$3 = { nil: nil$2, append, get: get$2, set, assign, unset, remove };
 
 const $__value = Symbol("$__value");
 const $__href = Symbol("$__href");
@@ -2056,6 +2056,15 @@ const Reference$2 = reference;
 
 const nil$1 = Object.freeze({ id: "", pointer: "", instance: undefined, value: undefined });
 const cons = (instance, id = "") => Object.freeze({ ...nil$1, id: resolveUrl$2(id, ""), instance, value: instance });
+
+const get$1 = (url, instance = nil$1) => {
+  if (!url.startsWith("#")) {
+    throw Error(`No JSON document found at '${url.split("#")[0]}'`);
+  }
+
+  return Object.freeze({ ...instance, pointer: url.substr(1) });
+};
+
 const uri$1 = (doc) => `${doc.id}#${encodeURI(doc.pointer)}`;
 const value$1 = (doc) => Reference$2.isReference(doc.value) ? Reference$2.value(doc.value) : doc.value;
 const has$1 = (key, doc) => key in value$1(doc);
@@ -2075,6 +2084,9 @@ const keys$1 = (doc) => Object.keys(value$1(doc));
 const map$4 = curry$8((fn, doc) => value$1(doc)
   .map((item, ndx, array, thisArg) => fn(step$1(ndx, doc), ndx, array, thisArg)));
 
+const forEach = curry$8((fn, doc) => value$1(doc)
+  .forEach((item, ndx, array, thisArg) => fn(step$1(ndx, doc), ndx, array, thisArg)));
+
 const filter$1 = curry$8((fn, doc) => value$1(doc)
   .map((item, ndx, array, thisArg) => step$1(ndx, doc))
   .filter((item, ndx, array, thisArg) => fn(item, ndx, array, thisArg)));
@@ -2090,7 +2102,10 @@ const some$1 = curry$8((fn, doc) => value$1(doc)
 
 const length$1 = (doc) => value$1(doc).length;
 
-var instance = { nil: nil$1, cons, uri: uri$1, value: value$1, has: has$1, typeOf: typeOf$1, step: step$1, entries: entries$3, keys: keys$1, map: map$4, filter: filter$1, reduce: reduce$3, every: every$1, some: some$1, length: length$1 };
+var instance = {
+  nil: nil$1, cons, get: get$1, uri: uri$1, value: value$1, has: has$1, typeOf: typeOf$1, length: length$1,
+  step: step$1, entries: entries$3, keys: keys$1, map: map$4, forEach, filter: filter$1, reduce: reduce$3, every: every$1, some: some$1
+};
 
 var entries$2 = async (doc) => Object.entries(await doc);
 
@@ -2407,11 +2422,11 @@ const addPlugin = (contentType, plugin) => {
 };
 
 const parse = (response) => {
-  const contentType = contentTypeParser.parse(response.headers.get("content-type")).type;
-  if (!(contentType in mediaTypePlugins)) {
-    throw Error(`${response.url} is not a schema. Found a document with media type: ${contentType}`);
+  const contentType = contentTypeParser.parse(response.headers.get("content-type"));
+  if (!(contentType.type in mediaTypePlugins)) {
+    throw Error(`${response.url} is not a schema. Found a document with media type: ${contentType.type}`);
   }
-  return mediaTypePlugins[contentType].parse(response);
+  return mediaTypePlugins[contentType.type].parse(response, contentType.parameters);
 };
 
 const getContentType = (path) => {
@@ -2443,6 +2458,8 @@ const config = {};
 const dialectJsonSchemaVersion = {};
 
 const setConfig = (jsonSchemaVersion, key, value) => {
+  dialectJsonSchemaVersion[jsonSchemaVersion] = jsonSchemaVersion;
+
   if (!config[jsonSchemaVersion]) {
     config[jsonSchemaVersion] = {};
   }
@@ -2469,23 +2486,25 @@ const add$1 = (schema, url = "", defaultSchemaVersion = "") => {
   }
   delete schema["$schema"];
 
-  // JSON Schema version
+  // Determine JSON Schema version
   if (!(dialectId in dialectJsonSchemaVersion)) {
     if (schema?.$vocabulary?.[core201909Id] === true && dialectId === getSchemaIdentifier(schema, externalId, core201909Id)[0]) {
+      // Self describing 2019-09 meta-schema
       dialectJsonSchemaVersion[dialectId] = core201909Id;
     } else if (schema?.$vocabulary?.[core202012Id] === true && dialectId === getSchemaIdentifier(schema, externalId, core202012Id)[0]) {
+      // Self describing 2020-12 meta-schema
       dialectJsonSchemaVersion[dialectId] = core202012Id;
-    } else if (dialectId === getSchemaIdentifier(schema, externalId, dialectId)[0]) {
-      dialectJsonSchemaVersion[dialectId] = dialectId;
-    } else if (!(dialectId in schemaStore)) {
-      throw Error(`Couldn't determine JSON Schema version for dialect: '${dialectId}'`);
     } else {
+      // Need to look at meta-schema to determine version
       const metaSchema = schemaStore[dialectId];
-      if (metaSchema.vocabulary[core201909Id] === true) {
+      if (!metaSchema) {
+        throw Error(`Couldn't determine JSON Schema version for dialect: '${dialectId}'`);
+      } else if (metaSchema.vocabulary[core201909Id] === true) {
         dialectJsonSchemaVersion[dialectId] = core201909Id;
       } else if (metaSchema.vocabulary[core202012Id] === true) {
         dialectJsonSchemaVersion[dialectId] = core202012Id;
       } else {
+        // Assume the jsonSchemaVersion is the meta-schema's dialectId (non-standard behavior)
         dialectJsonSchemaVersion[dialectId] = dialectJsonSchemaVersion[metaSchema.dialectId];
       }
     }
@@ -2624,7 +2643,15 @@ const get = async (url, contextDoc = nil) => {
       throw Error(`Failed to retrieve schema with id: ${id}`);
     }
 
-    add$1(await MediaTypes$1.parse(response), id);
+    const [schema, defaultDialectId] = await MediaTypes$1.parse(response);
+
+    // Make sure the meta-schema is loaded if this isn't a known dialect
+    const dialectId = resolveUrl$1(schema.$schema, "") || defaultDialectId;
+    if (id !== dialectId && !(dialectId in dialectJsonSchemaVersion)) {
+      await get(dialectId);
+    }
+
+    add$1(schema, id);
   }
 
   const storedSchema = getStoredSchema(id);
@@ -2785,7 +2812,10 @@ let metaOutputFormat = DETAILED;
 let shouldMetaValidate = true;
 
 MediaTypes.addPlugin("application/schema+json", {
-  parse: async (response) => await response.json(),
+  parse: async (response, contentTypeParameters) => [
+    await response.json(),
+    contentTypeParameters.schema || contentTypeParameters.profile
+  ],
   matcher: (path) => path.endsWith(".schema.json")
 });