@nocobase/plugin-workflow-json-query 1.9.8 → 2.0.0-alpha.41

package/dist/node_modules/jsonata/jsonata-es5.js

@@ -1520,7 +1520,7 @@ var dateTime = function () {
               def.integerFormat.mandatoryDigits = def.width.min;
             }
           }
-          if ('YMD'.indexOf(def.component) !== -1) {
+          if (def.component === 'Y') {
             // §9.8.4.4
             def.n = -1;
             if (def.width && def.width.max !== undefined) {
@@ -1533,6 +1533,11 @@ var dateTime = function () {
               }
             }
           }
+          // if the previous part is also an integer with no intervening markup, then its width for parsing must be precisely defined
+          var previousPart = spec[spec.length - 1];
+          if (previousPart && previousPart.integerFormat) {
+            previousPart.integerFormat.parseWidth = previousPart.integerFormat.mandatoryDigits;
+          }
         }
         if (def.component === 'Z' || def.component === 'z') {
           def.integerFormat = analyseIntegerPicture(def.presentation1);
@@ -1909,7 +1914,6 @@ var dateTime = function () {
             return offsetHours * 60 + offsetMinutes;
           };
         } else if (part.integerFormat) {
-          part.integerFormat.n = part.n;
           res = generateRegex(part.integerFormat);
         } else {
           // must be a month or day name
@@ -1960,16 +1964,6 @@ var dateTime = function () {
       // type === 'integer'
       matcher.type = 'integer';
       var isUpper = formatSpec["case"] === tcase.UPPER;
-      var occurrences;
-      if (formatSpec.n && formatSpec.n > 0) {
-        if (formatSpec.optionalDigits === 0) {
-          occurrences = "{".concat(formatSpec.n, "}");
-        } else {
-          occurrences = "{".concat(formatSpec.n - formatSpec.optionalDigits, ",").concat(formatSpec.n, "}");
-        }
-      } else {
-        occurrences = '+';
-      }
       switch (formatSpec.primary) {
         case formats.LETTERS:
           matcher.regex = isUpper ? '[A-Z]+' : '[a-z]+';
@@ -1990,7 +1984,12 @@ var dateTime = function () {
           };
           break;
         case formats.DECIMAL:
-          matcher.regex = "[0-9]".concat(occurrences);
+          matcher.regex = '[0-9]';
+          if (formatSpec.parseWidth) {
+            matcher.regex += "{".concat(formatSpec.parseWidth, "}");
+          } else {
+            matcher.regex += '+';
+          }
           if (formatSpec.ordinal) {
             // ordinals
             matcher.regex += '(?:th|st|nd|rd)';
@@ -2276,7 +2275,9 @@ module.exports = dateTime;
 (function (global){(function (){
 "use strict";
 
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _regeneratorKeys(e) { var n = Object(e), r = []; for (var t in n) r.unshift(t); return function e() { for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = !1, e; return e.done = !0, e; }; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -2556,6 +2557,7 @@ var functions = function () {
       _char = ' ';
     }
     var result;
+    width = Math.trunc(width);
     var padLength = Math.abs(width) - length(str);
     if (padLength > 0) {
       var padding = new Array(padLength + 1).join(_char);
@@ -2590,34 +2592,31 @@ var functions = function () {
    * @returns {Boolean} - true if str contains token
    */
   function _evaluateMatcher() {
-    _evaluateMatcher = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(matcher, str) {
+    _evaluateMatcher = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(matcher, str) {
       var result;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             result = matcher.apply(this, [str]); // eslint-disable-line no-useless-call
             if (!isPromise(result)) {
-              _context.next = 5;
+              _context.n = 2;
               break;
             }
-            _context.next = 4;
+            _context.n = 1;
             return result;
-          case 4:
-            result = _context.sent;
-          case 5:
+          case 1:
+            result = _context.v;
+          case 2:
             if (!(result && !(typeof result.start === 'number' || result.end === 'number' || Array.isArray(result.groups) || isFunction(result.next)))) {
-              _context.next = 7;
+              _context.n = 3;
               break;
             }
             throw {
               code: "T1010",
               stack: new Error().stack
             };
-          case 7:
-            return _context.abrupt("return", result);
-          case 8:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2, result);
         }
       }, _callee, this);
     }));
@@ -2634,35 +2633,32 @@ var functions = function () {
    * @returns {Array} The array of match objects
    */
   function _contains() {
-    _contains = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(str, token) {
+    _contains = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(str, token) {
       var result, matches;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             if (!(typeof str === 'undefined')) {
-              _context2.next = 2;
+              _context2.n = 1;
               break;
             }
-            return _context2.abrupt("return", undefined);
-          case 2:
+            return _context2.a(2, undefined);
+          case 1:
             if (!(typeof token === 'string')) {
-              _context2.next = 6;
+              _context2.n = 2;
               break;
             }
             result = str.indexOf(token) !== -1;
-            _context2.next = 10;
+            _context2.n = 4;
             break;
-          case 6:
-            _context2.next = 8;
+          case 2:
+            _context2.n = 3;
             return evaluateMatcher(token, str);
-          case 8:
-            matches = _context2.sent;
+          case 3:
+            matches = _context2.v;
             result = typeof matches !== 'undefined';
-          case 10:
-            return _context2.abrupt("return", result);
-          case 11:
-          case "end":
-            return _context2.stop();
+          case 4:
+            return _context2.a(2, result);
         }
       }, _callee2);
     }));
@@ -2680,19 +2676,19 @@ var functions = function () {
    * @returns {Array} The array of match objects
    */
   function _match() {
-    _match = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(str, regex, limit) {
+    _match = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(str, regex, limit) {
       var result, count, matches;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             if (!(typeof str === 'undefined')) {
-              _context3.next = 2;
+              _context3.n = 1;
               break;
             }
-            return _context3.abrupt("return", undefined);
-          case 2:
+            return _context3.a(2, undefined);
+          case 1:
             if (!(limit < 0)) {
-              _context3.next = 4;
+              _context3.n = 2;
               break;
             }
             throw {
@@ -2701,24 +2697,24 @@ var functions = function () {
               code: 'D3040',
               index: 3
             };
-          case 4:
+          case 2:
             result = createSequence();
             if (!(typeof limit === 'undefined' || limit > 0)) {
-              _context3.next = 19;
+              _context3.n = 6;
               break;
             }
             count = 0;
-            _context3.next = 9;
+            _context3.n = 3;
             return evaluateMatcher(regex, str);
-          case 9:
-            matches = _context3.sent;
+          case 3:
+            matches = _context3.v;
             if (!(typeof matches !== 'undefined')) {
-              _context3.next = 19;
+              _context3.n = 6;
               break;
             }
-          case 11:
+          case 4:
             if (!(typeof matches !== 'undefined' && (typeof limit === 'undefined' || count < limit))) {
-              _context3.next = 19;
+              _context3.n = 6;
               break;
             }
             result.push({
@@ -2726,24 +2722,21 @@ var functions = function () {
               index: matches.start,
               groups: matches.groups
             });
-            _context3.next = 15;
+            _context3.n = 5;
             return evaluateMatcher(matches.next);
-          case 15:
-            matches = _context3.sent;
+          case 5:
+            matches = _context3.v;
             count++;
-            _context3.next = 11;
+            _context3.n = 4;
             break;
-          case 19:
-            return _context3.abrupt("return", result);
-          case 20:
-          case "end":
-            return _context3.stop();
+          case 6:
+            return _context3.a(2, result);
         }
       }, _callee3);
     }));
     return _match.apply(this, arguments);
   }
-  function replace(_x8, _x9, _x10, _x11) {
+  function replace(_x8, _x9, _x0, _x1) {
     return _replace.apply(this, arguments);
   }
   /**
@@ -2752,20 +2745,20 @@ var functions = function () {
    * @returns {String} Base 64 encoding of the binary data
    */
   function _replace() {
-    _replace = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(str, pattern, replacement, limit) {
+    _replace = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(str, pattern, replacement, limit) {
       var self, replacer, result, position, count, index, matches, replacedWith;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (!(typeof str === 'undefined')) {
-              _context4.next = 2;
+              _context4.n = 1;
               break;
             }
-            return _context4.abrupt("return", undefined);
-          case 2:
+            return _context4.a(2, undefined);
+          case 1:
             self = this; // pattern cannot be an empty string
             if (!(pattern === '')) {
-              _context4.next = 5;
+              _context4.n = 2;
               break;
             }
             throw {
@@ -2774,9 +2767,9 @@ var functions = function () {
               value: pattern,
               index: 2
             };
-          case 5:
+          case 2:
             if (!(limit < 0)) {
-              _context4.next = 7;
+              _context4.n = 3;
               break;
             }
             throw {
@@ -2785,7 +2778,7 @@ var functions = function () {
               value: limit,
               index: 4
             };
-          case 7:
+          case 3:
             if (typeof replacement === 'string') {
               replacer = function replacer(regexMatch) {
                 var substitute = '';
@@ -2841,12 +2834,12 @@ var functions = function () {
             result = '';
             position = 0;
             if (!(typeof limit === 'undefined' || limit > 0)) {
-              _context4.next = 47;
+              _context4.n = 15;
               break;
             }
             count = 0;
             if (!(typeof pattern === 'string')) {
-              _context4.next = 18;
+              _context4.n = 4;
               break;
             }
             index = str.indexOf(pattern, position);
@@ -2858,71 +2851,68 @@ var functions = function () {
               index = str.indexOf(pattern, position);
             }
             result += str.substring(position);
-            _context4.next = 45;
+            _context4.n = 14;
             break;
-          case 18:
-            _context4.next = 20;
+          case 4:
+            _context4.n = 5;
             return evaluateMatcher(pattern, str);
-          case 20:
-            matches = _context4.sent;
+          case 5:
+            matches = _context4.v;
             if (!(typeof matches !== 'undefined')) {
-              _context4.next = 44;
+              _context4.n = 13;
               break;
             }
-          case 22:
+          case 6:
             if (!(typeof matches !== 'undefined' && (typeof limit === 'undefined' || count < limit))) {
-              _context4.next = 41;
+              _context4.n = 12;
               break;
             }
             result += str.substring(position, matches.start);
             replacedWith = replacer.apply(self, [matches]);
             if (!isPromise(replacedWith)) {
-              _context4.next = 29;
+              _context4.n = 8;
               break;
             }
-            _context4.next = 28;
+            _context4.n = 7;
             return replacedWith;
-          case 28:
-            replacedWith = _context4.sent;
-          case 29:
+          case 7:
+            replacedWith = _context4.v;
+          case 8:
             if (!(typeof replacedWith === 'string')) {
-              _context4.next = 33;
+              _context4.n = 9;
               break;
             }
             result += replacedWith;
-            _context4.next = 34;
+            _context4.n = 10;
             break;
-          case 33:
+          case 9:
             throw {
               code: "D3012",
               stack: new Error().stack,
               value: replacedWith
             };
-          case 34:
+          case 10:
             position = matches.start + matches.match.length;
             count++;
-            _context4.next = 38;
+            _context4.n = 11;
             return evaluateMatcher(matches.next);
-          case 38:
-            matches = _context4.sent;
-            _context4.next = 22;
+          case 11:
+            matches = _context4.v;
+            _context4.n = 6;
             break;
-          case 41:
+          case 12:
             result += str.substring(position);
-            _context4.next = 45;
+            _context4.n = 14;
             break;
-          case 44:
+          case 13:
             result = str;
-          case 45:
-            _context4.next = 48;
+          case 14:
+            _context4.n = 16;
             break;
-          case 47:
+          case 15:
             result = str;
-          case 48:
-            return _context4.abrupt("return", result);
-          case 49:
-          case "end":
-            return _context4.stop();
+          case 16:
+            return _context4.a(2, result);
         }
       }, _callee4, this);
     }));
@@ -3075,7 +3065,7 @@ var functions = function () {
    * @param {Integer} [limit] - max number of substrings
    * @returns {Array} The array of string
    */
-  function split(_x12, _x13, _x14) {
+  function split(_x10, _x11, _x12) {
     return _split.apply(this, arguments);
   }
   /**
@@ -3085,19 +3075,19 @@ var functions = function () {
    * @returns {String} The concatenated string
    */
   function _split() {
-    _split = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(str, separator, limit) {
+    _split = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(str, separator, limit) {
       var result, count, matches, start;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
             if (!(typeof str === 'undefined')) {
-              _context5.next = 2;
+              _context5.n = 1;
               break;
             }
-            return _context5.abrupt("return", undefined);
-          case 2:
+            return _context5.a(2, undefined);
+          case 1:
             if (!(limit < 0)) {
-              _context5.next = 4;
+              _context5.n = 2;
               break;
             }
             throw {
@@ -3106,57 +3096,54 @@ var functions = function () {
               value: limit,
               index: 3
             };
-          case 4:
+          case 2:
             result = [];
             if (!(typeof limit === 'undefined' || limit > 0)) {
-              _context5.next = 29;
+              _context5.n = 9;
               break;
             }
             if (!(typeof separator === 'string')) {
-              _context5.next = 10;
+              _context5.n = 3;
               break;
             }
             result = str.split(separator, limit);
-            _context5.next = 29;
+            _context5.n = 9;
             break;
-          case 10:
+          case 3:
             count = 0;
-            _context5.next = 13;
+            _context5.n = 4;
             return evaluateMatcher(separator, str);
-          case 13:
-            matches = _context5.sent;
+          case 4:
+            matches = _context5.v;
             if (!(typeof matches !== 'undefined')) {
-              _context5.next = 28;
+              _context5.n = 8;
               break;
             }
             start = 0;
-          case 16:
+          case 5:
             if (!(typeof matches !== 'undefined' && (typeof limit === 'undefined' || count < limit))) {
-              _context5.next = 25;
+              _context5.n = 7;
               break;
             }
             result.push(str.substring(start, matches.start));
             start = matches.end;
-            _context5.next = 21;
+            _context5.n = 6;
             return evaluateMatcher(matches.next);
-          case 21:
-            matches = _context5.sent;
+          case 6:
+            matches = _context5.v;
             count++;
-            _context5.next = 16;
+            _context5.n = 5;
             break;
-          case 25:
+          case 7:
             if (typeof limit === 'undefined' || count < limit) {
               result.push(str.substring(start));
             }
-            _context5.next = 29;
+            _context5.n = 9;
             break;
-          case 28:
+          case 8:
             result.push(str);
-          case 29:
-            return _context5.abrupt("return", result);
-          case 30:
-          case "end":
-            return _context5.stop();
+          case 9:
+            return _context5.a(2, result);
         }
       }, _callee5);
     }));
@@ -3407,8 +3394,8 @@ var functions = function () {
       }
       var minimumExponentSize = 0;
       if (exponentPresent) {
-        minimumExponentSize = parts.exponentPart.split('').filter(function (_char10) {
-          return decimalDigitFamily.indexOf(_char10) !== -1;
+        minimumExponentSize = parts.exponentPart.split('').filter(function (_char0) {
+          return decimalDigitFamily.indexOf(_char0) !== -1;
         }).length;
       }
       return {
@@ -3801,7 +3788,7 @@ var functions = function () {
       if (arg !== 0) {
         result = true;
       }
-    } else if (arg !== null && _typeof(arg) === 'object') {
+    } else if (arg !== null && _typeof(arg) === 'object' && !isFunction(arg)) {
       if (Object.keys(arg).length > 0) {
         result = true;
       }
@@ -3852,7 +3839,7 @@ var functions = function () {
    * @param {Function} func - function to apply
    * @returns {Array} Map array
    */
-  function map(_x15, _x16) {
+  function map(_x13, _x14) {
     return _map.apply(this, arguments);
   }
   /**
@@ -3862,47 +3849,44 @@ var functions = function () {
    * @returns {Array} Map array
    */
   function _map() {
-    _map = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(arr, func) {
+    _map = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(arr, func) {
       var result, i, func_args, res;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator().w(function (_context6) {
+        while (1) switch (_context6.n) {
           case 0:
             if (!(typeof arr === 'undefined')) {
-              _context6.next = 2;
+              _context6.n = 1;
               break;
             }
-            return _context6.abrupt("return", undefined);
-          case 2:
+            return _context6.a(2, undefined);
+          case 1:
             result = createSequence(); // do the map - iterate over the arrays, and invoke func
             i = 0;
-          case 4:
+          case 2:
             if (!(i < arr.length)) {
-              _context6.next = 13;
+              _context6.n = 5;
               break;
             }
             func_args = hofFuncArgs(func, arr[i], i, arr); // invoke func
-            _context6.next = 8;
+            _context6.n = 3;
             return func.apply(this, func_args);
-          case 8:
-            res = _context6.sent;
+          case 3:
+            res = _context6.v;
             if (typeof res !== 'undefined') {
               result.push(res);
             }
-          case 10:
+          case 4:
             i++;
-            _context6.next = 4;
+            _context6.n = 2;
             break;
-          case 13:
-            return _context6.abrupt("return", result);
-          case 14:
-          case "end":
-            return _context6.stop();
+          case 5:
+            return _context6.a(2, result);
         }
       }, _callee6, this);
     }));
     return _map.apply(this, arguments);
   }
-  function filter(_x17, _x18) {
+  function filter(_x15, _x16) {
     return _filter.apply(this, arguments);
   }
   /**
@@ -3913,48 +3897,45 @@ var functions = function () {
    * @returns {*} Matching element
    */
   function _filter() {
-    _filter = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(arr, func) {
+    _filter = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(arr, func) {
       var result, i, entry, func_args, res;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regenerator().w(function (_context7) {
+        while (1) switch (_context7.n) {
           case 0:
             if (!(typeof arr === 'undefined')) {
-              _context7.next = 2;
+              _context7.n = 1;
               break;
             }
-            return _context7.abrupt("return", undefined);
-          case 2:
+            return _context7.a(2, undefined);
+          case 1:
             result = createSequence();
             i = 0;
-          case 4:
+          case 2:
             if (!(i < arr.length)) {
-              _context7.next = 14;
+              _context7.n = 5;
               break;
             }
             entry = arr[i];
             func_args = hofFuncArgs(func, entry, i, arr); // invoke func
-            _context7.next = 9;
+            _context7.n = 3;
             return func.apply(this, func_args);
-          case 9:
-            res = _context7.sent;
+          case 3:
+            res = _context7.v;
             if (_boolean(res)) {
               result.push(entry);
             }
-          case 11:
+          case 4:
             i++;
-            _context7.next = 4;
+            _context7.n = 2;
             break;
-          case 14:
-            return _context7.abrupt("return", result);
-          case 15:
-          case "end":
-            return _context7.stop();
+          case 5:
+            return _context7.a(2, result);
         }
       }, _callee7, this);
     }));
     return _filter.apply(this, arguments);
   }
-  function single(_x19, _x20) {
+  function single(_x17, _x18) {
     return _single.apply(this, arguments);
   }
   /**
@@ -3963,73 +3944,70 @@ var functions = function () {
    * @returns {Array} Zipped array
    */
   function _single() {
-    _single = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(arr, func) {
+    _single = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(arr, func) {
       var hasFoundMatch, result, i, entry, positiveResult, func_args, res;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regenerator().w(function (_context8) {
+        while (1) switch (_context8.n) {
           case 0:
             if (!(typeof arr === 'undefined')) {
-              _context8.next = 2;
+              _context8.n = 1;
               break;
             }
-            return _context8.abrupt("return", undefined);
-          case 2:
+            return _context8.a(2, undefined);
+          case 1:
             hasFoundMatch = false;
             i = 0;
-          case 4:
+          case 2:
             if (!(i < arr.length)) {
-              _context8.next = 23;
+              _context8.n = 7;
               break;
             }
             entry = arr[i];
             positiveResult = true;
             if (!(typeof func !== 'undefined')) {
-              _context8.next = 13;
+              _context8.n = 4;
               break;
             }
             func_args = hofFuncArgs(func, entry, i, arr); // invoke func
-            _context8.next = 11;
+            _context8.n = 3;
             return func.apply(this, func_args);
-          case 11:
-            res = _context8.sent;
+          case 3:
+            res = _context8.v;
             positiveResult = _boolean(res);
-          case 13:
+          case 4:
             if (!positiveResult) {
-              _context8.next = 20;
+              _context8.n = 6;
               break;
             }
             if (hasFoundMatch) {
-              _context8.next = 19;
+              _context8.n = 5;
               break;
             }
             result = entry;
             hasFoundMatch = true;
-            _context8.next = 20;
+            _context8.n = 6;
             break;
-          case 19:
+          case 5:
             throw {
               stack: new Error().stack,
               code: "D3138",
               index: i
             };
-          case 20:
+          case 6:
             i++;
-            _context8.next = 4;
+            _context8.n = 2;
             break;
-          case 23:
+          case 7:
             if (hasFoundMatch) {
-              _context8.next = 25;
+              _context8.n = 8;
               break;
             }
             throw {
               stack: new Error().stack,
               code: "D3139"
             };
-          case 25:
-            return _context8.abrupt("return", result);
-          case 26:
-          case "end":
-            return _context8.stop();
+          case 8:
+            return _context8.a(2, result);
         }
       }, _callee8, this);
     }));
@@ -4062,7 +4040,7 @@ var functions = function () {
    * @param {Object} init - Initial value
    * @returns {*} Result
    */
-  function foldLeft(_x21, _x22, _x23) {
+  function foldLeft(_x19, _x20, _x21) {
     return _foldLeft.apply(this, arguments);
   }
   /**
@@ -4071,20 +4049,20 @@ var functions = function () {
    * @returns {Array} Array of keys
    */
   function _foldLeft() {
-    _foldLeft = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(sequence, func, init) {
+    _foldLeft = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(sequence, func, init) {
       var result, arity, index, args;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regenerator().w(function (_context9) {
+        while (1) switch (_context9.n) {
           case 0:
             if (!(typeof sequence === 'undefined')) {
-              _context9.next = 2;
+              _context9.n = 1;
               break;
             }
-            return _context9.abrupt("return", undefined);
-          case 2:
+            return _context9.a(2, undefined);
+          case 1:
             arity = getFunctionArity(func);
             if (!(arity < 2)) {
-              _context9.next = 5;
+              _context9.n = 2;
               break;
             }
             throw {
@@ -4092,7 +4070,7 @@ var functions = function () {
               code: "D3050",
               index: 1
             };
-          case 5:
+          case 2:
             if (typeof init === 'undefined' && sequence.length > 0) {
               result = sequence[0];
               index = 1;
@@ -4100,9 +4078,9 @@ var functions = function () {
               result = init;
               index = 0;
             }
-          case 6:
+          case 3:
             if (!(index < sequence.length)) {
-              _context9.next = 16;
+              _context9.n = 5;
               break;
             }
             args = [result, sequence[index]];
@@ -4112,18 +4090,15 @@ var functions = function () {
             if (arity >= 4) {
               args.push(sequence);
             }
-            _context9.next = 12;
+            _context9.n = 4;
             return func.apply(this, args);
-          case 12:
-            result = _context9.sent;
+          case 4:
+            result = _context9.v;
             index++;
-            _context9.next = 6;
+            _context9.n = 3;
             break;
-          case 16:
-            return _context9.abrupt("return", result);
-          case 17:
-          case "end":
-            return _context9.stop();
+          case 5:
+            return _context9.a(2, result);
         }
       }, _callee9, this);
     }));
@@ -4286,7 +4261,7 @@ var functions = function () {
    * @param {*} func - the function to apply to each key/value pair
    * @returns {Array} - the resultant array
    */
-  function each(_x24, _x25) {
+  function each(_x22, _x23) {
     return _each.apply(this, arguments);
   }
   /**
@@ -4295,36 +4270,33 @@ var functions = function () {
    * @throws custom error with code 'D3137'
    */
   function _each() {
-    _each = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(obj, func) {
-      var result, key, func_args, val;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    _each = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(obj, func) {
+      var result, key, func_args, val, _t, _t2;
+      return _regenerator().w(function (_context0) {
+        while (1) switch (_context0.n) {
           case 0:
             result = createSequence();
-            _context10.t0 = _regeneratorRuntime().keys(obj);
-          case 2:
-            if ((_context10.t1 = _context10.t0()).done) {
-              _context10.next = 11;
+            _t = _regeneratorKeys(obj);
+          case 1:
+            if ((_t2 = _t()).done) {
+              _context0.n = 3;
               break;
             }
-            key = _context10.t1.value;
+            key = _t2.value;
             func_args = hofFuncArgs(func, obj[key], key, obj); // invoke func
-            _context10.next = 7;
+            _context0.n = 2;
             return func.apply(this, func_args);
-          case 7:
-            val = _context10.sent;
+          case 2:
+            val = _context0.v;
             if (typeof val !== 'undefined') {
               result.push(val);
             }
-            _context10.next = 2;
+            _context0.n = 1;
             break;
-          case 11:
-            return _context10.abrupt("return", result);
-          case 12:
-          case "end":
-            return _context10.stop();
+          case 3:
+            return _context0.a(2, result);
         }
-      }, _callee10, this);
+      }, _callee0, this);
     }));
     return _each.apply(this, arguments);
   }
@@ -4391,7 +4363,7 @@ var functions = function () {
    * @param {*} comparator - comparator function
    * @returns {Array} - sorted array
    */
-  function sort(_x26, _x27) {
+  function sort(_x24, _x25) {
     return _sort.apply(this, arguments);
   }
   /**
@@ -4400,29 +4372,29 @@ var functions = function () {
    * @returns {Array} the shuffled array
    */
   function _sort() {
-    _sort = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(arr, comparator) {
+    _sort = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(arr, comparator) {
       var comp, merge, _msort, result;
-      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+      return _regenerator().w(function (_context13) {
+        while (1) switch (_context13.n) {
           case 0:
             if (!(typeof arr === 'undefined')) {
-              _context15.next = 2;
+              _context13.n = 1;
               break;
             }
-            return _context15.abrupt("return", undefined);
-          case 2:
+            return _context13.a(2, undefined);
+          case 1:
             if (!(arr.length <= 1)) {
-              _context15.next = 4;
+              _context13.n = 2;
               break;
             }
-            return _context15.abrupt("return", arr);
-          case 4:
+            return _context13.a(2, arr);
+          case 2:
             if (!(typeof comparator === 'undefined')) {
-              _context15.next = 10;
+              _context13.n = 4;
               break;
             }
             if (!(!isArrayOfNumbers(arr) && !isArrayOfStrings(arr))) {
-              _context15.next = 7;
+              _context13.n = 3;
               break;
             }
             throw {
@@ -4430,148 +4402,137 @@ var functions = function () {
               code: "D3070",
               index: 1
             };
-          case 7:
+          case 3:
             comp = /*#__PURE__*/function () {
-              var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(a, b) {
-                return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-                  while (1) switch (_context11.prev = _context11.next) {
+              var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(a, b) {
+                return _regenerator().w(function (_context1) {
+                  while (1) switch (_context1.n) {
                     case 0:
-                      return _context11.abrupt("return", a > b);
-                    case 1:
-                    case "end":
-                      return _context11.stop();
+                      return _context1.a(2, a > b);
                   }
-                }, _callee11);
+                }, _callee1);
               }));
-              return function comp(_x30, _x31) {
+              return function comp(_x28, _x29) {
                 return _ref.apply(this, arguments);
               };
             }();
-            _context15.next = 11;
+            _context13.n = 5;
             break;
-          case 10:
+          case 4:
             // for internal usage of functionSort (i.e. order-by syntax)
             comp = comparator;
-          case 11:
+          case 5:
             merge = /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(l, r) {
+              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(l, r) {
                 var _merge_iter, merged;
-                return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-                  while (1) switch (_context13.prev = _context13.next) {
+                return _regenerator().w(function (_context11) {
+                  while (1) switch (_context11.n) {
                     case 0:
                       _merge_iter = /*#__PURE__*/function () {
-                        var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(result, left, right) {
-                          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-                            while (1) switch (_context12.prev = _context12.next) {
+                        var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(result, left, right) {
+                          return _regenerator().w(function (_context10) {
+                            while (1) switch (_context10.n) {
                               case 0:
                                 if (!(left.length === 0)) {
-                                  _context12.next = 4;
+                                  _context10.n = 1;
                                   break;
                                 }
                                 Array.prototype.push.apply(result, right);
-                                _context12.next = 19;
+                                _context10.n = 6;
                                 break;
-                              case 4:
+                              case 1:
                                 if (!(right.length === 0)) {
-                                  _context12.next = 8;
+                                  _context10.n = 2;
                                   break;
                                 }
                                 Array.prototype.push.apply(result, left);
-                                _context12.next = 19;
+                                _context10.n = 6;
                                 break;
-                              case 8:
-                                _context12.next = 10;
+                              case 2:
+                                _context10.n = 3;
                                 return comp(left[0], right[0]);
-                              case 10:
-                                if (!_context12.sent) {
-                                  _context12.next = 16;
+                              case 3:
+                                if (!_context10.v) {
+                                  _context10.n = 5;
                                   break;
                                 }
                                 // invoke the comparator function
                                 // if it returns true - swap left and right
                                 result.push(right[0]);
-                                _context12.next = 14;
+                                _context10.n = 4;
                                 return _merge_iter(result, left, right.slice(1));
-                              case 14:
-                                _context12.next = 19;
+                              case 4:
+                                _context10.n = 6;
                                 break;
-                              case 16:
+                              case 5:
                                 // otherwise keep the same order
                                 result.push(left[0]);
-                                _context12.next = 19;
+                                _context10.n = 6;
                                 return _merge_iter(result, left.slice(1), right);
-                              case 19:
-                              case "end":
-                                return _context12.stop();
+                              case 6:
+                                return _context10.a(2);
                             }
-                          }, _callee12);
+                          }, _callee10);
                         }));
-                        return function merge_iter(_x34, _x35, _x36) {
+                        return function merge_iter(_x32, _x33, _x34) {
                           return _ref3.apply(this, arguments);
                         };
                       }();
                       merged = [];
-                      _context13.next = 4;
+                      _context11.n = 1;
                       return _merge_iter(merged, l, r);
-                    case 4:
-                      return _context13.abrupt("return", merged);
-                    case 5:
-                    case "end":
-                      return _context13.stop();
+                    case 1:
+                      return _context11.a(2, merged);
                   }
-                }, _callee13);
+                }, _callee11);
               }));
-              return function merge(_x32, _x33) {
+              return function merge(_x30, _x31) {
                 return _ref2.apply(this, arguments);
               };
             }();
             _msort = /*#__PURE__*/function () {
-              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(array) {
+              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(array) {
                 var middle, left, right;
-                return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-                  while (1) switch (_context14.prev = _context14.next) {
+                return _regenerator().w(function (_context12) {
+                  while (1) switch (_context12.n) {
                     case 0:
                       if (!(!Array.isArray(array) || array.length <= 1)) {
-                        _context14.next = 4;
+                        _context12.n = 1;
                         break;
                       }
-                      return _context14.abrupt("return", array);
-                    case 4:
+                      return _context12.a(2, array);
+                    case 1:
                       middle = Math.floor(array.length / 2);
                       left = array.slice(0, middle);
                       right = array.slice(middle);
-                      _context14.next = 9;
+                      _context12.n = 2;
                       return _msort(left);
-                    case 9:
-                      left = _context14.sent;
-                      _context14.next = 12;
+                    case 2:
+                      left = _context12.v;
+                      _context12.n = 3;
                       return _msort(right);
-                    case 12:
-                      right = _context14.sent;
-                      _context14.next = 15;
+                    case 3:
+                      right = _context12.v;
+                      _context12.n = 4;
                       return merge(left, right);
-                    case 15:
-                      return _context14.abrupt("return", _context14.sent);
-                    case 16:
-                    case "end":
-                      return _context14.stop();
+                    case 4:
+                      return _context12.a(2, _context12.v);
+                    case 5:
+                      return _context12.a(2);
                   }
-                }, _callee14);
+                }, _callee12);
               }));
-              return function msort(_x37) {
+              return function msort(_x35) {
                 return _ref4.apply(this, arguments);
               };
             }();
-            _context15.next = 15;
+            _context13.n = 6;
             return _msort(arr);
-          case 15:
-            result = _context15.sent;
-            return _context15.abrupt("return", result);
-          case 17:
-          case "end":
-            return _context15.stop();
+          case 6:
+            result = _context13.v;
+            return _context13.a(2, result);
         }
-      }, _callee15);
+      }, _callee13);
     }));
     return _sort.apply(this, arguments);
   }
@@ -4635,45 +4596,42 @@ var functions = function () {
    * @param {object} func - the predicate function (lambda or native)
    * @returns {object} - sifted object
    */
-  function sift(_x28, _x29) {
+  function sift(_x26, _x27) {
     return _sift.apply(this, arguments);
   }
   function _sift() {
-    _sift = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(arg, func) {
-      var result, item, entry, func_args, res;
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+    _sift = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(arg, func) {
+      var result, item, entry, func_args, res, _t3, _t4;
+      return _regenerator().w(function (_context14) {
+        while (1) switch (_context14.n) {
           case 0:
             result = {};
-            _context16.t0 = _regeneratorRuntime().keys(arg);
-          case 2:
-            if ((_context16.t1 = _context16.t0()).done) {
-              _context16.next = 12;
+            _t3 = _regeneratorKeys(arg);
+          case 1:
+            if ((_t4 = _t3()).done) {
+              _context14.n = 3;
               break;
             }
-            item = _context16.t1.value;
+            item = _t4.value;
             entry = arg[item];
             func_args = hofFuncArgs(func, entry, item, arg); // invoke func
-            _context16.next = 8;
+            _context14.n = 2;
             return func.apply(this, func_args);
-          case 8:
-            res = _context16.sent;
+          case 2:
+            res = _context14.v;
             if (_boolean(res)) {
               result[item] = entry;
             }
-            _context16.next = 2;
+            _context14.n = 1;
             break;
-          case 12:
+          case 3:
             // empty objects should be changed to undefined
             if (Object.keys(result).length === 0) {
               result = undefined;
             }
-            return _context16.abrupt("return", result);
-          case 14:
-          case "end":
-            return _context16.stop();
+            return _context14.a(2, result);
         }
-      }, _callee16, this);
+      }, _callee14, this);
     }));
     return _sift.apply(this, arguments);
   }
@@ -4742,6 +4700,7 @@ module.exports = functions;
 },{"./utils":6}],3:[function(require,module,exports){
 "use strict";
 
+function _regeneratorValues(e) { if (null != e) { var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"], r = 0; if (t) return t.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) return { next: function next() { return e && r >= e.length && (e = void 0), { value: e && e[r++], done: !e }; } }; } throw new TypeError(_typeof(e) + " is not iterable"); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -4749,7 +4708,8 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -4813,140 +4773,140 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluate() {
-    _evaluate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(expr, input, environment) {
-      var result, entryCallback, ii, exitCallback;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    _evaluate = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(expr, input, environment) {
+      var result, entryCallback, ii, exitCallback, _t2;
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             entryCallback = environment.lookup(Symbol["for"]('jsonata.__evaluate_entry'));
             if (!entryCallback) {
-              _context4.next = 4;
+              _context4.n = 1;
               break;
             }
-            _context4.next = 4;
+            _context4.n = 1;
             return entryCallback(expr, input, environment);
-          case 4:
-            _context4.t0 = expr.type;
-            _context4.next = _context4.t0 === 'path' ? 7 : _context4.t0 === 'binary' ? 11 : _context4.t0 === 'unary' ? 15 : _context4.t0 === 'name' ? 19 : _context4.t0 === 'string' ? 21 : _context4.t0 === 'number' ? 21 : _context4.t0 === 'value' ? 21 : _context4.t0 === 'wildcard' ? 23 : _context4.t0 === 'descendant' ? 25 : _context4.t0 === 'parent' ? 27 : _context4.t0 === 'condition' ? 29 : _context4.t0 === 'block' ? 33 : _context4.t0 === 'bind' ? 37 : _context4.t0 === 'regex' ? 41 : _context4.t0 === 'function' ? 43 : _context4.t0 === 'variable' ? 47 : _context4.t0 === 'lambda' ? 49 : _context4.t0 === 'partial' ? 51 : _context4.t0 === 'apply' ? 55 : _context4.t0 === 'transform' ? 59 : 61;
+          case 1:
+            _t2 = expr.type;
+            _context4.n = _t2 === 'path' ? 2 : _t2 === 'binary' ? 4 : _t2 === 'unary' ? 6 : _t2 === 'name' ? 8 : _t2 === 'string' ? 9 : _t2 === 'number' ? 9 : _t2 === 'value' ? 9 : _t2 === 'wildcard' ? 10 : _t2 === 'descendant' ? 11 : _t2 === 'parent' ? 12 : _t2 === 'condition' ? 13 : _t2 === 'block' ? 15 : _t2 === 'bind' ? 17 : _t2 === 'regex' ? 19 : _t2 === 'function' ? 20 : _t2 === 'variable' ? 22 : _t2 === 'lambda' ? 23 : _t2 === 'partial' ? 24 : _t2 === 'apply' ? 26 : _t2 === 'transform' ? 28 : 29;
             break;
-          case 7:
-            _context4.next = 9;
+          case 2:
+            _context4.n = 3;
             return evaluatePath(expr, input, environment);
-          case 9:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 11:
-            _context4.next = 13;
+          case 3:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 4:
+            _context4.n = 5;
             return evaluateBinary(expr, input, environment);
-          case 13:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 15:
-            _context4.next = 17;
+          case 5:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 6:
+            _context4.n = 7;
             return evaluateUnary(expr, input, environment);
-          case 17:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 19:
+          case 7:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 8:
             result = evaluateName(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 21:
+            return _context4.a(3, 29);
+          case 9:
             result = evaluateLiteral(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 23:
+            return _context4.a(3, 29);
+          case 10:
             result = evaluateWildcard(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 25:
+            return _context4.a(3, 29);
+          case 11:
             result = evaluateDescendants(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 27:
+            return _context4.a(3, 29);
+          case 12:
             result = environment.lookup(expr.slot.label);
-            return _context4.abrupt("break", 61);
-          case 29:
-            _context4.next = 31;
+            return _context4.a(3, 29);
+          case 13:
+            _context4.n = 14;
             return evaluateCondition(expr, input, environment);
-          case 31:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 33:
-            _context4.next = 35;
+          case 14:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 15:
+            _context4.n = 16;
             return evaluateBlock(expr, input, environment);
-          case 35:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 37:
-            _context4.next = 39;
+          case 16:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 17:
+            _context4.n = 18;
             return evaluateBindExpression(expr, input, environment);
-          case 39:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 41:
+          case 18:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 19:
             result = evaluateRegex(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 43:
-            _context4.next = 45;
+            return _context4.a(3, 29);
+          case 20:
+            _context4.n = 21;
             return evaluateFunction(expr, input, environment);
-          case 45:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 47:
+          case 21:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 22:
             result = evaluateVariable(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 49:
+            return _context4.a(3, 29);
+          case 23:
             result = evaluateLambda(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 51:
-            _context4.next = 53;
+            return _context4.a(3, 29);
+          case 24:
+            _context4.n = 25;
             return evaluatePartialApplication(expr, input, environment);
-          case 53:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 55:
-            _context4.next = 57;
+          case 25:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 26:
+            _context4.n = 27;
             return evaluateApplyExpression(expr, input, environment);
-          case 57:
-            result = _context4.sent;
-            return _context4.abrupt("break", 61);
-          case 59:
+          case 27:
+            result = _context4.v;
+            return _context4.a(3, 29);
+          case 28:
             result = evaluateTransformExpression(expr, input, environment);
-            return _context4.abrupt("break", 61);
-          case 61:
+            return _context4.a(3, 29);
+          case 29:
             if (!Object.prototype.hasOwnProperty.call(expr, 'predicate')) {
-              _context4.next = 70;
+              _context4.n = 33;
               break;
             }
             ii = 0;
-          case 63:
+          case 30:
             if (!(ii < expr.predicate.length)) {
-              _context4.next = 70;
+              _context4.n = 33;
               break;
             }
-            _context4.next = 66;
+            _context4.n = 31;
             return evaluateFilter(expr.predicate[ii].expr, result, environment);
-          case 66:
-            result = _context4.sent;
-          case 67:
+          case 31:
+            result = _context4.v;
+          case 32:
             ii++;
-            _context4.next = 63;
+            _context4.n = 30;
             break;
-          case 70:
+          case 33:
             if (!(expr.type !== 'path' && Object.prototype.hasOwnProperty.call(expr, 'group'))) {
-              _context4.next = 74;
+              _context4.n = 35;
               break;
             }
-            _context4.next = 73;
+            _context4.n = 34;
             return evaluateGroupExpression(expr.group, result, environment);
-          case 73:
-            result = _context4.sent;
-          case 74:
+          case 34:
+            result = _context4.v;
+          case 35:
             exitCallback = environment.lookup(Symbol["for"]('jsonata.__evaluate_exit'));
             if (!exitCallback) {
-              _context4.next = 78;
+              _context4.n = 36;
               break;
             }
-            _context4.next = 78;
+            _context4.n = 36;
             return exitCallback(expr, input, environment, result);
-          case 78:
+          case 36:
             if (result && isSequence(result) && !result.tupleStream) {
               if (expr.keepArray) {
                 result.keepSingleton = true;
@@ -4957,10 +4917,7 @@ var jsonata = function () {
                 result = result.keepSingleton ? result : result[0];
               }
             }
-            return _context4.abrupt("return", result);
-          case 80:
-          case "end":
-            return _context4.stop();
+            return _context4.a(2, result);
         }
       }, _callee4);
     }));
@@ -4970,10 +4927,10 @@ var jsonata = function () {
     return _evaluatePath.apply(this, arguments);
   }
   function _evaluatePath() {
-    _evaluatePath = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(expr, input, environment) {
+    _evaluatePath = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(expr, input, environment) {
       var inputSequence, resultSequence, isTupleStream, tupleBindings, ii, step;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
             // expr is an array of steps
             // if the first step is a variable reference ($...), including root reference ($$),
@@ -4987,9 +4944,9 @@ var jsonata = function () {
             isTupleStream = false;
             tupleBindings = undefined; // evaluate each step in turn
             ii = 0;
-          case 4:
+          case 1:
             if (!(ii < expr.steps.length)) {
-              _context5.next = 28;
+              _context5.n = 10;
               break;
             }
             step = expr.steps[ii];
@@ -4999,46 +4956,46 @@ var jsonata = function () {
 
             // if the first step is an explicit array constructor, then just evaluate that (i.e. don't iterate over a context array)
             if (!(ii === 0 && step.consarray)) {
-              _context5.next = 13;
+              _context5.n = 3;
               break;
             }
-            _context5.next = 10;
+            _context5.n = 2;
             return _evaluate2(step, inputSequence, environment);
-          case 10:
-            resultSequence = _context5.sent;
-            _context5.next = 22;
+          case 2:
+            resultSequence = _context5.v;
+            _context5.n = 7;
             break;
-          case 13:
+          case 3:
             if (!isTupleStream) {
-              _context5.next = 19;
+              _context5.n = 5;
               break;
             }
-            _context5.next = 16;
+            _context5.n = 4;
             return evaluateTupleStep(step, inputSequence, tupleBindings, environment);
-          case 16:
-            tupleBindings = _context5.sent;
-            _context5.next = 22;
+          case 4:
+            tupleBindings = _context5.v;
+            _context5.n = 7;
             break;
-          case 19:
-            _context5.next = 21;
+          case 5:
+            _context5.n = 6;
             return evaluateStep(step, inputSequence, environment, ii === expr.steps.length - 1);
-          case 21:
-            resultSequence = _context5.sent;
-          case 22:
+          case 6:
+            resultSequence = _context5.v;
+          case 7:
             if (!(!isTupleStream && (typeof resultSequence === 'undefined' || resultSequence.length === 0))) {
-              _context5.next = 24;
+              _context5.n = 8;
               break;
             }
-            return _context5.abrupt("break", 28);
-          case 24:
+            return _context5.a(3, 10);
+          case 8:
             if (typeof step.focus === 'undefined') {
               inputSequence = resultSequence;
             }
-          case 25:
+          case 9:
             ii++;
-            _context5.next = 4;
+            _context5.n = 1;
             break;
-          case 28:
+          case 10:
             if (isTupleStream) {
               if (expr.tuple) {
                 // tuple stream is carrying ancestry information - keep this
@@ -5058,18 +5015,15 @@ var jsonata = function () {
               resultSequence.keepSingleton = true;
             }
             if (!expr.hasOwnProperty('group')) {
-              _context5.next = 34;
+              _context5.n = 12;
               break;
             }
-            _context5.next = 33;
+            _context5.n = 11;
             return evaluateGroupExpression(expr.group, isTupleStream ? tupleBindings : resultSequence, environment);
-          case 33:
-            resultSequence = _context5.sent;
-          case 34:
-            return _context5.abrupt("return", resultSequence);
-          case 35:
-          case "end":
-            return _context5.stop();
+          case 11:
+            resultSequence = _context5.v;
+          case 12:
+            return _context5.a(2, resultSequence);
         }
       }, _callee5);
     }));
@@ -5091,72 +5045,72 @@ var jsonata = function () {
    * @param {boolean} lastStep - flag the last step in a path
    * @returns {*} Evaluated input data
    */
-  function evaluateStep(_x7, _x8, _x9, _x10) {
+  function evaluateStep(_x7, _x8, _x9, _x0) {
     return _evaluateStep.apply(this, arguments);
   }
   function _evaluateStep() {
-    _evaluateStep = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(expr, input, environment, lastStep) {
+    _evaluateStep = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(expr, input, environment, lastStep) {
       var result, ii, res, ss, resultSequence;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator().w(function (_context6) {
+        while (1) switch (_context6.n) {
           case 0:
             if (!(expr.type === 'sort')) {
-              _context6.next = 9;
+              _context6.n = 4;
               break;
             }
-            _context6.next = 3;
+            _context6.n = 1;
             return evaluateSortExpression(expr, input, environment);
-          case 3:
-            result = _context6.sent;
+          case 1:
+            result = _context6.v;
             if (!expr.stages) {
-              _context6.next = 8;
+              _context6.n = 3;
               break;
             }
-            _context6.next = 7;
+            _context6.n = 2;
             return evaluateStages(expr.stages, result, environment);
-          case 7:
-            result = _context6.sent;
-          case 8:
-            return _context6.abrupt("return", result);
-          case 9:
+          case 2:
+            result = _context6.v;
+          case 3:
+            return _context6.a(2, result);
+          case 4:
             result = createSequence();
             ii = 0;
-          case 11:
+          case 5:
             if (!(ii < input.length)) {
-              _context6.next = 28;
+              _context6.n = 12;
               break;
             }
-            _context6.next = 14;
+            _context6.n = 6;
             return _evaluate2(expr, input[ii], environment);
-          case 14:
-            res = _context6.sent;
+          case 6:
+            res = _context6.v;
             if (!expr.stages) {
-              _context6.next = 24;
+              _context6.n = 10;
               break;
             }
             ss = 0;
-          case 17:
+          case 7:
             if (!(ss < expr.stages.length)) {
-              _context6.next = 24;
+              _context6.n = 10;
               break;
             }
-            _context6.next = 20;
+            _context6.n = 8;
             return evaluateFilter(expr.stages[ss].expr, res, environment);
-          case 20:
-            res = _context6.sent;
-          case 21:
+          case 8:
+            res = _context6.v;
+          case 9:
             ss++;
-            _context6.next = 17;
+            _context6.n = 7;
             break;
-          case 24:
+          case 10:
             if (typeof res !== 'undefined') {
               result.push(res);
             }
-          case 25:
+          case 11:
             ii++;
-            _context6.next = 11;
+            _context6.n = 5;
             break;
-          case 28:
+          case 12:
             resultSequence = createSequence();
             if (lastStep && result.length === 1 && Array.isArray(result[0]) && !isSequence(result[0])) {
               resultSequence = result[0];
@@ -5174,16 +5128,13 @@ var jsonata = function () {
                 }
               });
             }
-            return _context6.abrupt("return", resultSequence);
-          case 31:
-          case "end":
-            return _context6.stop();
+            return _context6.a(2, resultSequence);
         }
       }, _callee6);
     }));
     return _evaluateStep.apply(this, arguments);
   }
-  function evaluateStages(_x11, _x12, _x13) {
+  function evaluateStages(_x1, _x10, _x11) {
     return _evaluateStages.apply(this, arguments);
   }
   /**
@@ -5195,49 +5146,46 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateStages() {
-    _evaluateStages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(stages, input, environment) {
-      var result, ss, stage, ee, tuple;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+    _evaluateStages = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(stages, input, environment) {
+      var result, ss, stage, ee, tuple, _t3;
+      return _regenerator().w(function (_context7) {
+        while (1) switch (_context7.n) {
           case 0:
             result = input;
             ss = 0;
-          case 2:
+          case 1:
             if (!(ss < stages.length)) {
-              _context7.next = 16;
+              _context7.n = 6;
               break;
             }
             stage = stages[ss];
-            _context7.t0 = stage.type;
-            _context7.next = _context7.t0 === 'filter' ? 7 : _context7.t0 === 'index' ? 11 : 13;
+            _t3 = stage.type;
+            _context7.n = _t3 === 'filter' ? 2 : _t3 === 'index' ? 4 : 5;
             break;
-          case 7:
-            _context7.next = 9;
+          case 2:
+            _context7.n = 3;
             return evaluateFilter(stage.expr, result, environment);
-          case 9:
-            result = _context7.sent;
-            return _context7.abrupt("break", 13);
-          case 11:
+          case 3:
+            result = _context7.v;
+            return _context7.a(3, 5);
+          case 4:
             for (ee = 0; ee < result.length; ee++) {
               tuple = result[ee];
               tuple[stage.value] = ee;
             }
-            return _context7.abrupt("break", 13);
-          case 13:
+            return _context7.a(3, 5);
+          case 5:
             ss++;
-            _context7.next = 2;
+            _context7.n = 1;
             break;
-          case 16:
-            return _context7.abrupt("return", result);
-          case 17:
-          case "end":
-            return _context7.stop();
+          case 6:
+            return _context7.a(2, result);
         }
       }, _callee7);
     }));
     return _evaluateStages.apply(this, arguments);
   }
-  function evaluateTupleStep(_x14, _x15, _x16, _x17) {
+  function evaluateTupleStep(_x12, _x13, _x14, _x15) {
     return _evaluateTupleStep.apply(this, arguments);
   }
   /**
@@ -5248,30 +5196,30 @@ var jsonata = function () {
    * @returns {*} Result after applying predicates
    */
   function _evaluateTupleStep() {
-    _evaluateTupleStep = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(expr, input, tupleBindings, environment) {
+    _evaluateTupleStep = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(expr, input, tupleBindings, environment) {
       var result, sorted, ss, tuple, stepEnv, ee, res, bb;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regenerator().w(function (_context8) {
+        while (1) switch (_context8.n) {
           case 0:
             if (!(expr.type === 'sort')) {
-              _context8.next = 18;
+              _context8.n = 7;
               break;
             }
             if (!tupleBindings) {
-              _context8.next = 7;
+              _context8.n = 2;
               break;
             }
-            _context8.next = 4;
+            _context8.n = 1;
             return evaluateSortExpression(expr, tupleBindings, environment);
-          case 4:
-            result = _context8.sent;
-            _context8.next = 13;
+          case 1:
+            result = _context8.v;
+            _context8.n = 4;
             break;
-          case 7:
-            _context8.next = 9;
+          case 2:
+            _context8.n = 3;
             return evaluateSortExpression(expr, input, environment);
-          case 9:
-            sorted = _context8.sent;
+          case 3:
+            sorted = _context8.v;
             result = createSequence();
             result.tupleStream = true;
             for (ss = 0; ss < sorted.length; ss++) {
@@ -5281,18 +5229,18 @@ var jsonata = function () {
               tuple[expr.index] = ss;
               result.push(tuple);
             }
-          case 13:
+          case 4:
             if (!expr.stages) {
-              _context8.next = 17;
+              _context8.n = 6;
               break;
             }
-            _context8.next = 16;
+            _context8.n = 5;
             return evaluateStages(expr.stages, result, environment);
-          case 16:
-            result = _context8.sent;
-          case 17:
-            return _context8.abrupt("return", result);
-          case 18:
+          case 5:
+            result = _context8.v;
+          case 6:
+            return _context8.a(2, result);
+          case 7:
             result = createSequence();
             result.tupleStream = true;
             stepEnv = environment;
@@ -5304,16 +5252,16 @@ var jsonata = function () {
               });
             }
             ee = 0;
-          case 23:
+          case 8:
             if (!(ee < tupleBindings.length)) {
-              _context8.next = 32;
+              _context8.n = 11;
               break;
             }
             stepEnv = createFrameFromTuple(environment, tupleBindings[ee]);
-            _context8.next = 27;
+            _context8.n = 9;
             return _evaluate2(expr, tupleBindings[ee]['@'], stepEnv);
-          case 27:
-            res = _context8.sent;
+          case 9:
+            res = _context8.v;
             // res is the binding sequence for the output tuple stream
             if (typeof res !== 'undefined') {
               if (!Array.isArray(res)) {
@@ -5341,30 +5289,27 @@ var jsonata = function () {
                 result.push(tuple);
               }
             }
-          case 29:
+          case 10:
             ee++;
-            _context8.next = 23;
+            _context8.n = 8;
             break;
-          case 32:
+          case 11:
             if (!expr.stages) {
-              _context8.next = 36;
+              _context8.n = 13;
               break;
             }
-            _context8.next = 35;
+            _context8.n = 12;
             return evaluateStages(expr.stages, result, environment);
-          case 35:
-            result = _context8.sent;
-          case 36:
-            return _context8.abrupt("return", result);
-          case 37:
-          case "end":
-            return _context8.stop();
+          case 12:
+            result = _context8.v;
+          case 13:
+            return _context8.a(2, result);
         }
       }, _callee8);
     }));
     return _evaluateTupleStep.apply(this, arguments);
   }
-  function evaluateFilter(_x18, _x19, _x20) {
+  function evaluateFilter(_x16, _x17, _x18) {
     return _evaluateFilter.apply(this, arguments);
   }
   /**
@@ -5375,10 +5320,10 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateFilter() {
-    _evaluateFilter = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(predicate, input, environment) {
+    _evaluateFilter = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(predicate, input, environment) {
       var results, index, item, context, env, res;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regenerator().w(function (_context9) {
+        while (1) switch (_context9.n) {
           case 0:
             results = createSequence();
             if (input && input.tupleStream) {
@@ -5388,7 +5333,7 @@ var jsonata = function () {
               input = createSequence(input);
             }
             if (!(predicate.type === 'number')) {
-              _context9.next = 10;
+              _context9.n = 2;
               break;
             }
             index = Math.floor(predicate.value); // round it down
@@ -5396,7 +5341,10 @@ var jsonata = function () {
               // count in from end of array
               index = input.length + index;
             }
-            item = input[index];
+            _context9.n = 1;
+            return input[index];
+          case 1:
+            item = _context9.v;
             if (typeof item !== 'undefined') {
               if (Array.isArray(item)) {
                 results = item;
@@ -5404,13 +5352,13 @@ var jsonata = function () {
                 results.push(item);
               }
             }
-            _context9.next = 24;
+            _context9.n = 6;
             break;
-          case 10:
+          case 2:
             index = 0;
-          case 11:
+          case 3:
             if (!(index < input.length)) {
-              _context9.next = 24;
+              _context9.n = 6;
               break;
             }
             item = input[index];
@@ -5420,10 +5368,10 @@ var jsonata = function () {
               context = item['@'];
               env = createFrameFromTuple(environment, item);
             }
-            _context9.next = 18;
+            _context9.n = 4;
             return _evaluate2(predicate, context, env);
-          case 18:
-            res = _context9.sent;
+          case 4:
+            res = _context9.v;
             if (isNumeric(res)) {
               res = [res];
             }
@@ -5443,21 +5391,18 @@ var jsonata = function () {
               // truthy
               results.push(item);
             }
-          case 21:
+          case 5:
             index++;
-            _context9.next = 11;
+            _context9.n = 3;
             break;
-          case 24:
-            return _context9.abrupt("return", results);
-          case 25:
-          case "end":
-            return _context9.stop();
+          case 6:
+            return _context9.a(2, results);
         }
       }, _callee9);
     }));
     return _evaluateFilter.apply(this, arguments);
   }
-  function evaluateBinary(_x21, _x22, _x23) {
+  function evaluateBinary(_x19, _x20, _x21) {
     return _evaluateBinary.apply(this, arguments);
   }
   /**
@@ -5468,97 +5413,91 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateBinary() {
-    _evaluateBinary = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(expr, input, environment) {
-      var result, lhs, op, evalrhs, rhs;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+    _evaluateBinary = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(expr, input, environment) {
+      var result, lhs, op, evalrhs, rhs, _t4, _t5, _t6;
+      return _regenerator().w(function (_context1) {
+        while (1) switch (_context1.p = _context1.n) {
           case 0:
-            _context11.next = 2;
+            _context1.n = 1;
             return _evaluate2(expr.lhs, input, environment);
-          case 2:
-            lhs = _context11.sent;
+          case 1:
+            lhs = _context1.v;
             op = expr.value; //defer evaluation of RHS to allow short-circuiting
             evalrhs = /*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-                return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                  while (1) switch (_context10.prev = _context10.next) {
+              var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+                return _regenerator().w(function (_context0) {
+                  while (1) switch (_context0.n) {
                     case 0:
-                      _context10.next = 2;
+                      _context0.n = 1;
                       return _evaluate2(expr.rhs, input, environment);
-                    case 2:
-                      return _context10.abrupt("return", _context10.sent);
-                    case 3:
-                    case "end":
-                      return _context10.stop();
+                    case 1:
+                      return _context0.a(2, _context0.v);
                   }
-                }, _callee10);
+                }, _callee0);
               }));
               return function evalrhs() {
                 return _ref3.apply(this, arguments);
               };
             }();
             if (!(op === "and" || op === "or")) {
-              _context11.next = 17;
+              _context1.n = 5;
               break;
             }
-            _context11.prev = 6;
-            _context11.next = 9;
+            _context1.p = 2;
+            _context1.n = 3;
             return evaluateBooleanExpression(lhs, evalrhs, op);
-          case 9:
-            return _context11.abrupt("return", _context11.sent);
-          case 12:
-            _context11.prev = 12;
-            _context11.t0 = _context11["catch"](6);
-            _context11.t0.position = expr.position;
-            _context11.t0.token = op;
-            throw _context11.t0;
-          case 17:
-            _context11.next = 19;
+          case 3:
+            return _context1.a(2, _context1.v);
+          case 4:
+            _context1.p = 4;
+            _t4 = _context1.v;
+            _t4.position = expr.position;
+            _t4.token = op;
+            throw _t4;
+          case 5:
+            _context1.n = 6;
             return evalrhs();
-          case 19:
-            rhs = _context11.sent;
-            _context11.prev = 20;
-            _context11.t1 = op;
-            _context11.next = _context11.t1 === '+' ? 24 : _context11.t1 === '-' ? 24 : _context11.t1 === '*' ? 24 : _context11.t1 === '/' ? 24 : _context11.t1 === '%' ? 24 : _context11.t1 === '=' ? 26 : _context11.t1 === '!=' ? 26 : _context11.t1 === '<' ? 28 : _context11.t1 === '<=' ? 28 : _context11.t1 === '>' ? 28 : _context11.t1 === '>=' ? 28 : _context11.t1 === '&' ? 30 : _context11.t1 === '..' ? 32 : _context11.t1 === 'in' ? 34 : 36;
+          case 6:
+            rhs = _context1.v;
+            _context1.p = 7;
+            _t5 = op;
+            _context1.n = _t5 === '+' ? 8 : _t5 === '-' ? 8 : _t5 === '*' ? 8 : _t5 === '/' ? 8 : _t5 === '%' ? 8 : _t5 === '=' ? 9 : _t5 === '!=' ? 9 : _t5 === '<' ? 10 : _t5 === '<=' ? 10 : _t5 === '>' ? 10 : _t5 === '>=' ? 10 : _t5 === '&' ? 11 : _t5 === '..' ? 12 : _t5 === 'in' ? 13 : 14;
             break;
-          case 24:
+          case 8:
             result = evaluateNumericExpression(lhs, rhs, op);
-            return _context11.abrupt("break", 36);
-          case 26:
+            return _context1.a(3, 14);
+          case 9:
             result = evaluateEqualityExpression(lhs, rhs, op);
-            return _context11.abrupt("break", 36);
-          case 28:
+            return _context1.a(3, 14);
+          case 10:
             result = evaluateComparisonExpression(lhs, rhs, op);
-            return _context11.abrupt("break", 36);
-          case 30:
+            return _context1.a(3, 14);
+          case 11:
             result = evaluateStringConcat(lhs, rhs);
-            return _context11.abrupt("break", 36);
-          case 32:
+            return _context1.a(3, 14);
+          case 12:
             result = evaluateRangeExpression(lhs, rhs);
-            return _context11.abrupt("break", 36);
-          case 34:
+            return _context1.a(3, 14);
+          case 13:
             result = evaluateIncludesExpression(lhs, rhs);
-            return _context11.abrupt("break", 36);
-          case 36:
-            _context11.next = 43;
+            return _context1.a(3, 14);
+          case 14:
+            _context1.n = 16;
             break;
-          case 38:
-            _context11.prev = 38;
-            _context11.t2 = _context11["catch"](20);
-            _context11.t2.position = expr.position;
-            _context11.t2.token = op;
-            throw _context11.t2;
-          case 43:
-            return _context11.abrupt("return", result);
-          case 44:
-          case "end":
-            return _context11.stop();
-        }
-      }, _callee11, null, [[6, 12], [20, 38]]);
+          case 15:
+            _context1.p = 15;
+            _t6 = _context1.v;
+            _t6.position = expr.position;
+            _t6.token = op;
+            throw _t6;
+          case 16:
+            return _context1.a(2, result);
+        }
+      }, _callee1, null, [[7, 15], [2, 4]]);
     }));
     return _evaluateBinary.apply(this, arguments);
   }
-  function evaluateUnary(_x24, _x25, _x26) {
+  function evaluateUnary(_x22, _x23, _x24) {
     return _evaluateUnary.apply(this, arguments);
   }
   /**
@@ -5569,35 +5508,35 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateUnary() {
-    _evaluateUnary = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(expr, input, environment) {
-      var result, generators, _iterator, _step, generator, _generator, item, value;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+    _evaluateUnary = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(expr, input, environment) {
+      var result, generators, _iterator, _step, generator, _generator, item, value, _t9;
+      return _regenerator().w(function (_context11) {
+        while (1) switch (_context11.n) {
           case 0:
-            _context13.t0 = expr.value;
-            _context13.next = _context13.t0 === '-' ? 3 : _context13.t0 === '[' ? 16 : _context13.t0 === '{' ? 24 : 28;
+            _t9 = expr.value;
+            _context11.n = _t9 === '-' ? 1 : _t9 === '[' ? 6 : _t9 === '{' ? 8 : 10;
             break;
-          case 3:
-            _context13.next = 5;
+          case 1:
+            _context11.n = 2;
             return _evaluate2(expr.expression, input, environment);
-          case 5:
-            result = _context13.sent;
+          case 2:
+            result = _context11.v;
             if (!(typeof result === 'undefined')) {
-              _context13.next = 10;
+              _context11.n = 3;
               break;
             }
             result = undefined;
-            _context13.next = 15;
+            _context11.n = 5;
             break;
-          case 10:
+          case 3:
             if (!isNumeric(result)) {
-              _context13.next = 14;
+              _context11.n = 4;
               break;
             }
             result = -result;
-            _context13.next = 15;
+            _context11.n = 5;
             break;
-          case 14:
+          case 4:
             throw {
               code: "D1002",
               stack: new Error().stack,
@@ -5605,36 +5544,34 @@ var jsonata = function () {
               token: expr.value,
               value: result
             };
-          case 15:
-            return _context13.abrupt("break", 28);
-          case 16:
+          case 5:
+            return _context11.a(3, 10);
+          case 6:
             // array constructor - evaluate each item
             result = [];
-            _context13.next = 19;
+            _context11.n = 7;
             return Promise.all(expr.expressions.map(/*#__PURE__*/function () {
-              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(item, idx) {
-                return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-                  while (1) switch (_context12.prev = _context12.next) {
+              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(item, idx) {
+                var _t7, _t8;
+                return _regenerator().w(function (_context10) {
+                  while (1) switch (_context10.n) {
                     case 0:
                       environment.isParallelCall = idx > 0;
-                      _context12.t0 = item;
-                      _context12.next = 4;
+                      _t7 = item;
+                      _context10.n = 1;
                       return _evaluate2(item, input, environment);
-                    case 4:
-                      _context12.t1 = _context12.sent;
-                      return _context12.abrupt("return", [_context12.t0, _context12.t1]);
-                    case 6:
-                    case "end":
-                      return _context12.stop();
+                    case 1:
+                      _t8 = _context10.v;
+                      return _context10.a(2, [_t7, _t8]);
                   }
-                }, _callee12);
+                }, _callee10);
               }));
-              return function (_x75, _x76) {
+              return function (_x73, _x74) {
                 return _ref4.apply(this, arguments);
               };
             }()));
-          case 19:
-            generators = _context13.sent;
+          case 7:
+            generators = _context11.v;
             _iterator = _createForOfIteratorHelper(generators);
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -5660,20 +5597,17 @@ var jsonata = function () {
                 value: true
               });
             }
-            return _context13.abrupt("break", 28);
-          case 24:
-            _context13.next = 26;
+            return _context11.a(3, 10);
+          case 8:
+            _context11.n = 9;
             return evaluateGroupExpression(expr, input, environment);
-          case 26:
-            result = _context13.sent;
-            return _context13.abrupt("break", 28);
-          case 28:
-            return _context13.abrupt("return", result);
-          case 29:
-          case "end":
-            return _context13.stop();
+          case 9:
+            result = _context11.v;
+            return _context11.a(3, 10);
+          case 10:
+            return _context11.a(2, result);
         }
-      }, _callee13);
+      }, _callee11);
     }));
     return _evaluateUnary.apply(this, arguments);
   }
@@ -5943,56 +5877,53 @@ var jsonata = function () {
    * @param {Object} op - opcode
    * @returns {*} Result
    */
-  function evaluateBooleanExpression(_x27, _x28, _x29) {
+  function evaluateBooleanExpression(_x25, _x26, _x27) {
     return _evaluateBooleanExpression.apply(this, arguments);
   }
   function _evaluateBooleanExpression() {
-    _evaluateBooleanExpression = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(lhs, evalrhs, op) {
-      var result, lBool;
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+    _evaluateBooleanExpression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(lhs, evalrhs, op) {
+      var result, lBool, _t0, _t1, _t10, _t11, _t12, _t13, _t14;
+      return _regenerator().w(function (_context12) {
+        while (1) switch (_context12.n) {
           case 0:
             lBool = boolize(lhs);
-            _context14.t0 = op;
-            _context14.next = _context14.t0 === 'and' ? 4 : _context14.t0 === 'or' ? 13 : 22;
+            _t0 = op;
+            _context12.n = _t0 === 'and' ? 1 : _t0 === 'or' ? 4 : 7;
             break;
-          case 4:
-            _context14.t1 = lBool;
-            if (!_context14.t1) {
-              _context14.next = 11;
+          case 1:
+            _t1 = lBool;
+            if (!_t1) {
+              _context12.n = 3;
               break;
             }
-            _context14.t2 = boolize;
-            _context14.next = 9;
+            _t10 = boolize;
+            _context12.n = 2;
             return evalrhs();
-          case 9:
-            _context14.t3 = _context14.sent;
-            _context14.t1 = (0, _context14.t2)(_context14.t3);
-          case 11:
-            result = _context14.t1;
-            return _context14.abrupt("break", 22);
-          case 13:
-            _context14.t4 = lBool;
-            if (_context14.t4) {
-              _context14.next = 20;
+          case 2:
+            _t11 = _context12.v;
+            _t1 = _t10(_t11);
+          case 3:
+            result = _t1;
+            return _context12.a(3, 7);
+          case 4:
+            _t12 = lBool;
+            if (_t12) {
+              _context12.n = 6;
               break;
             }
-            _context14.t5 = boolize;
-            _context14.next = 18;
+            _t13 = boolize;
+            _context12.n = 5;
             return evalrhs();
-          case 18:
-            _context14.t6 = _context14.sent;
-            _context14.t4 = (0, _context14.t5)(_context14.t6);
-          case 20:
-            result = _context14.t4;
-            return _context14.abrupt("break", 22);
-          case 22:
-            return _context14.abrupt("return", result);
-          case 23:
-          case "end":
-            return _context14.stop();
+          case 5:
+            _t14 = _context12.v;
+            _t12 = _t13(_t14);
+          case 6:
+            result = _t12;
+            return _context12.a(3, 7);
+          case 7:
+            return _context12.a(2, result);
         }
-      }, _callee14);
+      }, _callee12);
     }));
     return _evaluateBooleanExpression.apply(this, arguments);
   }
@@ -6028,14 +5959,14 @@ var jsonata = function () {
    * @param {Object} environment - Environment
    * @returns {{}} Evaluated input data
    */
-  function evaluateGroupExpression(_x30, _x31, _x32) {
+  function evaluateGroupExpression(_x28, _x29, _x30) {
     return _evaluateGroupExpression.apply(this, arguments);
   }
   function _evaluateGroupExpression() {
-    _evaluateGroupExpression = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(expr, input, environment) {
-      var result, groups, reduce, itemIndex, item, env, pairIndex, pair, key, entry, generators, _iterator2, _step2, generator, _yield$generator, _yield$generator2, value;
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+    _evaluateGroupExpression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(expr, input, environment) {
+      var result, groups, reduce, itemIndex, item, env, pairIndex, pair, key, entry, generators, _iterator2, _step2, generator, _yield$generator, _yield$generator2, value, _t17;
+      return _regenerator().w(function (_context14) {
+        while (1) switch (_context14.p = _context14.n) {
           case 0:
             result = {};
             groups = {};
@@ -6048,26 +5979,26 @@ var jsonata = function () {
               input.push(undefined);
             }
             itemIndex = 0;
-          case 6:
+          case 1:
             if (!(itemIndex < input.length)) {
-              _context16.next = 32;
+              _context14.n = 9;
               break;
             }
             item = input[itemIndex];
             env = reduce ? createFrameFromTuple(environment, item) : environment;
             pairIndex = 0;
-          case 10:
+          case 2:
             if (!(pairIndex < expr.lhs.length)) {
-              _context16.next = 29;
+              _context14.n = 8;
               break;
             }
             pair = expr.lhs[pairIndex];
-            _context16.next = 14;
+            _context14.n = 3;
             return _evaluate2(pair[0], reduce ? item['@'] : item, env);
-          case 14:
-            key = _context16.sent;
+          case 3:
+            key = _context14.v;
             if (!(typeof key !== 'string' && key !== undefined)) {
-              _context16.next = 17;
+              _context14.n = 4;
               break;
             }
             throw {
@@ -6076,9 +6007,9 @@ var jsonata = function () {
               position: expr.position,
               value: key
             };
-          case 17:
+          case 4:
             if (!(key !== undefined)) {
-              _context16.next = 26;
+              _context14.n = 7;
               break;
             }
             entry = {
@@ -6086,11 +6017,11 @@ var jsonata = function () {
               exprIndex: pairIndex
             };
             if (!groups.hasOwnProperty(key)) {
-              _context16.next = 25;
+              _context14.n = 6;
               break;
             }
             if (!(groups[key].exprIndex !== pairIndex)) {
-              _context16.next = 22;
+              _context14.n = 5;
               break;
             }
             throw {
@@ -6099,28 +6030,28 @@ var jsonata = function () {
               position: expr.position,
               value: key
             };
-          case 22:
+          case 5:
             // append it as an array
             groups[key].data = fn.append(groups[key].data, item);
-            _context16.next = 26;
+            _context14.n = 7;
             break;
-          case 25:
+          case 6:
             groups[key] = entry;
-          case 26:
+          case 7:
             pairIndex++;
-            _context16.next = 10;
+            _context14.n = 2;
             break;
-          case 29:
+          case 8:
             itemIndex++;
-            _context16.next = 6;
+            _context14.n = 1;
             break;
-          case 32:
-            _context16.next = 34;
+          case 9:
+            _context14.n = 10;
             return Promise.all(Object.keys(groups).map(/*#__PURE__*/function () {
-              var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(key, idx) {
-                var entry, context, env, tuple;
-                return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-                  while (1) switch (_context15.prev = _context15.next) {
+              var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(key, idx) {
+                var entry, context, env, tuple, _t15, _t16;
+                return _regenerator().w(function (_context13) {
+                  while (1) switch (_context13.n) {
                     case 0:
                       entry = groups[key];
                       context = entry.data;
@@ -6132,64 +6063,58 @@ var jsonata = function () {
                         env = createFrameFromTuple(environment, tuple);
                       }
                       environment.isParallelCall = idx > 0;
-                      _context15.t0 = key;
-                      _context15.next = 8;
+                      _t15 = key;
+                      _context13.n = 1;
                       return _evaluate2(expr.lhs[entry.exprIndex][1], context, env);
-                    case 8:
-                      _context15.t1 = _context15.sent;
-                      return _context15.abrupt("return", [_context15.t0, _context15.t1]);
-                    case 10:
-                    case "end":
-                      return _context15.stop();
+                    case 1:
+                      _t16 = _context13.v;
+                      return _context13.a(2, [_t15, _t16]);
                   }
-                }, _callee15);
+                }, _callee13);
               }));
-              return function (_x77, _x78) {
+              return function (_x75, _x76) {
                 return _ref5.apply(this, arguments);
               };
             }()));
-          case 34:
-            generators = _context16.sent;
+          case 10:
+            generators = _context14.v;
             _iterator2 = _createForOfIteratorHelper(generators);
-            _context16.prev = 36;
+            _context14.p = 11;
             _iterator2.s();
-          case 38:
+          case 12:
             if ((_step2 = _iterator2.n()).done) {
-              _context16.next = 49;
+              _context14.n = 15;
               break;
             }
             generator = _step2.value;
-            _context16.next = 42;
+            _context14.n = 13;
             return generator;
-          case 42:
-            _yield$generator = _context16.sent;
+          case 13:
+            _yield$generator = _context14.v;
             _yield$generator2 = _slicedToArray(_yield$generator, 2);
             key = _yield$generator2[0];
             value = _yield$generator2[1];
             if (typeof value !== 'undefined') {
               result[key] = value;
             }
-          case 47:
-            _context16.next = 38;
+          case 14:
+            _context14.n = 12;
             break;
-          case 49:
-            _context16.next = 54;
+          case 15:
+            _context14.n = 17;
             break;
-          case 51:
-            _context16.prev = 51;
-            _context16.t0 = _context16["catch"](36);
-            _iterator2.e(_context16.t0);
-          case 54:
-            _context16.prev = 54;
+          case 16:
+            _context14.p = 16;
+            _t17 = _context14.v;
+            _iterator2.e(_t17);
+          case 17:
+            _context14.p = 17;
             _iterator2.f();
-            return _context16.finish(54);
-          case 57:
-            return _context16.abrupt("return", result);
-          case 58:
-          case "end":
-            return _context16.stop();
-        }
-      }, _callee16, null, [[36, 51, 54, 57]]);
+            return _context14.f(17);
+          case 18:
+            return _context14.a(2, result);
+        }
+      }, _callee14, null, [[11, 16, 17, 18]]);
     }));
     return _evaluateGroupExpression.apply(this, arguments);
   }
@@ -6264,7 +6189,7 @@ var jsonata = function () {
    * @param {Object} environment - Environment
    * @returns {*} Evaluated input data
    */
-  function evaluateBindExpression(_x33, _x34, _x35) {
+  function evaluateBindExpression(_x31, _x32, _x33) {
     return _evaluateBindExpression.apply(this, arguments);
   }
   /**
@@ -6275,26 +6200,23 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateBindExpression() {
-    _evaluateBindExpression = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(expr, input, environment) {
+    _evaluateBindExpression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(expr, input, environment) {
       var value;
-      return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+      return _regenerator().w(function (_context15) {
+        while (1) switch (_context15.n) {
           case 0:
-            _context17.next = 2;
+            _context15.n = 1;
             return _evaluate2(expr.rhs, input, environment);
-          case 2:
-            value = _context17.sent;
+          case 1:
+            value = _context15.v;
             environment.bind(expr.lhs.value, value);
-            return _context17.abrupt("return", value);
-          case 5:
-          case "end":
-            return _context17.stop();
+            return _context15.a(2, value);
         }
-      }, _callee17);
+      }, _callee15);
     }));
     return _evaluateBindExpression.apply(this, arguments);
   }
-  function evaluateCondition(_x36, _x37, _x38) {
+  function evaluateCondition(_x34, _x35, _x36) {
     return _evaluateCondition.apply(this, arguments);
   }
   /**
@@ -6305,45 +6227,42 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateCondition() {
-    _evaluateCondition = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(expr, input, environment) {
+    _evaluateCondition = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(expr, input, environment) {
       var result, condition;
-      return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+      return _regenerator().w(function (_context16) {
+        while (1) switch (_context16.n) {
           case 0:
-            _context18.next = 2;
+            _context16.n = 1;
             return _evaluate2(expr.condition, input, environment);
-          case 2:
-            condition = _context18.sent;
+          case 1:
+            condition = _context16.v;
             if (!fn["boolean"](condition)) {
-              _context18.next = 9;
+              _context16.n = 3;
               break;
             }
-            _context18.next = 6;
+            _context16.n = 2;
             return _evaluate2(expr.then, input, environment);
-          case 6:
-            result = _context18.sent;
-            _context18.next = 13;
+          case 2:
+            result = _context16.v;
+            _context16.n = 5;
             break;
-          case 9:
+          case 3:
             if (!(typeof expr["else"] !== 'undefined')) {
-              _context18.next = 13;
+              _context16.n = 5;
               break;
             }
-            _context18.next = 12;
+            _context16.n = 4;
             return _evaluate2(expr["else"], input, environment);
-          case 12:
-            result = _context18.sent;
-          case 13:
-            return _context18.abrupt("return", result);
-          case 14:
-          case "end":
-            return _context18.stop();
+          case 4:
+            result = _context16.v;
+          case 5:
+            return _context16.a(2, result);
         }
-      }, _callee18);
+      }, _callee16);
     }));
     return _evaluateCondition.apply(this, arguments);
   }
-  function evaluateBlock(_x39, _x40, _x41) {
+  function evaluateBlock(_x37, _x38, _x39) {
     return _evaluateBlock.apply(this, arguments);
   }
   /**
@@ -6352,36 +6271,33 @@ var jsonata = function () {
    * @returns {Function} Higher order function representing prepared regex
    */
   function _evaluateBlock() {
-    _evaluateBlock = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(expr, input, environment) {
+    _evaluateBlock = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(expr, input, environment) {
       var result, frame, ii;
-      return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return _regenerator().w(function (_context17) {
+        while (1) switch (_context17.n) {
           case 0:
             // create a new frame to limit the scope of variable assignments
             // TODO, only do this if the post-parse stage has flagged this as required
             frame = createFrame(environment); // invoke each expression in turn
             // only return the result of the last one
             ii = 0;
-          case 2:
+          case 1:
             if (!(ii < expr.expressions.length)) {
-              _context19.next = 9;
+              _context17.n = 4;
               break;
             }
-            _context19.next = 5;
+            _context17.n = 2;
             return _evaluate2(expr.expressions[ii], input, frame);
-          case 5:
-            result = _context19.sent;
-          case 6:
+          case 2:
+            result = _context17.v;
+          case 3:
             ii++;
-            _context19.next = 2;
+            _context17.n = 1;
             break;
-          case 9:
-            return _context19.abrupt("return", result);
-          case 10:
-          case "end":
-            return _context19.stop();
+          case 4:
+            return _context17.a(2, result);
         }
-      }, _callee19);
+      }, _callee17);
     }));
     return _evaluateBlock.apply(this, arguments);
   }
@@ -6452,7 +6368,7 @@ var jsonata = function () {
    * @param {Object} environment - Environment
    * @returns {*} Ordered sequence
    */
-  function evaluateSortExpression(_x42, _x43, _x44) {
+  function evaluateSortExpression(_x40, _x41, _x42) {
     return _evaluateSortExpression.apply(this, arguments);
   }
   /**
@@ -6463,27 +6379,27 @@ var jsonata = function () {
    * @returns {*} tranformer function
    */
   function _evaluateSortExpression() {
-    _evaluateSortExpression = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21(expr, input, environment) {
+    _evaluateSortExpression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(expr, input, environment) {
       var result, lhs, isTupleSort, comparator, focus;
-      return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+      return _regenerator().w(function (_context19) {
+        while (1) switch (_context19.n) {
           case 0:
             // evaluate the lhs, then sort the results in order according to rhs expression
             lhs = input;
             isTupleSort = input.tupleStream ? true : false; // sort the lhs array
             // use comparator function
             comparator = /*#__PURE__*/function () {
-              var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(a, b) {
+              var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(a, b) {
                 var comp, index, term, context, env, aa, bb, atype, btype;
-                return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-                  while (1) switch (_context20.prev = _context20.next) {
+                return _regenerator().w(function (_context18) {
+                  while (1) switch (_context18.n) {
                     case 0:
                       // expr.terms is an array of order-by in priority order
                       comp = 0;
                       index = 0;
-                    case 2:
+                    case 1:
                       if (!(comp === 0 && index < expr.terms.length)) {
-                        _context20.next = 37;
+                        _context18.n = 11;
                         break;
                       }
                       term = expr.terms[index]; //evaluate the sort term in the context of a
@@ -6493,10 +6409,10 @@ var jsonata = function () {
                         context = a['@'];
                         env = createFrameFromTuple(environment, a);
                       }
-                      _context20.next = 9;
+                      _context18.n = 2;
                       return _evaluate2(term.expression, context, env);
-                    case 9:
-                      aa = _context20.sent;
+                    case 2:
+                      aa = _context18.v;
                       //evaluate the sort term in the context of b
                       context = b;
                       env = environment;
@@ -6504,30 +6420,30 @@ var jsonata = function () {
                         context = b['@'];
                         env = createFrameFromTuple(environment, b);
                       }
-                      _context20.next = 15;
+                      _context18.n = 3;
                       return _evaluate2(term.expression, context, env);
-                    case 15:
-                      bb = _context20.sent;
+                    case 3:
+                      bb = _context18.v;
                       // type checks
                       atype = _typeof(aa);
                       btype = _typeof(bb); // undefined should be last in sort order
                       if (!(atype === 'undefined')) {
-                        _context20.next = 21;
+                        _context18.n = 4;
                         break;
                       }
                       // swap them, unless btype is also undefined
                       comp = btype === 'undefined' ? 0 : 1;
-                      return _context20.abrupt("continue", 34);
-                    case 21:
+                      return _context18.a(3, 10);
+                    case 4:
                       if (!(btype === 'undefined')) {
-                        _context20.next = 24;
+                        _context18.n = 5;
                         break;
                       }
                       comp = -1;
-                      return _context20.abrupt("continue", 34);
-                    case 24:
+                      return _context18.a(3, 10);
+                    case 5:
                       if (!(!(atype === 'string' || atype === 'number') || !(btype === 'string' || btype === 'number'))) {
-                        _context20.next = 26;
+                        _context18.n = 6;
                         break;
                       }
                       throw {
@@ -6536,9 +6452,9 @@ var jsonata = function () {
                         position: expr.position,
                         value: !(atype === 'string' || atype === 'number') ? aa : bb
                       };
-                    case 26:
+                    case 6:
                       if (!(atype !== btype)) {
-                        _context20.next = 28;
+                        _context18.n = 7;
                         break;
                       }
                       throw {
@@ -6548,35 +6464,32 @@ var jsonata = function () {
                         value: aa,
                         value2: bb
                       };
-                    case 28:
+                    case 7:
                       if (!(aa === bb)) {
-                        _context20.next = 32;
+                        _context18.n = 8;
                         break;
                       }
-                      return _context20.abrupt("continue", 34);
-                    case 32:
+                      return _context18.a(3, 10);
+                    case 8:
                       if (aa < bb) {
                         comp = -1;
                       } else {
                         comp = 1;
                       }
-                    case 33:
+                    case 9:
                       if (term.descending === true) {
                         comp = -comp;
                       }
-                    case 34:
+                    case 10:
                       index++;
-                      _context20.next = 2;
+                      _context18.n = 1;
                       break;
-                    case 37:
-                      return _context20.abrupt("return", comp === 1);
-                    case 38:
-                    case "end":
-                      return _context20.stop();
+                    case 11:
+                      return _context18.a(2, comp === 1);
                   }
-                }, _callee20);
+                }, _callee18);
               }));
-              return function comparator(_x79, _x80) {
+              return function comparator(_x77, _x78) {
                 return _ref6.apply(this, arguments);
               };
             }();
@@ -6584,37 +6497,34 @@ var jsonata = function () {
               environment: environment,
               input: input
             }; // the `focus` is passed in as the `this` for the invoked function
-            _context21.next = 6;
+            _context19.n = 1;
             return fn.sort.apply(focus, [lhs, comparator]);
-          case 6:
-            result = _context21.sent;
-            return _context21.abrupt("return", result);
-          case 8:
-          case "end":
-            return _context21.stop();
+          case 1:
+            result = _context19.v;
+            return _context19.a(2, result);
         }
-      }, _callee21);
+      }, _callee19);
     }));
     return _evaluateSortExpression.apply(this, arguments);
   }
   function evaluateTransformExpression(expr, input, environment) {
     // create a function to implement the transform definition
     var transformer = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(obj) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(obj) {
         var cloneFunction, result, matches, ii, match, update, updateType, prop, deletions, val, jj;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               if (!(typeof obj === 'undefined')) {
-                _context.next = 2;
+                _context.n = 1;
                 break;
               }
-              return _context.abrupt("return", undefined);
-            case 2:
+              return _context.a(2, undefined);
+            case 1:
               // this function returns a copy of obj with changes specified by the pattern/operation
               cloneFunction = environment.lookup('clone');
               if (isFunction(cloneFunction)) {
-                _context.next = 5;
+                _context.n = 2;
                 break;
               }
               throw {
@@ -6622,31 +6532,31 @@ var jsonata = function () {
                 stack: new Error().stack,
                 position: expr.position
               };
-            case 5:
-              _context.next = 7;
+            case 2:
+              _context.n = 3;
               return apply(cloneFunction, [obj], null, environment);
-            case 7:
-              result = _context.sent;
-              _context.next = 10;
+            case 3:
+              result = _context.v;
+              _context.n = 4;
               return _evaluate2(expr.pattern, result, environment);
-            case 10:
-              matches = _context.sent;
+            case 4:
+              matches = _context.v;
               if (!(typeof matches !== 'undefined')) {
-                _context.next = 39;
+                _context.n = 13;
                 break;
               }
               if (!Array.isArray(matches)) {
                 matches = [matches];
               }
               ii = 0;
-            case 14:
+            case 5:
               if (!(ii < matches.length)) {
-                _context.next = 39;
+                _context.n = 13;
                 break;
               }
               match = matches[ii];
               if (!(match && (match.isPrototypeOf(result) || match instanceof Object.constructor))) {
-                _context.next = 18;
+                _context.n = 6;
                 break;
               }
               throw {
@@ -6654,19 +6564,19 @@ var jsonata = function () {
                 stack: new Error().stack,
                 position: expr.position
               };
-            case 18:
-              _context.next = 20;
+            case 6:
+              _context.n = 7;
               return _evaluate2(expr.update, match, environment);
-            case 20:
-              update = _context.sent;
+            case 7:
+              update = _context.v;
               // update must be an object
               updateType = _typeof(update);
               if (!(updateType !== 'undefined')) {
-                _context.next = 26;
+                _context.n = 9;
                 break;
               }
               if (!(updateType !== 'object' || update === null || Array.isArray(update))) {
-                _context.next = 25;
+                _context.n = 8;
                 break;
               }
               throw {
@@ -6675,22 +6585,22 @@ var jsonata = function () {
                 position: expr.update.position,
                 value: update
               };
-            case 25:
+            case 8:
               // merge the update
               for (prop in update) {
                 match[prop] = update[prop];
               }
-            case 26:
+            case 9:
               if (!(typeof expr["delete"] !== 'undefined')) {
-                _context.next = 36;
+                _context.n = 12;
                 break;
               }
-              _context.next = 29;
+              _context.n = 10;
               return _evaluate2(expr["delete"], match, environment);
-            case 29:
-              deletions = _context.sent;
+            case 10:
+              deletions = _context.v;
               if (!(typeof deletions !== 'undefined')) {
-                _context.next = 36;
+                _context.n = 12;
                 break;
               }
               val = deletions;
@@ -6698,7 +6608,7 @@ var jsonata = function () {
                 deletions = [deletions];
               }
               if (isArrayOfStrings(deletions)) {
-                _context.next = 35;
+                _context.n = 11;
                 break;
               }
               throw {
@@ -6707,25 +6617,22 @@ var jsonata = function () {
                 position: expr["delete"].position,
                 value: val
               };
-            case 35:
+            case 11:
               for (jj = 0; jj < deletions.length; jj++) {
                 if (_typeof(match) === 'object' && match !== null) {
                   delete match[deletions[jj]];
                 }
               }
-            case 36:
+            case 12:
               ii++;
-              _context.next = 14;
+              _context.n = 5;
               break;
-            case 39:
-              return _context.abrupt("return", result);
-            case 40:
-            case "end":
-              return _context.stop();
+            case 13:
+              return _context.a(2, result);
           }
         }, _callee);
       }));
-      return function transformer(_x45) {
+      return function transformer(_x43) {
         return _ref.apply(this, arguments);
       };
     }();
@@ -6740,7 +6647,7 @@ var jsonata = function () {
    * @param {Object} environment - Environment
    * @returns {*} Evaluated input data
    */
-  function evaluateApplyExpression(_x46, _x47, _x48) {
+  function evaluateApplyExpression(_x44, _x45, _x46) {
     return _evaluateApplyExpression.apply(this, arguments);
   }
   /**
@@ -6751,34 +6658,34 @@ var jsonata = function () {
    * @returns {*} Evaluated input data
    */
   function _evaluateApplyExpression() {
-    _evaluateApplyExpression = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(expr, input, environment) {
+    _evaluateApplyExpression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(expr, input, environment) {
       var result, lhs, func, chain;
-      return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-        while (1) switch (_context22.prev = _context22.next) {
+      return _regenerator().w(function (_context20) {
+        while (1) switch (_context20.n) {
           case 0:
-            _context22.next = 2;
+            _context20.n = 1;
             return _evaluate2(expr.lhs, input, environment);
-          case 2:
-            lhs = _context22.sent;
+          case 1:
+            lhs = _context20.v;
             if (!(expr.rhs.type === 'function')) {
-              _context22.next = 9;
+              _context20.n = 3;
               break;
             }
-            _context22.next = 6;
+            _context20.n = 2;
             return evaluateFunction(expr.rhs, input, environment, {
               context: lhs
             });
-          case 6:
-            result = _context22.sent;
-            _context22.next = 26;
+          case 2:
+            result = _context20.v;
+            _context20.n = 10;
             break;
-          case 9:
-            _context22.next = 11;
+          case 3:
+            _context20.n = 4;
             return _evaluate2(expr.rhs, input, environment);
-          case 11:
-            func = _context22.sent;
+          case 4:
+            func = _context20.v;
             if (isFunction(func)) {
-              _context22.next = 14;
+              _context20.n = 5;
               break;
             }
             throw {
@@ -6787,37 +6694,34 @@ var jsonata = function () {
               position: expr.position,
               value: func
             };
-          case 14:
+          case 5:
             if (!isFunction(lhs)) {
-              _context22.next = 23;
+              _context20.n = 8;
               break;
             }
-            _context22.next = 17;
+            _context20.n = 6;
             return _evaluate2(chainAST, null, environment);
-          case 17:
-            chain = _context22.sent;
-            _context22.next = 20;
+          case 6:
+            chain = _context20.v;
+            _context20.n = 7;
             return apply(chain, [lhs, func], null, environment);
-          case 20:
-            result = _context22.sent;
-            _context22.next = 26;
+          case 7:
+            result = _context20.v;
+            _context20.n = 10;
             break;
-          case 23:
-            _context22.next = 25;
+          case 8:
+            _context20.n = 9;
             return apply(func, [lhs], null, environment);
-          case 25:
-            result = _context22.sent;
-          case 26:
-            return _context22.abrupt("return", result);
-          case 27:
-          case "end":
-            return _context22.stop();
+          case 9:
+            result = _context20.v;
+          case 10:
+            return _context20.a(2, result);
         }
-      }, _callee22);
+      }, _callee20);
     }));
     return _evaluateApplyExpression.apply(this, arguments);
   }
-  function evaluateFunction(_x49, _x50, _x51, _x52) {
+  function evaluateFunction(_x47, _x48, _x49, _x50) {
     return _evaluateFunction.apply(this, arguments);
   }
   /**
@@ -6829,17 +6733,17 @@ var jsonata = function () {
    * @returns {*} Result of procedure
    */
   function _evaluateFunction() {
-    _evaluateFunction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(expr, input, environment, applyto) {
-      var result, proc, evaluatedArgs, _loop, jj, procName;
-      return _regeneratorRuntime().wrap(function _callee24$(_context25) {
-        while (1) switch (_context25.prev = _context25.next) {
+    _evaluateFunction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(expr, input, environment, applyto) {
+      var result, proc, evaluatedArgs, _loop, jj, procName, _t18;
+      return _regenerator().w(function (_context23) {
+        while (1) switch (_context23.p = _context23.n) {
           case 0:
-            _context25.next = 2;
+            _context23.n = 1;
             return _evaluate2(expr.procedure, input, environment);
-          case 2:
-            proc = _context25.sent;
+          case 1:
+            proc = _context23.v;
             if (!(typeof proc === 'undefined' && expr.procedure.type === 'path' && environment.lookup(expr.procedure.steps[0].value))) {
-              _context25.next = 5;
+              _context23.n = 2;
               break;
             }
             throw {
@@ -6848,44 +6752,41 @@ var jsonata = function () {
               position: expr.position,
               token: expr.procedure.steps[0].value
             };
-          case 5:
+          case 2:
             evaluatedArgs = [];
             if (typeof applyto !== 'undefined') {
               evaluatedArgs.push(applyto.context);
             }
             // eager evaluation - evaluate the arguments
-            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+            _loop = /*#__PURE__*/_regenerator().m(function _loop() {
               var arg, closure;
-              return _regeneratorRuntime().wrap(function _loop$(_context24) {
-                while (1) switch (_context24.prev = _context24.next) {
+              return _regenerator().w(function (_context22) {
+                while (1) switch (_context22.n) {
                   case 0:
-                    _context24.next = 2;
+                    _context22.n = 1;
                     return _evaluate2(expr.arguments[jj], input, environment);
-                  case 2:
-                    arg = _context24.sent;
+                  case 1:
+                    arg = _context22.v;
                     if (isFunction(arg)) {
                       // wrap this in a closure
                       closure = /*#__PURE__*/function () {
-                        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+                        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21() {
                           var _len,
                             params,
                             _key,
-                            _args23 = arguments;
-                          return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-                            while (1) switch (_context23.prev = _context23.next) {
+                            _args21 = arguments;
+                          return _regenerator().w(function (_context21) {
+                            while (1) switch (_context21.n) {
                               case 0:
-                                for (_len = _args23.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-                                  params[_key] = _args23[_key];
+                                for (_len = _args21.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+                                  params[_key] = _args21[_key];
                                 }
-                                _context23.next = 3;
+                                _context21.n = 1;
                                 return apply(arg, params, null, environment);
-                              case 3:
-                                return _context23.abrupt("return", _context23.sent);
-                              case 4:
-                              case "end":
-                                return _context23.stop();
+                              case 1:
+                                return _context21.a(2, _context21.v);
                             }
-                          }, _callee23);
+                          }, _callee21);
                         }));
                         return function closure() {
                           return _ref7.apply(this, arguments);
@@ -6896,60 +6797,56 @@ var jsonata = function () {
                     } else {
                       evaluatedArgs.push(arg);
                     }
-                  case 4:
-                  case "end":
-                    return _context24.stop();
+                  case 2:
+                    return _context22.a(2);
                 }
               }, _loop);
             });
             jj = 0;
-          case 9:
+          case 3:
             if (!(jj < expr.arguments.length)) {
-              _context25.next = 14;
+              _context23.n = 5;
               break;
             }
-            return _context25.delegateYield(_loop(), "t0", 11);
-          case 11:
+            return _context23.d(_regeneratorValues(_loop()), 4);
+          case 4:
             jj++;
-            _context25.next = 9;
+            _context23.n = 3;
             break;
-          case 14:
+          case 5:
             // apply the procedure
             procName = expr.procedure.type === 'path' ? expr.procedure.steps[0].value : expr.procedure.value;
-            _context25.prev = 15;
+            _context23.p = 6;
             if (_typeof(proc) === 'object') {
               proc.token = procName;
               proc.position = expr.position;
             }
-            _context25.next = 19;
+            _context23.n = 7;
             return apply(proc, evaluatedArgs, input, environment);
-          case 19:
-            result = _context25.sent;
-            _context25.next = 27;
+          case 7:
+            result = _context23.v;
+            _context23.n = 9;
             break;
-          case 22:
-            _context25.prev = 22;
-            _context25.t1 = _context25["catch"](15);
-            if (!_context25.t1.position) {
+          case 8:
+            _context23.p = 8;
+            _t18 = _context23.v;
+            if (!_t18.position) {
               // add the position field to the error
-              _context25.t1.position = expr.position;
+              _t18.position = expr.position;
             }
-            if (!_context25.t1.token) {
+            if (!_t18.token) {
               // and the function identifier
-              _context25.t1.token = procName;
+              _t18.token = procName;
             }
-            throw _context25.t1;
-          case 27:
-            return _context25.abrupt("return", result);
-          case 28:
-          case "end":
-            return _context25.stop();
+            throw _t18;
+          case 9:
+            return _context23.a(2, result);
         }
-      }, _callee24, null, [[15, 22]]);
+      }, _callee22, null, [[6, 8]]);
     }));
     return _evaluateFunction.apply(this, arguments);
   }
-  function apply(_x53, _x54, _x55, _x56) {
+  function apply(_x51, _x52, _x53, _x54) {
     return _apply.apply(this, arguments);
   }
   /**
@@ -6961,63 +6858,60 @@ var jsonata = function () {
    * @returns {*} Result of procedure
    */
   function _apply() {
-    _apply = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25(proc, args, input, environment) {
-      var result, next, evaluatedArgs, ii;
-      return _regeneratorRuntime().wrap(function _callee25$(_context26) {
-        while (1) switch (_context26.prev = _context26.next) {
+    _apply = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(proc, args, input, environment) {
+      var result, next, evaluatedArgs, ii, _t19, _t20;
+      return _regenerator().w(function (_context24) {
+        while (1) switch (_context24.n) {
           case 0:
-            _context26.next = 2;
+            _context24.n = 1;
             return applyInner(proc, args, input, environment);
+          case 1:
+            result = _context24.v;
           case 2:
-            result = _context26.sent;
-          case 3:
             if (!(isLambda(result) && result.thunk === true)) {
-              _context26.next = 25;
+              _context24.n = 9;
               break;
             }
-            _context26.next = 6;
+            _context24.n = 3;
             return _evaluate2(result.body.procedure, result.input, result.environment);
-          case 6:
-            next = _context26.sent;
+          case 3:
+            next = _context24.v;
             if (result.body.procedure.type === 'variable') {
               next.token = result.body.procedure.value;
             }
             next.position = result.body.procedure.position;
             evaluatedArgs = [];
             ii = 0;
-          case 11:
+          case 4:
             if (!(ii < result.body.arguments.length)) {
-              _context26.next = 20;
+              _context24.n = 7;
               break;
             }
-            _context26.t0 = evaluatedArgs;
-            _context26.next = 15;
+            _t19 = evaluatedArgs;
+            _context24.n = 5;
             return _evaluate2(result.body.arguments[ii], result.input, result.environment);
-          case 15:
-            _context26.t1 = _context26.sent;
-            _context26.t0.push.call(_context26.t0, _context26.t1);
-          case 17:
+          case 5:
+            _t20 = _context24.v;
+            _t19.push.call(_t19, _t20);
+          case 6:
             ii++;
-            _context26.next = 11;
+            _context24.n = 4;
             break;
-          case 20:
-            _context26.next = 22;
+          case 7:
+            _context24.n = 8;
             return applyInner(next, evaluatedArgs, input, environment);
-          case 22:
-            result = _context26.sent;
-            _context26.next = 3;
+          case 8:
+            result = _context24.v;
+            _context24.n = 2;
             break;
-          case 25:
-            return _context26.abrupt("return", result);
-          case 26:
-          case "end":
-            return _context26.stop();
+          case 9:
+            return _context24.a(2, result);
         }
-      }, _callee25);
+      }, _callee23);
     }));
     return _apply.apply(this, arguments);
   }
-  function applyInner(_x57, _x58, _x59, _x60) {
+  function applyInner(_x55, _x56, _x57, _x58) {
     return _applyInner.apply(this, arguments);
   }
   /**
@@ -7028,29 +6922,29 @@ var jsonata = function () {
    * @returns {{lambda: boolean, input: *, environment: *, arguments: *, body: *}} Evaluated input data
    */
   function _applyInner() {
-    _applyInner = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26(proc, args, input, environment) {
-      var result, validatedArgs, focus;
-      return _regeneratorRuntime().wrap(function _callee26$(_context27) {
-        while (1) switch (_context27.prev = _context27.next) {
+    _applyInner = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(proc, args, input, environment) {
+      var result, validatedArgs, focus, _t21;
+      return _regenerator().w(function (_context25) {
+        while (1) switch (_context25.p = _context25.n) {
           case 0:
-            _context27.prev = 0;
+            _context25.p = 0;
             validatedArgs = args;
             if (proc) {
               validatedArgs = validateArguments(proc.signature, args, input);
             }
             if (!isLambda(proc)) {
-              _context27.next = 9;
+              _context25.n = 2;
               break;
             }
-            _context27.next = 6;
+            _context25.n = 1;
             return applyProcedure(proc, validatedArgs);
-          case 6:
-            result = _context27.sent;
-            _context27.next = 28;
+          case 1:
+            result = _context25.v;
+            _context25.n = 9;
             break;
-          case 9:
+          case 2:
             if (!(proc && proc._jsonata_function === true)) {
-              _context27.next = 19;
+              _context25.n = 5;
               break;
             }
             focus = {
@@ -7064,19 +6958,19 @@ var jsonata = function () {
               result = result.next().value;
             }
             if (!isPromise(result)) {
-              _context27.next = 17;
+              _context25.n = 4;
               break;
             }
-            _context27.next = 16;
+            _context25.n = 3;
             return result;
-          case 16:
-            result = _context27.sent;
-          case 17:
-            _context27.next = 28;
+          case 3:
+            result = _context25.v;
+          case 4:
+            _context25.n = 9;
             break;
-          case 19:
+          case 5:
             if (!(typeof proc === 'function')) {
-              _context27.next = 27;
+              _context25.n = 8;
               break;
             }
             // typically these are functions that are returned by the invocation of plugin functions
@@ -7085,41 +6979,38 @@ var jsonata = function () {
             // e.g. await (await $func())
             result = proc.apply(input, validatedArgs);
             if (!isPromise(result)) {
-              _context27.next = 25;
+              _context25.n = 7;
               break;
             }
-            _context27.next = 24;
+            _context25.n = 6;
             return result;
-          case 24:
-            result = _context27.sent;
-          case 25:
-            _context27.next = 28;
+          case 6:
+            result = _context25.v;
+          case 7:
+            _context25.n = 9;
             break;
-          case 27:
+          case 8:
             throw {
               code: "T1006",
               stack: new Error().stack
             };
-          case 28:
-            _context27.next = 34;
+          case 9:
+            _context25.n = 11;
             break;
-          case 30:
-            _context27.prev = 30;
-            _context27.t0 = _context27["catch"](0);
+          case 10:
+            _context25.p = 10;
+            _t21 = _context25.v;
             if (proc) {
-              if (typeof _context27.t0.token == 'undefined' && typeof proc.token !== 'undefined') {
-                _context27.t0.token = proc.token;
+              if (typeof _t21.token == 'undefined' && typeof proc.token !== 'undefined') {
+                _t21.token = proc.token;
               }
-              _context27.t0.position = proc.position || _context27.t0.position;
+              _t21.position = proc.position || _t21.position;
             }
-            throw _context27.t0;
-          case 34:
-            return _context27.abrupt("return", result);
-          case 35:
-          case "end":
-            return _context27.stop();
+            throw _t21;
+          case 11:
+            return _context25.a(2, result);
         }
-      }, _callee26, null, [[0, 30]]);
+      }, _callee24, null, [[0, 10]]);
     }));
     return _applyInner.apply(this, arguments);
   }
@@ -7137,21 +7028,18 @@ var jsonata = function () {
       procedure.thunk = true;
     }
     procedure.apply = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(self, args) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(self, args) {
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              _context2.next = 2;
+              _context2.n = 1;
               return apply(procedure, args, input, !!self ? self.environment : environment);
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
-            case 3:
-            case "end":
-              return _context2.stop();
+            case 1:
+              return _context2.a(2, _context2.v);
           }
         }, _callee2);
       }));
-      return function (_x61, _x62) {
+      return function (_x59, _x60) {
         return _ref2.apply(this, arguments);
       };
     }();
@@ -7165,7 +7053,7 @@ var jsonata = function () {
    * @param {Object} environment - Environment
    * @returns {*} Evaluated input data
    */
-  function evaluatePartialApplication(_x63, _x64, _x65) {
+  function evaluatePartialApplication(_x61, _x62, _x63) {
     return _evaluatePartialApplication.apply(this, arguments);
   }
   /**
@@ -7176,46 +7064,46 @@ var jsonata = function () {
    * @returns {Array} - validated arguments
    */
   function _evaluatePartialApplication() {
-    _evaluatePartialApplication = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27(expr, input, environment) {
-      var result, evaluatedArgs, ii, arg, proc;
-      return _regeneratorRuntime().wrap(function _callee27$(_context28) {
-        while (1) switch (_context28.prev = _context28.next) {
+    _evaluatePartialApplication = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(expr, input, environment) {
+      var result, evaluatedArgs, ii, arg, proc, _t22, _t23;
+      return _regenerator().w(function (_context26) {
+        while (1) switch (_context26.n) {
           case 0:
             // partially apply a function
             // evaluate the arguments
             evaluatedArgs = [];
             ii = 0;
-          case 2:
+          case 1:
             if (!(ii < expr.arguments.length)) {
-              _context28.next = 16;
+              _context26.n = 5;
               break;
             }
             arg = expr.arguments[ii];
             if (!(arg.type === 'operator' && arg.value === '?')) {
-              _context28.next = 8;
+              _context26.n = 2;
               break;
             }
             evaluatedArgs.push(arg);
-            _context28.next = 13;
+            _context26.n = 4;
             break;
-          case 8:
-            _context28.t0 = evaluatedArgs;
-            _context28.next = 11;
+          case 2:
+            _t22 = evaluatedArgs;
+            _context26.n = 3;
             return _evaluate2(arg, input, environment);
-          case 11:
-            _context28.t1 = _context28.sent;
-            _context28.t0.push.call(_context28.t0, _context28.t1);
-          case 13:
+          case 3:
+            _t23 = _context26.v;
+            _t22.push.call(_t22, _t23);
+          case 4:
             ii++;
-            _context28.next = 2;
+            _context26.n = 1;
             break;
-          case 16:
-            _context28.next = 18;
+          case 5:
+            _context26.n = 6;
             return _evaluate2(expr.procedure, input, environment);
-          case 18:
-            proc = _context28.sent;
+          case 6:
+            proc = _context26.v;
             if (!(typeof proc === 'undefined' && expr.procedure.type === 'path' && environment.lookup(expr.procedure.steps[0].value))) {
-              _context28.next = 21;
+              _context26.n = 7;
               break;
             }
             throw {
@@ -7224,44 +7112,41 @@ var jsonata = function () {
               position: expr.position,
               token: expr.procedure.steps[0].value
             };
-          case 21:
+          case 7:
             if (!isLambda(proc)) {
-              _context28.next = 25;
+              _context26.n = 8;
               break;
             }
             result = partialApplyProcedure(proc, evaluatedArgs);
-            _context28.next = 34;
+            _context26.n = 11;
             break;
-          case 25:
+          case 8:
             if (!(proc && proc._jsonata_function === true)) {
-              _context28.next = 29;
+              _context26.n = 9;
               break;
             }
             result = partialApplyNativeFunction(proc.implementation, evaluatedArgs);
-            _context28.next = 34;
+            _context26.n = 11;
             break;
-          case 29:
+          case 9:
             if (!(typeof proc === 'function')) {
-              _context28.next = 33;
+              _context26.n = 10;
               break;
             }
             result = partialApplyNativeFunction(proc, evaluatedArgs);
-            _context28.next = 34;
+            _context26.n = 11;
             break;
-          case 33:
+          case 10:
             throw {
               code: "T1008",
               stack: new Error().stack,
               position: expr.position,
               token: expr.procedure.type === 'path' ? expr.procedure.steps[0].value : expr.procedure.value
             };
-          case 34:
-            return _context28.abrupt("return", result);
-          case 35:
-          case "end":
-            return _context28.stop();
+          case 11:
+            return _context26.a(2, result);
         }
-      }, _callee27);
+      }, _callee25);
     }));
     return _evaluatePartialApplication.apply(this, arguments);
   }
@@ -7280,7 +7165,7 @@ var jsonata = function () {
    * @param {Array} args - Arguments
    * @returns {*} Result of procedure
    */
-  function applyProcedure(_x66, _x67) {
+  function applyProcedure(_x64, _x65) {
     return _applyProcedure.apply(this, arguments);
   }
   /**
@@ -7290,37 +7175,34 @@ var jsonata = function () {
    * @returns {{lambda: boolean, input: *, environment: {bind, lookup}, arguments: Array, body: *}} Result of partially applied procedure
    */
   function _applyProcedure() {
-    _applyProcedure = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28(proc, args) {
+    _applyProcedure = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(proc, args) {
       var result, env;
-      return _regeneratorRuntime().wrap(function _callee28$(_context29) {
-        while (1) switch (_context29.prev = _context29.next) {
+      return _regenerator().w(function (_context27) {
+        while (1) switch (_context27.n) {
           case 0:
             env = createFrame(proc.environment);
             proc.arguments.forEach(function (param, index) {
               env.bind(param.value, args[index]);
             });
             if (!(typeof proc.body === 'function')) {
-              _context29.next = 8;
+              _context27.n = 2;
               break;
             }
-            _context29.next = 5;
+            _context27.n = 1;
             return applyNativeFunction(proc.body, env);
-          case 5:
-            result = _context29.sent;
-            _context29.next = 11;
+          case 1:
+            result = _context27.v;
+            _context27.n = 4;
             break;
-          case 8:
-            _context29.next = 10;
+          case 2:
+            _context27.n = 3;
             return _evaluate2(proc.body, proc.input, env);
-          case 10:
-            result = _context29.sent;
-          case 11:
-            return _context29.abrupt("return", result);
-          case 12:
-          case "end":
-            return _context29.stop();
+          case 3:
+            result = _context27.v;
+          case 4:
+            return _context27.a(2, result);
         }
-      }, _callee28);
+      }, _callee26);
     }));
     return _applyProcedure.apply(this, arguments);
   }
@@ -7373,7 +7255,7 @@ var jsonata = function () {
    * @param {Object} env - Environment
    * @returns {*} Result of applying native function
    */
-  function applyNativeFunction(_x68, _x69) {
+  function applyNativeFunction(_x66, _x67) {
     return _applyNativeFunction.apply(this, arguments);
   }
   /**
@@ -7382,10 +7264,10 @@ var jsonata = function () {
    * @returns {*|Array} Native function arguments
    */
   function _applyNativeFunction() {
-    _applyNativeFunction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee29(proc, env) {
+    _applyNativeFunction = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(proc, env) {
       var sigArgs, args, focus, result;
-      return _regeneratorRuntime().wrap(function _callee29$(_context30) {
-        while (1) switch (_context30.prev = _context30.next) {
+      return _regenerator().w(function (_context28) {
+        while (1) switch (_context28.n) {
           case 0:
             sigArgs = getNativeFunctionArguments(proc); // generate the array of arguments for invoking the function - look them up in the environment
             args = sigArgs.map(function (sigArg) {
@@ -7396,20 +7278,17 @@ var jsonata = function () {
             };
             result = proc.apply(focus, args);
             if (!isPromise(result)) {
-              _context30.next = 8;
+              _context28.n = 2;
               break;
             }
-            _context30.next = 7;
+            _context28.n = 1;
             return result;
-          case 7:
-            result = _context30.sent;
-          case 8:
-            return _context30.abrupt("return", result);
-          case 9:
-          case "end":
-            return _context30.stop();
+          case 1:
+            result = _context28.v;
+          case 2:
+            return _context28.a(2, result);
         }
-      }, _callee29);
+      }, _callee27);
     }));
     return _applyNativeFunction.apply(this, arguments);
   }
@@ -7442,7 +7321,7 @@ var jsonata = function () {
    * @param {string} expr - expression to evaluate
    * @returns {*} - result of evaluating the expression
    */
-  function functionEval(_x70, _x71) {
+  function functionEval(_x68, _x69) {
     return _functionEval.apply(this, arguments);
   }
   /**
@@ -7451,17 +7330,17 @@ var jsonata = function () {
    * @returns {*} - the cloned object
    */
   function _functionEval() {
-    _functionEval = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee30(expr, focus) {
-      var input, ast, result;
-      return _regeneratorRuntime().wrap(function _callee30$(_context31) {
-        while (1) switch (_context31.prev = _context31.next) {
+    _functionEval = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(expr, focus) {
+      var input, ast, result, _t24, _t25;
+      return _regenerator().w(function (_context29) {
+        while (1) switch (_context29.p = _context29.n) {
           case 0:
             if (!(typeof expr === 'undefined')) {
-              _context31.next = 2;
+              _context29.n = 1;
               break;
             }
-            return _context31.abrupt("return", undefined);
-          case 2:
+            return _context29.a(2, undefined);
+          case 1:
             input = this.input;
             if (typeof focus !== 'undefined') {
               input = focus;
@@ -7471,47 +7350,44 @@ var jsonata = function () {
                 input.outerWrapper = true;
               }
             }
-            _context31.prev = 4;
+            _context29.p = 2;
             ast = parser(expr, false);
-            _context31.next = 12;
+            _context29.n = 4;
             break;
-          case 8:
-            _context31.prev = 8;
-            _context31.t0 = _context31["catch"](4);
+          case 3:
+            _context29.p = 3;
+            _t24 = _context29.v;
             // error parsing the expression passed to $eval
-            populateMessage(_context31.t0);
+            populateMessage(_t24);
             throw {
               stack: new Error().stack,
               code: "D3120",
-              value: _context31.t0.message,
-              error: _context31.t0
+              value: _t24.message,
+              error: _t24
             };
-          case 12:
-            _context31.prev = 12;
-            _context31.next = 15;
+          case 4:
+            _context29.p = 4;
+            _context29.n = 5;
             return _evaluate2(ast, input, this.environment);
-          case 15:
-            result = _context31.sent;
-            _context31.next = 22;
+          case 5:
+            result = _context29.v;
+            _context29.n = 7;
             break;
-          case 18:
-            _context31.prev = 18;
-            _context31.t1 = _context31["catch"](12);
+          case 6:
+            _context29.p = 6;
+            _t25 = _context29.v;
             // error evaluating the expression passed to $eval
-            populateMessage(_context31.t1);
+            populateMessage(_t25);
             throw {
               stack: new Error().stack,
               code: "D3121",
-              value: _context31.t1.message,
-              error: _context31.t1
+              value: _t25.message,
+              error: _t25
             };
-          case 22:
-            return _context31.abrupt("return", result);
-          case 23:
-          case "end":
-            return _context31.stop();
+          case 7:
+            return _context29.a(2, result);
         }
-      }, _callee30, this, [[4, 8], [12, 18]]);
+      }, _callee28, this, [[4, 6], [2, 3]]);
     }));
     return _functionEval.apply(this, arguments);
   }
@@ -7799,13 +7675,13 @@ var jsonata = function () {
     }
     return {
       evaluate: function () {
-        var _evaluate3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(input, bindings, callback) {
-          var err, exec_env, v, it;
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+        var _evaluate3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input, bindings, callback) {
+          var err, exec_env, v, it, _t;
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.p = _context3.n) {
               case 0:
                 if (!(typeof _errors !== 'undefined')) {
-                  _context3.next = 4;
+                  _context3.n = 1;
                   break;
                 }
                 err = {
@@ -7814,7 +7690,7 @@ var jsonata = function () {
                 };
                 populateMessage(err); // possible side-effects on `err`
                 throw err;
-              case 4:
+              case 1:
                 if (typeof bindings !== 'undefined') {
                   // the variable bindings have been passed in - create a frame to hold these
                   exec_env = createFrame(environment);
@@ -7837,28 +7713,27 @@ var jsonata = function () {
                   input = createSequence(input);
                   input.outerWrapper = true;
                 }
-                _context3.prev = 9;
-                _context3.next = 12;
+                _context3.p = 2;
+                _context3.n = 3;
                 return _evaluate2(_ast, input, exec_env);
-              case 12:
-                it = _context3.sent;
+              case 3:
+                it = _context3.v;
                 if (typeof callback === "function") {
                   callback(null, it);
                 }
-                return _context3.abrupt("return", it);
-              case 17:
-                _context3.prev = 17;
-                _context3.t0 = _context3["catch"](9);
+                return _context3.a(2, it);
+              case 4:
+                _context3.p = 4;
+                _t = _context3.v;
                 // insert error message into structure
-                populateMessage(_context3.t0); // possible side-effects on `err`
-                throw _context3.t0;
-              case 21:
-              case "end":
-                return _context3.stop();
+                populateMessage(_t); // possible side-effects on `err`
+                throw _t;
+              case 5:
+                return _context3.a(2);
             }
-          }, _callee3, null, [[9, 17]]);
+          }, _callee3, null, [[2, 4]]);
         }));
-        function evaluate(_x72, _x73, _x74) {
+        function evaluate(_x70, _x71, _x72) {
           return _evaluate3.apply(this, arguments);
         }
         return evaluate;
@@ -7927,6 +7802,8 @@ var parser = function () {
     '<=': 40,
     '>=': 40,
     '~>': 40,
+    '?:': 40,
+    '??': 40,
     'and': 30,
     'or': 25,
     'in': 40,
@@ -8084,6 +7961,16 @@ var parser = function () {
         position += 2;
         return create('operator', '~>');
       }
+      if (currentChar === '?' && path.charAt(position + 1) === ':') {
+        // ?: default / elvis operator
+        position += 2;
+        return create('operator', '?:');
+      }
+      if (currentChar === '?' && path.charAt(position + 1) === '?') {
+        // ?? coalescing operator
+        position += 2;
+        return create('operator', '??');
+      }
       // test for single char operators
       if (Object.prototype.hasOwnProperty.call(operators, currentChar)) {
         position++;
@@ -8445,6 +8332,22 @@ var parser = function () {
     prefix("-"); // unary numeric negation
     infix("~>"); // function application
 
+    // coalescing operator
+    infix("??", operators['??'], function (left) {
+      this.type = 'condition';
+      this.condition = {
+        type: 'function',
+        value: '(',
+        procedure: {
+          type: 'variable',
+          value: 'exists'
+        },
+        arguments: [left]
+      };
+      this.then = left;
+      this["else"] = expression(0);
+      return this;
+    });
     infixr("(error)", 10, function (left) {
       this.lhs = left;
       this.error = node.error;
@@ -8731,6 +8634,15 @@ var parser = function () {
       return this;
     });
 
+    // elvis/default operator
+    infix("?:", operators['?:'], function (left) {
+      this.type = 'condition';
+      this.condition = left;
+      this.then = left;
+      this["else"] = expression(0);
+      return this;
+    });
+
     // object transformer
     prefix("|", function () {
       this.type = 'transform';