@hyperjump/json-schema 0.23.3 → 0.23.5

package/dist/json-schema-cjs.js

@@ -45,7 +45,11 @@ function curry$b(fn, arity) {
   };
 }
 
-var pubsub = {exports: {}};
+var pubsubExports = {};
+var pubsub = {
+  get exports(){ return pubsubExports; },
+  set exports(v){ pubsubExports = v; },
+};
 
 /**
  * Copyright (c) 2010,2011,2012,2013,2014 Morgan Roderick http://roderick.dk
@@ -399,9 +403,13 @@ var pubsub = {exports: {}};
 	        return result;
 	    };
 	}));
-} (pubsub, pubsub.exports));
+} (pubsub, pubsubExports));
 
-var uri_all = {exports: {}};
+var uri_allExports = {};
+var uri_all = {
+  get exports(){ return uri_allExports; },
+  set exports(v){ uri_allExports = v; },
+};
 
 /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
 
@@ -1807,9 +1815,9 @@ var uri_all = {exports: {}};
 
 	})));
 	
-} (uri_all, uri_all.exports));
+} (uri_all, uri_allExports));
 
-const URI = uri_all.exports;
+const URI = uri_allExports;
 
 
 const isObject$1 = (value) => typeof value === "object" && !Array.isArray(value) && value !== null;
@@ -1905,116 +1913,138 @@ const curry$a = justCurryIt$1;
 
 const nil$2 = "";
 
-const compile$N = (pointer) => {
+const EXISTS = Symbol("EXISTS");
+
+const segmentGenerator = (pointer) => {
   if (pointer.length > 0 && pointer[0] !== "/") {
     throw Error("Invalid JSON Pointer");
   }
 
-  return pointer.split("/").slice(1).map(unescape);
-};
+  let segmentStart = 1;
+  let segmentEnd = 0;
 
-const get$2 = (pointer, value = undefined) => {
-  const ptr = compile$N(pointer);
+  return (mode) => {
+    if (mode === EXISTS) {
+      return segmentEnd < pointer.length;
+    }
+
+    if (segmentEnd >= pointer.length) {
+      return;
+    }
 
-  const fn = (value) => ptr.reduce(([value, pointer], segment) => {
-    return [applySegment(value, segment, pointer), append(segment, pointer)];
-  }, [value, ""])[0];
+    const position = pointer.indexOf("/", segmentStart);
+    segmentEnd = position === -1 ? pointer.length : position;
+    const segment = unescape(pointer.slice(segmentStart, segmentEnd));
+    segmentStart = segmentEnd + 1;
+
+    return segment;
+  };
+};
+
+const get$2 = (pointer, subject = undefined) => {
+  const nextSegment = segmentGenerator(pointer);
+  const fn = (subject) => _get(nextSegment, subject, nil$2);
+  return subject === undefined ? fn : fn(subject);
+};
 
-  return value === undefined ? fn : fn(value);
+const _get = (nextSegment, subject, cursor) => {
+  if (!nextSegment(EXISTS)) {
+    return subject;
+  } else {
+    const segment = nextSegment();
+    return _get(nextSegment, applySegment(subject, segment, cursor), append(segment, cursor));
+  }
 };
 
 const set = (pointer, subject = undefined, value = undefined) => {
-  const ptr = compile$N(pointer);
-  const fn = curry$a((subject, value) => _set(ptr, subject, value, nil$2));
+  const nextSegment = segmentGenerator(pointer);
+  const fn = curry$a((subject, value) => _set(nextSegment, subject, value, nil$2));
   return subject === undefined ? fn : fn(subject, value);
 };
 
-const _set = (pointer, subject, value, cursor) => {
-  if (pointer.length === 0) {
+const _set = (nextSegment, subject, value, cursor) => {
+  const segment = nextSegment();
+  if (segment === undefined) {
     return value;
-  } else if (pointer.length > 1) {
+  } else if (nextSegment(EXISTS)) {
     if (Array.isArray(subject)) {
-      const index = pointer.shift();
       const clonedSubject = [...subject];
-      clonedSubject[index] = _set(pointer, applySegment(subject, index, cursor), value, append(index, cursor));
+      clonedSubject[segment] = _set(nextSegment, applySegment(subject, segment, cursor), value, append(segment, cursor));
       return clonedSubject;
     } else {
-      const segment = pointer.shift();
-      return { ...subject, [segment]: _set(pointer, applySegment(subject, segment, cursor), value, append(segment, cursor)) };
+      return { ...subject, [segment]: _set(nextSegment, applySegment(subject, segment, cursor), value, append(segment, cursor)) };
     }
   } else if (Array.isArray(subject)) {
     const clonedSubject = [...subject];
-    const segment = computeSegment(subject, pointer[0]);
-    clonedSubject[segment] = value;
+    clonedSubject[computeSegment(subject, segment)] = value;
     return clonedSubject;
   } else if (typeof subject === "object" && subject !== null) {
-    return { ...subject, [pointer[0]]: value };
+    return { ...subject, [segment]: value };
   } else {
-    return applySegment(subject, pointer[0], cursor);
+    return applySegment(subject, segment, cursor);
   }
 };
 
 const assign = (pointer, subject = undefined, value = undefined) => {
-  const ptr = compile$N(pointer);
-  const fn = curry$a((subject, value) => _assign(ptr, subject, value, nil$2));
+  const nextSegment = segmentGenerator(pointer);
+  const fn = curry$a((subject, value) => _assign(nextSegment, subject, value, nil$2));
   return subject === undefined ? fn : fn(subject, value);
 };
 
-const _assign = (pointer, subject, value, cursor) => {
-  if (pointer.length === 0) {
+const _assign = (nextSegment, subject, value, cursor) => {
+  const segment = nextSegment();
+  if (segment === undefined) {
     return;
-  } else if (pointer.length === 1 && !isScalar(subject)) {
-    const segment = computeSegment(subject, pointer[0]);
-    subject[segment] = value;
+  } else if (!nextSegment(EXISTS) && !isScalar(subject)) {
+    subject[computeSegment(subject, segment)] = value;
   } else {
-    const segment = pointer.shift();
-    _assign(pointer, applySegment(subject, segment, cursor), value, append(segment, cursor));
+    _assign(nextSegment, applySegment(subject, segment, cursor), value, append(segment, cursor));
   }
 };
 
 const unset = (pointer, subject = undefined) => {
-  const ptr = compile$N(pointer);
-  const fn = (subject) => _unset(ptr, subject, nil$2);
+  const nextSegment = segmentGenerator(pointer);
+  const fn = (subject) => _unset(nextSegment, subject, nil$2);
   return subject === undefined ? fn : fn(subject);
 };
 
-const _unset = (pointer, subject, cursor) => {
-  if (pointer.length == 0) {
-    return undefined;
-  } else if (pointer.length > 1) {
-    const segment = pointer.shift();
+const _unset = (nextSegment, subject, cursor) => {
+  const segment = nextSegment();
+  if (segment === undefined) {
+    return;
+  } else if (nextSegment(EXISTS)) {
     const value = applySegment(subject, segment, cursor);
-    return { ...subject, [segment]: _unset(pointer, value, append(segment, cursor)) };
+    return { ...subject, [segment]: _unset(nextSegment, value, append(segment, cursor)) };
   } else if (Array.isArray(subject)) {
-    return subject.filter((_, ndx) => ndx != pointer[0]);
+    const clonedSubject = [...subject];
+    delete clonedSubject[computeSegment(subject, segment)];
+    return clonedSubject;
   } else if (typeof subject === "object" && subject !== null) {
     // eslint-disable-next-line no-unused-vars
-    const { [pointer[0]]: _, ...result } = subject;
+    const { [segment]: _, ...result } = subject;
     return result;
   } else {
-    return applySegment(subject, pointer[0], cursor);
+    return applySegment(subject, segment, cursor);
   }
 };
 
 const remove = (pointer, subject = undefined) => {
-  const ptr = compile$N(pointer);
-  const fn = (subject) => _remove(ptr, subject, nil$2);
+  const nextSegment = segmentGenerator(pointer);
+  const fn = (subject) => _remove(nextSegment, subject, nil$2);
   return subject === undefined ? fn : fn(subject);
 };
 
-const _remove = (pointer, subject, cursor) => {
-  if (pointer.length === 0) {
+const _remove = (nextSegment, subject, cursor) => {
+  const segment = nextSegment();
+  if (segment === undefined) {
     return;
-  } else if (pointer.length > 1) {
-    const segment = pointer.shift();
+  } else if (nextSegment(EXISTS)) {
     const value = applySegment(subject, segment, cursor);
-    _remove(pointer, value, append(segment, cursor));
-  } else if (Array.isArray(subject)) {
-    subject.splice(pointer[0], 1);
-  } else if (typeof subject === "object" && subject !== null) {
-    delete subject[pointer[0]];
+    _remove(nextSegment, value, append(segment, cursor));
+  } else if (!isScalar(subject)) {
+    delete subject[segment];
   } else {
-    applySegment(subject, pointer[0], cursor);
+    applySegment(subject, segment, cursor);
   }
 };
 
@@ -2235,7 +2265,11 @@ var lib$3 = {
   allValues: allValues
 };
 
-var moo$1 = {exports: {}};
+var mooExports = {};
+var moo$1 = {
+  get exports(){ return mooExports; },
+  set exports(v){ mooExports = v; },
+};
 
 (function (module) {
 	(function(root, factory) {
@@ -2290,6 +2324,38 @@ var moo$1 = {exports: {}};
 	    }
 	  }
 
+	  function pad(s, length) {
+	    if (s.length > length) {
+	      return s
+	    }
+	    return Array(length - s.length + 1).join(" ") + s
+	  }
+
+	  function lastNLines(string, numLines) {
+	    var position = string.length;
+	    var lineBreaks = 0;
+	    while (true) {
+	      var idx = string.lastIndexOf("\n", position - 1);
+	      if (idx === -1) {
+	        break;
+	      } else {
+	        lineBreaks++;
+	      }
+	      position = idx;
+	      if (lineBreaks === numLines) {
+	        break;
+	      }
+	      if (position === 0) {
+	        break;
+	      }
+	    }
+	    var startPosition = 
+	      lineBreaks < numLines ?
+	      0 : 
+	      position + 1;
+	    return string.substring(startPosition).split("\n")
+	  }
+
 	  function objectToRules(object) {
 	    var keys = Object.getOwnPropertyNames(object);
 	    var result = [];
@@ -2572,39 +2638,31 @@ var moo$1 = {exports: {}};
 	  }
 
 	  function keywordTransform(map) {
-	    var reverseMap = Object.create(null);
-	    var byLength = Object.create(null);
+
+	    // Use a JavaScript Map to map keywords to their corresponding token type
+	    // unless Map is unsupported, then fall back to using an Object:
+	    var isMap = typeof Map !== 'undefined';
+	    var reverseMap = isMap ? new Map : Object.create(null);
+
 	    var types = Object.getOwnPropertyNames(map);
 	    for (var i = 0; i < types.length; i++) {
 	      var tokenType = types[i];
 	      var item = map[tokenType];
 	      var keywordList = Array.isArray(item) ? item : [item];
 	      keywordList.forEach(function(keyword) {
-	        (byLength[keyword.length] = byLength[keyword.length] || []).push(keyword);
 	        if (typeof keyword !== 'string') {
 	          throw new Error("keyword must be string (in keyword '" + tokenType + "')")
 	        }
-	        reverseMap[keyword] = tokenType;
+	        if (isMap) {
+	          reverseMap.set(keyword, tokenType);
+	        } else {
+	          reverseMap[keyword] = tokenType;
+	        }
 	      });
 	    }
-
-	    // fast string lookup
-	    // https://jsperf.com/string-lookups
-	    function str(x) { return JSON.stringify(x) }
-	    var source = '';
-	    source += 'switch (value.length) {\n';
-	    for (var length in byLength) {
-	      var keywords = byLength[length];
-	      source += 'case ' + length + ':\n';
-	      source += 'switch (value) {\n';
-	      keywords.forEach(function(keyword) {
-	        var tokenType = reverseMap[keyword];
-	        source += 'case ' + str(keyword) + ': return ' + str(tokenType) + '\n';
-	      });
-	      source += '}\n';
+	    return function(k) {
+	      return isMap ? reverseMap.get(k) : reverseMap[k]
 	    }
-	    source += '}\n';
-	    return Function('value', source) // type
 	  }
 
 	  /***************************************************************************/
@@ -2623,6 +2681,7 @@ var moo$1 = {exports: {}};
 	    this.line = info ? info.line : 1;
 	    this.col = info ? info.col : 1;
 	    this.queuedToken = info ? info.queuedToken : null;
+	    this.queuedText = info ? info.queuedText: "";
 	    this.queuedThrow = info ? info.queuedThrow : null;
 	    this.setState(info ? info.state : this.startState);
 	    this.stack = info && info.stack ? info.stack.slice() : [];
@@ -2636,6 +2695,7 @@ var moo$1 = {exports: {}};
 	      state: this.state,
 	      stack: this.stack.slice(),
 	      queuedToken: this.queuedToken,
+	      queuedText: this.queuedText,
 	      queuedThrow: this.queuedThrow,
 	    }
 	  };
@@ -2767,7 +2827,8 @@ var moo$1 = {exports: {}};
 
 	    // throw, if no rule with {error: true}
 	    if (group.shouldThrow) {
-	      throw new Error(this.formatError(token, "invalid syntax"))
+	      var err = new Error(this.formatError(token, "invalid syntax"));
+	      throw err;
 	    }
 
 	    if (group.pop) this.popState();
@@ -2808,13 +2869,28 @@ var moo$1 = {exports: {}};
 	        col: this.col,
 	      };
 	    }
-	    var start = Math.max(0, token.offset - token.col + 1);
-	    var eol = token.lineBreaks ? token.text.indexOf('\n') : token.text.length;
-	    var firstLine = this.buffer.substring(start, token.offset + eol);
-	    message += " at line " + token.line + " col " + token.col + ":\n\n";
-	    message += "  " + firstLine + "\n";
-	    message += "  " + Array(token.col).join(" ") + "^";
-	    return message
+	    
+	    var numLinesAround = 2;
+	    var firstDisplayedLine = Math.max(token.line - numLinesAround, 1);
+	    var lastDisplayedLine = token.line + numLinesAround;
+	    var lastLineDigits = String(lastDisplayedLine).length;
+	    var displayedLines = lastNLines(
+	        this.buffer, 
+	        (this.line - token.line) + numLinesAround + 1
+	      )
+	      .slice(0, 5);
+	    var errorLines = [];
+	    errorLines.push(message + " at line " + token.line + " col " + token.col + ":");
+	    errorLines.push("");
+	    for (var i = 0; i < displayedLines.length; i++) {
+	      var line = displayedLines[i];
+	      var lineNo = firstDisplayedLine + i;
+	      errorLines.push(pad(String(lineNo), lastLineDigits) + "  " + line);
+	      if (lineNo === token.line) {
+	        errorLines.push(pad("", lastLineDigits + token.col + 1) + "^");
+	      }
+	    }
+	    return errorLines.join("\n")
 	  };
 
 	  Lexer.prototype.clone = function() {
@@ -2837,7 +2913,7 @@ var moo$1 = {exports: {}};
 	}));
 } (moo$1));
 
-const moo = moo$1.exports;
+const moo = mooExports;
 
 
 const digit = `[0-9]`;
@@ -3100,8 +3176,8 @@ var contentType = {};
  * obs-text      = %x80-FF
  * quoted-pair   = "\" ( HTAB / SP / VCHAR / obs-text )
  */
-var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g;
-var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/;
+var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g; // eslint-disable-line no-control-regex
+var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/; // eslint-disable-line no-control-regex
 var TOKEN_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
 
 /**
@@ -3110,7 +3186,7 @@ var TOKEN_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
  * quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text )
  * obs-text    = %x80-FF
  */
-var QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g;
+var QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g; // eslint-disable-line no-control-regex
 
 /**
  * RegExp to match chars that must be quoted-pair in RFC 7230 sec 3.2.6
@@ -3199,7 +3275,7 @@ function parse$1 (string) {
 
   var index = header.indexOf(';');
   var type = index !== -1
-    ? header.substr(0, index).trim()
+    ? header.slice(0, index).trim()
     : header.trim();
 
   if (!TYPE_REGEXP.test(type)) {
@@ -3225,11 +3301,14 @@ function parse$1 (string) {
       key = match[1].toLowerCase();
       value = match[2];
 
-      if (value[0] === '"') {
-        // remove quotes and escapes
-        value = value
-          .substr(1, value.length - 2)
-          .replace(QESC_REGEXP, '$1');
+      if (value.charCodeAt(0) === 0x22 /* " */) {
+        // remove quotes
+        value = value.slice(1, -1);
+
+        // remove escapes
+        if (value.indexOf('\\') !== -1) {
+          value = value.replace(QESC_REGEXP, '$1');
+        }
       }
 
       obj.parameters[key] = value;
@@ -3678,13 +3757,13 @@ var schema$5 = {
   toSchema
 };
 
-class InvalidSchemaError$3 extends Error {
+let InvalidSchemaError$3 = class InvalidSchemaError extends Error {
   constructor(output) {
     super("Invalid Schema");
     this.name = this.constructor.name;
     this.output = output;
   }
-}
+};
 
 var invalidSchemaError = InvalidSchemaError$3;
 
@@ -3697,7 +3776,7 @@ const interpret$M = () => true;
 var metaData$4 = { compile: compile$M, interpret: interpret$M };
 
 const curry = justCurryIt$1;
-const PubSub$1 = pubsub.exports;
+const PubSub$1 = pubsubExports;
 const { resolveUrl } = common$1;
 const Instance$C = instance;
 const Schema$O = schema$5;
@@ -3786,7 +3865,13 @@ const setShouldMetaValidate = (isEnabled) => {
 };
 
 const _keywords = {};
-const getKeyword = (id) => _keywords[id] || metaData$3;
+const getKeyword = (id) => {
+  if (!_keywords[id]) {
+    addKeyword(id, metaData$3);
+  }
+
+  return _keywords[id];
+};
 const hasKeyword = (id) => id in _keywords;
 const addKeyword = (id, keywordHandler) => {
   _keywords[id] = {
@@ -3903,7 +3988,7 @@ var core$2 = {
 };
 
 const Pact$9 = lib$3;
-const PubSub = pubsub.exports;
+const PubSub = pubsubExports;
 const Core$x = core$2;
 const Instance$B = instance;
 const Schema$N = schema$5;
@@ -4064,7 +4149,16 @@ const interpret$I = ([numberOfItems, additionalItems], instance, ast, dynamicAnc
 };
 
 const collectEvaluatedItems$d = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret$I(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance$y.map((item, ndx) => ndx, instance));
+  if (!interpret$I(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance$y.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 var additionalItems6 = { compile: compile$I, interpret: interpret$I, collectEvaluatedItems: collectEvaluatedItems$d };
@@ -4863,15 +4957,14 @@ const compile$7 = async (dynamicRef, ast) => {
   const [, fragment] = splitUrl(Schema$d.value(dynamicRef));
   const referencedSchema = await Schema$d.get(Schema$d.value(dynamicRef), dynamicRef);
   await Core$a.compileSchema(referencedSchema, ast);
-  return [referencedSchema.id, fragment];
+  return [referencedSchema.id, fragment, Schema$d.uri(referencedSchema)];
 };
 
-const interpret$7 = ([id, fragment], instance, ast, dynamicAnchors) => {
+const interpret$7 = ([id, fragment, ref], instance, ast, dynamicAnchors) => {
   if (fragment in ast.metaData[id].dynamicAnchors) {
     return Core$a.interpretSchema(dynamicAnchors[fragment], instance, ast, dynamicAnchors);
   } else {
-    const pointer = Schema$d.getAnchorPointer(ast.metaData[id], fragment);
-    return Core$a.interpretSchema(`${id}#${encodeURI(pointer)}`, instance, ast, dynamicAnchors);
+    return Core$a.interpretSchema(ref, instance, ast, dynamicAnchors);
   }
 };
 
@@ -6596,5 +6689,5 @@ var lib = {
   InvalidSchemaError: InvalidSchemaError
 };
 
-exports["default"] = lib;
+exports.default = lib;
 //# sourceMappingURL=json-schema-cjs.js.map