@loancrate/json-selector 2.1.0 → 3.0.0

package/dist/json-selector.esm.js

@@ -25,16 +25,19 @@ function hasOwnProperties(value) {
     return false;
 }
 function getField(obj, name) {
-    return isObject(obj) ? obj[name] ?? null : null;
+    var _a;
+    return isObject(obj) ? (_a = obj[name]) !== null && _a !== void 0 ? _a : null : null;
 }
 function getIndex(obj, index) {
+    var _a;
     return isArray(obj)
-        ? obj[index < 0 ? obj.length + index : index] ?? null
+        ? (_a = obj[index < 0 ? obj.length + index : index]) !== null && _a !== void 0 ? _a : null
         : null;
 }
 function findId(obj, id) {
+    var _a;
     return isArray(obj)
-        ? obj.find((e) => isObject(e) && e.id === id) ?? null
+        ? (_a = obj.find((e) => isObject(e) && e.id === id)) !== null && _a !== void 0 ? _a : null
         : null;
 }
 function findIdIndex(arr, id) {
@@ -59,6 +62,8 @@ function visitJsonSelector(selector, visitor, context) {
     switch (selector.type) {
         case "current":
             return visitor.current(selector, context);
+        case "root":
+            return visitor.root(selector, context);
         case "literal":
             return visitor.literal(selector, context);
         case "identifier":
@@ -90,11 +95,14 @@ function visitJsonSelector(selector, visitor, context) {
     }
 }
 
-function evaluateJsonSelector(selector, context) {
+function evaluateJsonSelector(selector, context, rootContext = context) {
     return visitJsonSelector(selector, {
         current() {
             return context;
         },
+        root() {
+            return rootContext;
+        },
         literal({ value }) {
             return value;
         },
@@ -102,48 +110,52 @@ function evaluateJsonSelector(selector, context) {
             return getField(context, id);
         },
         fieldAccess({ expression, field }) {
-            return getField(evaluateJsonSelector(expression, context), field);
+            return getField(evaluateJsonSelector(expression, context, rootContext), field);
         },
         indexAccess({ expression, index }) {
-            return getIndex(evaluateJsonSelector(expression, context), index);
+            return getIndex(evaluateJsonSelector(expression, context, rootContext), index);
         },
         idAccess({ expression, id }) {
-            return findId(evaluateJsonSelector(expression, context), id);
+            return findId(evaluateJsonSelector(expression, context, rootContext), id);
         },
         project({ expression, projection }) {
-            return project(evaluateJsonSelector(expression, context), projection);
+            return project(evaluateJsonSelector(expression, context, rootContext), projection, rootContext);
         },
         filter({ expression, condition }) {
-            return filter(evaluateJsonSelector(expression, context), condition);
+            return filter(evaluateJsonSelector(expression, context, rootContext), condition, rootContext);
         },
         slice({ expression, start, end, step }) {
-            return slice(evaluateJsonSelector(expression, context), start, end, step);
+            return slice(evaluateJsonSelector(expression, context, rootContext), start, end, step);
         },
         flatten({ expression }) {
-            return flatten(evaluateJsonSelector(expression, context));
+            return flatten(evaluateJsonSelector(expression, context, rootContext));
         },
         not({ expression }) {
-            return isFalseOrEmpty(evaluateJsonSelector(expression, context));
+            return isFalseOrEmpty(evaluateJsonSelector(expression, context, rootContext));
         },
         compare({ lhs, rhs, operator }) {
-            const lv = evaluateJsonSelector(lhs, context);
-            const rv = evaluateJsonSelector(rhs, context);
+            const lv = evaluateJsonSelector(lhs, context, rootContext);
+            const rv = evaluateJsonSelector(rhs, context, rootContext);
             return compare(lv, rv, operator);
         },
         and({ lhs, rhs }) {
-            const lv = evaluateJsonSelector(lhs, context);
-            return isFalseOrEmpty(lv) ? lv : evaluateJsonSelector(rhs, context);
+            const lv = evaluateJsonSelector(lhs, context, rootContext);
+            return isFalseOrEmpty(lv)
+                ? lv
+                : evaluateJsonSelector(rhs, context, rootContext);
         },
         or({ lhs, rhs }) {
-            const lv = evaluateJsonSelector(lhs, context);
-            return !isFalseOrEmpty(lv) ? lv : evaluateJsonSelector(rhs, context);
+            const lv = evaluateJsonSelector(lhs, context, rootContext);
+            return !isFalseOrEmpty(lv)
+                ? lv
+                : evaluateJsonSelector(rhs, context, rootContext);
         },
         pipe({ lhs, rhs }) {
-            return evaluateJsonSelector(rhs, evaluateJsonSelector(lhs, context));
+            return evaluateJsonSelector(rhs, evaluateJsonSelector(lhs, context, rootContext), rootContext);
         },
     }, context);
 }
-function project(value, projection) {
+function project(value, projection, rootContext) {
     if (!isArray(value)) {
         return null;
     }
@@ -151,15 +163,15 @@ function project(value, projection) {
         return value;
     }
     const result = value
-        .map((e) => evaluateJsonSelector(projection, e))
+        .map((e) => evaluateJsonSelector(projection, e, rootContext))
         .filter((e) => e != null);
     return result;
 }
-function filter(value, condition) {
+function filter(value, condition, rootContext) {
     if (!isArray(value)) {
         return null;
     }
-    const result = value.filter((e) => !isFalseOrEmpty(evaluateJsonSelector(condition, e)));
+    const result = value.filter((e) => !isFalseOrEmpty(evaluateJsonSelector(condition, e, rootContext)));
     return result;
 }
 function slice(value, start, end, step) {
@@ -266,7 +278,7 @@ const operatorPrecedence = {
 function formatSubexpression(expr, options, precedence) {
     // Ensure @ is only used as a bare expression
     if (!options.currentImplied) {
-        options = { ...options, currentImplied: true };
+        options = Object.assign(Object.assign({}, options), { currentImplied: true });
     }
     let result = formatJsonSelector(expr, options);
     const subPrecedence = operatorPrecedence[expr.type];
@@ -286,6 +298,9 @@ function formatJsonSelector(selector, options = {}) {
         current() {
             return !options.currentImplied ? "@" : "";
         },
+        root() {
+            return "$";
+        },
         literal({ value }) {
             return formatLiteral(value);
         },
@@ -322,7 +337,7 @@ function formatJsonSelector(selector, options = {}) {
         },
         slice({ expression, start, end, step }) {
             const lv = formatSubexpression(expression, options, PRECEDENCE_ACCESS);
-            const rv = `${start ?? ""}:${end ?? ""}${step != null ? `:${step}` : ""}`;
+            const rv = `${start !== null && start !== void 0 ? start : ""}:${end !== null && end !== void 0 ? end : ""}${step != null ? `:${step}` : ""}`;
             return `${lv}[${rv}]`;
         },
         flatten({ expression }) {
@@ -391,11 +406,22 @@ class ContextAccessor extends ReadOnlyAccessor {
         return context;
     }
 }
+class RootContextAccessor extends ReadOnlyAccessor {
+    constructor() {
+        super({ type: "root" });
+    }
+    get(context, rootContext = context) {
+        return rootContext;
+    }
+}
 function makeJsonSelectorAccessor(selector) {
     return visitJsonSelector(selector, {
         current() {
             return new ContextAccessor();
         },
+        root() {
+            return new RootContextAccessor();
+        },
         literal(selector) {
             return new ConstantAccessor(selector, selector.value);
         },
@@ -411,7 +437,7 @@ function makeJsonSelectorAccessor(selector) {
                 get(context) {
                     return getField(context, id);
                 }
-                set(context, value) {
+                set(value, context) {
                     if (isObject(context)) {
                         context[id] = value;
                     }
@@ -431,20 +457,20 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isObject(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isObject(base.get(context, rootContext));
                 }
-                get(context) {
-                    return getField(base.get(context), field);
+                get(context, rootContext = context) {
+                    return getField(base.get(context, rootContext), field);
                 }
-                set(context, value) {
-                    const obj = base.get(context);
+                set(value, context, rootContext = context) {
+                    const obj = base.get(context, rootContext);
                     if (isObject(obj)) {
                         obj[field] = value;
                     }
                 }
-                delete(context) {
-                    const obj = base.get(context);
+                delete(context, rootContext = context) {
+                    const obj = base.get(context, rootContext);
                     if (isObject(obj)) {
                         delete obj[field];
                     }
@@ -459,20 +485,20 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return getIndex(base.get(context), index);
+                get(context, rootContext = context) {
+                    return getIndex(base.get(context, rootContext), index);
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         arr[index] = value;
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         arr.splice(index, 1);
                     }
@@ -487,14 +513,14 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return findId(base.get(context), id);
+                get(context, rootContext = context) {
+                    return findId(base.get(context, rootContext), id);
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         const index = findIdIndex(arr, id);
                         if (index >= 0) {
@@ -502,8 +528,8 @@ function makeJsonSelectorAccessor(selector) {
                         }
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         const index = findIdIndex(arr, id);
                         if (index >= 0) {
@@ -522,18 +548,18 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return project(base.get(context), projection);
+                get(context, rootContext = context) {
+                    return project(base.get(context, rootContext), projection, context);
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         if (proj) {
                             for (const element of arr) {
-                                proj.set(element, value);
+                                proj.set(value, element, rootContext);
                             }
                         }
                         else {
@@ -541,12 +567,12 @@ function makeJsonSelectorAccessor(selector) {
                         }
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         if (proj) {
                             for (const element of arr) {
-                                proj.delete(element);
+                                proj.delete(element, rootContext);
                             }
                         }
                         else {
@@ -564,22 +590,22 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return filter(base.get(context), condition);
+                get(context, rootContext = context) {
+                    return filter(base.get(context, rootContext), condition, context);
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
-                        replaceArray(arr, invertedFilter(arr, condition).concat(asArray(value)));
+                        replaceArray(arr, invertedFilter(arr, condition, rootContext).concat(asArray(value)));
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
-                        replaceArray(arr, invertedFilter(arr, condition));
+                        replaceArray(arr, invertedFilter(arr, condition, rootContext));
                     }
                 }
             };
@@ -592,20 +618,20 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return slice(base.get(context), start, end, step);
+                get(context, rootContext = context) {
+                    return slice(base.get(context, rootContext), start, end, step);
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         replaceArray(arr, invertedSlice(arr, start, end, step).concat(asArray(value)));
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         replaceArray(arr, invertedSlice(arr, start, end, step));
                     }
@@ -620,20 +646,20 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return isArray(base.get(context));
+                isValidContext(context, rootContext = context) {
+                    return isArray(base.get(context, rootContext));
                 }
-                get(context) {
-                    return flatten(base.get(context));
+                get(context, rootContext = context) {
+                    return flatten(base.get(context, rootContext));
                 }
-                set(context, value) {
-                    const arr = base.get(context);
+                set(value, context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         replaceArray(arr, asArray(value));
                     }
                 }
-                delete(context) {
-                    const arr = base.get(context);
+                delete(context, rootContext = context) {
+                    const arr = base.get(context, rootContext);
                     if (isArray(arr)) {
                         arr.length = 0;
                     }
@@ -648,8 +674,8 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                get(context) {
-                    return isFalseOrEmpty(base.get(context));
+                get(context, rootContext = context) {
+                    return isFalseOrEmpty(base.get(context, rootContext));
                 }
             };
             return new Accessor();
@@ -662,9 +688,9 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                get(context) {
-                    const lv = la.get(context);
-                    const rv = ra.get(context);
+                get(context, rootContext = context) {
+                    const lv = la.get(context, rootContext);
+                    const rv = ra.get(context, rootContext);
                     return compare(lv, rv, operator);
                 }
             };
@@ -678,9 +704,9 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                get(context) {
-                    const lv = la.get(context);
-                    return isFalseOrEmpty(lv) ? lv : ra.get(context);
+                get(context, rootContext = context) {
+                    const lv = la.get(context, rootContext);
+                    return isFalseOrEmpty(lv) ? lv : ra.get(context, rootContext);
                 }
             };
             return new Accessor();
@@ -693,9 +719,9 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                get(context) {
-                    const lv = la.get(context);
-                    return !isFalseOrEmpty(lv) ? lv : ra.get(context);
+                get(context, rootContext = context) {
+                    const lv = la.get(context, rootContext);
+                    return !isFalseOrEmpty(lv) ? lv : ra.get(context, rootContext);
                 }
             };
             return new Accessor();
@@ -708,51 +734,51 @@ function makeJsonSelectorAccessor(selector) {
                 constructor() {
                     super(selector);
                 }
-                isValidContext(context) {
-                    return ra.isValidContext(la.get(context));
+                isValidContext(context, rootContext = context) {
+                    return ra.isValidContext(la.get(context, rootContext), rootContext);
                 }
-                get(context) {
-                    return ra.get(la.get(context));
+                get(context, rootContext = context) {
+                    return ra.get(la.get(context, rootContext), rootContext);
                 }
-                set(context, value) {
-                    ra.set(la.get(context), value);
+                set(value, context, rootContext = context) {
+                    ra.set(value, la.get(context, rootContext), rootContext);
                 }
-                delete(context) {
-                    ra.delete(la.get(context));
+                delete(context, rootContext = context) {
+                    ra.delete(la.get(context, rootContext), rootContext);
                 }
             };
             return new Accessor();
         },
     }, undefined);
 }
-function bindJsonSelectorAccessor(unbound, context) {
+function bindJsonSelectorAccessor(unbound, context, rootContext = context) {
     const { selector } = unbound;
-    const valid = unbound.isValidContext(context);
+    const valid = unbound.isValidContext(context, rootContext);
     return {
         selector,
         valid,
         path: formatJsonSelector(selector),
         get() {
-            return unbound.get(context);
+            return unbound.get(context, rootContext);
         },
-        set(v) {
-            unbound.set(context, v);
+        set(value) {
+            unbound.set(value, context, rootContext);
         },
         delete() {
-            unbound.delete(context);
+            unbound.delete(context, rootContext);
         },
     };
 }
-function accessWithJsonSelector(selector, context) {
-    return bindJsonSelectorAccessor(makeJsonSelectorAccessor(selector), context);
+function accessWithJsonSelector(selector, context, rootContext = context) {
+    return bindJsonSelectorAccessor(makeJsonSelectorAccessor(selector), context, rootContext);
 }
 function replaceArray(target, source) {
     target.length = 0;
     target.push(...source);
     return target;
 }
-function invertedFilter(value, condition) {
-    return value.filter((e) => isFalseOrEmpty(evaluateJsonSelector(condition, e)));
+function invertedFilter(value, condition, rootContext) {
+    return value.filter((e) => isFalseOrEmpty(evaluateJsonSelector(condition, e, rootContext)));
 }
 function invertedSlice(value, start, end, step) {
     ({ start, end, step } = normalizeSlice(value.length, start, end, step));
@@ -833,16 +859,19 @@ peg$SyntaxError.prototype.format = function(sources) {
       }
     }
     var s = this.location.start;
-    var loc = this.location.source + ":" + s.line + ":" + s.column;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
     if (src) {
       var e = this.location.end;
-      var filler = peg$padEnd("", s.line.toString().length, ' ');
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
       var line = src[s.line - 1];
       var last = s.line === e.line ? e.column : line.length + 1;
       var hatLen = (last - s.column) || 1;
       str += "\n --> " + loc + "\n"
           + filler + " |\n"
-          + s.line + " | " + line + "\n"
+          + offset_s.line + " | " + line + "\n"
           + filler + " | " + peg$padEnd("", s.column - 1, ' ')
           + peg$padEnd("", hatLen, "^");
     } else {
@@ -979,27 +1008,28 @@ function peg$parse(input, options) {
   var peg$c15 = ":";
   var peg$c16 = ".";
   var peg$c17 = "@";
-  var peg$c18 = "(";
-  var peg$c19 = ")";
-  var peg$c20 = "`";
-  var peg$c21 = "\"";
-  var peg$c22 = "\\";
-  var peg$c23 = "/";
-  var peg$c24 = "b";
-  var peg$c25 = "f";
-  var peg$c26 = "n";
-  var peg$c27 = "r";
-  var peg$c28 = "t";
-  var peg$c29 = "u";
-  var peg$c30 = "'";
-  var peg$c31 = "-";
-  var peg$c32 = "0";
-  var peg$c33 = "null";
-  var peg$c34 = "false";
-  var peg$c35 = "true";
-  var peg$c36 = "{";
-  var peg$c37 = ",";
-  var peg$c38 = "}";
+  var peg$c18 = "$";
+  var peg$c19 = "(";
+  var peg$c20 = ")";
+  var peg$c21 = "`";
+  var peg$c22 = "\"";
+  var peg$c23 = "\\";
+  var peg$c24 = "/";
+  var peg$c25 = "b";
+  var peg$c26 = "f";
+  var peg$c27 = "n";
+  var peg$c28 = "r";
+  var peg$c29 = "t";
+  var peg$c30 = "u";
+  var peg$c31 = "'";
+  var peg$c32 = "-";
+  var peg$c33 = "0";
+  var peg$c34 = "null";
+  var peg$c35 = "false";
+  var peg$c36 = "true";
+  var peg$c37 = "{";
+  var peg$c38 = ",";
+  var peg$c39 = "}";
 
   var peg$r0 = /^[a-z_]/i;
   var peg$r1 = /^[0-9a-z_]/i;
@@ -1032,40 +1062,41 @@ function peg$parse(input, options) {
   var peg$e15 = peg$literalExpectation(":", false);
   var peg$e16 = peg$literalExpectation(".", false);
   var peg$e17 = peg$literalExpectation("@", false);
-  var peg$e18 = peg$literalExpectation("(", false);
-  var peg$e19 = peg$literalExpectation(")", false);
-  var peg$e20 = peg$literalExpectation("`", false);
-  var peg$e21 = peg$classExpectation([["a", "z"], "_"], false, true);
-  var peg$e22 = peg$classExpectation([["0", "9"], ["a", "z"], "_"], false, true);
-  var peg$e23 = peg$literalExpectation("\"", false);
-  var peg$e24 = peg$classExpectation([["\0", "\x1F"], "\"", "\\"], true, false);
-  var peg$e25 = peg$literalExpectation("\\", false);
-  var peg$e26 = peg$literalExpectation("/", false);
-  var peg$e27 = peg$literalExpectation("b", false);
-  var peg$e28 = peg$literalExpectation("f", false);
-  var peg$e29 = peg$literalExpectation("n", false);
-  var peg$e30 = peg$literalExpectation("r", false);
-  var peg$e31 = peg$literalExpectation("t", false);
-  var peg$e32 = peg$literalExpectation("u", false);
-  var peg$e33 = peg$classExpectation([["0", "9"], ["a", "f"]], false, true);
-  var peg$e34 = peg$literalExpectation("'", false);
-  var peg$e35 = peg$classExpectation(["'", "\\"], true, false);
-  var peg$e36 = peg$classExpectation(["'"], true, false);
-  var peg$e37 = peg$literalExpectation("-", false);
-  var peg$e38 = peg$literalExpectation("0", false);
-  var peg$e39 = peg$classExpectation([["1", "9"]], false, false);
-  var peg$e40 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e41 = peg$literalExpectation("null", false);
-  var peg$e42 = peg$literalExpectation("false", false);
-  var peg$e43 = peg$literalExpectation("true", false);
-  var peg$e44 = peg$classExpectation(["e", "E"], false, false);
-  var peg$e45 = peg$classExpectation(["+", "-"], false, false);
-  var peg$e46 = peg$classExpectation([["\0", "\x1F"], "\"", "\\", "`"], true, false);
-  var peg$e47 = peg$literalExpectation("{", false);
-  var peg$e48 = peg$literalExpectation(",", false);
-  var peg$e49 = peg$literalExpectation("}", false);
-  var peg$e50 = peg$otherExpectation("whitespace");
-  var peg$e51 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false);
+  var peg$e18 = peg$literalExpectation("$", false);
+  var peg$e19 = peg$literalExpectation("(", false);
+  var peg$e20 = peg$literalExpectation(")", false);
+  var peg$e21 = peg$literalExpectation("`", false);
+  var peg$e22 = peg$classExpectation([["a", "z"], "_"], false, true);
+  var peg$e23 = peg$classExpectation([["0", "9"], ["a", "z"], "_"], false, true);
+  var peg$e24 = peg$literalExpectation("\"", false);
+  var peg$e25 = peg$classExpectation([["\0", "\x1F"], "\"", "\\"], true, false);
+  var peg$e26 = peg$literalExpectation("\\", false);
+  var peg$e27 = peg$literalExpectation("/", false);
+  var peg$e28 = peg$literalExpectation("b", false);
+  var peg$e29 = peg$literalExpectation("f", false);
+  var peg$e30 = peg$literalExpectation("n", false);
+  var peg$e31 = peg$literalExpectation("r", false);
+  var peg$e32 = peg$literalExpectation("t", false);
+  var peg$e33 = peg$literalExpectation("u", false);
+  var peg$e34 = peg$classExpectation([["0", "9"], ["a", "f"]], false, true);
+  var peg$e35 = peg$literalExpectation("'", false);
+  var peg$e36 = peg$classExpectation(["'", "\\"], true, false);
+  var peg$e37 = peg$classExpectation(["'"], true, false);
+  var peg$e38 = peg$literalExpectation("-", false);
+  var peg$e39 = peg$literalExpectation("0", false);
+  var peg$e40 = peg$classExpectation([["1", "9"]], false, false);
+  var peg$e41 = peg$classExpectation([["0", "9"]], false, false);
+  var peg$e42 = peg$literalExpectation("null", false);
+  var peg$e43 = peg$literalExpectation("false", false);
+  var peg$e44 = peg$literalExpectation("true", false);
+  var peg$e45 = peg$classExpectation(["e", "E"], false, false);
+  var peg$e46 = peg$classExpectation(["+", "-"], false, false);
+  var peg$e47 = peg$classExpectation([["\0", "\x1F"], "\"", "\\", "`"], true, false);
+  var peg$e48 = peg$literalExpectation("{", false);
+  var peg$e49 = peg$literalExpectation(",", false);
+  var peg$e50 = peg$literalExpectation("}", false);
+  var peg$e51 = peg$otherExpectation("whitespace");
+  var peg$e52 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false);
 
   var peg$f0 = function(head, tail) { return binaryExpression("pipe", head, tail); };
   var peg$f1 = function(head, tail) { return binaryExpression("or", head, tail); };
@@ -1093,7 +1124,15 @@ function peg$parse(input, options) {
   var peg$f14 = function(projection) { return projection({ type: "current" }); };
   var peg$f15 = function(projection, pfns) { return (expression) => maybeProject(projection(expression), pfns); };
   var peg$f16 = function() { return (expression) => ({ type: "project", expression, projection: { type: "current" } }); };
-  var peg$f17 = function(start, end, step) { return (expression) => ({ type: "slice", expression, start, end, step }); };
+  var peg$f17 = function(start, end, step) {
+  return (expression) => ({
+    type: "slice",
+    expression,
+    start: start ?? undefined,
+    end: end ?? undefined,
+    step: step ?? undefined,
+  });
+};
   var peg$f18 = function(lhs, rhs) { return reduceProjection(lhs, rhs); };
   var peg$f19 = function(index) { return index({ type: "current" }); };
   var peg$f20 = function(index) { return (expression) => ({ type: "indexAccess", expression, index }); };
@@ -1102,31 +1141,32 @@ function peg$parse(input, options) {
   var peg$f23 = function(lhs, rhs) { return reduceProjection(lhs, rhs); };
   var peg$f24 = function(id) { return { type: "identifier", id }; };
   var peg$f25 = function() { return { type: "current" }; };
-  var peg$f26 = function(value) { return { type: "literal", value }; };
+  var peg$f26 = function() { return { type: "root" }; };
   var peg$f27 = function(value) { return { type: "literal", value }; };
-  var peg$f28 = function(head, tail) { return head + tail.join(""); };
-  var peg$f29 = function(chars) { return chars.join(""); };
-  var peg$f30 = function() { return "\b"; };
-  var peg$f31 = function() { return "\f"; };
-  var peg$f32 = function() { return "\n"; };
-  var peg$f33 = function() { return "\r"; };
-  var peg$f34 = function() { return "\t"; };
-  var peg$f35 = function(digits) {
+  var peg$f28 = function(value) { return { type: "literal", value }; };
+  var peg$f29 = function(head, tail) { return head + tail.join(""); };
+  var peg$f30 = function(chars) { return chars.join(""); };
+  var peg$f31 = function() { return "\b"; };
+  var peg$f32 = function() { return "\f"; };
+  var peg$f33 = function() { return "\n"; };
+  var peg$f34 = function() { return "\r"; };
+  var peg$f35 = function() { return "\t"; };
+  var peg$f36 = function(digits) {
         return String.fromCharCode(parseInt(digits, 16));
       };
-  var peg$f36 = function(chars) { return chars.join(""); };
-  var peg$f37 = function() { return text(); };
-  var peg$f38 = function() { return parseInt(text()); };
-  var peg$f39 = function() { return null; };
-  var peg$f40 = function() { return false; };
-  var peg$f41 = function() { return true; };
-  var peg$f42 = function() { return parseFloat(text()); };
-  var peg$f43 = function(chars) { return chars.join(""); };
-  var peg$f44 = function(head, tail) { return [head].concat(tail); };
-  var peg$f45 = function(members) { return Object.fromEntries(members ?? []); };
-  var peg$f46 = function(name, value) { return [name, value]; };
-  var peg$f47 = function(head, tail) { return [head].concat(tail); };
-  var peg$f48 = function(values) { return values ?? []; };
+  var peg$f37 = function(chars) { return chars.join(""); };
+  var peg$f38 = function() { return text(); };
+  var peg$f39 = function() { return parseInt(text()); };
+  var peg$f40 = function() { return null; };
+  var peg$f41 = function() { return false; };
+  var peg$f42 = function() { return true; };
+  var peg$f43 = function() { return parseFloat(text()); };
+  var peg$f44 = function(chars) { return chars.join(""); };
+  var peg$f45 = function(head, tail) { return [head].concat(tail); };
+  var peg$f46 = function(members) { return Object.fromEntries(members ?? []); };
+  var peg$f47 = function(name, value) { return [name, value]; };
+  var peg$f48 = function(head, tail) { return [head].concat(tail); };
+  var peg$f49 = function(values) { return values ?? []; };
   var peg$currPos = 0;
   var peg$savedPos = 0;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -1199,11 +1239,11 @@ function peg$parse(input, options) {
     }
   }
 
-  function peg$computeLocation(startPos, endPos) {
+  function peg$computeLocation(startPos, endPos, offset) {
     var startPosDetails = peg$computePosDetails(startPos);
     var endPosDetails = peg$computePosDetails(endPos);
 
-    return {
+    var res = {
       source: peg$source,
       start: {
         offset: startPos,
@@ -1216,6 +1256,11 @@ function peg$parse(input, options) {
         column: endPosDetails.column
       }
     };
+    if (offset && peg$source && (typeof peg$source.offset === "function")) {
+      res.start = peg$source.offset(res.start);
+      res.end = peg$source.offset(res.end);
+    }
+    return res;
   }
 
   function peg$fail(expected) {
@@ -2217,36 +2262,54 @@ function peg$parse(input, options) {
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
-        s0 = peg$parseliteral();
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 36) {
+          s1 = peg$c18;
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f26();
+        }
+        s0 = s1;
         if (s0 === peg$FAILED) {
-          s0 = peg$currPos;
-          s1 = peg$parseraw_string();
-          if (s1 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$f26(s1);
-          }
-          s0 = s1;
+          s0 = peg$parseliteral();
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.charCodeAt(peg$currPos) === 40) {
-              s1 = peg$c18;
-              peg$currPos++;
-            } else {
-              s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e18); }
-            }
+            s1 = peg$parseraw_string();
             if (s1 !== peg$FAILED) {
-              s2 = peg$parseselector();
-              if (s2 !== peg$FAILED) {
-                if (input.charCodeAt(peg$currPos) === 41) {
-                  s3 = peg$c19;
-                  peg$currPos++;
-                } else {
-                  s3 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e19); }
-                }
-                if (s3 !== peg$FAILED) {
-                  s0 = s2;
+              peg$savedPos = s0;
+              s1 = peg$f27(s1);
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.charCodeAt(peg$currPos) === 40) {
+                s1 = peg$c19;
+                peg$currPos++;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e19); }
+              }
+              if (s1 !== peg$FAILED) {
+                s2 = peg$parseselector();
+                if (s2 !== peg$FAILED) {
+                  if (input.charCodeAt(peg$currPos) === 41) {
+                    s3 = peg$c20;
+                    peg$currPos++;
+                  } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) { peg$fail(peg$e20); }
+                  }
+                  if (s3 !== peg$FAILED) {
+                    s0 = s2;
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -2255,9 +2318,6 @@ function peg$parse(input, options) {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
               }
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
             }
           }
         }
@@ -2272,11 +2332,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 96) {
-      s1 = peg$c20;
+      s1 = peg$c21;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
     }
     if (s1 !== peg$FAILED) {
       peg$parsews();
@@ -2287,15 +2347,15 @@ function peg$parse(input, options) {
       if (s3 !== peg$FAILED) {
         peg$parsews();
         if (input.charCodeAt(peg$currPos) === 96) {
-          s5 = peg$c20;
+          s5 = peg$c21;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e20); }
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f27(s3);
+          s0 = peg$f28(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2332,7 +2392,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2341,7 +2401,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e22); }
+        if (peg$silentFails === 0) { peg$fail(peg$e23); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -2350,11 +2410,11 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e22); }
+          if (peg$silentFails === 0) { peg$fail(peg$e23); }
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f28(s1, s2);
+      s0 = peg$f29(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2368,11 +2428,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c21;
+      s1 = peg$c22;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2382,15 +2442,15 @@ function peg$parse(input, options) {
         s3 = peg$parsechar();
       }
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c21;
+        s3 = peg$c22;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f29(s2);
+        s0 = peg$f30(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2422,7 +2482,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
     }
 
     return s0;
@@ -2433,114 +2493,114 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c22;
+      s1 = peg$c23;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c21;
+        s2 = peg$c22;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s2 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 92) {
-          s2 = peg$c22;
+          s2 = peg$c23;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e25); }
+          if (peg$silentFails === 0) { peg$fail(peg$e26); }
         }
         if (s2 === peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 47) {
-            s2 = peg$c23;
+            s2 = peg$c24;
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e26); }
+            if (peg$silentFails === 0) { peg$fail(peg$e27); }
           }
           if (s2 === peg$FAILED) {
             s2 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 98) {
-              s3 = peg$c24;
+              s3 = peg$c25;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e27); }
+              if (peg$silentFails === 0) { peg$fail(peg$e28); }
             }
             if (s3 !== peg$FAILED) {
               peg$savedPos = s2;
-              s3 = peg$f30();
+              s3 = peg$f31();
             }
             s2 = s3;
             if (s2 === peg$FAILED) {
               s2 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 102) {
-                s3 = peg$c25;
+                s3 = peg$c26;
                 peg$currPos++;
               } else {
                 s3 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e28); }
+                if (peg$silentFails === 0) { peg$fail(peg$e29); }
               }
               if (s3 !== peg$FAILED) {
                 peg$savedPos = s2;
-                s3 = peg$f31();
+                s3 = peg$f32();
               }
               s2 = s3;
               if (s2 === peg$FAILED) {
                 s2 = peg$currPos;
                 if (input.charCodeAt(peg$currPos) === 110) {
-                  s3 = peg$c26;
+                  s3 = peg$c27;
                   peg$currPos++;
                 } else {
                   s3 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e29); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e30); }
                 }
                 if (s3 !== peg$FAILED) {
                   peg$savedPos = s2;
-                  s3 = peg$f32();
+                  s3 = peg$f33();
                 }
                 s2 = s3;
                 if (s2 === peg$FAILED) {
                   s2 = peg$currPos;
                   if (input.charCodeAt(peg$currPos) === 114) {
-                    s3 = peg$c27;
+                    s3 = peg$c28;
                     peg$currPos++;
                   } else {
                     s3 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e30); }
+                    if (peg$silentFails === 0) { peg$fail(peg$e31); }
                   }
                   if (s3 !== peg$FAILED) {
                     peg$savedPos = s2;
-                    s3 = peg$f33();
+                    s3 = peg$f34();
                   }
                   s2 = s3;
                   if (s2 === peg$FAILED) {
                     s2 = peg$currPos;
                     if (input.charCodeAt(peg$currPos) === 116) {
-                      s3 = peg$c28;
+                      s3 = peg$c29;
                       peg$currPos++;
                     } else {
                       s3 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+                      if (peg$silentFails === 0) { peg$fail(peg$e32); }
                     }
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s2;
-                      s3 = peg$f34();
+                      s3 = peg$f35();
                     }
                     s2 = s3;
                     if (s2 === peg$FAILED) {
                       s2 = peg$currPos;
                       if (input.charCodeAt(peg$currPos) === 117) {
-                        s3 = peg$c29;
+                        s3 = peg$c30;
                         peg$currPos++;
                       } else {
                         s3 = peg$FAILED;
-                        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+                        if (peg$silentFails === 0) { peg$fail(peg$e33); }
                       }
                       if (s3 !== peg$FAILED) {
                         s4 = peg$currPos;
@@ -2578,7 +2638,7 @@ function peg$parse(input, options) {
                         }
                         if (s4 !== peg$FAILED) {
                           peg$savedPos = s2;
-                          s2 = peg$f35(s4);
+                          s2 = peg$f36(s4);
                         } else {
                           peg$currPos = s2;
                           s2 = peg$FAILED;
@@ -2617,7 +2677,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
 
     return s0;
@@ -2628,11 +2688,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 39) {
-      s1 = peg$c30;
+      s1 = peg$c31;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -2642,15 +2702,15 @@ function peg$parse(input, options) {
         s3 = peg$parseraw_string_char();
       }
       if (input.charCodeAt(peg$currPos) === 39) {
-        s3 = peg$c30;
+        s3 = peg$c31;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s2);
+        s0 = peg$f37(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2685,7 +2745,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
 
     return s0;
@@ -2696,11 +2756,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c22;
+      s1 = peg$c23;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       if (peg$r5.test(input.charAt(peg$currPos))) {
@@ -2708,11 +2768,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e36); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f37();
+        s0 = peg$f38();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2730,19 +2790,19 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c22;
+      s1 = peg$c23;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 39) {
-        s2 = peg$c30;
+        s2 = peg$c31;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
       if (s2 !== peg$FAILED) {
         s0 = s2;
@@ -2765,7 +2825,7 @@ function peg$parse(input, options) {
     s1 = peg$parseint();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2777,21 +2837,21 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c31;
+      s1 = peg$c32;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 === peg$FAILED) {
       s1 = null;
     }
     if (input.charCodeAt(peg$currPos) === 48) {
-      s2 = peg$c32;
+      s2 = peg$c33;
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s2 === peg$FAILED) {
       s2 = peg$currPos;
@@ -2800,7 +2860,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e39); }
+        if (peg$silentFails === 0) { peg$fail(peg$e40); }
       }
       if (s3 !== peg$FAILED) {
         s4 = [];
@@ -2809,7 +2869,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e40); }
+          if (peg$silentFails === 0) { peg$fail(peg$e41); }
         }
         while (s5 !== peg$FAILED) {
           s4.push(s5);
@@ -2818,7 +2878,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e40); }
+            if (peg$silentFails === 0) { peg$fail(peg$e41); }
           }
         }
         s3 = [s3, s4];
@@ -2843,44 +2903,44 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c33) {
-      s1 = peg$c33;
+    if (input.substr(peg$currPos, 4) === peg$c34) {
+      s1 = peg$c34;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f39();
+      s1 = peg$f40();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 5) === peg$c34) {
-        s1 = peg$c34;
+      if (input.substr(peg$currPos, 5) === peg$c35) {
+        s1 = peg$c35;
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
+        if (peg$silentFails === 0) { peg$fail(peg$e43); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f40();
+        s1 = peg$f41();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 4) === peg$c35) {
-          s1 = peg$c35;
+        if (input.substr(peg$currPos, 4) === peg$c36) {
+          s1 = peg$c36;
           peg$currPos += 4;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e43); }
+          if (peg$silentFails === 0) { peg$fail(peg$e44); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f41();
+          s1 = peg$f42();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -2922,7 +2982,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e40); }
+          if (peg$silentFails === 0) { peg$fail(peg$e41); }
         }
         if (s5 !== peg$FAILED) {
           while (s5 !== peg$FAILED) {
@@ -2932,7 +2992,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e40); }
+              if (peg$silentFails === 0) { peg$fail(peg$e41); }
             }
           }
         } else {
@@ -2958,7 +3018,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e45); }
       }
       if (s4 !== peg$FAILED) {
         if (peg$r9.test(input.charAt(peg$currPos))) {
@@ -2966,7 +3026,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e45); }
+          if (peg$silentFails === 0) { peg$fail(peg$e46); }
         }
         if (s5 === peg$FAILED) {
           s5 = null;
@@ -2977,7 +3037,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e40); }
+          if (peg$silentFails === 0) { peg$fail(peg$e41); }
         }
         if (s7 !== peg$FAILED) {
           while (s7 !== peg$FAILED) {
@@ -2987,7 +3047,7 @@ function peg$parse(input, options) {
               peg$currPos++;
             } else {
               s7 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e40); }
+              if (peg$silentFails === 0) { peg$fail(peg$e41); }
             }
           }
         } else {
@@ -3008,7 +3068,7 @@ function peg$parse(input, options) {
         s3 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f42();
+      s0 = peg$f43();
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -3022,20 +3082,20 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c21;
+      s1 = peg$c22;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseunquoted_json_string();
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c21;
+        s3 = peg$c22;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        if (peg$silentFails === 0) { peg$fail(peg$e24); }
       }
       if (s3 !== peg$FAILED) {
         s0 = s2;
@@ -3068,7 +3128,7 @@ function peg$parse(input, options) {
       }
     }
     peg$savedPos = s0;
-    s1 = peg$f43(s1);
+    s1 = peg$f44(s1);
     s0 = s1;
 
     return s0;
@@ -3082,7 +3142,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
 
     return s0;
@@ -3095,19 +3155,19 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c22;
+        s1 = peg$c23;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
+        if (peg$silentFails === 0) { peg$fail(peg$e26); }
       }
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 96) {
-          s2 = peg$c20;
+          s2 = peg$c21;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e20); }
+          if (peg$silentFails === 0) { peg$fail(peg$e21); }
         }
         if (s2 !== peg$FAILED) {
           s0 = s2;
@@ -3129,11 +3189,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
-      s1 = peg$c36;
+      s1 = peg$c37;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$parsews();
@@ -3144,11 +3204,11 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         peg$parsews();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c37;
+          s8 = peg$c38;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e48); }
+          if (peg$silentFails === 0) { peg$fail(peg$e49); }
         }
         if (s8 !== peg$FAILED) {
           peg$parsews();
@@ -3168,11 +3228,11 @@ function peg$parse(input, options) {
           s6 = peg$currPos;
           peg$parsews();
           if (input.charCodeAt(peg$currPos) === 44) {
-            s8 = peg$c37;
+            s8 = peg$c38;
             peg$currPos++;
           } else {
             s8 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e48); }
+            if (peg$silentFails === 0) { peg$fail(peg$e49); }
           }
           if (s8 !== peg$FAILED) {
             peg$parsews();
@@ -3189,7 +3249,7 @@ function peg$parse(input, options) {
           }
         }
         peg$savedPos = s3;
-        s3 = peg$f44(s4, s5);
+        s3 = peg$f45(s4, s5);
       } else {
         peg$currPos = s3;
         s3 = peg$FAILED;
@@ -3199,15 +3259,15 @@ function peg$parse(input, options) {
       }
       s4 = peg$parsews();
       if (input.charCodeAt(peg$currPos) === 125) {
-        s5 = peg$c38;
+        s5 = peg$c39;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e49); }
+        if (peg$silentFails === 0) { peg$fail(peg$e50); }
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f45(s3);
+        s0 = peg$f46(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3239,7 +3299,7 @@ function peg$parse(input, options) {
         s5 = peg$parsejson_value();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f46(s1, s5);
+          s0 = peg$f47(s1, s5);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3276,11 +3336,11 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         peg$parsews();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c37;
+          s8 = peg$c38;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e48); }
+          if (peg$silentFails === 0) { peg$fail(peg$e49); }
         }
         if (s8 !== peg$FAILED) {
           peg$parsews();
@@ -3300,11 +3360,11 @@ function peg$parse(input, options) {
           s6 = peg$currPos;
           peg$parsews();
           if (input.charCodeAt(peg$currPos) === 44) {
-            s8 = peg$c37;
+            s8 = peg$c38;
             peg$currPos++;
           } else {
             s8 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e48); }
+            if (peg$silentFails === 0) { peg$fail(peg$e49); }
           }
           if (s8 !== peg$FAILED) {
             peg$parsews();
@@ -3321,7 +3381,7 @@ function peg$parse(input, options) {
           }
         }
         peg$savedPos = s3;
-        s3 = peg$f47(s4, s5);
+        s3 = peg$f48(s4, s5);
       } else {
         peg$currPos = s3;
         s3 = peg$FAILED;
@@ -3339,7 +3399,7 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f48(s3);
+        s0 = peg$f49(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3362,7 +3422,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3371,12 +3431,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e51); }
+        if (peg$silentFails === 0) { peg$fail(peg$e52); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e50); }
+    if (peg$silentFails === 0) { peg$fail(peg$e51); }
 
     return s0;
   }