@hyperjump/json-schema 0.22.0 → 0.23.0

package/README.md

@@ -101,10 +101,14 @@ MediaTypePlugin to support that.
     way JSON is supported.
 * **MediaTypePlugin**: object
 
-    * parse: (response: Response) => string -- Given a fetch Response object,
-      parse the body of the request
-    * matcher: (path) => boolean -- Given a filesystem path, return whether or
-      not the file should be considered a member of this media type
+    * parse: (response: Response, mediaTypeParameters: object) => [SchemaObject, string]
+
+      Given a fetch Response object, parse the body of the request. Return the
+      parsed schema and an optional default dialectId.
+    * matcher: (path) => boolean
+
+      Given a filesystem path, return whether or not the file should be
+      considered a member of this media type.
 
 ```javascript
 const JsonSchema = require("@hyperjump/json-schema");
@@ -113,7 +117,7 @@ const YAML = require("yaml");
 
 // Add support for JSON Schemas written in YAML
 JsonSchema.addMediaTypePlugin("application/schema+yaml", {
-  parse: async (response) => YAML.parse(await response.text()),
+  parse: async (response) => [YAML.parse(await response.text()), undefined],
   matcher: (path) => path.endsWith(".schema.yaml")
 });
 

package/dist/json-schema-amd.js

@@ -1911,7 +1911,7 @@ define(['exports'], (function (exports) { 'use strict';
 	  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) => {
@@ -2030,7 +2030,7 @@ define(['exports'], (function (exports) { 'use strict';
 
 	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");
@@ -2054,6 +2054,15 @@ define(['exports'], (function (exports) { 'use strict';
 
 	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);
@@ -2073,6 +2082,9 @@ define(['exports'], (function (exports) { 'use strict';
 	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)));
@@ -2088,7 +2100,10 @@ define(['exports'], (function (exports) { 'use strict';
 
 	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);
 
@@ -2405,11 +2420,11 @@ define(['exports'], (function (exports) { 'use strict';
 	};
 
 	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) => {
@@ -2441,6 +2456,8 @@ define(['exports'], (function (exports) { 'use strict';
 	const dialectJsonSchemaVersion = {};
 
 	const setConfig = (jsonSchemaVersion, key, value) => {
+	  dialectJsonSchemaVersion[jsonSchemaVersion] = jsonSchemaVersion;
+
 	  if (!config[jsonSchemaVersion]) {
 	    config[jsonSchemaVersion] = {};
 	  }
@@ -2467,23 +2484,25 @@ define(['exports'], (function (exports) { 'use strict';
 	  }
 	  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];
 	      }
 	    }
@@ -2622,7 +2641,15 @@ define(['exports'], (function (exports) { 'use strict';
 	      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);
@@ -2783,7 +2810,10 @@ define(['exports'], (function (exports) { 'use strict';
 	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")
 	});