npm - @digipair/skill-canvas - Versions diffs - 0.42.0 → 0.43.1 - Mend

@digipair/skill-canvas 0.42.0 → 0.43.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/index.esm.js +1177 -690
package/package.json +1 -1
/package/{libs/skill-canvas/src → src}/index.d.ts +0 -0
/package/{libs/skill-canvas/src → src}/lib/skill-canvas.d.ts +0 -0

package/index.esm.js CHANGED Viewed

@@ -8135,7 +8135,7 @@ function _type_of(obj) {
     }
     return self;
 }
-function _class_call_check$i(instance, Constructor) {
+function _class_call_check$j(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -8250,7 +8250,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(LuxonError, Error1);
     var _super = _create_super$7(LuxonError);
     function LuxonError() {
-        _class_call_check$i(this, LuxonError);
+        _class_call_check$j(this, LuxonError);
         return _super.apply(this, arguments);
     }
     return LuxonError;
@@ -8261,7 +8261,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(InvalidDateTimeError, LuxonError);
     var _super = _create_super$7(InvalidDateTimeError);
     function InvalidDateTimeError(reason) {
-        _class_call_check$i(this, InvalidDateTimeError);
+        _class_call_check$j(this, InvalidDateTimeError);
         return _super.call(this, "Invalid DateTime: ".concat(reason.toMessage()));
     }
     return InvalidDateTimeError;
@@ -8272,7 +8272,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(InvalidIntervalError, LuxonError);
     var _super = _create_super$7(InvalidIntervalError);
     function InvalidIntervalError(reason) {
-        _class_call_check$i(this, InvalidIntervalError);
+        _class_call_check$j(this, InvalidIntervalError);
         return _super.call(this, "Invalid Interval: ".concat(reason.toMessage()));
     }
     return InvalidIntervalError;
@@ -8283,7 +8283,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(InvalidDurationError, LuxonError);
     var _super = _create_super$7(InvalidDurationError);
     function InvalidDurationError(reason) {
-        _class_call_check$i(this, InvalidDurationError);
+        _class_call_check$j(this, InvalidDurationError);
         return _super.call(this, "Invalid Duration: ".concat(reason.toMessage()));
     }
     return InvalidDurationError;
@@ -8294,7 +8294,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(ConflictingSpecificationError, LuxonError);
     var _super = _create_super$7(ConflictingSpecificationError);
     function ConflictingSpecificationError() {
-        _class_call_check$i(this, ConflictingSpecificationError);
+        _class_call_check$j(this, ConflictingSpecificationError);
         return _super.apply(this, arguments);
     }
     return ConflictingSpecificationError;
@@ -8305,7 +8305,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(InvalidUnitError, LuxonError);
     var _super = _create_super$7(InvalidUnitError);
     function InvalidUnitError(unit) {
-        _class_call_check$i(this, InvalidUnitError);
+        _class_call_check$j(this, InvalidUnitError);
         return _super.call(this, "Invalid unit ".concat(unit));
     }
     return InvalidUnitError;
@@ -8316,7 +8316,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(InvalidArgumentError, LuxonError);
     var _super = _create_super$7(InvalidArgumentError);
     function InvalidArgumentError() {
-        _class_call_check$i(this, InvalidArgumentError);
+        _class_call_check$j(this, InvalidArgumentError);
         return _super.apply(this, arguments);
     }
     return InvalidArgumentError;
@@ -8327,7 +8327,7 @@ var LuxonError = /*#__PURE__*/ function(Error1) {
     _inherits$7(ZoneIsAbstractError, LuxonError);
     var _super = _create_super$7(ZoneIsAbstractError);
     function ZoneIsAbstractError() {
-        _class_call_check$i(this, ZoneIsAbstractError);
+        _class_call_check$j(this, ZoneIsAbstractError);
         return _super.call(this, "Zone is an abstract class");
     }
     return ZoneIsAbstractError;
@@ -8484,12 +8484,12 @@ var DATETIME_HUGE_WITH_SECONDS = {
     timeZoneName: l
 };
-function _class_call_check$h(instance, Constructor) {
+function _class_call_check$i(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$h(target, props) {
+function _defineProperties$i(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -8498,16 +8498,16 @@ function _defineProperties$h(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$h(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$h(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$h(Constructor, staticProps);
+function _create_class$i(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$i(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$i(Constructor, staticProps);
     return Constructor;
 }
 var Zone = /*#__PURE__*/ function() {
     function Zone() {
-        _class_call_check$h(this, Zone);
+        _class_call_check$i(this, Zone);
     }
-    _create_class$h(Zone, [
+    _create_class$i(Zone, [
         {
             key: "type",
             get: /**
@@ -8530,7 +8530,12 @@ var Zone = /*#__PURE__*/ function() {
         },
         {
             key: "ianaName",
-            get: function get() {
+            get: /**
+   * The IANA name of this zone.
+   * Defaults to `name` if not overwritten by a subclass.
+   * @abstract
+   * @type {string}
+   */ function get() {
                 return this.name;
             }
         },
@@ -8613,12 +8618,12 @@ function _assert_this_initialized$6(self) {
     }
     return self;
 }
-function _class_call_check$g(instance, Constructor) {
+function _class_call_check$h(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$g(target, props) {
+function _defineProperties$h(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -8627,9 +8632,9 @@ function _defineProperties$g(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$g(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$g(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$g(Constructor, staticProps);
+function _create_class$h(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$h(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$h(Constructor, staticProps);
     return Constructor;
 }
 function _get_prototype_of$6(o) {
@@ -8697,10 +8702,10 @@ var SystemZone = /*#__PURE__*/ function(Zone) {
     _inherits$6(SystemZone, Zone);
     var _super = _create_super$6(SystemZone);
     function SystemZone() {
-        _class_call_check$g(this, SystemZone);
+        _class_call_check$h(this, SystemZone);
         return _super.apply(this, arguments);
     }
-    _create_class$g(SystemZone, [
+    _create_class$h(SystemZone, [
         {
             key: "type",
             get: /** @override **/ function get() {
@@ -8781,12 +8786,12 @@ function _assert_this_initialized$5(self) {
     }
     return self;
 }
-function _class_call_check$f(instance, Constructor) {
+function _class_call_check$g(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$f(target, props) {
+function _defineProperties$g(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -8795,9 +8800,9 @@ function _defineProperties$f(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$f(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$f(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$f(Constructor, staticProps);
+function _create_class$g(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$g(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$g(Constructor, staticProps);
     return Constructor;
 }
 function _get_prototype_of$5(o) {
@@ -8944,7 +8949,7 @@ function partsOffset(dtf, date) {
         var pos = typeToPos[type];
         if (type === "era") {
             filled[pos] = value;
-        } else if (!isUndefined(pos)) {
+        } else if (!isUndefined$1(pos)) {
             filled[pos] = parseInt(value, 10);
         }
     }
@@ -8955,47 +8960,80 @@ var IANAZone = /*#__PURE__*/ function(Zone) {
     _inherits$5(IANAZone, Zone);
     var _super = _create_super$5(IANAZone);
     function IANAZone(name) {
-        _class_call_check$f(this, IANAZone);
+        _class_call_check$g(this, IANAZone);
         var _this;
         _this = _super.call(this);
         /** @private **/ _this.zoneName = name;
         /** @private **/ _this.valid = IANAZone.isValidZone(name);
         return _this;
     }
-    _create_class$f(IANAZone, [
+    _create_class$g(IANAZone, [
         {
             key: "type",
-            get: /** @override **/ function get() {
+            get: /**
+   * The type of zone. `iana` for all instances of `IANAZone`.
+   * @override
+   * @type {string}
+   */ function get() {
                 return "iana";
             }
         },
         {
             key: "name",
-            get: /** @override **/ function get() {
+            get: /**
+   * The name of this zone (i.e. the IANA zone name).
+   * @override
+   * @type {string}
+   */ function get() {
                 return this.zoneName;
             }
         },
         {
             key: "isUniversal",
-            get: /** @override **/ function get() {
+            get: /**
+   * Returns whether the offset is known to be fixed for the whole year:
+   * Always returns false for all IANA zones.
+   * @override
+   * @type {boolean}
+   */ function get() {
                 return false;
             }
         },
         {
-            /** @override **/ key: "offsetName",
+            /**
+   * Returns the offset's common name (such as EST) at the specified timestamp
+   * @override
+   * @param {number} ts - Epoch milliseconds for which to get the name
+   * @param {Object} opts - Options to affect the format
+   * @param {string} opts.format - What style of offset to return. Accepts 'long' or 'short'.
+   * @param {string} opts.locale - What locale to return the offset name in.
+   * @return {string}
+   */ key: "offsetName",
             value: function offsetName(ts, param) {
                 var format = param.format, locale = param.locale;
                 return parseZoneInfo(ts, format, locale, this.name);
             }
         },
         {
-            /** @override **/ key: "formatOffset",
+            /**
+   * Returns the offset's value as a string
+   * @override
+   * @param {number} ts - Epoch milliseconds for which to get the offset
+   * @param {string} format - What style of offset to return.
+   *                          Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively
+   * @return {string}
+   */ key: "formatOffset",
             value: function formatOffset1(ts, format) {
                 return formatOffset(this.offset(ts), format);
             }
         },
         {
-            /** @override **/ key: "offset",
+            /**
+   * Return the offset in minutes for this zone at the specified timestamp.
+   * @override
+   * @param {number} ts - Epoch milliseconds for which to compute the offset
+   * @return {number}
+   */ key: "offset",
             value: function offset(ts) {
                 var date = new Date(ts);
                 if (isNaN(date)) return NaN;
@@ -9022,14 +9060,23 @@ var IANAZone = /*#__PURE__*/ function(Zone) {
             }
         },
         {
-            /** @override **/ key: "equals",
+            /**
+   * Return whether this Zone is equal to another zone
+   * @override
+   * @param {Zone} otherZone - the zone to compare
+   * @return {boolean}
+   */ key: "equals",
             value: function equals(otherZone) {
                 return otherZone.type === "iana" && otherZone.name === this.name;
             }
         },
         {
             key: "isValid",
-            get: /** @override **/ function get() {
+            get: /**
+   * Return whether this Zone is valid.
+   * @override
+   * @type {boolean}
+   */ function get() {
                 return this.valid;
             }
         }
@@ -9063,7 +9110,7 @@ var IANAZone = /*#__PURE__*/ function(Zone) {
    * @param {string} s - The string to check validity on
    * @example IANAZone.isValidSpecifier("America/New_York") //=> true
    * @example IANAZone.isValidSpecifier("Sport~~blorp") //=> false
-   * @deprecated This method returns false for some valid IANA names. Use isValidZone instead.
+   * @deprecated For backward compatibility, this forwards to isValidZone, better use `isValidZone()` directly instead.
    * @return {boolean}
    */ function isValidSpecifier(s) {
                 return this.isValidZone(s);
@@ -9104,12 +9151,12 @@ function _array_like_to_array$d(arr, len) {
 function _array_with_holes$b(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _class_call_check$e(instance, Constructor) {
+function _class_call_check$f(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$e(target, props) {
+function _defineProperties$f(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -9118,9 +9165,9 @@ function _defineProperties$e(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$e(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$e(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$e(Constructor, staticProps);
+function _create_class$f(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$f(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$f(Constructor, staticProps);
     return Constructor;
 }
 function _define_property$9(obj, key, value) {
@@ -9411,7 +9458,7 @@ function supportsFastNumbers(loc) {
  * @private
  */ var PolyNumberFormatter = /*#__PURE__*/ function() {
     function PolyNumberFormatter(intl, forceSimple, opts) {
-        _class_call_check$e(this, PolyNumberFormatter);
+        _class_call_check$f(this, PolyNumberFormatter);
         this.padTo = opts.padTo || 0;
         this.floor = opts.floor || false;
         opts.padTo; opts.floor; var otherOpts = _object_without_properties(opts, [
@@ -9426,7 +9473,7 @@ function supportsFastNumbers(loc) {
             this.inf = getCachedINF(intl, intlOpts);
         }
     }
-    _create_class$e(PolyNumberFormatter, [
+    _create_class$f(PolyNumberFormatter, [
         {
             key: "format",
             value: function format(i) {
@@ -9447,7 +9494,7 @@ function supportsFastNumbers(loc) {
  * @private
  */ var PolyDateFormatter = /*#__PURE__*/ function() {
     function PolyDateFormatter(dt, intl, opts) {
-        _class_call_check$e(this, PolyDateFormatter);
+        _class_call_check$f(this, PolyDateFormatter);
         this.opts = opts;
         this.originalZone = undefined;
         var z = undefined;
@@ -9493,7 +9540,7 @@ function supportsFastNumbers(loc) {
         intlOpts.timeZone = intlOpts.timeZone || z;
         this.dtf = getCachedDTF(intl, intlOpts);
     }
-    _create_class$e(PolyDateFormatter, [
+    _create_class$f(PolyDateFormatter, [
         {
             key: "format",
             value: function format() {
@@ -9544,7 +9591,7 @@ function supportsFastNumbers(loc) {
  * @private
  */ var PolyRelFormatter = /*#__PURE__*/ function() {
     function PolyRelFormatter(intl, isEnglish, opts) {
-        _class_call_check$e(this, PolyRelFormatter);
+        _class_call_check$f(this, PolyRelFormatter);
         this.opts = _object_spread$7({
             style: "long"
         }, opts);
@@ -9552,7 +9599,7 @@ function supportsFastNumbers(loc) {
             this.rtf = getCachedRTF(intl, opts);
         }
     }
-    _create_class$e(PolyRelFormatter, [
+    _create_class$f(PolyRelFormatter, [
         {
             key: "format",
             value: function format(count, unit) {
@@ -9586,7 +9633,7 @@ var fallbackWeekSettings = {
 };
 var Locale = /*#__PURE__*/ function() {
     function Locale(locale, numbering, outputCalendar, weekSettings, specifiedLocale) {
-        _class_call_check$e(this, Locale);
+        _class_call_check$f(this, Locale);
         var _parseLocaleString = _sliced_to_array$b(parseLocaleString(locale), 3), parsedLocale = _parseLocaleString[0], parsedNumberingSystem = _parseLocaleString[1], parsedOutputCalendar = _parseLocaleString[2];
         this.locale = parsedLocale;
         this.numberingSystem = numbering || parsedNumberingSystem || null;
@@ -9606,7 +9653,7 @@ var Locale = /*#__PURE__*/ function() {
         this.specifiedLocale = specifiedLocale;
         this.fastNumbersCached = null;
     }
-    _create_class$e(Locale, [
+    _create_class$f(Locale, [
         {
             key: "fastNumbers",
             get: function get() {
@@ -9823,6 +9870,12 @@ var Locale = /*#__PURE__*/ function() {
             value: function equals(other) {
                 return this.locale === other.locale && this.numberingSystem === other.numberingSystem && this.outputCalendar === other.outputCalendar;
             }
+        },
+        {
+            key: "toString",
+            value: function toString() {
+                return "Locale(".concat(this.locale, ", ").concat(this.numberingSystem, ", ").concat(this.outputCalendar, ")");
+            }
         }
     ], [
         {
@@ -9836,7 +9889,7 @@ var Locale = /*#__PURE__*/ function() {
             value: function create(locale, numberingSystem, outputCalendar, weekSettings) {
                 var defaultToEN = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
                 var specifiedLocale = locale || Settings.defaultLocale;
-                // the system locale is useful for human readable strings but annoying for parsing/formatting known formats
+                // the system locale is useful for human-readable strings but annoying for parsing/formatting known formats
                 var localeR = specifiedLocale || (defaultToEN ? "en-US" : systemLocale());
                 var numberingSystemR = numberingSystem || Settings.defaultNumberingSystem;
                 var outputCalendarR = outputCalendar || Settings.defaultOutputCalendar;
@@ -9870,12 +9923,12 @@ function _assert_this_initialized$4(self) {
     }
     return self;
 }
-function _class_call_check$d(instance, Constructor) {
+function _class_call_check$e(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$d(target, props) {
+function _defineProperties$e(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -9884,9 +9937,9 @@ function _defineProperties$d(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$d(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$d(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$d(Constructor, staticProps);
+function _create_class$e(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$e(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$e(Constructor, staticProps);
     return Constructor;
 }
 function _get_prototype_of$4(o) {
@@ -9954,28 +10007,42 @@ var FixedOffsetZone = /*#__PURE__*/ function(Zone) {
     _inherits$4(FixedOffsetZone, Zone);
     var _super = _create_super$4(FixedOffsetZone);
     function FixedOffsetZone(offset) {
-        _class_call_check$d(this, FixedOffsetZone);
+        _class_call_check$e(this, FixedOffsetZone);
         var _this;
         _this = _super.call(this);
         /** @private **/ _this.fixed = offset;
         return _this;
     }
-    _create_class$d(FixedOffsetZone, [
+    _create_class$e(FixedOffsetZone, [
         {
             key: "type",
-            get: /** @override **/ function get() {
+            get: /**
+   * The type of zone. `fixed` for all instances of `FixedOffsetZone`.
+   * @override
+   * @type {string}
+   */ function get() {
                 return "fixed";
             }
         },
         {
             key: "name",
-            get: /** @override **/ function get() {
+            get: /**
+   * The name of this zone.
+   * All fixed zones' names always start with "UTC" (plus optional offset)
+   * @override
+   * @type {string}
+   */ function get() {
                 return this.fixed === 0 ? "UTC" : "UTC".concat(formatOffset(this.fixed, "narrow"));
             }
         },
         {
             key: "ianaName",
-            get: function get() {
+            get: /**
+   * The IANA name of this zone, i.e. `Etc/UTC` or `Etc/GMT+/-nn`
+   *
+   * @override
+   * @type {string}
+   */ function get() {
                 if (this.fixed === 0) {
                     return "Etc/UTC";
                 } else {
@@ -9984,38 +10051,71 @@ var FixedOffsetZone = /*#__PURE__*/ function(Zone) {
             }
         },
         {
-            /** @override **/ key: "offsetName",
+            /**
+   * Returns the offset's common name at the specified timestamp.
+   *
+   * For fixed offset zones this equals to the zone name.
+   * @override
+   */ key: "offsetName",
             value: function offsetName() {
                 return this.name;
             }
         },
         {
-            /** @override **/ key: "formatOffset",
+            /**
+   * Returns the offset's value as a string
+   * @override
+   * @param {number} ts - Epoch milliseconds for which to get the offset
+   * @param {string} format - What style of offset to return.
+   *                          Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively
+   * @return {string}
+   */ key: "formatOffset",
             value: function formatOffset1(ts, format) {
                 return formatOffset(this.fixed, format);
             }
         },
         {
             key: "isUniversal",
-            get: /** @override **/ function get() {
+            get: /**
+   * Returns whether the offset is known to be fixed for the whole year:
+   * Always returns true for all fixed offset zones.
+   * @override
+   * @type {boolean}
+   */ function get() {
                 return true;
             }
         },
         {
-            /** @override **/ key: "offset",
+            /**
+   * Return the offset in minutes for this zone at the specified timestamp.
+   *
+   * For fixed offset zones, this is constant and does not depend on a timestamp.
+   * @override
+   * @return {number}
+   */ key: "offset",
             value: function offset() {
                 return this.fixed;
             }
         },
         {
-            /** @override **/ key: "equals",
+            /**
+   * Return whether this Zone is equal to another zone (i.e. also fixed and same offset)
+   * @override
+   * @param {Zone} otherZone - the zone to compare
+   * @return {boolean}
+   */ key: "equals",
             value: function equals(otherZone) {
                 return otherZone.type === "fixed" && otherZone.fixed === this.fixed;
             }
         },
         {
             key: "isValid",
-            get: /** @override **/ function get() {
+            get: /**
+   * Return whether this Zone is valid:
+   * All fixed offset zones are valid.
+   * @override
+   * @type {boolean}
+   */ function get() {
                 return true;
             }
         }
@@ -10071,12 +10171,12 @@ function _assert_this_initialized$3(self) {
     }
     return self;
 }
-function _class_call_check$c(instance, Constructor) {
+function _class_call_check$d(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$c(target, props) {
+function _defineProperties$d(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -10085,9 +10185,9 @@ function _defineProperties$c(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$c(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$c(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$c(Constructor, staticProps);
+function _create_class$d(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$d(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$d(Constructor, staticProps);
     return Constructor;
 }
 function _get_prototype_of$3(o) {
@@ -10154,13 +10254,13 @@ var InvalidZone = /*#__PURE__*/ function(Zone) {
     _inherits$3(InvalidZone, Zone);
     var _super = _create_super$3(InvalidZone);
     function InvalidZone(zoneName) {
-        _class_call_check$c(this, InvalidZone);
+        _class_call_check$d(this, InvalidZone);
         var _this;
         _this = _super.call(this);
         /**  @private */ _this.zoneName = zoneName;
         return _this;
     }
-    _create_class$c(InvalidZone, [
+    _create_class$d(InvalidZone, [
         {
             key: "type",
             get: /** @override **/ function get() {
@@ -10215,7 +10315,7 @@ var InvalidZone = /*#__PURE__*/ function(Zone) {
 /**
  * @private
- */ function _instanceof$7(left, right) {
+ */ function _instanceof$8(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -10223,9 +10323,9 @@ var InvalidZone = /*#__PURE__*/ function(Zone) {
     }
 }
 function normalizeZone(input, defaultZone) {
-    if (isUndefined(input) || input === null) {
+    if (isUndefined$1(input) || input === null) {
         return defaultZone;
-    } else if (_instanceof$7(input, Zone)) {
+    } else if (_instanceof$8(input, Zone)) {
         return input;
     } else if (isString$1(input)) {
         var lowered = input.toLowerCase();
@@ -10244,80 +10344,267 @@ function normalizeZone(input, defaultZone) {
     }
 }
-function _class_call_check$b(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
+function _array_like_to_array$c(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
 }
-function _defineProperties$b(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
+function _array_with_holes$a(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _iterable_to_array_limit$a(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
     }
+    return _arr;
 }
-function _create_class$b(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$b(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$b(Constructor, staticProps);
-    return Constructor;
+function _non_iterable_rest$a() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-var now = function() {
-    return Date.now();
-}, defaultZone = "system", defaultLocale = null, defaultNumberingSystem = null, defaultOutputCalendar = null, twoDigitCutoffYear = 60, throwOnInvalid, defaultWeekSettings = null;
-var Settings = /*#__PURE__*/ function() {
-    function Settings() {
-        _class_call_check$b(this, Settings);
-    }
-    _create_class$b(Settings, null, [
-        {
-            key: "now",
-            get: /**
-   * Get the callback for returning the current timestamp.
-   * @type {function}
-   */ function get() {
-                return now;
-            },
-            set: /**
-   * Set the callback for returning the current timestamp.
-   * The function should return a number, which will be interpreted as an Epoch millisecond count
-   * @type {function}
-   * @example Settings.now = () => Date.now() + 3000 // pretend it is 3 seconds in the future
-   * @example Settings.now = () => 0 // always pretend it's Jan 1, 1970 at midnight in UTC time
-   */ function set(n) {
-                now = n;
-            }
-        },
-        {
-            key: "defaultZone",
-            get: /**
-   * Get the default time zone object currently used to create DateTimes. Does not affect existing instances.
-   * The default value is the system's time zone (the one set on the machine that runs this code).
-   * @type {Zone}
-   */ function get() {
-                return normalizeZone(defaultZone, SystemZone.instance);
-            },
-            set: /**
-   * Set the default time zone to create DateTimes in. Does not affect existing instances.
-   * Use the value "system" to reset this value to the system's time zone.
-   * @type {string}
-   */ function set(zone) {
-                defaultZone = zone;
-            }
-        },
-        {
-            key: "defaultLocale",
-            get: /**
-   * Get the default locale to create DateTimes with. Does not affect existing instances.
-   * @type {string}
-   */ function get() {
-                return defaultLocale;
-            },
-            set: /**
-   * Set the default locale to create DateTimes with. Does not affect existing instances.
-   * @type {string}
-   */ function set(locale) {
+function _sliced_to_array$a(arr, i) {
+    return _array_with_holes$a(arr) || _iterable_to_array_limit$a(arr, i) || _unsupported_iterable_to_array$c(arr, i) || _non_iterable_rest$a();
+}
+function _unsupported_iterable_to_array$c(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array$c(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$c(o, minLen);
+}
+var numberingSystems = {
+    arab: "[٠-٩]",
+    arabext: "[۰-۹]",
+    bali: "[᭐-᭙]",
+    beng: "[০-৯]",
+    deva: "[०-९]",
+    fullwide: "[０-９]",
+    gujr: "[૦-૯]",
+    hanidec: "[〇|一|二|三|四|五|六|七|八|九]",
+    khmr: "[០-៩]",
+    knda: "[೦-೯]",
+    laoo: "[໐-໙]",
+    limb: "[᥆-᥏]",
+    mlym: "[൦-൯]",
+    mong: "[᠐-᠙]",
+    mymr: "[၀-၉]",
+    orya: "[୦-୯]",
+    tamldec: "[௦-௯]",
+    telu: "[౦-౯]",
+    thai: "[๐-๙]",
+    tibt: "[༠-༩]",
+    latn: "\\d"
+};
+var numberingSystemsUTF16 = {
+    arab: [
+        1632,
+        1641
+    ],
+    arabext: [
+        1776,
+        1785
+    ],
+    bali: [
+        6992,
+        7001
+    ],
+    beng: [
+        2534,
+        2543
+    ],
+    deva: [
+        2406,
+        2415
+    ],
+    fullwide: [
+        65296,
+        65303
+    ],
+    gujr: [
+        2790,
+        2799
+    ],
+    khmr: [
+        6112,
+        6121
+    ],
+    knda: [
+        3302,
+        3311
+    ],
+    laoo: [
+        3792,
+        3801
+    ],
+    limb: [
+        6470,
+        6479
+    ],
+    mlym: [
+        3430,
+        3439
+    ],
+    mong: [
+        6160,
+        6169
+    ],
+    mymr: [
+        4160,
+        4169
+    ],
+    orya: [
+        2918,
+        2927
+    ],
+    tamldec: [
+        3046,
+        3055
+    ],
+    telu: [
+        3174,
+        3183
+    ],
+    thai: [
+        3664,
+        3673
+    ],
+    tibt: [
+        3872,
+        3881
+    ]
+};
+var hanidecChars = numberingSystems.hanidec.replace(/[\[|\]]/g, "").split("");
+function parseDigits(str) {
+    var value = parseInt(str, 10);
+    if (isNaN(value)) {
+        value = "";
+        for(var i = 0; i < str.length; i++){
+            var code = str.charCodeAt(i);
+            if (str[i].search(numberingSystems.hanidec) !== -1) {
+                value += hanidecChars.indexOf(str[i]);
+            } else {
+                for(var key in numberingSystemsUTF16){
+                    var _numberingSystemsUTF16_key = _sliced_to_array$a(numberingSystemsUTF16[key], 2), min = _numberingSystemsUTF16_key[0], max = _numberingSystemsUTF16_key[1];
+                    if (code >= min && code <= max) {
+                        value += code - min;
+                    }
+                }
+            }
+        }
+        return parseInt(value, 10);
+    } else {
+        return value;
+    }
+}
+// cache of {numberingSystem: {append: regex}}
+var digitRegexCache = {};
+function resetDigitRegexCache() {
+    digitRegexCache = {};
+}
+function digitRegex(param) {
+    var numberingSystem = param.numberingSystem, append = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+    var ns = numberingSystem || "latn";
+    if (!digitRegexCache[ns]) {
+        digitRegexCache[ns] = {};
+    }
+    if (!digitRegexCache[ns][append]) {
+        digitRegexCache[ns][append] = new RegExp("".concat(numberingSystems[ns]).concat(append));
+    }
+    return digitRegexCache[ns][append];
+}
+function _class_call_check$c(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties$c(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class$c(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$c(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$c(Constructor, staticProps);
+    return Constructor;
+}
+var now = function() {
+    return Date.now();
+}, defaultZone = "system", defaultLocale = null, defaultNumberingSystem = null, defaultOutputCalendar = null, twoDigitCutoffYear = 60, throwOnInvalid, defaultWeekSettings = null;
+var Settings = /*#__PURE__*/ function() {
+    function Settings() {
+        _class_call_check$c(this, Settings);
+    }
+    _create_class$c(Settings, null, [
+        {
+            key: "now",
+            get: /**
+   * Get the callback for returning the current timestamp.
+   * @type {function}
+   */ function get() {
+                return now;
+            },
+            set: /**
+   * Set the callback for returning the current timestamp.
+   * The function should return a number, which will be interpreted as an Epoch millisecond count
+   * @type {function}
+   * @example Settings.now = () => Date.now() + 3000 // pretend it is 3 seconds in the future
+   * @example Settings.now = () => 0 // always pretend it's Jan 1, 1970 at midnight in UTC time
+   */ function set(n) {
+                now = n;
+            }
+        },
+        {
+            key: "defaultZone",
+            get: /**
+   * Get the default time zone object currently used to create DateTimes. Does not affect existing instances.
+   * The default value is the system's time zone (the one set on the machine that runs this code).
+   * @type {Zone}
+   */ function get() {
+                return normalizeZone(defaultZone, SystemZone.instance);
+            },
+            set: /**
+   * Set the default time zone to create DateTimes in. Does not affect existing instances.
+   * Use the value "system" to reset this value to the system's time zone.
+   * @type {string}
+   */ function set(zone) {
+                defaultZone = zone;
+            }
+        },
+        {
+            key: "defaultLocale",
+            get: /**
+   * Get the default locale to create DateTimes with. Does not affect existing instances.
+   * @type {string}
+   */ function get() {
+                return defaultLocale;
+            },
+            set: /**
+   * Set the default locale to create DateTimes with. Does not affect existing instances.
+   * @type {string}
+   */ function set(locale) {
                 defaultLocale = locale;
             }
         },
@@ -10376,16 +10663,17 @@ var Settings = /*#__PURE__*/ function() {
         {
             key: "twoDigitCutoffYear",
             get: /**
-   * Get the cutoff year after which a string encoding a year as two digits is interpreted to occur in the current century.
+   * Get the cutoff year for whether a 2-digit year string is interpreted in the current or previous century. Numbers higher than the cutoff will be considered to mean 19xx and numbers lower or equal to the cutoff will be considered 20xx.
    * @type {number}
    */ function get() {
                 return twoDigitCutoffYear;
             },
             set: /**
-   * Set the cutoff year after which a string encoding a year as two digits is interpreted to occur in the current century.
+   * Set the cutoff year for whether a 2-digit year string is interpreted in the current or previous century. Numbers higher than the cutoff will be considered to mean 19xx and numbers lower or equal to the cutoff will be considered 20xx.
    * @type {number}
-   * @example Settings.twoDigitCutoffYear = 0 // cut-off year is 0, so all 'yy' are interpreted as current century
-   * @example Settings.twoDigitCutoffYear = 50 // '49' -> 1949; '50' -> 2050
+   * @example Settings.twoDigitCutoffYear = 0 // all 'yy' are interpreted as 20th century
+   * @example Settings.twoDigitCutoffYear = 99 // all 'yy' are interpreted as 21st century
+   * @example Settings.twoDigitCutoffYear = 50 // '49' -> 2049; '50' -> 1950
    * @example Settings.twoDigitCutoffYear = 1950 // interpreted as 50
    * @example Settings.twoDigitCutoffYear = 2050 // ALSO interpreted as 50
    */ function set(cutoffYear) {
@@ -10415,18 +10703,20 @@ var Settings = /*#__PURE__*/ function() {
    */ function resetCaches() {
                 Locale.resetCache();
                 IANAZone.resetCache();
+                DateTime.resetCache();
+                resetDigitRegexCache();
             }
         }
     ]);
     return Settings;
 }();
-function _class_call_check$a(instance, Constructor) {
+function _class_call_check$b(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$a(target, props) {
+function _defineProperties$b(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -10435,18 +10725,18 @@ function _defineProperties$a(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$a(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$a(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$a(Constructor, staticProps);
+function _create_class$b(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$b(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$b(Constructor, staticProps);
     return Constructor;
 }
 var Invalid = /*#__PURE__*/ function() {
     function Invalid(reason, explanation) {
-        _class_call_check$a(this, Invalid);
+        _class_call_check$b(this, Invalid);
         this.reason = reason;
         this.explanation = explanation;
     }
-    _create_class$a(Invalid, [
+    _create_class$b(Invalid, [
         {
             key: "toMessage",
             value: function toMessage() {
@@ -10610,15 +10900,15 @@ function ordinalToGregorian(ordinalData) {
  * Modifies obj in-place!
  * @param obj the object values
  */ function usesLocalWeekValues(obj, loc) {
-    var hasLocaleWeekData = !isUndefined(obj.localWeekday) || !isUndefined(obj.localWeekNumber) || !isUndefined(obj.localWeekYear);
+    var hasLocaleWeekData = !isUndefined$1(obj.localWeekday) || !isUndefined$1(obj.localWeekNumber) || !isUndefined$1(obj.localWeekYear);
     if (hasLocaleWeekData) {
-        var hasIsoWeekData = !isUndefined(obj.weekday) || !isUndefined(obj.weekNumber) || !isUndefined(obj.weekYear);
+        var hasIsoWeekData = !isUndefined$1(obj.weekday) || !isUndefined$1(obj.weekNumber) || !isUndefined$1(obj.weekYear);
         if (hasIsoWeekData) {
             throw new ConflictingSpecificationError("Cannot mix locale-based week fields with ISO-based week fields");
         }
-        if (!isUndefined(obj.localWeekday)) obj.weekday = obj.localWeekday;
-        if (!isUndefined(obj.localWeekNumber)) obj.weekNumber = obj.localWeekNumber;
-        if (!isUndefined(obj.localWeekYear)) obj.weekYear = obj.localWeekYear;
+        if (!isUndefined$1(obj.localWeekday)) obj.weekday = obj.localWeekday;
+        if (!isUndefined$1(obj.localWeekNumber)) obj.weekNumber = obj.localWeekNumber;
+        if (!isUndefined$1(obj.localWeekYear)) obj.weekYear = obj.localWeekYear;
         delete obj.localWeekday;
         delete obj.localWeekNumber;
         delete obj.localWeekYear;
@@ -10711,7 +11001,7 @@ function _object_spread$5(target) {
 /**
  * @private
  */ // TYPES
-function isUndefined(o) {
+function isUndefined$1(o) {
     return typeof o === "undefined";
 }
 function isNumber$1(o) {
@@ -10812,14 +11102,14 @@ function padStart(input) {
     return padded;
 }
 function parseInteger(string) {
-    if (isUndefined(string) || string === null || string === "") {
+    if (isUndefined$1(string) || string === null || string === "") {
         return undefined;
     } else {
         return parseInt(string, 10);
     }
 }
 function parseFloating(string) {
-    if (isUndefined(string) || string === null || string === "") {
+    if (isUndefined$1(string) || string === null || string === "") {
         return undefined;
     } else {
         return parseFloat(string);
@@ -10827,7 +11117,7 @@ function parseFloating(string) {
 }
 function parseMillis(fraction) {
     // Return undefined (instead of 0) in these cases, where fraction is not set
-    if (isUndefined(fraction) || fraction === null || fraction === "") {
+    if (isUndefined$1(fraction) || fraction === null || fraction === "") {
         return undefined;
     } else {
         var f = parseFloat("0." + fraction) * 1000;
@@ -10945,7 +11235,13 @@ function normalizeObject(obj, normalizer) {
     }
     return normalized;
 }
-function formatOffset(offset, format) {
+/**
+ * Returns the offset's value as a string
+ * @param {number} ts - Epoch milliseconds for which to get the offset
+ * @param {string} format - What style of offset to return.
+ *                          Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively
+ * @return {string}
+ */ function formatOffset(offset, format) {
     var hours = Math.trunc(Math.abs(offset / 60)), minutes = Math.trunc(Math.abs(offset % 60)), sign = offset >= 0 ? "+" : "-";
     switch(format){
         case "short":
@@ -10967,13 +11263,13 @@ function timeObject(obj) {
     ]);
 }
-function _array_like_to_array$c(arr, len) {
+function _array_like_to_array$b(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
 function _array_without_holes$7(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$c(arr);
+    if (Array.isArray(arr)) return _array_like_to_array$b(arr);
 }
 function _iterable_to_array$7(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
@@ -10982,15 +11278,15 @@ function _non_iterable_spread$7() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _to_consumable_array$7(arr) {
-    return _array_without_holes$7(arr) || _iterable_to_array$7(arr) || _unsupported_iterable_to_array$c(arr) || _non_iterable_spread$7();
+    return _array_without_holes$7(arr) || _iterable_to_array$7(arr) || _unsupported_iterable_to_array$b(arr) || _non_iterable_spread$7();
 }
-function _unsupported_iterable_to_array$c(o, minLen) {
+function _unsupported_iterable_to_array$b(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$c(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$b(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$c(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$b(o, minLen);
 }
 /**
  * @private
@@ -11224,20 +11520,20 @@ function formatRelativeTime(unit, count) {
     return isInPast ? "".concat(fmtValue, " ").concat(fmtUnit, " ago") : "in ".concat(fmtValue, " ").concat(fmtUnit);
 }
-function _array_like_to_array$b(arr, len) {
+function _array_like_to_array$a(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
 function _array_without_holes$6(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$b(arr);
+    if (Array.isArray(arr)) return _array_like_to_array$a(arr);
 }
-function _class_call_check$9(instance, Constructor) {
+function _class_call_check$a(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$9(target, props) {
+function _defineProperties$a(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -11246,9 +11542,9 @@ function _defineProperties$9(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$9(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$9(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$9(Constructor, staticProps);
+function _create_class$a(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$a(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$a(Constructor, staticProps);
     return Constructor;
 }
 function _define_property$6(obj, key, value) {
@@ -11286,15 +11582,15 @@ function _object_spread$4(target) {
     return target;
 }
 function _to_consumable_array$6(arr) {
-    return _array_without_holes$6(arr) || _iterable_to_array$6(arr) || _unsupported_iterable_to_array$b(arr) || _non_iterable_spread$6();
+    return _array_without_holes$6(arr) || _iterable_to_array$6(arr) || _unsupported_iterable_to_array$a(arr) || _non_iterable_spread$6();
 }
-function _unsupported_iterable_to_array$b(o, minLen) {
+function _unsupported_iterable_to_array$a(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$b(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$a(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$b(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$a(o, minLen);
 }
 function stringifyTokens(splits, tokenToString) {
     var s = "";
@@ -11348,12 +11644,12 @@ var macroTokenToFormatOpts = {
 };
 var Formatter = /*#__PURE__*/ function() {
     function Formatter(locale, formatOpts) {
-        _class_call_check$9(this, Formatter);
+        _class_call_check$a(this, Formatter);
         this.opts = formatOpts;
         this.loc = locale;
         this.systemLoc = null;
     }
-    _create_class$9(Formatter, [
+    _create_class$a(Formatter, [
         {
             key: "formatWithSystemDefault",
             value: function formatWithSystemDefault(dt, opts) {
@@ -11774,12 +12070,12 @@ var Formatter = /*#__PURE__*/ function() {
     return Formatter;
 }();
-function _array_like_to_array$a(arr, len) {
+function _array_like_to_array$9(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes$a(arr) {
+function _array_with_holes$9(arr) {
     if (Array.isArray(arr)) return arr;
 }
 function _define_property$5(obj, key, value) {
@@ -11795,7 +12091,7 @@ function _define_property$5(obj, key, value) {
     }
     return obj;
 }
-function _iterable_to_array_limit$a(arr, i) {
+function _iterable_to_array_limit$9(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -11819,7 +12115,7 @@ function _iterable_to_array_limit$a(arr, i) {
     }
     return _arr;
 }
-function _non_iterable_rest$a() {
+function _non_iterable_rest$9() {
     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 _object_spread$3(target) {
@@ -11837,16 +12133,16 @@ function _object_spread$3(target) {
     }
     return target;
 }
-function _sliced_to_array$a(arr, i) {
-    return _array_with_holes$a(arr) || _iterable_to_array_limit$a(arr, i) || _unsupported_iterable_to_array$a(arr, i) || _non_iterable_rest$a();
+function _sliced_to_array$9(arr, i) {
+    return _array_with_holes$9(arr) || _iterable_to_array_limit$9(arr, i) || _unsupported_iterable_to_array$9(arr, i) || _non_iterable_rest$9();
 }
-function _unsupported_iterable_to_array$a(o, minLen) {
+function _unsupported_iterable_to_array$9(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$a(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$9(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$a(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$9(o, minLen);
 }
 /*
  * This file handles parsing for well-specified formats. Here's how it works:
@@ -11872,8 +12168,8 @@ function combineExtractors() {
     }
     return function(m) {
         return extractors.reduce(function(param, ex) {
-            var _param = _sliced_to_array$a(param, 3), mergedVals = _param[0], mergedZone = _param[1], cursor = _param[2];
-            var _ex = _sliced_to_array$a(ex(m, cursor), 3), val = _ex[0], zone = _ex[1], next = _ex[2];
+            var _param = _sliced_to_array$9(param, 3), mergedVals = _param[0], mergedZone = _param[1], cursor = _param[2];
+            var _ex = _sliced_to_array$9(ex(m, cursor), 3), val = _ex[0], zone = _ex[1], next = _ex[2];
             return [
                 _object_spread$3({}, mergedVals, val),
                 zone || mergedZone,
@@ -11899,7 +12195,7 @@ function parse(s) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = patterns[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _step_value = _sliced_to_array$a(_step.value, 2), regex = _step_value[0], extractor = _step_value[1];
+            var _step_value = _sliced_to_array$9(_step.value, 2), regex = _step_value[0], extractor = _step_value[1];
             var m = regex.exec(s);
             if (m) {
                 return extractor(m);
@@ -11957,7 +12253,7 @@ var sqlTimeRegex = RegExp("".concat(isoTimeBaseRegex.source, " ?(?:").concat(off
 var sqlTimeExtensionRegex = RegExp("(?: ".concat(sqlTimeRegex.source, ")?"));
 function int(match, pos, fallback) {
     var m = match[pos];
-    return isUndefined(m) ? fallback : parseInteger(m);
+    return isUndefined$1(m) ? fallback : parseInteger(m);
 }
 function extractISOYmd(match, cursor) {
     var item = {
@@ -12005,7 +12301,7 @@ var isoTimeOnly = RegExp("^T?".concat(isoTimeBaseRegex.source, "$"));
 // ISO duration parsing
 var isoDuration = /^-?P(?:(?:(-?\d{1,20}(?:\.\d{1,20})?)Y)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20}(?:\.\d{1,20})?)W)?(?:(-?\d{1,20}(?:\.\d{1,20})?)D)?(?:T(?:(-?\d{1,20}(?:\.\d{1,20})?)H)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,20}))?S)?)?)$/;
 function extractISODuration(match) {
-    var _match = _sliced_to_array$a(match, 9), s = _match[0], yearStr = _match[1], monthStr = _match[2], weekStr = _match[3], dayStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], millisecondsStr = _match[8];
+    var _match = _sliced_to_array$9(match, 9), s = _match[0], yearStr = _match[1], monthStr = _match[2], weekStr = _match[3], dayStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], millisecondsStr = _match[8];
     var hasNegativePrefix = s[0] === "-";
     var negativeSeconds = secondStr && secondStr[0] === "-";
     var maybeNegate = function(num) {
@@ -12056,7 +12352,7 @@ function fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr,
 // RFC 2822/5322
 var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|(?:([+-]\d\d)(\d\d)))$/;
 function extractRFC2822(match) {
-    var _match = _sliced_to_array$a(match, 12), weekdayStr = _match[1], dayStr = _match[2], monthStr = _match[3], yearStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], obsOffset = _match[8], milOffset = _match[9], offHourStr = _match[10], offMinuteStr = _match[11], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
+    var _match = _sliced_to_array$9(match, 12), weekdayStr = _match[1], dayStr = _match[2], monthStr = _match[3], yearStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], obsOffset = _match[8], milOffset = _match[9], offHourStr = _match[10], offMinuteStr = _match[11], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
     var offset;
     if (obsOffset) {
         offset = obsOffsets[obsOffset];
@@ -12077,14 +12373,14 @@ function preprocessRFC2822(s) {
 // http date
 var rfc1123 = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun), (\d\d) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{4}) (\d\d):(\d\d):(\d\d) GMT$/, rfc850 = /^(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d) (\d\d):(\d\d):(\d\d) GMT$/, ascii = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ( \d|\d\d) (\d\d):(\d\d):(\d\d) (\d{4})$/;
 function extractRFC1123Or850(match) {
-    var _match = _sliced_to_array$a(match, 8), weekdayStr = _match[1], dayStr = _match[2], monthStr = _match[3], yearStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
+    var _match = _sliced_to_array$9(match, 8), weekdayStr = _match[1], dayStr = _match[2], monthStr = _match[3], yearStr = _match[4], hourStr = _match[5], minuteStr = _match[6], secondStr = _match[7], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
     return [
         result,
         FixedOffsetZone.utcInstance
     ];
 }
 function extractASCII(match) {
-    var _match = _sliced_to_array$a(match, 8), weekdayStr = _match[1], monthStr = _match[2], dayStr = _match[3], hourStr = _match[4], minuteStr = _match[5], secondStr = _match[6], yearStr = _match[7], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
+    var _match = _sliced_to_array$9(match, 8), weekdayStr = _match[1], monthStr = _match[2], dayStr = _match[3], hourStr = _match[4], minuteStr = _match[5], secondStr = _match[6], yearStr = _match[7], result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);
     return [
         result,
         FixedOffsetZone.utcInstance
@@ -12159,20 +12455,20 @@ function parseSQL(s) {
     ]);
 }
-function _array_like_to_array$9(arr, len) {
+function _array_like_to_array$8(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes$9(arr) {
+function _array_with_holes$8(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _class_call_check$8(instance, Constructor) {
+function _class_call_check$9(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$8(target, props) {
+function _defineProperties$9(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -12181,9 +12477,9 @@ function _defineProperties$8(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$8(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$8(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$8(Constructor, staticProps);
+function _create_class$9(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$9(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$9(Constructor, staticProps);
     return Constructor;
 }
 function _define_property$4(obj, key, value) {
@@ -12199,14 +12495,14 @@ function _define_property$4(obj, key, value) {
     }
     return obj;
 }
-function _instanceof$6(left, right) {
+function _instanceof$7(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
         return left instanceof right;
     }
 }
-function _iterable_to_array_limit$9(arr, i) {
+function _iterable_to_array_limit$8(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -12230,7 +12526,7 @@ function _iterable_to_array_limit$9(arr, i) {
     }
     return _arr;
 }
-function _non_iterable_rest$9() {
+function _non_iterable_rest$8() {
     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 _object_spread$2(target) {
@@ -12272,20 +12568,20 @@ function _object_spread_props$2(target, source) {
     }
     return target;
 }
-function _sliced_to_array$9(arr, i) {
-    return _array_with_holes$9(arr) || _iterable_to_array_limit$9(arr, i) || _unsupported_iterable_to_array$9(arr, i) || _non_iterable_rest$9();
+function _sliced_to_array$8(arr, i) {
+    return _array_with_holes$8(arr) || _iterable_to_array_limit$8(arr, i) || _unsupported_iterable_to_array$8(arr, i) || _non_iterable_rest$8();
 }
 function _type_of$5(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-function _unsupported_iterable_to_array$9(o, minLen) {
+function _unsupported_iterable_to_array$8(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$9(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$8(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$9(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$8(o, minLen);
 }
 var INVALID$2 = "Invalid Duration";
 // unit conversion constants
@@ -12430,7 +12726,7 @@ function normalizeValues(matrix, vals) {
     // if this is not the case, factor is used to make it so
     var factor = durationToMillis(matrix, vals) < 0 ? -1 : 1;
     orderedUnits$1.reduceRight(function(previous, current) {
-        if (!isUndefined(vals[current])) {
+        if (!isUndefined$1(vals[current])) {
             if (previous) {
                 var previousVal = vals[previous] * factor;
                 var conv = matrix[current][previous];
@@ -12461,7 +12757,7 @@ function normalizeValues(matrix, vals) {
     // try to convert any decimals into smaller units if possible
     // for example for { years: 2.5, days: 0, seconds: 0 } we want to get { years: 2, days: 182, hours: 12 }
     orderedUnits$1.reduce(function(previous, current) {
-        if (!isUndefined(vals[current])) {
+        if (!isUndefined$1(vals[current])) {
             if (previous) {
                 var fraction = vals[previous] % 1;
                 vals[previous] -= fraction;
@@ -12479,7 +12775,7 @@ function removeZeroes(vals) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = Object.entries(vals)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _step_value = _sliced_to_array$9(_step.value, 2), key = _step_value[0], value = _step_value[1];
+            var _step_value = _sliced_to_array$8(_step.value, 2), key = _step_value[0], value = _step_value[1];
             if (value !== 0) {
                 newVals[key] = value;
             }
@@ -12502,7 +12798,7 @@ function removeZeroes(vals) {
 }
 var Duration = /*#__PURE__*/ function() {
     function Duration(config) {
-        _class_call_check$8(this, Duration);
+        _class_call_check$9(this, Duration);
         var accurate = config.conversionAccuracy === "longterm" || false;
         var matrix = accurate ? accurateMatrix : casualMatrix;
         if (config.matrix) {
@@ -12527,7 +12823,7 @@ var Duration = /*#__PURE__*/ function() {
      * @access private
      */ this.isLuxonDuration = true;
     }
-    _create_class$8(Duration, [
+    _create_class$9(Duration, [
         {
             key: "locale",
             get: /**
@@ -12600,7 +12896,7 @@ var Duration = /*#__PURE__*/ function() {
                 if (!this.isValid) return INVALID$2;
                 var l = orderedUnits$1.map(function(unit) {
                     var val = _this.values[unit];
-                    if (isUndefined(val)) {
+                    if (isUndefined$1(val)) {
                         return null;
                     }
                     return _this.loc.numberFormatter(_object_spread_props$2(_object_spread$2({
@@ -13289,7 +13585,7 @@ var Duration = /*#__PURE__*/ function() {
    * @example Duration.fromISO('P5Y3M').toObject() //=> { years: 5, months: 3 }
    * @return {Duration}
    */ function fromISO(text, opts) {
-                var _parseISODuration = _sliced_to_array$9(parseISODuration(text), 1), parsed = _parseISODuration[0];
+                var _parseISODuration = _sliced_to_array$8(parseISODuration(text), 1), parsed = _parseISODuration[0];
                 if (parsed) {
                     return Duration.fromObject(parsed, opts);
                 } else {
@@ -13315,7 +13611,7 @@ var Duration = /*#__PURE__*/ function() {
    * @example Duration.fromISOTime('T1100').toObject() //=> { hours: 11, minutes: 0, seconds: 0 }
    * @return {Duration}
    */ function fromISOTime(text, opts) {
-                var _parseISOTimeOnly = _sliced_to_array$9(parseISOTimeOnly(text), 1), parsed = _parseISOTimeOnly[0];
+                var _parseISOTimeOnly = _sliced_to_array$8(parseISOTimeOnly(text), 1), parsed = _parseISOTimeOnly[0];
                 if (parsed) {
                     return Duration.fromObject(parsed, opts);
                 } else {
@@ -13335,7 +13631,7 @@ var Duration = /*#__PURE__*/ function() {
                 if (!reason) {
                     throw new InvalidArgumentError("need to specify a reason the Duration is invalid");
                 }
-                var invalid = _instanceof$6(reason, Invalid) ? reason : new Invalid(reason, explanation);
+                var invalid = _instanceof$7(reason, Invalid) ? reason : new Invalid(reason, explanation);
                 if (Settings.throwOnInvalid) {
                     throw new InvalidDurationError(invalid);
                 } else {
@@ -13388,23 +13684,23 @@ var Duration = /*#__PURE__*/ function() {
     return Duration;
 }();
-function _array_like_to_array$8(arr, len) {
+function _array_like_to_array$7(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes$8(arr) {
+function _array_with_holes$7(arr) {
     if (Array.isArray(arr)) return arr;
 }
 function _array_without_holes$5(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$8(arr);
+    if (Array.isArray(arr)) return _array_like_to_array$7(arr);
 }
-function _class_call_check$7(instance, Constructor) {
+function _class_call_check$8(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$7(target, props) {
+function _defineProperties$8(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -13413,12 +13709,12 @@ function _defineProperties$7(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$7(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$7(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$7(Constructor, staticProps);
+function _create_class$8(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$8(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$8(Constructor, staticProps);
     return Constructor;
 }
-function _instanceof$5(left, right) {
+function _instanceof$6(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -13428,7 +13724,7 @@ function _instanceof$5(left, right) {
 function _iterable_to_array$5(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterable_to_array_limit$8(arr, i) {
+function _iterable_to_array_limit$7(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -13452,25 +13748,25 @@ function _iterable_to_array_limit$8(arr, i) {
     }
     return _arr;
 }
-function _non_iterable_rest$8() {
+function _non_iterable_rest$7() {
     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 _non_iterable_spread$5() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _sliced_to_array$8(arr, i) {
-    return _array_with_holes$8(arr) || _iterable_to_array_limit$8(arr, i) || _unsupported_iterable_to_array$8(arr, i) || _non_iterable_rest$8();
+function _sliced_to_array$7(arr, i) {
+    return _array_with_holes$7(arr) || _iterable_to_array_limit$7(arr, i) || _unsupported_iterable_to_array$7(arr, i) || _non_iterable_rest$7();
 }
 function _to_consumable_array$5(arr) {
-    return _array_without_holes$5(arr) || _iterable_to_array$5(arr) || _unsupported_iterable_to_array$8(arr) || _non_iterable_spread$5();
+    return _array_without_holes$5(arr) || _iterable_to_array$5(arr) || _unsupported_iterable_to_array$7(arr) || _non_iterable_spread$5();
 }
-function _unsupported_iterable_to_array$8(o, minLen) {
+function _unsupported_iterable_to_array$7(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$8(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$7(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$8(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$7(o, minLen);
 }
 var INVALID$1 = "Invalid Interval";
 // checks if the start is equal to or before the end
@@ -13487,7 +13783,7 @@ function validateStartEnd(start, end) {
 }
 var Interval = /*#__PURE__*/ function() {
     function Interval(config) {
-        _class_call_check$7(this, Interval);
+        _class_call_check$8(this, Interval);
         /**
      * @access private
      */ this.s = config.start;
@@ -13501,7 +13797,7 @@ var Interval = /*#__PURE__*/ function() {
      * @access private
      */ this.isLuxonInterval = true;
     }
-    _create_class$7(Interval, [
+    _create_class$8(Interval, [
         {
             key: "start",
             get: /**
@@ -13750,7 +14046,7 @@ var Interval = /*#__PURE__*/ function() {
         },
         {
             /**
-   * Return whether this Interval engulfs the start and end of the specified Interval.
+   * Returns true if this Interval fully contains the specified Interval, specifically if the intersect (of this Interval and the other Interval) is equal to the other Interval; false otherwise.
    * @param {Interval} other
    * @return {boolean}
    */ key: "engulfs",
@@ -13970,7 +14266,7 @@ var Interval = /*#__PURE__*/ function() {
                 if (!reason) {
                     throw new InvalidArgumentError("need to specify a reason the Interval is invalid");
                 }
-                var invalid = _instanceof$5(reason, Invalid) ? reason : new Invalid(reason, explanation);
+                var invalid = _instanceof$6(reason, Invalid) ? reason : new Invalid(reason, explanation);
                 if (Settings.throwOnInvalid) {
                     throw new InvalidIntervalError(invalid);
                 } else {
@@ -14034,7 +14330,7 @@ var Interval = /*#__PURE__*/ function() {
    * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals
    * @return {Interval}
    */ function fromISO(text, opts) {
-                var _split = _sliced_to_array$8((text || "").split("/", 2), 2), s = _split[0], e = _split[1];
+                var _split = _sliced_to_array$7((text || "").split("/", 2), 2), s = _split[0], e = _split[1];
                 if (s && e) {
                     var start, startIsValid;
                     try {
@@ -14086,10 +14382,10 @@ var Interval = /*#__PURE__*/ function() {
    * @param {Array} intervals
    * @return {Array}
    */ function merge(intervals) {
-                var _intervals_sort_reduce = _sliced_to_array$8(intervals.sort(function(a, b) {
+                var _intervals_sort_reduce = _sliced_to_array$7(intervals.sort(function(a, b) {
                     return a.s - b.s;
                 }).reduce(function(param, item) {
-                    var _param = _sliced_to_array$8(param, 2), sofar = _param[0], current = _param[1];
+                    var _param = _sliced_to_array$7(param, 2), sofar = _param[0], current = _param[1];
                     if (!current) {
                         return [
                             sofar,
@@ -14176,12 +14472,12 @@ var Interval = /*#__PURE__*/ function() {
     return Interval;
 }();
-function _class_call_check$6(instance, Constructor) {
+function _class_call_check$7(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
-function _defineProperties$6(target, props) {
+function _defineProperties$7(target, props) {
     for(var i = 0; i < props.length; i++){
         var descriptor = props[i];
         descriptor.enumerable = descriptor.enumerable || false;
@@ -14190,16 +14486,16 @@ function _defineProperties$6(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _create_class$6(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties$6(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties$6(Constructor, staticProps);
+function _create_class$7(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$7(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$7(Constructor, staticProps);
     return Constructor;
 }
 var Info = /*#__PURE__*/ function() {
     function Info() {
-        _class_call_check$6(this, Info);
+        _class_call_check$7(this, Info);
     }
-    _create_class$6(Info, null, [
+    _create_class$7(Info, null, [
         {
             key: "hasDST",
             value: /**
@@ -14417,16 +14713,16 @@ var Info = /*#__PURE__*/ function() {
     return Info;
 }();
-function _array_like_to_array$7(arr, len) {
+function _array_like_to_array$6(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _array_with_holes$7(arr) {
+function _array_with_holes$6(arr) {
     if (Array.isArray(arr)) return arr;
 }
 function _array_without_holes$4(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array$7(arr);
+    if (Array.isArray(arr)) return _array_like_to_array$6(arr);
 }
 function _define_property$3(obj, key, value) {
     if (key in obj) {
@@ -14444,7 +14740,7 @@ function _define_property$3(obj, key, value) {
 function _iterable_to_array$4(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterable_to_array_limit$7(arr, i) {
+function _iterable_to_array_limit$6(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -14468,25 +14764,25 @@ function _iterable_to_array_limit$7(arr, i) {
     }
     return _arr;
 }
-function _non_iterable_rest$7() {
+function _non_iterable_rest$6() {
     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 _non_iterable_spread$4() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _sliced_to_array$7(arr, i) {
-    return _array_with_holes$7(arr) || _iterable_to_array_limit$7(arr, i) || _unsupported_iterable_to_array$7(arr, i) || _non_iterable_rest$7();
+function _sliced_to_array$6(arr, i) {
+    return _array_with_holes$6(arr) || _iterable_to_array_limit$6(arr, i) || _unsupported_iterable_to_array$6(arr, i) || _non_iterable_rest$6();
 }
 function _to_consumable_array$4(arr) {
-    return _array_without_holes$4(arr) || _iterable_to_array$4(arr) || _unsupported_iterable_to_array$7(arr) || _non_iterable_spread$4();
+    return _array_without_holes$4(arr) || _iterable_to_array$4(arr) || _unsupported_iterable_to_array$6(arr) || _non_iterable_spread$4();
 }
-function _unsupported_iterable_to_array$7(o, minLen) {
+function _unsupported_iterable_to_array$6(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$7(o, minLen);
+    if (typeof o === "string") return _array_like_to_array$6(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$7(o, minLen);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$6(o, minLen);
 }
 function dayDiff(earlier, later) {
     var utcDayStart = function(dt) {
@@ -14541,7 +14837,7 @@ function highOrderDiffs(cursor, later, units) {
      this is used later to potentially convert any difference smaller than the smallest higher order unit
      into a fraction of that smallest higher order unit
   */ for(var _iterator = differs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _step_value = _sliced_to_array$7(_step.value, 2), unit = _step_value[0], differ = _step_value[1];
+            var _step_value = _sliced_to_array$6(_step.value, 2), unit = _step_value[0], differ = _step_value[1];
             if (units.indexOf(unit) >= 0) {
                 lowestOrder = unit;
                 results[unit] = differ(cursor, later);
@@ -14566,227 +14862,52 @@ function highOrderDiffs(cursor, later, units) {
             }
         }
     } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return [
-        cursor,
-        results,
-        highWater,
-        lowestOrder
-    ];
-}
-function diff(earlier, later, units, opts) {
-    var _highOrderDiffs = _sliced_to_array$7(highOrderDiffs(earlier, later, units), 4), cursor = _highOrderDiffs[0], results = _highOrderDiffs[1], highWater = _highOrderDiffs[2], lowestOrder = _highOrderDiffs[3];
-    var remainingMillis = later - cursor;
-    var lowerOrderUnits = units.filter(function(u) {
-        return [
-            "hours",
-            "minutes",
-            "seconds",
-            "milliseconds"
-        ].indexOf(u) >= 0;
-    });
-    if (lowerOrderUnits.length === 0) {
-        if (highWater < later) {
-            highWater = cursor.plus(_define_property$3({}, lowestOrder, 1));
-        }
-        if (highWater !== cursor) {
-            results[lowestOrder] = (results[lowestOrder] || 0) + remainingMillis / (highWater - cursor);
-        }
-    }
-    var duration = Duration.fromObject(results, opts);
-    if (lowerOrderUnits.length > 0) {
-        var _Duration_fromMillis;
-        return (_Duration_fromMillis = Duration.fromMillis(remainingMillis, opts)).shiftTo.apply(_Duration_fromMillis, _to_consumable_array$4(lowerOrderUnits)).plus(duration);
-    } else {
-        return duration;
-    }
-}
-function _array_like_to_array$6(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_with_holes$6(arr) {
-    if (Array.isArray(arr)) return arr;
-}
-function _iterable_to_array_limit$6(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
-            _arr.push(_s.value);
-            if (i && _arr.length === i) break;
-        }
-    } catch (err) {
-        _d = true;
-        _e = err;
-    } finally{
-        try {
-            if (!_n && _i["return"] != null) _i["return"]();
-        } finally{
-            if (_d) throw _e;
-        }
-    }
-    return _arr;
-}
-function _non_iterable_rest$6() {
-    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 _sliced_to_array$6(arr, i) {
-    return _array_with_holes$6(arr) || _iterable_to_array_limit$6(arr, i) || _unsupported_iterable_to_array$6(arr, i) || _non_iterable_rest$6();
-}
-function _unsupported_iterable_to_array$6(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array$6(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$6(o, minLen);
-}
-var numberingSystems = {
-    arab: "[٠-٩]",
-    arabext: "[۰-۹]",
-    bali: "[᭐-᭙]",
-    beng: "[০-৯]",
-    deva: "[०-९]",
-    fullwide: "[０-９]",
-    gujr: "[૦-૯]",
-    hanidec: "[〇|一|二|三|四|五|六|七|八|九]",
-    khmr: "[០-៩]",
-    knda: "[೦-೯]",
-    laoo: "[໐-໙]",
-    limb: "[᥆-᥏]",
-    mlym: "[൦-൯]",
-    mong: "[᠐-᠙]",
-    mymr: "[၀-၉]",
-    orya: "[୦-୯]",
-    tamldec: "[௦-௯]",
-    telu: "[౦-౯]",
-    thai: "[๐-๙]",
-    tibt: "[༠-༩]",
-    latn: "\\d"
-};
-var numberingSystemsUTF16 = {
-    arab: [
-        1632,
-        1641
-    ],
-    arabext: [
-        1776,
-        1785
-    ],
-    bali: [
-        6992,
-        7001
-    ],
-    beng: [
-        2534,
-        2543
-    ],
-    deva: [
-        2406,
-        2415
-    ],
-    fullwide: [
-        65296,
-        65303
-    ],
-    gujr: [
-        2790,
-        2799
-    ],
-    khmr: [
-        6112,
-        6121
-    ],
-    knda: [
-        3302,
-        3311
-    ],
-    laoo: [
-        3792,
-        3801
-    ],
-    limb: [
-        6470,
-        6479
-    ],
-    mlym: [
-        3430,
-        3439
-    ],
-    mong: [
-        6160,
-        6169
-    ],
-    mymr: [
-        4160,
-        4169
-    ],
-    orya: [
-        2918,
-        2927
-    ],
-    tamldec: [
-        3046,
-        3055
-    ],
-    telu: [
-        3174,
-        3183
-    ],
-    thai: [
-        3664,
-        3673
-    ],
-    tibt: [
-        3872,
-        3881
-    ]
-};
-var hanidecChars = numberingSystems.hanidec.replace(/[\[|\]]/g, "").split("");
-function parseDigits(str) {
-    var value = parseInt(str, 10);
-    if (isNaN(value)) {
-        value = "";
-        for(var i = 0; i < str.length; i++){
-            var code = str.charCodeAt(i);
-            if (str[i].search(numberingSystems.hanidec) !== -1) {
-                value += hanidecChars.indexOf(str[i]);
-            } else {
-                for(var key in numberingSystemsUTF16){
-                    var _numberingSystemsUTF16_key = _sliced_to_array$6(numberingSystemsUTF16[key], 2), min = _numberingSystemsUTF16_key[0], max = _numberingSystemsUTF16_key[1];
-                    if (code >= min && code <= max) {
-                        value += code - min;
-                    }
-                }
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
             }
         }
-        return parseInt(value, 10);
-    } else {
-        return value;
     }
+    return [
+        cursor,
+        results,
+        highWater,
+        lowestOrder
+    ];
 }
-function digitRegex(param) {
-    var numberingSystem = param.numberingSystem, append = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
-    return new RegExp("".concat(numberingSystems[numberingSystem || "latn"]).concat(append));
+function diff(earlier, later, units, opts) {
+    var _highOrderDiffs = _sliced_to_array$6(highOrderDiffs(earlier, later, units), 4), cursor = _highOrderDiffs[0], results = _highOrderDiffs[1], highWater = _highOrderDiffs[2], lowestOrder = _highOrderDiffs[3];
+    var remainingMillis = later - cursor;
+    var lowerOrderUnits = units.filter(function(u) {
+        return [
+            "hours",
+            "minutes",
+            "seconds",
+            "milliseconds"
+        ].indexOf(u) >= 0;
+    });
+    if (lowerOrderUnits.length === 0) {
+        if (highWater < later) {
+            highWater = cursor.plus(_define_property$3({}, lowestOrder, 1));
+        }
+        if (highWater !== cursor) {
+            results[lowestOrder] = (results[lowestOrder] || 0) + remainingMillis / (highWater - cursor);
+        }
+    }
+    var duration = Duration.fromObject(results, opts);
+    if (lowerOrderUnits.length > 0) {
+        var _Duration_fromMillis;
+        return (_Duration_fromMillis = Duration.fromMillis(remainingMillis, opts)).shiftTo.apply(_Duration_fromMillis, _to_consumable_array$4(lowerOrderUnits)).plus(duration);
+    } else {
+        return duration;
+    }
 }
 function _array_like_to_array$5(arr, len) {
@@ -14800,6 +14921,25 @@ function _array_with_holes$5(arr) {
 function _array_without_holes$3(arr) {
     if (Array.isArray(arr)) return _array_like_to_array$5(arr);
 }
+function _class_call_check$6(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties$6(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class$6(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties$6(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties$6(Constructor, staticProps);
+    return Constructor;
+}
 function _iterable_to_array$3(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -15206,19 +15346,19 @@ function dateTimeFromMatches(matches) {
     };
     var zone = null;
     var specificOffset;
-    if (!isUndefined(matches.z)) {
+    if (!isUndefined$1(matches.z)) {
         zone = IANAZone.create(matches.z);
     }
-    if (!isUndefined(matches.Z)) {
+    if (!isUndefined$1(matches.Z)) {
         if (!zone) {
             zone = new FixedOffsetZone(matches.Z);
         }
         specificOffset = matches.Z;
     }
-    if (!isUndefined(matches.q)) {
+    if (!isUndefined$1(matches.q)) {
         matches.M = (matches.q - 1) * 3 + 1;
     }
-    if (!isUndefined(matches.h)) {
+    if (!isUndefined$1(matches.h)) {
         if (matches.h < 12 && matches.a === 1) {
             matches.h += 12;
         } else if (matches.h === 12 && matches.a === 0) {
@@ -15228,7 +15368,7 @@ function dateTimeFromMatches(matches) {
     if (matches.G === 0 && matches.y) {
         matches.y = -matches.y;
     }
-    if (!isUndefined(matches.u)) {
+    if (!isUndefined$1(matches.u)) {
         matches.S = parseMillis(matches.u);
     }
     var vals = Object.keys(matches).reduce(function(r, k) {
@@ -15270,38 +15410,74 @@ function expandMacroTokens(tokens, locale) {
 }
 /**
  * @private
- */ function explainFromTokens(locale, input, format) {
-    var tokens = expandMacroTokens(Formatter.parseFormat(format), locale), units = tokens.map(function(t) {
-        return unitForToken(t, locale);
-    }), disqualifyingUnit = units.find(function(t) {
-        return t.invalidReason;
-    });
-    if (disqualifyingUnit) {
-        return {
-            input: input,
-            tokens: tokens,
-            invalidReason: disqualifyingUnit.invalidReason
-        };
-    } else {
-        var _buildRegex = _sliced_to_array$5(buildRegex(units), 2), regexString = _buildRegex[0], handlers = _buildRegex[1], regex = RegExp(regexString, "i"), _match = _sliced_to_array$5(match(input, regex, handlers), 2), rawMatches = _match[0], matches = _match[1], _ref = _sliced_to_array$5(matches ? dateTimeFromMatches(matches) : [
-            null,
-            null,
-            undefined
-        ], 3), result = _ref[0], zone = _ref[1], specificOffset = _ref[2];
-        if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
-            throw new ConflictingSpecificationError("Can't include meridiem when specifying 24-hour format");
+ */ var TokenParser = /*#__PURE__*/ function() {
+    function TokenParser(locale, format) {
+        _class_call_check$6(this, TokenParser);
+        this.locale = locale;
+        this.format = format;
+        this.tokens = expandMacroTokens(Formatter.parseFormat(format), locale);
+        this.units = this.tokens.map(function(t) {
+            return unitForToken(t, locale);
+        });
+        this.disqualifyingUnit = this.units.find(function(t) {
+            return t.invalidReason;
+        });
+        if (!this.disqualifyingUnit) {
+            var _buildRegex = _sliced_to_array$5(buildRegex(this.units), 2), regexString = _buildRegex[0], handlers = _buildRegex[1];
+            this.regex = RegExp(regexString, "i");
+            this.handlers = handlers;
         }
-        return {
-            input: input,
-            tokens: tokens,
-            regex: regex,
-            rawMatches: rawMatches,
-            matches: matches,
-            result: result,
-            zone: zone,
-            specificOffset: specificOffset
-        };
     }
+    _create_class$6(TokenParser, [
+        {
+            key: "explainFromTokens",
+            value: function explainFromTokens(input) {
+                if (!this.isValid) {
+                    return {
+                        input: input,
+                        tokens: this.tokens,
+                        invalidReason: this.invalidReason
+                    };
+                } else {
+                    var _match = _sliced_to_array$5(match(input, this.regex, this.handlers), 2), rawMatches = _match[0], matches = _match[1], _ref = _sliced_to_array$5(matches ? dateTimeFromMatches(matches) : [
+                        null,
+                        null,
+                        undefined
+                    ], 3), result = _ref[0], zone = _ref[1], specificOffset = _ref[2];
+                    if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
+                        throw new ConflictingSpecificationError("Can't include meridiem when specifying 24-hour format");
+                    }
+                    return {
+                        input: input,
+                        tokens: this.tokens,
+                        regex: this.regex,
+                        rawMatches: rawMatches,
+                        matches: matches,
+                        result: result,
+                        zone: zone,
+                        specificOffset: specificOffset
+                    };
+                }
+            }
+        },
+        {
+            key: "isValid",
+            get: function get() {
+                return !this.disqualifyingUnit;
+            }
+        },
+        {
+            key: "invalidReason",
+            get: function get() {
+                return this.disqualifyingUnit ? this.disqualifyingUnit.invalidReason : null;
+            }
+        }
+    ]);
+    return TokenParser;
+}();
+function explainFromTokens(locale, input, format) {
+    var parser = new TokenParser(locale, format);
+    return parser.explainFromTokens(input);
 }
 function parseFromTokens(locale, input, format) {
     var _explainFromTokens = explainFromTokens(locale, input, format), result = _explainFromTokens.result, zone = _explainFromTokens.zone, specificOffset = _explainFromTokens.specificOffset, invalidReason = _explainFromTokens.invalidReason;
@@ -15365,7 +15541,7 @@ function _define_property$2(obj, key, value) {
     }
     return obj;
 }
-function _instanceof$4(left, right) {
+function _instanceof$5(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -15736,19 +15912,51 @@ function normalizeUnitWithLocalWeeks(unit) {
             return normalizeUnit(unit);
     }
 }
+// cache offsets for zones based on the current timestamp when this function is
+// first called. When we are handling a datetime from components like (year,
+// month, day, hour) in a time zone, we need a guess about what the timezone
+// offset is so that we can convert into a UTC timestamp. One way is to find the
+// offset of now in the zone. The actual date may have a different offset (for
+// example, if we handle a date in June while we're in December in a zone that
+// observes DST), but we can check and adjust that.
+//
+// When handling many dates, calculating the offset for now every time is
+// expensive. It's just a guess, so we can cache the offset to use even if we
+// are right on a time change boundary (we'll just correct in the other
+// direction). Using a timestamp from first read is a slight optimization for
+// handling dates close to the current date, since those dates will usually be
+// in the same offset (we could set the timestamp statically, instead). We use a
+// single timestamp for all zones to make things a bit more predictable.
+//
+// This is safe for quickDT (used by local() and utc()) because we don't fill in
+// higher-order units from tsNow (as we do in fromObject, this requires that
+// offset is calculated from tsNow).
+function guessOffsetForZone(zone) {
+    if (!zoneOffsetGuessCache[zone]) {
+        if (zoneOffsetTs === undefined) {
+            zoneOffsetTs = Settings.now();
+        }
+        zoneOffsetGuessCache[zone] = zone.offset(zoneOffsetTs);
+    }
+    return zoneOffsetGuessCache[zone];
+}
 // this is a dumbed down version of fromObject() that runs about 60% faster
 // but doesn't do any validation, makes a bunch of assumptions about what units
 // are present, and so on.
 function quickDT(obj, opts) {
-    var zone = normalizeZone(opts.zone, Settings.defaultZone), loc = Locale.fromObject(opts), tsNow = Settings.now();
+    var zone = normalizeZone(opts.zone, Settings.defaultZone);
+    if (!zone.isValid) {
+        return DateTime.invalid(unsupportedZone(zone));
+    }
+    var loc = Locale.fromObject(opts);
     var ts, o;
     // assume we have the higher-order units
-    if (!isUndefined(obj.year)) {
+    if (!isUndefined$1(obj.year)) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
             for(var _iterator = orderedUnits[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                 var u = _step.value;
-                if (isUndefined(obj[u])) {
+                if (isUndefined$1(obj[u])) {
                     obj[u] = defaultUnitValues[u];
                 }
             }
@@ -15770,11 +15978,11 @@ function quickDT(obj, opts) {
         if (invalid) {
             return DateTime.invalid(invalid);
         }
-        var offsetProvis = zone.offset(tsNow);
+        var offsetProvis = guessOffsetForZone(zone);
         var ref;
         ref = _sliced_to_array$4(objToTS(obj, offsetProvis, zone), 2), ts = ref[0], o = ref[1];
     } else {
-        ts = tsNow;
+        ts = Settings.now();
     }
     return new DateTime({
         ts: ts,
@@ -15784,7 +15992,7 @@ function quickDT(obj, opts) {
     });
 }
 function diffRelative(start, end, opts) {
-    var round = isUndefined(opts.round) ? true : opts.round, format = function(c, unit) {
+    var round = isUndefined$1(opts.round) ? true : opts.round, format = function(c, unit) {
         c = roundTo(c, round || opts.calendary ? 0 : 2, true);
         var formatter = end.loc.clone(opts).relFormatter(opts);
         return formatter.format(c, unit);
@@ -15838,6 +16046,15 @@ function lastOpts(argList) {
         args
     ];
 }
+/**
+ * Timestamp to use for cached zone offset guesses (exposed for test)
+ */ var zoneOffsetTs;
+/**
+ * Cache for zone offset guesses (exposed for test).
+ *
+ * This optimizes quickDT via guessOffsetForZone to avoid repeated calls of
+ * zone.offset().
+ */ var zoneOffsetGuessCache = {};
 var DateTime = /*#__PURE__*/ function() {
     function DateTime(config) {
         _class_call_check$5(this, DateTime);
@@ -15845,7 +16062,7 @@ var DateTime = /*#__PURE__*/ function() {
         var invalid = config.invalid || (Number.isNaN(config.ts) ? new Invalid("invalid input") : null) || (!zone.isValid ? unsupportedZone(zone) : null);
         /**
      * @access private
-     */ this.ts = isUndefined(config.ts) ? Settings.now() : config.ts;
+     */ this.ts = isUndefined$1(config.ts) ? Settings.now() : config.ts;
         var c = null, o = null;
         if (!invalid) {
             var unchanged = config.old && config.old.ts === this.ts && config.old.zone.equals(zone);
@@ -15856,7 +16073,9 @@ var DateTime = /*#__PURE__*/ function() {
                     config.old.o
                 ], c = ref[0], o = ref[1];
             } else {
-                var ot = zone.offset(this.ts);
+                // If an offset has been passed and we have not been called from
+                // clone(), we can trust it and avoid the offset calculation.
+                var ot = isNumber$1(config.o) && !config.old ? config.o : zone.offset(this.ts);
                 c = tsToObj(this.ts, ot);
                 invalid = Number.isNaN(c.year) ? new Invalid("invalid input") : null;
                 c = invalid ? null : c;
@@ -16494,7 +16713,7 @@ var DateTime = /*#__PURE__*/ function() {
                 if (!this.isValid) return this;
                 var normalized = normalizeObject(values, normalizeUnitWithLocalWeeks);
                 var _usesLocalWeekValues = usesLocalWeekValues(normalized, this.loc), minDaysInFirstWeek = _usesLocalWeekValues.minDaysInFirstWeek, startOfWeek = _usesLocalWeekValues.startOfWeek;
-                var settingWeekStuff = !isUndefined(normalized.weekYear) || !isUndefined(normalized.weekNumber) || !isUndefined(normalized.weekday), containsOrdinal = !isUndefined(normalized.ordinal), containsGregorYear = !isUndefined(normalized.year), containsGregorMD = !isUndefined(normalized.month) || !isUndefined(normalized.day), containsGregor = containsGregorYear || containsGregorMD, definiteWeekDef = normalized.weekYear || normalized.weekNumber;
+                var settingWeekStuff = !isUndefined$1(normalized.weekYear) || !isUndefined$1(normalized.weekNumber) || !isUndefined$1(normalized.weekday), containsOrdinal = !isUndefined$1(normalized.ordinal), containsGregorYear = !isUndefined$1(normalized.year), containsGregorMD = !isUndefined$1(normalized.month) || !isUndefined$1(normalized.day), containsGregor = containsGregorYear || containsGregorMD, definiteWeekDef = normalized.weekYear || normalized.weekNumber;
                 if ((containsGregor || containsOrdinal) && definiteWeekDef) {
                     throw new ConflictingSpecificationError("Can't mix weekYear/weekNumber units with year/month/day or ordinals");
                 }
@@ -16504,13 +16723,13 @@ var DateTime = /*#__PURE__*/ function() {
                 var mixed;
                 if (settingWeekStuff) {
                     mixed = weekToGregorian(_object_spread$1({}, gregorianToWeek(this.c, minDaysInFirstWeek, startOfWeek), normalized), minDaysInFirstWeek, startOfWeek);
-                } else if (!isUndefined(normalized.ordinal)) {
+                } else if (!isUndefined$1(normalized.ordinal)) {
                     mixed = ordinalToGregorian(_object_spread$1({}, gregorianToOrdinal(this.c), normalized));
                 } else {
                     mixed = _object_spread$1({}, this.toObject(), normalized);
                     // if we didn't set the day but we ended up on an overflow date,
                     // use the last day of the right month
-                    if (isUndefined(normalized.day)) {
+                    if (isUndefined$1(normalized.day)) {
                         mixed.day = Math.min(daysInMonth(mixed.year, mixed.month), mixed.day);
                     }
                 }
@@ -17189,6 +17408,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [options.locale] - a locale to set on the resulting DateTime instance
    * @param {string} [options.outputCalendar] - the output calendar to set on the resulting DateTime instance
    * @param {string} [options.numberingSystem] - the numbering system to set on the resulting DateTime instance
+   * @param {string} [options.weekSettings] - the week settings to set on the resulting DateTime instance
    * @example DateTime.utc()                                              //~> now
    * @example DateTime.utc(2017)                                          //~> 2017-01-01T00:00:00Z
    * @example DateTime.utc(2017, 3)                                       //~> 2017-03-01T00:00:00Z
@@ -17248,13 +17468,14 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [options.locale] - a locale to set on the resulting DateTime instance
    * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance
+   * @param {string} options.weekSettings - the week settings to set on the resulting DateTime instance
    * @return {DateTime}
    */ function fromMillis(milliseconds) {
                 var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
                 if (!isNumber$1(milliseconds)) {
                     throw new InvalidArgumentError("fromMillis requires a numerical input, but received a ".concat(typeof milliseconds === "undefined" ? "undefined" : _type_of$4(milliseconds), " with value ").concat(milliseconds));
                 } else if (milliseconds < -MAX_DATE || milliseconds > MAX_DATE) {
-                    // this isn't perfect because because we can still end up out of range because of additional shifting, but it's a start
+                    // this isn't perfect because we can still end up out of range because of additional shifting, but it's a start
                     return DateTime.invalid("Timestamp out of range");
                 } else {
                     return new DateTime({
@@ -17275,6 +17496,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [options.locale] - a locale to set on the resulting DateTime instance
    * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance
+   * @param {string} options.weekSettings - the week settings to set on the resulting DateTime instance
    * @return {DateTime}
    */ function fromSeconds(seconds) {
                 var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
@@ -17313,6 +17535,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [opts.locale='system\'s locale'] - a locale to set on the resulting DateTime instance
    * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance
+   * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance
    * @example DateTime.fromObject({ year: 1982, month: 5, day: 25}).toISODate() //=> '1982-05-25'
    * @example DateTime.fromObject({ year: 1982 }).toISODate() //=> '1982-01-01'
    * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6 }) //~> today at 10:26:06
@@ -17332,7 +17555,7 @@ var DateTime = /*#__PURE__*/ function() {
                 var loc = Locale.fromObject(opts);
                 var normalized = normalizeObject(obj, normalizeUnitWithLocalWeeks);
                 var _usesLocalWeekValues = usesLocalWeekValues(normalized, loc), minDaysInFirstWeek = _usesLocalWeekValues.minDaysInFirstWeek, startOfWeek = _usesLocalWeekValues.startOfWeek;
-                var tsNow = Settings.now(), offsetProvis = !isUndefined(opts.specificOffset) ? opts.specificOffset : zoneToUse.offset(tsNow), containsOrdinal = !isUndefined(normalized.ordinal), containsGregorYear = !isUndefined(normalized.year), containsGregorMD = !isUndefined(normalized.month) || !isUndefined(normalized.day), containsGregor = containsGregorYear || containsGregorMD, definiteWeekDef = normalized.weekYear || normalized.weekNumber;
+                var tsNow = Settings.now(), offsetProvis = !isUndefined$1(opts.specificOffset) ? opts.specificOffset : zoneToUse.offset(tsNow), containsOrdinal = !isUndefined$1(normalized.ordinal), containsGregorYear = !isUndefined$1(normalized.year), containsGregorMD = !isUndefined$1(normalized.month) || !isUndefined$1(normalized.day), containsGregor = containsGregorYear || containsGregorMD, definiteWeekDef = normalized.weekYear || normalized.weekNumber;
                 // cases:
                 // just a weekday -> this week's instance of that weekday, no worries
                 // (gregorian data or ordinal) + (weekYear or weekNumber) -> error
@@ -17366,7 +17589,7 @@ var DateTime = /*#__PURE__*/ function() {
                     for(var _iterator = units[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                         var u = _step.value;
                         var v = normalized[u];
-                        if (!isUndefined(v)) {
+                        if (!isUndefined$1(v)) {
                             foundFirst = true;
                         } else if (foundFirst) {
                             normalized[u] = defaultValues[u];
@@ -17404,6 +17627,9 @@ var DateTime = /*#__PURE__*/ function() {
                 if (normalized.weekday && containsGregor && obj.weekday !== inst.weekday) {
                     return DateTime.invalid("mismatched weekday", "you can't specify both a weekday of ".concat(normalized.weekday, " and a date of ").concat(inst.toISO()));
                 }
+                if (!inst.isValid) {
+                    return DateTime.invalid(inst.invalid);
+                }
                 return inst;
             }
         },
@@ -17418,6 +17644,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance
    * @param {string} [opts.outputCalendar] - the output calendar to set on the resulting DateTime instance
    * @param {string} [opts.numberingSystem] - the numbering system to set on the resulting DateTime instance
+   * @param {string} [opts.weekSettings] - the week settings to set on the resulting DateTime instance
    * @example DateTime.fromISO('2016-05-25T09:08:34.123')
    * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00')
    * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00', {setZone: true})
@@ -17441,6 +17668,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance
    * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance
+   * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance
    * @example DateTime.fromRFC2822('25 Nov 2016 13:23:12 GMT')
    * @example DateTime.fromRFC2822('Fri, 25 Nov 2016 13:23:12 +0600')
    * @example DateTime.fromRFC2822('25 Nov 2016 13:23 Z')
@@ -17463,6 +17691,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance
    * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance
+   * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance
    * @example DateTime.fromHTTP('Sun, 06 Nov 1994 08:49:37 GMT')
    * @example DateTime.fromHTTP('Sunday, 06-Nov-94 08:49:37 GMT')
    * @example DateTime.fromHTTP('Sun Nov  6 08:49:37 1994')
@@ -17485,11 +17714,12 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one
    * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale
    * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system
+   * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance
    * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @return {DateTime}
    */ function fromFormat(text, fmt) {
                 var opts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-                if (isUndefined(text) || isUndefined(fmt)) {
+                if (isUndefined$1(text) || isUndefined$1(fmt)) {
                     throw new InvalidArgumentError("fromFormat requires an input string and a format");
                 }
                 var _opts_locale = opts.locale, locale = _opts_locale === void 0 ? null : _opts_locale, _opts_numberingSystem = opts.numberingSystem, numberingSystem = _opts_numberingSystem === void 0 ? null : _opts_numberingSystem, localeToUse = Locale.fromOpts({
@@ -17524,6 +17754,7 @@ var DateTime = /*#__PURE__*/ function() {
    * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one
    * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale
    * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system
+   * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance
    * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance
    * @example DateTime.fromSQL('2017-05-15')
    * @example DateTime.fromSQL('2017-05-15 09:12:34')
@@ -17552,7 +17783,7 @@ var DateTime = /*#__PURE__*/ function() {
                 if (!reason) {
                     throw new InvalidArgumentError("need to specify a reason the DateTime is invalid");
                 }
-                var invalid = _instanceof$4(reason, Invalid) ? reason : new Invalid(reason, explanation);
+                var invalid = _instanceof$5(reason, Invalid) ? reason : new Invalid(reason, explanation);
                 if (Settings.throwOnInvalid) {
                     throw new InvalidDateTimeError(invalid);
                 } else {
@@ -17603,6 +17834,13 @@ var DateTime = /*#__PURE__*/ function() {
                 }).join("");
             }
         },
+        {
+            key: "resetCache",
+            value: function resetCache() {
+                zoneOffsetTs = undefined;
+                zoneOffsetGuessCache = {};
+            }
+        },
         {
             key: "min",
             value: /**
@@ -17667,6 +17905,61 @@ var DateTime = /*#__PURE__*/ function() {
                 return DateTime.fromFormatExplain(text, fmt, options);
             }
         },
+        {
+            key: "buildFormatParser",
+            value: /**
+   * Build a parser for `fmt` using the given locale. This parser can be passed
+   * to {@link DateTime.fromFormatParser} to a parse a date in this format. This
+   * can be used to optimize cases where many dates need to be parsed in a
+   * specific format.
+   *
+   * @param {String} fmt - the format the string is expected to be in (see
+   * description)
+   * @param {Object} options - options used to set locale and numberingSystem
+   * for parser
+   * @returns {TokenParser} - opaque object to be used
+   */ function buildFormatParser(fmt) {
+                var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+                var _options_locale = options.locale, locale = _options_locale === void 0 ? null : _options_locale, _options_numberingSystem = options.numberingSystem, numberingSystem = _options_numberingSystem === void 0 ? null : _options_numberingSystem, localeToUse = Locale.fromOpts({
+                    locale: locale,
+                    numberingSystem: numberingSystem,
+                    defaultToEN: true
+                });
+                return new TokenParser(localeToUse, fmt);
+            }
+        },
+        {
+            key: "fromFormatParser",
+            value: /**
+   * Create a DateTime from an input string and format parser.
+   *
+   * The format parser must have been created with the same locale as this call.
+   *
+   * @param {String} text - the string to parse
+   * @param {TokenParser} formatParser - parser from {@link DateTime.buildFormatParser}
+   * @param {Object} opts - options taken by fromFormat()
+   * @returns {DateTime}
+   */ function fromFormatParser(text, formatParser) {
+                var opts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+                if (isUndefined$1(text) || isUndefined$1(formatParser)) {
+                    throw new InvalidArgumentError("fromFormatParser requires an input string and a format parser");
+                }
+                var _opts_locale = opts.locale, locale = _opts_locale === void 0 ? null : _opts_locale, _opts_numberingSystem = opts.numberingSystem, numberingSystem = _opts_numberingSystem === void 0 ? null : _opts_numberingSystem, localeToUse = Locale.fromOpts({
+                    locale: locale,
+                    numberingSystem: numberingSystem,
+                    defaultToEN: true
+                });
+                if (!localeToUse.equals(formatParser.locale)) {
+                    throw new InvalidArgumentError("fromFormatParser called with a locale of ".concat(localeToUse, ", ") + "but the format parser was created for ".concat(formatParser.locale));
+                }
+                var _formatParser_explainFromTokens = formatParser.explainFromTokens(text), result = _formatParser_explainFromTokens.result, zone = _formatParser_explainFromTokens.zone, specificOffset = _formatParser_explainFromTokens.specificOffset, invalidReason = _formatParser_explainFromTokens.invalidReason;
+                if (invalidReason) {
+                    return DateTime.invalid(invalidReason);
+                } else {
+                    return parseDataToDateTime(result, zone, opts, "format ".concat(formatParser.format), text, specificOffset);
+                }
+            }
+        },
         {
             key: "DATE_SHORT",
             get: // FORMAT PRESETS
@@ -17937,7 +18230,7 @@ function _inherits$2(subClass, superClass) {
     });
     if (superClass) _set_prototype_of$2(subClass, superClass);
 }
-function _instanceof$3(left, right) {
+function _instanceof$4(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -18866,14 +19159,14 @@ function resolveNode(node, pos, side, overlays) {
     var _a;
     // Move up to a node that actually holds the position, if possible
     while(node.from == node.to || (side < 1 ? node.from >= pos : node.from > pos) || (side > -1 ? node.to <= pos : node.to < pos)){
-        var parent = !overlays && _instanceof$3(node, TreeNode) && node.index < 0 ? null : node.parent;
+        var parent = !overlays && _instanceof$4(node, TreeNode) && node.index < 0 ? null : node.parent;
         if (!parent) return node;
         node = parent;
     }
     var mode = overlays ? 0 : IterMode.IgnoreOverlays;
     // Must go up out of overlays when those do not overlap with pos
     if (overlays) for(var scan = node, parent1 = scan.parent; parent1; scan = parent1, parent1 = scan.parent){
-        if (_instanceof$3(scan, TreeNode) && scan.index < 0 && ((_a = parent1.enter(pos, side, mode)) === null || _a === void 0 ? void 0 : _a.from) != scan.from) node = parent1;
+        if (_instanceof$4(scan, TreeNode) && scan.index < 0 && ((_a = parent1.enter(pos, side, mode)) === null || _a === void 0 ? void 0 : _a.from) != scan.from) node = parent1;
     }
     for(;;){
         var inner = node.enter(pos, side, mode);
@@ -18925,7 +19218,7 @@ var BaseNode = /*#__PURE__*/ function() {
         {
             key: "matchContext",
             value: function matchContext(context) {
-                return matchNodeContext(this, context);
+                return matchNodeContext(this.parent, context);
             }
         },
         {
@@ -19001,7 +19294,7 @@ var TreeNode = /*#__PURE__*/ function(BaseNode) {
                     for(var _parent__tree = parent._tree, children = _parent__tree.children, positions = _parent__tree.positions, e = dir > 0 ? children.length : -1; i != e; i += dir){
                         var next = children[i], start = positions[i] + parent.from;
                         if (!checkSide(side, pos, start, start + next.length)) continue;
-                        if (_instanceof$3(next, TreeBuffer)) {
+                        if (_instanceof$4(next, TreeBuffer)) {
                             if (mode & IterMode.ExcludeBuffers) continue;
                             var index = next.findChild(0, next.buffer.length, dir, pos - start, side);
                             if (index > -1) return new BufferNode(new BufferContext(parent, next, i, start), null, index);
@@ -19139,7 +19432,7 @@ function getChildren(node, type, before, after) {
 }
 function matchNodeContext(node, context) {
     var i = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : context.length - 1;
-    for(var p = node.parent; i >= 0; p = p.parent){
+    for(var p = node; i >= 0; p = p.parent){
         if (!p) return false;
         if (!p.type.isAnonymous) {
             if (context[i] && context[i] != p.name) return false;
@@ -19300,7 +19593,7 @@ function iterStack(heads) {
             pick = i;
         }
     }
-    var next = _instanceof$3(picked, TreeNode) && picked.index < 0 ? null : picked.parent;
+    var next = _instanceof$4(picked, TreeNode) && picked.index < 0 ? null : picked.parent;
     var newHeads = heads.slice();
     if (next) newHeads[pick] = next;
     else newHeads.splice(pick, 1);
@@ -19324,7 +19617,7 @@ var StackIterator = /*#__PURE__*/ function() {
 }();
 function stackIterator(tree, pos, side) {
     var inner = tree.resolveInner(pos, side), layers = null;
-    for(var scan = _instanceof$3(inner, TreeNode) ? inner : inner.context.parent; scan; scan = scan.parent){
+    for(var scan = _instanceof$4(inner, TreeNode) ? inner : inner.context.parent; scan; scan = scan.parent){
         if (scan.index < 0) {
             var parent = scan.parent;
             (layers || (layers = [
@@ -19362,7 +19655,7 @@ allows you to move to adjacent nodes.
         @internal
         */ this.index = 0;
         this.bufferNode = null;
-        if (_instanceof$3(node, TreeNode)) {
+        if (_instanceof$4(node, TreeNode)) {
             this.yieldNode(node);
         } else {
             this._tree = node.context.parent;
@@ -19409,7 +19702,7 @@ allows you to move to adjacent nodes.
     */ key: "yield",
             value: function _yield(node) {
                 if (!node) return false;
-                if (_instanceof$3(node, TreeNode)) {
+                if (_instanceof$4(node, TreeNode)) {
                     this.buffer = null;
                     return this.yieldNode(node);
                 }
@@ -19550,7 +19843,7 @@ allows you to move to adjacent nodes.
                 for(; parent; ref2 = parent, index = ref2.index, parent = ref2._parent, ref2){
                     if (index > -1) for(var i1 = index + dir, e = dir < 0 ? -1 : parent._tree.children.length; i1 != e; i1 += dir){
                         var child = parent._tree.children[i1];
-                        if (this.mode & IterMode.IncludeAnonymous || _instanceof$3(child, TreeBuffer) || !child.type.isAnonymous || hasChild(child)) return false;
+                        if (this.mode & IterMode.IncludeAnonymous || _instanceof$4(child, TreeBuffer) || !child.type.isAnonymous || hasChild(child)) return false;
                     }
                 }
                 return true;
@@ -19581,7 +19874,7 @@ allows you to move to adjacent nodes.
         },
         {
             /**
-    Move to the next node in a last-to-first pre-order traveral. A
+    Move to the next node in a last-to-first pre-order traversal. A
     node is followed by its last child or, if it has none, its
     previous sibling or the previous sibling of the first parent
     node that has one.
@@ -19659,8 +19952,8 @@ allows you to move to adjacent nodes.
                     for(;;){
                         if (mustLeave && leave) leave(this);
                         mustLeave = this.type.isAnonymous;
-                        if (this.nextSibling()) break;
                         if (!depth) return;
+                        if (this.nextSibling()) break;
                         this.parent();
                         depth--;
                         mustLeave = true;
@@ -19675,10 +19968,10 @@ allows you to move to adjacent nodes.
     are treated as wildcards.
     */ key: "matchContext",
             value: function matchContext(context) {
-                if (!this.buffer) return matchNodeContext(this.node, context);
+                if (!this.buffer) return matchNodeContext(this.node.parent, context);
                 var buffer = this.buffer.buffer, types = buffer.set.types;
                 for(var i = context.length - 1, d = this.stack.length - 1; i >= 0; d--){
-                    if (d < 0) return matchNodeContext(this.node, context, i);
+                    if (d < 0) return matchNodeContext(this._tree, context, i);
                     var type = types[buffer.buffer[this.stack[d]]];
                     if (!type.isAnonymous) {
                         if (context[i] && context[i] != type.name) return false;
@@ -19693,7 +19986,7 @@ allows you to move to adjacent nodes.
 }();
 function hasChild(tree) {
     return tree.children.some(function(ch) {
-        return _instanceof$3(ch, TreeBuffer) || !ch.type.isAnonymous || hasChild(ch);
+        return _instanceof$4(ch, TreeBuffer) || !ch.type.isAnonymous || hasChild(ch);
     });
 }
 function buildTree(data) {
@@ -19704,7 +19997,7 @@ function buildTree(data) {
     var contextHash = 0, lookAhead = 0;
     function takeNode(parentStart, minPos, children, positions, inRepeat, depth) {
         var id = cursor.id, start = cursor.start, end = cursor.end, size = cursor.size;
-        var lookAheadAtStart = lookAhead;
+        var lookAheadAtStart = lookAhead, contextAtStart = contextHash;
         while(size < 0){
             cursor.next();
             if (size == -1 /* SpecialRecord.Reuse */ ) {
@@ -19740,7 +20033,7 @@ function buildTree(data) {
             while(cursor.pos > endPos1){
                 if (localInRepeat >= 0 && cursor.id == localInRepeat && cursor.size >= 0) {
                     if (cursor.end <= lastEnd - maxBufferLength) {
-                        makeRepeatLeaf(localChildren, localPositions, start, lastGroup, cursor.end, lastEnd, localInRepeat, lookAheadAtStart);
+                        makeRepeatLeaf(localChildren, localPositions, start, lastGroup, cursor.end, lastEnd, localInRepeat, lookAheadAtStart, contextAtStart);
                         lastGroup = localChildren.length;
                         lastEnd = cursor.end;
                     }
@@ -19751,14 +20044,14 @@ function buildTree(data) {
                     takeNode(start, endPos1, localChildren, localPositions, localInRepeat, depth + 1);
                 }
             }
-            if (localInRepeat >= 0 && lastGroup > 0 && lastGroup < localChildren.length) makeRepeatLeaf(localChildren, localPositions, start, lastGroup, start, lastEnd, localInRepeat, lookAheadAtStart);
+            if (localInRepeat >= 0 && lastGroup > 0 && lastGroup < localChildren.length) makeRepeatLeaf(localChildren, localPositions, start, lastGroup, start, lastEnd, localInRepeat, lookAheadAtStart, contextAtStart);
             localChildren.reverse();
             localPositions.reverse();
             if (localInRepeat > -1 && lastGroup > 0) {
-                var make = makeBalanced(type);
+                var make = makeBalanced(type, contextAtStart);
                 node1 = balanceRange(type, localChildren, localPositions, 0, localChildren.length, 0, end - start, make, make);
             } else {
-                node1 = makeTree(type, localChildren, localPositions, end - start, lookAheadAtStart - end);
+                node1 = makeTree(type, localChildren, localPositions, end - start, lookAheadAtStart - end, contextAtStart);
             }
         }
         children.push(node1);
@@ -19793,27 +20086,26 @@ function buildTree(data) {
             positions.push(start1 - parentStart);
         }
     }
-    function makeBalanced(type) {
+    function makeBalanced(type, contextHash) {
         return function(children, positions, length) {
             var lookAhead = 0, lastI = children.length - 1, last, lookAheadProp;
-            if (lastI >= 0 && _instanceof$3(last = children[lastI], Tree)) {
+            if (lastI >= 0 && _instanceof$4(last = children[lastI], Tree)) {
                 if (!lastI && last.type == type && last.length == length) return last;
                 if (lookAheadProp = last.prop(NodeProp.lookAhead)) lookAhead = positions[lastI] + last.length + lookAheadProp;
             }
-            return makeTree(type, children, positions, length, lookAhead);
+            return makeTree(type, children, positions, length, lookAhead, contextHash);
         };
     }
-    function makeRepeatLeaf(children, positions, base, i, from, to, type, lookAhead) {
+    function makeRepeatLeaf(children, positions, base, i, from, to, type, lookAhead, contextHash) {
         var localChildren = [], localPositions = [];
         while(children.length > i){
             localChildren.push(children.pop());
             localPositions.push(positions.pop() + base - from);
         }
-        children.push(makeTree(nodeSet.types[type], localChildren, localPositions, to - from, lookAhead - to));
+        children.push(makeTree(nodeSet.types[type], localChildren, localPositions, to - from, lookAhead - to, contextHash));
         positions.push(from - base);
     }
-    function makeTree(type, children, positions, length) {
-        var lookAhead = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : 0, props = arguments.length > 5 ? arguments[5] : void 0;
+    function makeTree(type, children, positions, length, lookAhead, contextHash, props) {
         if (contextHash) {
             var pair = [
                 NodeProp.contextHash,
@@ -19918,7 +20210,7 @@ function buildTree(data) {
 }
 var nodeSizeCache = new WeakMap;
 function nodeSize(balanceType, node) {
-    if (!balanceType.isAnonymous || _instanceof$3(node, TreeBuffer) || node.type != balanceType) return 1;
+    if (!balanceType.isAnonymous || _instanceof$4(node, TreeBuffer) || node.type != balanceType) return 1;
     var size = nodeSizeCache.get(node);
     if (size == null) {
         size = 1;
@@ -19926,7 +20218,7 @@ function nodeSize(balanceType, node) {
         try {
             for(var _iterator = node.children[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                 var child = _step.value;
-                if (child.type != balanceType || !_instanceof$3(child, Tree)) {
+                if (child.type != balanceType || !_instanceof$4(child, Tree)) {
                     size = 1;
                     break;
                 }
@@ -20125,7 +20417,7 @@ function _inherits$1(subClass, superClass) {
     });
     if (superClass) _set_prototype_of$1(subClass, superClass);
 }
-function _instanceof$2(left, right) {
+function _instanceof$3(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -20324,14 +20616,15 @@ about the parse state.
                 var _a;
                 var depth = action >> 19 /* Action.ReduceDepthShift */ , type = action & 65535 /* Action.ValueMask */ ;
                 var parser = this.p.parser;
-                if (this.reducePos < this.pos - 25 /* Lookahead.Margin */ ) this.setLookAhead(this.pos);
+                var lookaheadRecord = this.reducePos < this.pos - 25 /* Lookahead.Margin */ ;
+                if (lookaheadRecord) this.setLookAhead(this.pos);
                 var dPrec = parser.dynamicPrecedence(type);
                 if (dPrec) this.score += dPrec;
                 if (depth == 0) {
                     this.pushState(parser.getGoto(this.state, type, true), this.reducePos);
                     // Zero-depth reductions are a special case—they add stuff to
                     // the stack without popping anything off.
-                    if (type < parser.minRepeatTerm) this.storeNode(type, this.reducePos, this.reducePos, 4, true);
+                    if (type < parser.minRepeatTerm) this.storeNode(type, this.reducePos, this.reducePos, lookaheadRecord ? 8 : 4, true);
                     this.reduceContext(type, this.reducePos);
                     return;
                 }
@@ -20377,7 +20670,7 @@ about the parse state.
     @internal
     */ key: "storeNode",
             value: function storeNode(term, start, end) {
-                var size = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 4, isReduce = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
+                var size = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 4, mustSink = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
                 if (term == 0 /* Term.Err */  && (!this.stack.length || this.stack[this.stack.length - 1] < this.buffer.length + this.bufferBase)) {
                     // Try to omit/merge adjacent error nodes
                     var cur = this, top = this.buffer.length;
@@ -20393,18 +20686,27 @@ about the parse state.
                         }
                     }
                 }
-                if (!isReduce || this.pos == end) {
+                if (!mustSink || this.pos == end) {
                     this.buffer.push(term, start, end, size);
                 } else {
                     var index = this.buffer.length;
-                    if (index > 0 && this.buffer[index - 4] != 0 /* Term.Err */ ) while(index > 0 && this.buffer[index - 2] > end){
-                        // Move this record forward
-                        this.buffer[index] = this.buffer[index - 4];
-                        this.buffer[index + 1] = this.buffer[index - 3];
-                        this.buffer[index + 2] = this.buffer[index - 2];
-                        this.buffer[index + 3] = this.buffer[index - 1];
-                        index -= 4;
-                        if (size > 4) size -= 4;
+                    if (index > 0 && this.buffer[index - 4] != 0 /* Term.Err */ ) {
+                        var mustMove = false;
+                        for(var scan = index; scan > 0 && this.buffer[scan - 2] > end; scan -= 4){
+                            if (this.buffer[scan - 1] >= 0) {
+                                mustMove = true;
+                                break;
+                            }
+                        }
+                        if (mustMove) while(index > 0 && this.buffer[index - 2] > end){
+                            // Move this record forward
+                            this.buffer[index] = this.buffer[index - 4];
+                            this.buffer[index + 1] = this.buffer[index - 3];
+                            this.buffer[index + 2] = this.buffer[index - 2];
+                            this.buffer[index + 3] = this.buffer[index - 1];
+                            index -= 4;
+                            if (size > 4) size -= 4;
+                        }
                     }
                     this.buffer[index] = term;
                     this.buffer[index + 1] = start;
@@ -21345,7 +21647,7 @@ var FragmentCursor = /*#__PURE__*/ function() {
                         this.nextStart = start;
                         return null;
                     }
-                    if (_instanceof$2(next, Tree)) {
+                    if (_instanceof$3(next, Tree)) {
                         if (start == pos) {
                             if (start < this.safeFrom) return null;
                             var end = start + next.length;
@@ -21648,9 +21950,9 @@ var Parse = /*#__PURE__*/ function() {
                             if (verbose) console.log(base + this.stackID(stack) + " (via reuse of ".concat(parser.getName(cached.type.id), ")"));
                             return true;
                         }
-                        if (!_instanceof$2(cached, Tree) || cached.children.length == 0 || cached.positions[0] > 0) break;
+                        if (!_instanceof$3(cached, Tree) || cached.children.length == 0 || cached.positions[0] > 0) break;
                         var inner = cached.children[0];
-                        if (_instanceof$2(inner, Tree) && cached.positions[0] == 0) cached = inner;
+                        if (_instanceof$3(inner, Tree) && cached.positions[0] == 0) cached = inner;
                         else break;
                     }
                 }
@@ -22241,6 +22543,76 @@ function getSpecializer(spec) {
     return spec.get;
 }
+var nativeToString = Object.prototype.toString;
+var nativeHasOwnProperty = Object.prototype.hasOwnProperty;
+function isUndefined(obj) {
+    return obj === undefined;
+}
+function isNil(obj) {
+    return obj == null;
+}
+function isArray$1(obj) {
+    return nativeToString.call(obj) === "[object Array]";
+}
+/**
+ * Return true, if target owns a property with the given key.
+ *
+ * @param {Object} target
+ * @param {String} key
+ *
+ * @return {Boolean}
+ */ function has(target, key) {
+    return !isNil(target) && nativeHasOwnProperty.call(target, key);
+}
+/**
+ * Iterate over collection; returning something
+ * (non-undefined) will stop iteration.
+ *
+ * @template T
+ * @param {Collection<T>} collection
+ * @param { ((item: T, idx: number) => (boolean|void)) | ((item: T, key: string) => (boolean|void)) } iterator
+ *
+ * @return {T} return result that stopped the iteration
+ */ function forEach(collection, iterator) {
+    var val, result;
+    if (isUndefined(collection)) {
+        return;
+    }
+    var convertKey = isArray$1(collection) ? toNum : identity;
+    for(var key in collection){
+        if (has(collection, key)) {
+            val = collection[key];
+            result = iterator(val, convertKey(key));
+            if (result === false) {
+                return val;
+            }
+        }
+    }
+}
+/**
+ * Reduce collection, returning a single result.
+ *
+ * @template T
+ * @template V
+ *
+ * @param {Collection<T>} collection
+ * @param {(result: V, entry: T, index: any) => V} iterator
+ * @param {V} result
+ *
+ * @return {V} result returned from last iterator
+ */ function reduce(collection, iterator, result) {
+    forEach(collection, function(value, idx) {
+        result = iterator(result, value, idx);
+    });
+    return result;
+}
+function identity(arg) {
+    return arg;
+}
+function toNum(arg) {
+    return Number(arg);
+}
 function _class_call_check$2(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -22260,6 +22632,13 @@ function _create_class$2(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties$2(Constructor, staticProps);
     return Constructor;
 }
+function _instanceof$2(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 var nextTagID = 0;
 /**
 Highlighting tags are markers that denote a highlighting category.
@@ -22281,6 +22660,8 @@ be picked up by regular highlighters (though you can derive them
 from standard tags to allow highlighters to fall back to those).
 */ var Tag = /*#__PURE__*/ function() {
     function Tag(/**
+    The optional name of the base tag @internal
+    */ name, /**
     The set of this tag and all its parent tags, starting with
     this one itself and sorted in order of decreasing specificity.
     */ set, /**
@@ -22290,6 +22671,7 @@ from standard tags to allow highlighters to fall back to those).
     The modifiers applied to this.base @internal
     */ modified) {
         _class_call_check$2(this, Tag);
+        this.name = name;
         this.set = set;
         this.base = base;
         this.modified = modified;
@@ -22297,18 +22679,42 @@ from standard tags to allow highlighters to fall back to those).
         @internal
         */ this.id = nextTagID++;
     }
-    _create_class$2(Tag, null, [
+    _create_class$2(Tag, [
+        {
+            key: "toString",
+            value: function toString() {
+                var name = this.name;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = this.modified[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var mod = _step.value;
+                        if (mod.name) name = "".concat(mod.name, "(").concat(name, ")");
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return name;
+            }
+        }
+    ], [
         {
             key: "define",
-            value: /**
-    Define a new tag. If `parent` is given, the tag is treated as a
-    sub-tag of that parent, and
-    [highlighters](#highlight.tagHighlighter) that don't mention
-    this tag will try to fall back to the parent tag (or grandparent
-    tag, etc).
-    */ function define(parent) {
+            value: function define(nameOrParent, parent) {
+                var name = typeof nameOrParent == "string" ? nameOrParent : "?";
+                if (_instanceof$2(nameOrParent, Tag)) parent = nameOrParent;
                 if (parent === null || parent === void 0 ? void 0 : parent.base) throw new Error("Can not derive from a modified tag");
-                var tag = new Tag([], null, []);
+                var tag = new Tag(name, [], null, []);
                 tag.set.push(tag);
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 if (parent) try {
@@ -22346,8 +22752,8 @@ from standard tags to allow highlighters to fall back to those).
     smaller set of modifiers is registered as a parent, so that for
     example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
     `m1(m3(t1)`, and so on.
-    */ function defineModifier() {
-                var mod = new Modifier;
+    */ function defineModifier(name) {
+                var mod = new Modifier(name);
                 return function(tag) {
                     if (tag.modified.indexOf(mod) > -1) return tag;
                     return Modifier.get(tag.base || tag, tag.modified.concat(mod).sort(function(a, b) {
@@ -22361,8 +22767,9 @@ from standard tags to allow highlighters to fall back to those).
 }();
 var nextModifierID = 0;
 var Modifier = /*#__PURE__*/ function() {
-    function Modifier() {
+    function Modifier(name) {
         _class_call_check$2(this, Modifier);
+        this.name = name;
         this.instances = [];
         this.id = nextModifierID++;
     }
@@ -22375,7 +22782,7 @@ var Modifier = /*#__PURE__*/ function() {
                     return t.base == base && sameArray(mods, t.modified);
                 });
                 if (exists) return exists;
-                var set = [], tag = new Tag(set, base, mods);
+                var set = [], tag = new Tag(base.name, set, base, mods);
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
                     for(var _iterator = mods[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -22921,7 +23328,7 @@ the parent.
     A level 6 [heading](#highlight.tags.heading).
     */ heading6: t(heading),
     /**
-    A prose separator (such as a horizontal rule).
+    A prose [content](#highlight.tags.content) separator (such as a horizontal rule).
     */ contentSeparator: t(content),
     /**
     [Content](#highlight.tags.content) that represents a list.
@@ -22977,27 +23384,27 @@ the parent.
     [Modifier](#highlight.Tag^defineModifier) that indicates that a
     given element is being defined. Expected to be used with the
     various [name](#highlight.tags.name) tags.
-    */ definition: Tag.defineModifier(),
+    */ definition: Tag.defineModifier("definition"),
     /**
     [Modifier](#highlight.Tag^defineModifier) that indicates that
     something is constant. Mostly expected to be used with
     [variable names](#highlight.tags.variableName).
-    */ constant: Tag.defineModifier(),
+    */ constant: Tag.defineModifier("constant"),
     /**
     [Modifier](#highlight.Tag^defineModifier) used to indicate that
     a [variable](#highlight.tags.variableName) or [property
     name](#highlight.tags.propertyName) is being called or defined
     as a function.
-    */ function: Tag.defineModifier(),
+    */ function: Tag.defineModifier("function"),
     /**
     [Modifier](#highlight.Tag^defineModifier) that can be applied to
     [names](#highlight.tags.name) to indicate that they belong to
     the language's standard environment.
-    */ standard: Tag.defineModifier(),
+    */ standard: Tag.defineModifier("standard"),
     /**
     [Modifier](#highlight.Tag^defineModifier) that indicates a given
     [names](#highlight.tags.name) is local to some scope.
-    */ local: Tag.defineModifier(),
+    */ local: Tag.defineModifier("local"),
     /**
     A generic variant [modifier](#highlight.Tag^defineModifier) that
     can be used to tag language-specific alternative variants of
@@ -23005,8 +23412,12 @@ the parent.
     forms of at least the [string](#highlight.tags.string) and
     [variable name](#highlight.tags.variableName) tags, since those
     come up a lot.
-    */ special: Tag.defineModifier()
+    */ special: Tag.defineModifier("special")
 };
+for(var name1 in tags){
+    var val = tags[name1];
+    if (_instanceof$2(val, Tag)) val.name = name1;
+}
 /**
 This is a highlighter that adds stable, predictable classes to
 tokens, for styling with external CSS.
@@ -23325,7 +23736,7 @@ function _unsupported_iterable_to_array$1(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$1(o, minLen);
 }
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-var propertyIdentifier = 120, identifier = 121, nameIdentifier = 122, insertSemi = 123, expression0 = 127, ForExpression = 4, forExpressionStart = 130, ForInExpression = 7, Name = 8, Identifier = 9, AdditionalIdentifier = 10, forExpressionBodyStart = 138, IfExpression = 19, ifExpressionStart = 139, QuantifiedExpression = 23, quantifiedExpressionStart = 140, QuantifiedInExpression = 27, PositiveUnaryTest = 37, ArithmeticExpression = 41, arithmeticPlusStart = 144, arithmeticTimesStart = 145, arithmeticExpStart = 146, arithmeticUnaryStart = 147, VariableName = 47, PathExpression = 67, pathExpressionStart = 152, FilterExpression = 69, filterExpressionStart = 153, FunctionInvocation = 71, functionInvocationStart = 154, ParameterName = 75, nil = 159, NumericLiteral = 78, StringLiteral = 79, BooleanLiteral = 80, listStart = 165, List = 88, FunctionDefinition = 89, functionDefinitionStart = 167, Context = 96, contextStart = 169, ContextEntry = 97, PropertyName = 99, PropertyIdentifier = 100;
+var propertyIdentifier = 121, identifier = 122, nameIdentifier = 123, insertSemi = 124, expression0 = 128, ForExpression = 4, forExpressionStart = 131, ForInExpression = 7, Name = 8, Identifier = 9, AdditionalIdentifier = 10, forExpressionBodyStart = 139, IfExpression = 19, ifExpressionStart = 140, QuantifiedExpression = 23, quantifiedExpressionStart = 141, QuantifiedInExpression = 27, PositiveUnaryTest = 37, ArithmeticExpression = 41, arithmeticPlusStart = 145, arithmeticTimesStart = 146, arithmeticExpStart = 147, arithmeticUnaryStart = 148, VariableName = 47, PathExpression = 68, pathExpressionStart = 154, FilterExpression = 70, filterExpressionStart = 155, FunctionInvocation = 72, functionInvocationStart = 156, ParameterName = 76, nil = 161, NumericLiteral = 79, StringLiteral = 80, BooleanLiteral = 81, listStart = 167, List = 89, FunctionDefinition = 90, functionDefinitionStart = 169, Context = 97, contextStart = 171, ContextEntry = 98, PropertyName = 100, PropertyIdentifier = 101;
 /* global console,process */ // @ts-expect-error env access
 var LOG_PARSE = typeof process != "undefined" && process.env && /\bfparse(:dbg)?\b/.test(process.env.LOG);
 // @ts-expect-error env access
@@ -23401,7 +23812,6 @@ var additionalNameChars = chars$1("'./-+*^");
  */ function isSpace(ch) {
     return spaceChars.includes(ch);
 }
-// eslint-disable-next-line
 function indent(str, spaces) {
     return spaces.concat(str.split(/\n/g).join("\n" + spaces));
 }
@@ -23491,14 +23901,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23517,7 +23927,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23536,9 +23946,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
-        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+        return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -23604,7 +24014,10 @@ var _obj2;
 var contextStarts = (_obj2 = {}, _define_property$1(_obj2, contextStart, "Context"), _define_property$1(_obj2, functionDefinitionStart, "FunctionDefinition"), _define_property$1(_obj2, forExpressionStart, "ForExpression"), _define_property$1(_obj2, listStart, "List"), _define_property$1(_obj2, ifExpressionStart, "IfExpression"), _define_property$1(_obj2, quantifiedExpressionStart, "QuantifiedExpression"), _obj2);
 var _obj3;
 var contextEnds = (_obj3 = {}, _define_property$1(_obj3, Context, "Context"), _define_property$1(_obj3, FunctionDefinition, "FunctionDefinition"), _define_property$1(_obj3, ForExpression, "ForExpression"), _define_property$1(_obj3, List, "List"), _define_property$1(_obj3, IfExpression, "IfExpression"), _define_property$1(_obj3, QuantifiedExpression, "QuantifiedExpression"), _define_property$1(_obj3, PathExpression, "PathExpression"), _define_property$1(_obj3, FunctionInvocation, "FunctionInvocation"), _define_property$1(_obj3, FilterExpression, "FilterExpression"), _define_property$1(_obj3, ArithmeticExpression, "ArithmeticExpression"), _obj3);
-var ValueProducer = /*#__PURE__*/ function() {
+/**
+ * A simple producer that retrievs a value from
+ * a given context. Used to lazily take things.
+ */ var ValueProducer = /*#__PURE__*/ function() {
     function ValueProducer(fn) {
         _class_call_check$1(this, ValueProducer);
         this.fn = fn;
@@ -23690,6 +24103,20 @@ var dateTimeIdentifiers = Object.keys(dateTimeLiterals);
                 var constructor = /** @type { typeof VariableContext } */ this.constructor;
                 return constructor.of(_object_spread_props(_object_spread({}, this.value), _define_property$1({}, key, value)));
             }
+        },
+        {
+            /**
+   * Non-destructively merge another context into this one,
+   * and return the result.
+   *
+   * @param {ContextValue} other
+   *
+   * @return {VariableContext}
+   */ key: "merge",
+            value: function merge(other) {
+                var constructor = /** @type { typeof VariableContext } */ this.constructor;
+                return new constructor(constructor.__merge(this.value, other));
+            }
         }
     ], [
         {
@@ -23707,36 +24134,71 @@ var dateTimeIdentifiers = Object.keys(dateTimeLiterals);
         {
             key: "of",
             value: /**
-   * Takes any number of Contexts and merges them into a single Context.
+   * Takes any number of Contexts and merges them into a single context.
    *
-   * @param  {...Context} contexts
-   * @returns {VariableContext}
+   * @param { ...VariableContext } contexts
+   * @returns { VariableContext }
    */ function of() {
-                var _this = this;
                 for(var _len = arguments.length, contexts = new Array(_len), _key = 0; _key < _len; _key++){
                     contexts[_key] = arguments[_key];
                 }
-                var unwrap = function(context) {
-                    if (!context || typeof context !== "object") {
-                        return {};
+                return contexts.reduce(function(context, otherContext) {
+                    return context.merge(otherContext);
+                }, new this({}));
+            }
+        },
+        {
+            key: "__unwrap",
+            value: /**
+   * Returns the raw representation of the given context.
+   *
+   * @param {VariableContext | any} context
+   *
+   * @return {any}
+   */ function __unwrap(context) {
+                if (!context) {
+                    return {};
+                }
+                if (_instanceof$1(context, this)) {
+                    return context.value;
+                }
+                if (typeof context !== "object") {
+                    return {};
+                }
+                return _object_spread({}, context);
+            }
+        },
+        {
+            key: "__merge",
+            value: /**
+   * Non-destructively merges two contexts (or their values)
+   * with each other, returning the result.
+   *
+   * @param {ContextValue} context
+   * @param {ContextValue} other
+   *
+   * @return {any}
+   */ function __merge(context, other) {
+                var _this = this;
+                return reduce(this.__unwrap(other), function(merged, value, key) {
+                    if (_instanceof$1(value, ValueProducer)) {
+                        // keep value producers in tact
+                        return _object_spread_props(_object_spread({}, merged), _define_property$1({}, key, value));
                     }
-                    if (_instanceof$1(context, _this)) {
-                        return context.value;
+                    value = _this.__unwrap(value);
+                    if (has(merged, key)) {
+                        value = _this.__merge(_this.__unwrap(merged[key]), value);
                     }
-                    return _object_spread({}, context);
-                };
-                var merged = contexts.reduce(function(merged, context) {
-                    return _object_spread({}, merged, unwrap(context));
-                }, {});
-                return new this(merged);
+                    return _object_spread_props(_object_spread({}, merged), _define_property$1({}, key, value));
+                }, this.__unwrap(context));
             }
         }
     ]);
     return VariableContext;
 }();
 var Variables = /*#__PURE__*/ function() {
-    function Variables() {
-        var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _ref_name = _ref.name, name = _ref_name === void 0 ? "Expressions" : _ref_name, _ref_tokens = _ref.tokens, tokens = _ref_tokens === void 0 ? [] : _ref_tokens, _ref_children = _ref.children, children = _ref_children === void 0 ? [] : _ref_children, _ref_parent = _ref.parent, parent = _ref_parent === void 0 ? null : _ref_parent, _ref_context = _ref.context, context = _ref_context === void 0 ? null : _ref_context, _ref_value = _ref.value, value = _ref_value === void 0 ? null : _ref_value, _ref_raw = _ref.raw, raw = _ref_raw === void 0 ? null : _ref_raw;
+    function Variables(param) {
+        var _param_name = param.name, name = _param_name === void 0 ? "Expressions" : _param_name, _param_tokens = param.tokens, tokens = _param_tokens === void 0 ? [] : _param_tokens, _param_children = param.children, children = _param_children === void 0 ? [] : _param_children, _param_parent = param.parent, parent = _param_parent === void 0 ? null : _param_parent, context = param.context, value = param.value, raw = param.raw;
         _class_call_check$1(this, Variables);
         this.name = name;
         this.tokens = tokens;
@@ -23967,7 +24429,19 @@ var Variables = /*#__PURE__*/ function() {
     ], [
         {
             key: "of",
-            value: function of(options) {
+            value: /**
+   * @param { {
+   *   name?: string,
+   *   tokens?: string[],
+   *   children?: Variables[],
+   *   parent?: Variables | null
+   *   context: VariableContext,
+   *   value?: any,
+   *   raw?: any
+   * } } options
+   *
+   * @return {Variables}
+   */ function of(options) {
                 var name = options.name, _options_tokens = options.tokens, tokens = _options_tokens === void 0 ? [] : _options_tokens, _options_children = options.children, children = _options_children === void 0 ? [] : _options_children, _options_parent = options.parent, parent = _options_parent === void 0 ? null : _options_parent, context = options.context, value = options.value, raw = options.raw;
                 if (!context) {
                     throw new Error("must provide <context>");
@@ -24254,57 +24728,57 @@ var spec_identifier = {
     between: 72,
     instance: 86,
     of: 89,
-    days: 99,
-    time: 101,
-    duration: 103,
-    years: 105,
-    months: 107,
-    date: 109,
-    list: 115,
-    context: 121,
-    function: 128,
-    null: 154,
-    true: 326,
-    false: 326,
-    "?": 168,
-    external: 184,
-    not: 209
+    days: 101,
+    time: 103,
+    duration: 105,
+    years: 107,
+    months: 109,
+    date: 111,
+    list: 117,
+    context: 123,
+    function: 130,
+    null: 156,
+    true: 330,
+    false: 330,
+    "?": 170,
+    external: 186,
+    not: 211
 };
 var parser = LRParser.deserialize({
     version: 14,
-    states: "CpO`QYOOO`QYOOO$gQYOOOOQU'#Ce'#CeO$qQYO'#C`O%zQYO'#FPOOQQ'#Fe'#FeO&UQYO'#FeO`QYO'#DVOOQU'#Em'#EmO'rQ^O'#D]OOQO'#Fl'#FlO)oQWO'#DuOOQQ'#D|'#D|OOQQ'#D}'#D}OOQQ'#EO'#EOO)tOWO'#ERO)oQWO'#EPOOQQ'#EP'#EPOOQQ'#Fr'#FrOOQQ'#Fp'#FpOOQQ'#Fw'#FwOOQQ'#ET'#ETO`QYO'#EVOOQQ'#FR'#FRO)yQ^O'#FRO+pQYO'#EWO+wQWO'#EXOOQP'#F{'#F{O+|QXO'#E`OOQQ'#Fx'#FxOOQQ'#FQ'#FQQOQWOOOOQQ'#FS'#FSOOQQ'#F]'#F]O`QYO'#CoOOQQ'#F^'#F^O$qQYO'#CsO,XQYO'#DvOOQQ'#Fq'#FqO,^QYO'#EQOOQO'#EQ'#EQO`QYO'#EUO`QYO'#ETOOQO'#Fy'#FyQ,fQWOOO,kQYO'#DRO-bQWO'#FaOOQO'#DT'#DTO-mQYO'#FeO-tQWOOO.kQYO'#CdO.xQYO'#FUOOQQ'#Cc'#CcO.}QYO'#FTOOQQ'#Cb'#CbO/VQYO,58zO`QYO,59iOOQQ'#Fb'#FbOOQQ'#Fc'#FcOOQQ'#Fd'#FdO`QYO,59qO`QYO,59qO`QYO,59qOOQQ'#Fj'#FjO$qQYO,5:]OOQQ'#Fk'#FkO`QYO,5:_O`QYO,59eO`QYO,59gO`QYO,59iO0uQYO,59iO0|QYO,59rOOQQ,5:h,5:hO1RQYO,59qOOQU-E8k-E8kO2uQYO'#FmOOQQ,5:a,5:aOOQQ,5:m,5:mOOQQ,5:k,5:kO2|QYO,5:qOOQQ,5;m,5;mO3WQYO,5:pO3eQWO,5:rO3jQYO,5:sOOQP'#Ed'#EdO4aQXO'#EcOOQO'#Eb'#EbO4hQWO'#EaO4mQWO'#F|O4uQWO,5:zO4zQYO,59ZO.xQYO'#F`OOQQ'#Cw'#CwO5RQYO'#F_OOQQ'#Cv'#CvO5ZQYO,59_O5`QYO,5:bO5eQYO,5:lO3PQYO,5:pO5jQYO,5:oO`QYO'#EvQ,fQWOOO`QYO'#ElO6aQWO,5;{O`QYOOOOQR'#Cf'#CfOOQQ'#Ei'#EiO7ZQYO,59OO`QYO,5;pOOQQ'#FX'#FXO$qQYO'#EjO7kQYO,5;oO`QYO1G.fOOQQ'#F['#F[O8bQYO1G/TO;XQYO1G/]O;cQYO1G/]O;mQYO1G/]OOQQ1G/w1G/wO=aQYO1G/yO=hQYO1G/PO>qQYO1G/RO?zQYO1G/TO`QYO1G/TOOQQ1G/T1G/TO@bQYO1G/^O@|Q^O'#CdOB`QYO'#FoOOQO'#Dy'#DyOBjQWO'#DxOBoQWO'#FnOOQO'#Dw'#DwOOQO'#Dz'#DzOBwQWO,5<XOOQQ1G0]1G0]O`QYO1G0[O`QYO'#ErOB|QWO,5<ZOOQQ1G0^1G0^OCXQWO'#EZOCdQWO'#FzOOQO'#EY'#EYOClQWO1G0_OOQP'#Et'#EtOCqQXO,5:}O`QYO,5:{OCxQXO'#EuODQQWO,5<hOOQQ1G0f1G0fO`QYO1G.uO`QYO,5;zO$qQYO'#EkODYQYO,5;yO`QYO1G.yODbQYO1G/|OOQO1G0W1G0WOOQO,5;b,5;bOOQO-E8t-E8tOOQO,5;W,5;WOOQO-E8j-E8jODgQWOOOOQQ-E8g-E8gODlQYO'#CmOOQQ1G1[1G1[OOQQ,5;U,5;UOOQQ-E8h-E8hODyQYO7+$QOOQQ7+%e7+%eO`QYO7+$oOEpQYO,5:qOE}QWO7+$oOFSQYO'#D[OOQQ'#DZ'#DZOGvQYO'#D^OG{QYO'#D^OHQQYO'#D^OHVQ`O'#DfOH[Q`O'#DiOHaQ`O'#DmOOQQ7+$x7+$xO`QYO,5:dO$qQYO'#EqOHfQWO,5<YOOQQ1G1s1G1sOIlQYO7+%vOIyQYO,5;^OOQO-E8p-E8pO@bQYO,5:uO$qQYO'#EsOJWQWO,5<fOJ`QYO7+%yOOQP-E8r-E8rOJgQYO1G0gOOQO,5;a,5;aOOQO-E8s-E8sOJqQYO7+$aOJxQYO1G1fOOQQ,5;V,5;VOOQQ-E8i-E8iOKSQYO7+$eOOQO7+%h7+%hO`QYO,59XOKyQYO<<HZOOQQ<<HZ<<HZO$qQYO'#EnOMSQYO,59vONvQYO,59xON{QYO,59xO! QQYO,59xO! VQYO,5:QO$qQYO,5:TO! qQbO,5:XO! xQYO1G0OOOQO,5;],5;]OOQO-E8o-E8oO!!SQYO<<IbOOQQ<<Ib<<IbOOQO1G0a1G0aOOQO,5;_,5;_OOQO-E8q-E8qO!%OQYO'#E]OOQQ<<Ie<<IeO`QYO<<IeO`QYO<<G{O!%uQYO1G.sOOQQ,5;Y,5;YOOQQ-E8l-E8lO!&PQYO1G/dOOQQ1G/d1G/dO!&UQbO'#D]O!&gQ`O'#D[O!&rQ`O1G/lO!&wQWO'#DlO!&|Q`O'#FfOOQO'#Dk'#DkO!'UQ`O1G/oOOQO'#Dp'#DpO!'ZQ`O'#FhOOQO'#Do'#DoO!'cQ`O1G/sOOQQAN?PAN?PO!'hQYOAN=gOOQQ7+%O7+%OO!(_Q`O,59vOOQQ7+%W7+%WO! VQYO,5:WO$qQYO'#EoO!(jQ`O,5<QOOQQ7+%Z7+%ZO! VQYO'#EpO!(rQ`O,5<SO!(zQ`O7+%_OOQO1G/r1G/rOOQO,5;Z,5;ZOOQO-E8m-E8mOOQO,5;[,5;[OOQO-E8n-E8nO@bQYO<<HyOOQQAN>eAN>eO$qQYO'#EnO! VQYO<<HyO!)PQ`O7+%_O!)UQ`O1G/sO! qQbO,5:XO!)ZQ`O'#Dm",
-    stateData: "!)h~O#qOS#rOSPOSQOS~OTqOZVO[UOdrOhtOitOs{OvgO!SyO!TyO!UvO!WxO!b|O!fzO!heO!owO!vhO#RlO#mRO#nRO$g]O$h^O$i_O$j`O~OTqO[UOdrOhtOitOs{OvgO!SyO!TyO!UvO!WxO!b|O!fzO!heO!owO!vhO#RlO#mRO#nRO$g]O$h^O$i_O$j`O~OZ!RO#[!SO~P!|O#mRO#nRO~OZ![O[![O]!]O^!]O_!^O`!iOn!fOp!gOr!ZOs!ZOt!hO{!jO!h!dO#y!bOv$`X~O#k#sX$q#sX~P$yO$g!kOT$XXZ$XX[$XXd$XXh$XXi$XXs$XXv$XX!S$XX!T$XX!U$XX!W$XX!b$XX!f$XX!h$XX!o$XX!v$XX#R$XX#m$XX#n$XX$h$XX$i$XX$j$XX~O#mRO#nROZ!PX[!PX]!PX^!PX_!PX`!PXn!PXp!PXr!PXs!PXt!PXv!PX{!PX!h!PX#k!PX#o!PX#y!PX$q!PX#}!PXx!PX#|!PX!f!PXe!PXb!PX#Q!PXf!PXl!PX~Ov!nO~O$h^O~O#o!sOZ#uX[#uX]#uX^#uX_#uX`#uXn#uXp#uXr#uXs#uXt#uXv#uX{#uX!h#uX#k#uX#y#uX$q#uX#}#uXx#uX#|#uX!f#uXe#uXb#uX#Q#uXf#uXl#uX~O!f$cP~P`Ov!vO~O#l!wO$h^O#Q$pP~Op#TO~Op#UOv!tX~O$q#XO~O#kuX#}uX$quXxuX#|uX!fuXeuXbuX#QuXfuXluX~P$yO#}#ZO#k$TXx$TX~O#k#ZX~P&UOv#]O~OZ#^O[#^O]#^O^#^O_#^O#mRO#nRO#y#^O#z#^O$ZWX~O`WXxWX#}WX~P-yO`#bO~O#}#cOb#wX~Ob#fO~OTqOZVO[UOdrOhtOitOs{O!SyO!TyO!UvO!WxO!b|O!fzO!heO!owO!vhO#RlO#mRO#nRO$g]O$h^O$i_O$j`O~Ov#pO~P/[O|#rO~O{!jO!h!dO#y!bOZya[ya]ya^ya_ya`yanyapyaryasyatyav$`X#kya$qya#}yaxya#|ya!fyaeyabya#Qyafyalya~Ox$cP~P`Ox#{O#|#|O~P$yO#|#|O#}#}O!f$cX~P$yO!f$PO~O#mRO#nROx$nP~OZ#^O[#^O]#^O^#^O_#^O#l!wO#y#^O#z#^O~O$Z#VX~P3uO$Z$WO~O#}$XO#Q$pX~O#Q$ZO~Oe$[O~P$yO#}$^Ol$RX~Ol$`O~O!V$aO~O!S$bO~O#k!wa$q!wa#}!wax!wa#|!wa!f!wae!wab!wa#Q!waf!wal!wa~P$yO#}#ZO#k$Tax$Ta~OZ#^O[#^O]#^O^#^O_#^O#mRO#nRO#y#^O#z#^O~O`Wa$ZWaxWa#}Wa~P6lO#}#cOb#wa~OZ![O[![O]!]O^!]O_!^O{!jO!h!dO#y!bOv$`X~O`qinqipqirqisqitqi#kqi$qqi#}qixqi#|qi!fqieqibqi#Qqifqilqi~P7sO_!^O{!jO!h!dO#y!bOZyi[yi`yinyipyiryisyityiv$`X#kyi$qyi#}yixyi#|yi!fyieyibyi#Qyifyilyi~O]!]O^!]O~P9kO]yi^yi~P9kO{!jO!h!dO#y!bOZyi[yi]yi^yi_yi`yinyipyiryisyityiv$`X#kyi$qyi#}yixyi#|yi!fyieyibyi#Qyifyilyi~O!f$nO~P$yO`!iOp!gOr!ZOs!ZOt!hOnmi#kmi$qmi#}mixmi#|mi!fmiemibmi#Qmifmilmi~P7sO`!iOr!ZOs!ZOt!hOnoipoi#koi$qoi#}oixoi#|oi!foieoiboi#Qoifoiloi~P7sO`!iOn!fOp$oOr!ZOs!ZOt!hO~P7sO!R$tO!U$uO!W$vO!Z$wO!^$xO!b$yO#mRO#nRO~OZ#aX[#aX]#aX^#aX_#aX`#aXn#aXp#aXr#aXs#aXt#aXv#aXx#aX{#aX!h#aX#m#aX#n#aX#o#aX#y#aX#}#aX~P-yO#}#}Ox$cX~P$yO$Z${O~O#}$|Ox$bX~Ox%OO~O#}#}O!f$cax$ca~O$Z%SOx!}X#}!}X~O#}%TOx$nX~Ox%VO~O$Z#Va~P3uO#l!wO$h^O~O#}$XO#Q$pa~O#}$^Ol$Ra~O!T%aO~OxpO~O#|%bObaX#}aX~P$yO#kSq$qSq#}SqxSq#|Sq!fSqeSqbSq#QSqfSqlSq~P$yOx#{O#|#|O#}uX~P$yOx%dO~O#y%eOZ!OX[!OX]!OX^!OX_!OX`!OXn!OXp!OXr!OXs!OXt!OXv!OX{!OX!h!OX#k!OX$q!OX#}!OXx!OX#|!OX!f!OXe!OXb!OX#Q!OXf!OXl!OX~Op%gO~Op%hO~Op%iO~O![%jO~O![%kO~O![%lO~O#}$|Ox$ba~OZ![O[![O]!]O^!]O_!^O`!iOn!fOp!gOr!ZOs!ZOt!hO{!jO#y!bOv$`X~Ox%qO!f%qO!h%pO~PHnO!f#fa#}#fax#fa~P$yO#}%TOx$na~O#O%wO~P`O#Q#Ti#}#Ti~P$yOf%xO~P$yOl$Si#}$Si~P$yO#kgq$qgq#}gqxgq#|gq!fgqegqbgq#Qgqfgqlgq~P$yO`qynqypqyrqysqytqy#kqy$qqy#}qyxqy#|qy!fqyeqybqy#Qqyfqylqy~P7sO#y%eOZ!Oa[!Oa]!Oa^!Oa_!Oa`!Oan!Oap!Oar!Oas!Oat!Oav!Oa{!Oa!h!Oa#k!Oa$q!Oa#}!Oax!Oa#|!Oa!f!Oae!Oab!Oa#Q!Oaf!Oal!Oa~O!S%|O~O!V%|O~O!S%}O~O!R$tO!U$uO!W$vO!Z$wO!^$xO!b&sO#mRO#nRO~O!X$[P~P! VOx!li#}!li~P$yOT$_XZ$_X[$_X]!xy^!xy_!xy`!xyd$_Xh$_Xi$_Xn!xyp!xyr!xys$_Xt!xyv$_X{!xy!S$_X!T$_X!U$_X!W$_X!b$_X!f$_X!h$_X!o$_X!v$_X#R$_X#k!xy#m$_X#n$_X#y!xy$g$_X$h$_X$i$_X$j$_X$q!xy#}!xyx!xy#|!xye!xyb!xy#Q!xyf!xyl!xy~O#k#PX$q#PX#}#PXx#PX#|#PX!f#PXe#PXb#PX#Q#PXf#PXl#PX~P$yObai#}ai~P$yO!T&]O~O#mRO#nRO!X!PX#y!PX#}!PX~O#y&nO!X!OX#}!OX~O!X&_O~O$Z&`O~O#}&aO!X$YX~O!X&cO~O#}&dO!X$[X~O!X&fO~O#kc!R$qc!R#}c!Rxc!R#|c!R!fc!Rec!Rbc!R#Qc!Rfc!Rlc!R~P$yO#y&nO!X!Oa#}!Oa~O#}&aO!X$Ya~O#}&dO!X$[a~O$]&lO~O$]&oO~O!X&pO~O![&rO~OQP_^$g]#y~",
-    goto: "Du$qPPPP$rP%k%n%t&W'qPPPPPP'zP$rPPP$rPP'}(QP$rP$rP$rPPP(WP(cP$r$rPP(l)R)^)RPPPPPPP)RPP)RP*k*n)RP*t*z$rP$rP$r+R+z+},T+zP,]-U,],].U.}P$r/v$r0o0o1h1kP1qPP0o1w1}.Q2RPP2ZP2^2e2k2q2w4S4^4d4j4p4w4}5T5ZPPPPPPPP5a5j7q8j9c9fPP9jPP9p9s:l;e;h;l;q<`=O=o>hP>kP>o?b@T@|ASAV$rA]A]PPPPBU7qB}CvCyDr!mhOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR!YSQ!WSR$k#cS!US#cS#Ou$^W#u!n!v$|%TT&R%k&a#WXOPQWYgjsz{!Z!_!`!a!c!e!f!g!h!i#X#Z#]#a#e#p#r#|#}$W$[$]$`$o${%S%V%b%e%j%l%w%x&O&`&d&l&n&o&rb!TSu!v#c$^$|%T%k&aU#_!T#`#sR#s!nU#_!T#`#sT$U!x$VR$j#aR#SuQ#QuR%^$^U!PQ#]#pQ#q!iR$e#ZQpQQ$g#]R$q#pQ$z#rQ%r%SQ&Q%jU&V%l&d&rQ&g&`T&m&l&oc$s#r%S%j%l&`&d&l&o&r!liOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xQ#k!cU$r#r%S&lS%z%e&n]&P%j%l&`&d&o&rR&U%kQ&S%kR&h&aQ&Y%lR&q&rS&W%l&rR&j&d!mZOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR#z!nQ#w!nR%n$|S#v!n$|T$Q!v%T!mcOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!lcOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xQ!p`T!ym$X!maOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mbOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mfOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mnOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR$T!vQ$R!vR%s%TQ%v%VR&Z%wQ!{mR%Y$XT!zm$XS!xm$XT$U!x$VRpQS#`!T#sR$h#`Q#d!WR$l#dQ$_#QR%_$_Q#[!PR$f#[!vYOPQWgjsz{!Z!_!`!a!c!e!f!g!h!i!n#X#Z#]#a#e#p#r#|#}$W$[$]$`$o${%S%V%b%e%w%x&lS!mY&O_&O%j%l&`&d&n&o&rQ%f$rS%{%f&^R&^&PQ&b&SR&i&bQ&e&WR&k&eQ$}#wR%o$}S$O!t#tR%R$OQ%U$RR%t%UQ$V!xR%W$VQ$Y!{R%Z$YQ#Y}R$d#YQpOQ}PR$c#XUTOP#XW!OQ!i#Z#]Q!lWQ!rgQ!tjQ!}sQ#VzQ#W{Q#g!ZQ#h!_Q#i!`Q#j!aQ#l!eQ#m!fQ#n!gQ#o!hQ#t!nQ$i#aQ$m#eQ$p#pQ%P#|Q%Q#}Q%X$WQ%[$[Q%]$]Q%`$`Q%c$oQ%m${S%u%V%wQ%y%bR&[%x!moOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mSOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR!XST!VS#cQ#a!UR$]#OR#e!Y!msOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!muOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR#RuT#Pu$^V!QQ#]#p!X!_T!O!r!t!}#V#W#g#l#m#n#o#t$i$m$p%P%Q%X%[%]%`%c%m%u%y&[!Z!`T!O!r!t!}#V#W#g#h#l#m#n#o#t$i$m$p%P%Q%X%[%]%`%c%m%u%y&[!]!aT!O!r!t!}#V#W#g#h#i#l#m#n#o#t$i$m$p%P%Q%X%[%]%`%c%m%u%y&[!mWOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR&T%kT&X%l&r!a!cT!O!l!r!t!}#V#W#g#h#i#j#l#m#n#o#t$i$m$p%P%Q%X%[%]%`%c%m%u%y&[!a!eT!O!l!r!t!}#V#W#g#h#i#j#l#m#n#o#t$i$m$p%P%Q%X%[%]%`%c%m%u%y&[!m[OPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xQ!o[R!qaR#x!nQ!ujR#y!n!mdOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mjOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%x!mkOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR$S!v!mmOPQWgjsz{!Z!_!`!a!e!f!g!h!i!n#X#Z#]#a#e#p#|#}$W$[$]$`$o${%V%b%w%xR!|m",
-    nodeNames: "⚠ LineComment BlockComment Expression ForExpression for InExpressions InExpression Name Identifier Identifier ArithOp ArithOp ArithOp ArithOp ArithOp in IterationContext return IfExpression if then else QuantifiedExpression some every InExpressions InExpression satisfies Disjunction or Conjunction and Comparison CompareOp CompareOp between PositiveUnaryTest ( PositiveUnaryTests ) ArithmeticExpression InstanceOfExpression instance of Type QualifiedName VariableName SpecialType days time duration years months date > ListType list < ContextType context ContextEntryTypes ContextEntryType FunctionType function ArgumentTypes ArgumentType PathExpression ] FilterExpression [ FunctionInvocation SpecialFunctionName NamedParameters NamedParameter ParameterName PositionalParameters null NumericLiteral StringLiteral BooleanLiteral DateTimeLiteral DateTimeConstructor AtLiteral ? SimplePositiveUnaryTest Interval ParenthesizedExpression List FunctionDefinition FormalParameters FormalParameter external FunctionBody } { Context ContextEntry Key Name Identifier Expressions UnaryTests Wildcard not",
-    maxTerm: 171,
+    states: "C|O`QYOOO`QYOOO$mQYOOOOQU'#Ce'#CeO$wQYO'#C`O&QQYO'#FQOOQQ'#Ff'#FfO&[QYO'#FfO`QYO'#DVOOQU'#En'#EnO'{Q^O'#D]OOQU'#D^'#D^OOQU'#D]'#D]OOQO'#Fn'#FnO)xQWO'#DvOOQQ'#D}'#D}OOQQ'#EO'#EOOOQQ'#EP'#EPO)}OWO'#ESO)xQWO'#EQOOQQ'#EQ'#EQOOQQ'#Ft'#FtOOQQ'#Fr'#FrOOQQ'#Fy'#FyOOQQ'#EU'#EUO`QYO'#EWOOQQ'#FS'#FSO*SQ^O'#FSO+yQYO'#EXO,QQWO'#EYOOQP'#F}'#F}O,VQXO'#EaOOQQ'#Fz'#FzOOQQ'#FR'#FRQOQWOOOOQQ'#FT'#FTOOQQ'#F^'#F^O`QYO'#CoOOQQ'#F_'#F_O$wQYO'#CsO,bQYO'#DwOOQQ'#Fs'#FsO,gQYO'#EROOQO'#ER'#ERO`QYO'#EVO`QYO'#EUOOQO'#F{'#F{Q,oQWOOO,tQYO'#DRO-kQWO'#FbOOQO'#DT'#DTO-vQYO'#FfO-}QWOOO.tQYO'#CdO/RQYO'#FVOOQQ'#Cc'#CcO/WQYO'#FUOOQQ'#Cb'#CbO/`QYO,58zO`QYO,59iOOQQ'#Fc'#FcOOQQ'#Fd'#FdOOQQ'#Fe'#FeO`QYO,59qO`QYO,59qO`QYO,59qOOQQ'#Fl'#FlO/eQYO,5:^OOQQ'#Fm'#FmO`QYO,5:`O`QYO,59eO`QYO,59gO`QYO,59iO1^QYO,59iO1eQYO,59rOOQQ,5:i,5:iO1jQYO,59qOOQU-E8l-E8lO3^QYO'#FoOOQQ,5:b,5:bOOQQ,5:n,5:nOOQQ,5:l,5:lO3eQYO,5:rOOQQ,5;n,5;nO3oQYO,5:qO3|QWO,5:sO4RQYO,5:tOOQP'#Ee'#EeO4xQXO'#EdOOQO'#Ec'#EcO5PQWO'#EbO5UQWO'#GOO5^QWO,5:{O5cQYO,59ZO/RQYO'#FaOOQQ'#Cw'#CwO5jQYO'#F`OOQQ'#Cv'#CvO5rQYO,59_O5wQYO,5:cO5|QYO,5:mO3hQYO,5:qO6RQYO,5:pO`QYO'#EwQ,oQWOOO`QYO'#EmO6xQWO,5;|O`QYOOOOQR'#Cf'#CfOOQQ'#Ej'#EjO7rQYO,59OO`QYO,5;qOOQQ'#FY'#FYO$wQYO'#EkO8SQYO,5;pO`QYO1G.fOOQQ'#F]'#F]O8yQYO1G/TO;pQYO1G/]O;zQYO1G/]O<UQYO1G/]OOQQ1G/x1G/xO=xQYO1G/zO>PQYO1G/PO?YQYO1G/RO@cQYO1G/TO`QYO1G/TOOQQ1G/T1G/TO@yQYO1G/^OAhQ^O'#CdOBzQYO'#FqOOQO'#Dz'#DzOCUQWO'#DyOCZQWO'#FpOOQO'#Dx'#DxOOQO'#D{'#D{OCcQWO,5<ZOOQQ1G0^1G0^O`QYO1G0]O`QYO'#EsOChQWO,5<]OOQQ1G0_1G0_OCsQWO'#E[ODOQWO'#F|OOQO'#EZ'#EZODWQWO1G0`OOQP'#Eu'#EuOD]QXO,5;OO`QYO,5:|ODdQXO'#EvODlQWO,5<jOOQQ1G0g1G0gO`QYO1G.uO`QYO,5;{O$wQYO'#ElODtQYO,5;zO`QYO1G.yOD|QYO1G/}OOQO1G0X1G0XOOQO,5;c,5;cOOQO-E8u-E8uOOQO,5;X,5;XOOQO-E8k-E8kOERQWOOOOQQ-E8h-E8hOEWQYO'#CmOOQQ1G1]1G1]OOQQ,5;V,5;VOOQQ-E8i-E8iOEeQYO7+$QOOQQ7+%f7+%fO`QYO7+$oOF[QYO,5:rOFiQWO7+$oOFnQYO'#D[OOQQ'#DZ'#DZOHbQYO'#D_OHgQYO'#D_OHlQYO'#D_OHqQ`O'#DgOHvQ`O'#DjOH{Q`O'#DnOOQQ7+$x7+$xO`QYO,5:eO$wQYO'#ErOIQQWO,5<[OOQQ1G1u1G1uOJWQYO7+%wOJeQYO,5;_OOQO-E8q-E8qO@yQYO,5:vO$wQYO'#EtOJrQWO,5<hOJzQYO7+%zOOQP-E8s-E8sOKRQYO1G0hOOQO,5;b,5;bOOQO-E8t-E8tOK]QYO7+$aOKdQYO1G1gOOQQ,5;W,5;WOOQQ-E8j-E8jOKnQYO7+$eOOQO7+%i7+%iO`QYO,59XOLeQYO<<HZOOQQ<<HZ<<HZO/eQYO'#EoOMnQYO,59vO! bQYO,59yO! gQYO,59yO! lQYO,59yO! qQYO,5:RO$wQYO,5:UO!!`QbO,5:YO!!gQYO1G0POOQO,5;^,5;^OOQO-E8p-E8pO!!qQYO<<IcOOQQ<<Ic<<IcOOQO1G0b1G0bOOQO,5;`,5;`OOQO-E8r-E8rO!%pQYO'#E^OOQQ<<If<<IfO`QYO<<IfO`QYO<<G{O!&gQYO1G.sOOQQ,5;Z,5;ZOOQQ-E8m-E8mO!&qQYO1G/eOOQQ1G/e1G/eO!&vQbO'#D]O!'XQ`O'#D[O!'dQ`O1G/mO!'iQWO'#DmO!'nQ`O'#FhOOQO'#Dl'#DlO!'vQ`O1G/pOOQO'#Dq'#DqO!'{Q`O'#FjOOQO'#Dp'#DpO!(TQ`O1G/tOOQQAN?QAN?QO!(YQYOAN=gOOQQ7+%P7+%PO!)PQ`O,59vOOQQ7+%X7+%XO! qQYO,5:XO$wQYO'#EpO!)[Q`O,5<SOOQQ7+%[7+%[O! qQYO'#EqO!)dQ`O,5<UO!)lQ`O7+%`OOQO1G/s1G/sOOQO,5;[,5;[OOQO-E8n-E8nOOQO,5;],5;]OOQO-E8o-E8oO@yQYO<<HzOOQQAN>fAN>fO/eQYO'#EoO! qQYO<<HzO!)qQ`O7+%`O!)vQ`O1G/tO!!`QbO,5:YO!){Q`O'#Dn",
+    stateData: "!*[~O#rOS#sOSPOSQOS~OTsOZVO[UOdtOhvOivOs}OviO!T{O!U{O!VxO!XzO!c!OO!g|O!igO!pyO!wjO#SnO#nRO#oRO$ZZO$i_O$j`O$kaO$lbO~OTsO[UOdtOhvOivOs}OviO!T{O!U{O!VxO!XzO!c!OO!g|O!igO!pyO!wjO#SnO#nRO#oRO$ZZO$i_O$j`O$kaO$lbO~OZ!TO#]!UO~P#PO#nRO#oRO~OZ!^O[!^O]!_O^!_O_!`O`!kOn!hOp!iOr!]Os!]Ot!jO{!lO!i!fO#z!dOv$bX~O#l#tX$s#tX~P%PO$i!mOT$YXZ$YX[$YXd$YXh$YXi$YXs$YXv$YX!T$YX!U$YX!V$YX!X$YX!c$YX!g$YX!i$YX!p$YX!w$YX#S$YX#n$YX#o$YX$Z$YX$j$YX$k$YX$l$YX~O#nRO#oROZ!PX[!PX]!PX^!PX_!PX`!PXn!PXp!PXr!PXs!PXt!PXv!PX{!PX!i!PX#l!PX#p!PX#z!PX$s!PX$O!PXx!PX#}!PX!g!PXe!PXb!PX#R!PXf!PXl!PX~Ov!pO~O$j`O~O#p!uOZ#vX[#vX]#vX^#vX_#vX`#vXn#vXp#vXr#vXs#vXt#vXv#vX{#vX!i#vX#l#vX#z#vX$s#vX$O#vXx#vX#}#vX!g#vXe#vXb#vX#R#vXf#vXl#vX~O!g$eP~P`Ov!xO~O#m!yO$j`O#R$rP~Op#VO~Op#WOv!uX~O$s#ZO~O#luX$OuX$suXxuX#}uX!guXeuXbuX#RuXfuXluX~P%PO$O#]O#l$UXx$UX~O#l#[X~P&[Ov#_O~OZ#`O[#`O]#`O^#`O_#`O#nRO#oRO#z#`O#{#`O$]WX~O`WXxWX$OWX~P.SO`#dO~O$O#eOb#xX~Ob#hO~O#nRO#oRO$ZZO~OTsOZVO[UOdtOhvOivOs}O!T{O!U{O!VxO!XzO!c!OO!g|O!igO!pyO!wjO#SnO#nRO#oRO$ZZO$i_O$j`O$kaO$lbO~Ov#rO~P/pO|#tO~O{!lO!i!fO#z!dOZya[ya]ya^ya_ya`yanyapyaryasyatyav$bX#lya$sya$Oyaxya#}ya!gyaeyabya#Ryafyalya~Ox$eP~P`Ox#}O#}$OO~P%PO#}$OO$O$PO!g$eX~P%PO!g$RO~O#nRO#oROx$pP~OZ#`O[#`O]#`O^#`O_#`O#m!yO#z#`O#{#`O~O$]#WX~P4^O$]$YO~O$O$ZO#R$rX~O#R$]O~Oe$^O~P%PO$O$`Ol$SX~Ol$bO~O!W$cO~O!T$dO~O#l!xa$s!xa$O!xax!xa#}!xa!g!xae!xab!xa#R!xaf!xal!xa~P%PO$O#]O#l$Uax$Ua~OZ#`O[#`O]#`O^#`O_#`O#nRO#oRO#z#`O#{#`O~O`Wa$]WaxWa$OWa~P7TO$O#eOb#xa~OZ!^O[!^O]!_O^!_O_!`O{!lO!i!fO#z!dOv$bX~O`qinqipqirqisqitqi#lqi$sqi$Oqixqi#}qi!gqieqibqi#Rqifqilqi~P8[O_!`O{!lO!i!fO#z!dOZyi[yi`yinyipyiryisyityiv$bX#lyi$syi$Oyixyi#}yi!gyieyibyi#Ryifyilyi~O]!_O^!_O~P:SO]yi^yi~P:SO{!lO!i!fO#z!dOZyi[yi]yi^yi_yi`yinyipyiryisyityiv$bX#lyi$syi$Oyixyi#}yi!gyieyibyi#Ryifyilyi~O!g$pO~P%PO`!kOp!iOr!]Os!]Ot!jOnmi#lmi$smi$Omixmi#}mi!gmiemibmi#Rmifmilmi~P8[O`!kOr!]Os!]Ot!jOnoipoi#loi$soi$Ooixoi#}oi!goieoiboi#Roifoiloi~P8[O`!kOn!hOp$qOr!]Os!]Ot!jO~P8[O!S$vO!V$wO!X$xO![$yO!_$zO!c${O#nRO#oRO$ZZO~OZ#bX[#bX]#bX^#bX_#bX`#bXn#bXp#bXr#bXs#bXt#bXv#bXx#bX{#bX!i#bX#n#bX#o#bX#p#bX#z#bX$O#bX~P.SO$O$POx$eX~P%PO$]$}O~O$O%OOx$dX~Ox%QO~O$O$PO!g$eax$ea~O$]%UOx#OX$O#OX~O$O%VOx$pX~Ox%XO~O$]#Wa~P4^O#m!yO$j`O~O$O$ZO#R$ra~O$O$`Ol$Sa~O!U%cO~OxrO~O#}%dObaX$OaX~P%PO#lSq$sSq$OSqxSq#}Sq!gSqeSqbSq#RSqfSqlSq~P%POx#}O#}$OO$OuX~P%POx%fO~O#z%gOZ!OX[!OX]!OX^!OX_!OX`!OXn!OXp!OXr!OXs!OXt!OXv!OX{!OX!i!OX#l!OX$s!OX$O!OXx!OX#}!OX!g!OXe!OXb!OX#R!OXf!OXl!OX~Op%iO~Op%jO~Op%kO~O!]%lO~O!]%mO~O!]%nO~O$O%OOx$da~OZ!^O[!^O]!_O^!_O_!`O`!kOn!hOp!iOr!]Os!]Ot!jO{!lO#z!dOv$bX~Ox%sO!g%sO!i%rO~PIYO!g#ga$O#gax#ga~P%PO$O%VOx$pa~O#P%yO~P`O#R#Ui$O#Ui~P%POf%zO~P%POl$Ti$O$Ti~P%PO#lgq$sgq$Ogqxgq#}gq!ggqegqbgq#Rgqfgqlgq~P%PO`qynqypqyrqysqytqy#lqy$sqy$Oqyxqy#}qy!gqyeqybqy#Rqyfqylqy~P8[O#z%gOZ!Oa[!Oa]!Oa^!Oa_!Oa`!Oan!Oap!Oar!Oas!Oat!Oav!Oa{!Oa!i!Oa#l!Oa$s!Oa$O!Oax!Oa#}!Oa!g!Oae!Oab!Oa#R!Oaf!Oal!Oa~O!T&OO~O!W&OO~O!T&PO~O!S$vO!V$wO!X$xO![$yO!_$zO!c&uO#nRO#oRO$ZZO~O!Y$^P~P! qOx!mi$O!mi~P%POT$aXZ$aX[$aX]!yy^!yy_!yy`!yyd$aXh$aXi$aXn!yyp!yyr!yys$aXt!yyv$aX{!yy!T$aX!U$aX!V$aX!X$aX!c$aX!g$aX!i$aX!p$aX!w$aX#S$aX#l!yy#n$aX#o$aX#z!yy$Z$aX$i$aX$j$aX$k$aX$l$aX$s!yy$O!yyx!yy#}!yye!yyb!yy#R!yyf!yyl!yy~O#l#QX$s#QX$O#QXx#QX#}#QX!g#QXe#QXb#QX#R#QXf#QXl#QX~P%PObai$Oai~P%PO!U&_O~O#nRO#oRO!Y!PX#z!PX$O!PX~O#z&pO!Y!OX$O!OX~O!Y&aO~O$]&bO~O$O&cO!Y$[X~O!Y&eO~O$O&fO!Y$^X~O!Y&hO~O#lc!R$sc!R$Oc!Rxc!R#}c!R!gc!Rec!Rbc!R#Rc!Rfc!Rlc!R~P%PO#z&pO!Y!Oa$O!Oa~O$O&cO!Y$[a~O$O&fO!Y$^a~O$_&nO~O$_&qO~O!Y&rO~O!]&tO~O$Z~QP_^$i]#z~",
+    goto: "E|$sPPPP$tP%m%p%v&Y'sPPPPPP'|P$tPPP$tPP(P(SP$tP$tP$tPPP(YP(eP$t$tPP(n)T)`*m)TPPPPPPP)TPP)TP+r+u)TP+{,R$tP$tP$t,Y-R-U-[-RP-d.]-d-d/]0UP$t0}$t1v1v2o2rP2xPP1v3O3U/X3YPP3bP3e3l3r3x4O5Z5e5k5q5w6O6U6[6bPPPPPPPP6h6q8x9q:j:mPP:qPP:w:z;s<l<o<s<x=g>V>vP?oP?rP?v@iA[BTBZB^$tBdBdPPPPC]8xDUD}EQEy!mjOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR![SQ!YSR$m#eS!WS#eS#Qw$`W#w!p!x%O%VT&T%m&c#WXOPQWYilu|}!]!a!b!c!e!g!h!i!j!k#Z#]#_#c#g#r#t$O$P$Y$^$_$b$q$}%U%X%d%g%l%n%y%z&Q&b&f&n&p&q&tb!VSw!x#e$`%O%V%m&cU#a!V#b#uR#u!pU#a!V#b#uT$W!z$XR$l#cR#UwQ#SwR%`$`U!RQ#_#rQ#s!kR$g#]QrQQ$i#_R$s#rQ$|#tQ%t%UQ&S%lU&X%n&f&tQ&i&bT&o&n&qc$u#t%U%l%n&b&f&n&q&t!lkOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zQ#m!eU$t#t%U&nS%|%g&p]&R%l%n&b&f&q&t#V[OPQWilu|}!]!a!b!c!e!g!h!i!j!k!p#Z#]#_#c#g#r#t$O$P$Y$^$_$b$q$}%U%X%d%g%l%n%y%z&b&f&n&p&q&tR&W%mQ&U%mR&j&cQ&[%nR&s&tS&Y%n&tR&l&f!m]OPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR#|!pQ#y!pR%p%OS#x!p%OT$S!x%V!meOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!leOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zQ!rbT!{o$Z!mcOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mdOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mhOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mpOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR$V!xQ$T!xR%u%VQ%x%XR&]%yQ!}oR%[$ZT!|o$ZS!zo$ZT$W!z$XRrQS#b!V#uR$j#bQ#f!YR$n#fQ$a#SR%a$aQ#^!RR$h#^!vYOPQWilu|}!]!a!b!c!e!g!h!i!j!k!p#Z#]#_#c#g#r#t$O$P$Y$^$_$b$q$}%U%X%d%g%y%z&nS!oY&Q_&Q%l%n&b&f&p&q&tQ%h$tS%}%h&`R&`&RQ&d&UR&k&dQ&g&YR&m&gQ%P#yR%q%PS$Q!v#vR%T$QQ%W$TR%v%WQ$X!zR%Y$XQ$[!}R%]$[Q#[!PR$f#[QrOQ!PPR$e#ZUTOP#ZW!QQ!k#]#_Q!nWQ!tiQ!vlQ#PuQ#X|Q#Y}Q#i!]Q#j!aQ#k!bQ#l!cQ#n!gQ#o!hQ#p!iQ#q!jQ#v!pQ$k#cQ$o#gQ$r#rQ%R$OQ%S$PQ%Z$YQ%^$^Q%_$_Q%b$bQ%e$qQ%o$}S%w%X%yQ%{%dR&^%z!mqOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mSOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR!ZST!XS#eQ#c!WR$_#QR#g![!muOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mwOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR#TwT#Rw$`V!SQ#_#r!X!aT!Q!t!v#P#X#Y#i#n#o#p#q#v$k$o$r%R%S%Z%^%_%b%e%o%w%{&^!Z!bT!Q!t!v#P#X#Y#i#j#n#o#p#q#v$k$o$r%R%S%Z%^%_%b%e%o%w%{&^!]!cT!Q!t!v#P#X#Y#i#j#k#n#o#p#q#v$k$o$r%R%S%Z%^%_%b%e%o%w%{&^!mWOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR&V%mT&Z%n&t!a!eT!Q!n!t!v#P#X#Y#i#j#k#l#n#o#p#q#v$k$o$r%R%S%Z%^%_%b%e%o%w%{&^!a!gT!Q!n!t!v#P#X#Y#i#j#k#l#n#o#p#q#v$k$o$r%R%S%Z%^%_%b%e%o%w%{&^!m^OPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zQ!q^R!scR#z!pQ!wlR#{!p!mfOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mlOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%z!mmOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR$U!x!moOPQWilu|}!]!a!b!c!g!h!i!j!k!p#Z#]#_#c#g#r$O$P$Y$^$_$b$q$}%X%d%y%zR#Oo",
+    nodeNames: "⚠ LineComment BlockComment Expression ForExpression for InExpressions InExpression Name Identifier Identifier ArithOp ArithOp ArithOp ArithOp ArithOp in IterationContext return IfExpression if then else QuantifiedExpression some every InExpressions InExpression satisfies Disjunction or Conjunction and Comparison CompareOp CompareOp between PositiveUnaryTest ( PositiveUnaryTests ) ArithmeticExpression InstanceOfExpression instance of Type QualifiedName VariableName BacktickIdentifier SpecialType days time duration years months date > ListType list < ContextType context ContextEntryTypes ContextEntryType FunctionType function ArgumentTypes ArgumentType PathExpression ] FilterExpression [ FunctionInvocation SpecialFunctionName NamedParameters NamedParameter ParameterName PositionalParameters null NumericLiteral StringLiteral BooleanLiteral DateTimeLiteral DateTimeConstructor AtLiteral ? SimplePositiveUnaryTest Interval ParenthesizedExpression List FunctionDefinition FormalParameters FormalParameter external FunctionBody } { Context ContextEntry Key Name Identifier Expressions UnaryTests Wildcard not",
+    maxTerm: 173,
     context: variableTracker,
     nodeProps: [
         [
             "closedBy",
             38,
             ")",
-            70,
+            71,
             "]",
-            95,
+            96,
             "}"
         ],
         [
             "openedBy",
             40,
             "(",
-            68,
+            69,
             "[",
-            94,
+            95,
             "{"
         ],
         [
             "group",
             -5,
-            77,
             78,
             79,
             80,
             81,
+            82,
             "Literal"
         ]
     ],
@@ -24317,7 +24791,7 @@ var parser = LRParser.deserialize({
         2
     ],
     repeatNodeCount: 14,
-    tokenData: "+l~RuXY#fYZ$ZZ[#f]^$Zpq#fqr$`rs$kwx&cxy&hyz&mz{&r{|'P|}'U}!O'Z!O!P'h!P!Q(Q!Q![){![!]*^!]!^*c!^!_*h!_!`$f!`!a*w!b!c+R!}#O+W#P#Q+]#Q#R&z#o#p+b#q#r+g$f$g#f#BY#BZ#f$IS$I_#f$I|$I}$Z$I}$JO$Z$JT$JU#f$KV$KW#f&FU&FV#f?HT?HU#f~#kY#q~XY#fZ[#fpq#f$f$g#f#BY#BZ#f$IS$I_#f$JT$JU#f$KV$KW#f&FU&FV#f?HT?HU#f~$`O#r~~$cP!_!`$f~$kOr~~$pW$h~OY$kZr$krs%Ys#O$k#O#P%_#P;'S$k;'S;=`&]<%lO$k~%_O$h~~%bRO;'S$k;'S;=`%k;=`O$k~%pX$h~OY$kZr$krs%Ys#O$k#O#P%_#P;'S$k;'S;=`&];=`<%l$k<%lO$k~&`P;=`<%l$k~&hO#z~~&mOv~~&rOx~~&wP^~z{&z~'PO_~~'UO[~~'ZO#}~R'`PZP!`!a'cQ'hO$]Q~'mQ#y~!O!P's!Q!['x~'xO#|~~'}P$g~!Q!['x~(VQ]~z{(]!P!Q)d~(`TOz(]z{(o{;'S(];'S;=`)^<%lO(]~(rVOz(]z{(o{!P(]!P!Q)X!Q;'S(];'S;=`)^<%lO(]~)^OQ~~)aP;=`<%l(]~)iSP~OY)dZ;'S)d;'S;=`)u<%lO)d~)xP;=`<%l)d~*QQ$g~!O!P*W!Q![){~*ZP!Q!['x~*cO$Z~~*hO$q~R*oP![QsP!_!`*rP*wOsPR+OP!XQsP!_!`*r~+WO$j~~+]O!h~~+bO!f~~+gO#R~~+lO#Q~",
+    tokenData: "-c~RvXY#iYZ$^Z[#i]^$^pq#iqr$crs$nwx&fxy&kyz&pz{&u{|'S|}'X}!O'^!O!P'k!P!Q(T!Q![*O![!]*a!]!^*f!^!_*k!_!`$i!`!a*z!b!c+U!}#O+Z#P#Q+`#Q#R&}#S#T+e#o#p-X#q#r-^$f$g#i#BY#BZ#i$IS$I_#i$I|$I}$^$I}$JO$^$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~#nY#r~XY#iZ[#ipq#i$f$g#i#BY#BZ#i$IS$I_#i$JT$JU#i$KV$KW#i&FU&FV#i?HT?HU#i~$cO#s~~$fP!_!`$i~$nOr~~$sW$j~OY$nZr$nrs%]s#O$n#O#P%b#P;'S$n;'S;=`&`<%lO$n~%bO$j~~%eRO;'S$n;'S;=`%n;=`O$n~%sX$j~OY$nZr$nrs%]s#O$n#O#P%b#P;'S$n;'S;=`&`;=`<%l$n<%lO$n~&cP;=`<%l$n~&kO#{~~&pOv~~&uOx~~&zP^~z{&}~'SO_~~'XO[~~'^O$O~R'cPZP!`!a'fQ'kO$_Q~'pQ#z~!O!P'v!Q!['{~'{O#}~~(QP$i~!Q!['{~(YQ]~z{(`!P!Q)g~(cTOz(`z{(r{;'S(`;'S;=`)a<%lO(`~(uVOz(`z{(r{!P(`!P!Q)[!Q;'S(`;'S;=`)a<%lO(`~)aOQ~~)dP;=`<%l(`~)lSP~OY)gZ;'S)g;'S;=`)x<%lO)g~){P;=`<%l)g~*TQ$i~!O!P*Z!Q![*O~*^P!Q!['{~*fO$]~~*kO$s~R*rP!]QsP!_!`*uP*zOsPR+RP!YQsP!_!`*u~+ZO$l~~+`O!i~~+eO!g~~+hWOY+eZ#O+e#O#P,Q#P#S+e#S#T,|#T;'S+e;'S;=`-R<%lO+e~,TRO;'S+e;'S;=`,^;=`O+e~,aXOY+eZ#O+e#O#P,Q#P#S+e#S#T,|#T;'S+e;'S;=`-R;=`<%l+e<%lO+e~-RO$Z~~-UP;=`<%l+e~-^O#S~~-cO#R~",
     tokenizers: [
         propertyIdentifiers,
         identifiers,
@@ -24332,28 +24806,31 @@ var parser = LRParser.deserialize({
         ],
         "Expressions": [
             1,
-            101
+            102
         ],
         "UnaryTests": [
             2,
-            102
+            103
         ]
     },
+    dialects: {
+        camunda: 2532
+    },
     dynamicPrecedences: {
         "31": -1,
-        "67": 1,
-        "71": -1,
-        "73": -1
+        "68": 1,
+        "72": -1,
+        "74": -1
     },
     specialized: [
         {
-            term: 121,
+            term: 122,
             get: function(value) {
                 return spec_identifier[value] || -1;
             }
         }
     ],
-    tokenPrec: 2500
+    tokenPrec: 2534
 });
 function _array_like_to_array(arr, len) {
@@ -25428,10 +25905,10 @@ var builtins = {
     // 10.3.4.5 Numeric functions
     "decimal": fn(function(n, scale) {
         if (!scale) {
-            return round(n);
+            return bankersRound(n);
         }
         var offset = Math.pow(10, scale);
-        return round(n * offset) / offset;
+        return bankersRound(n * offset) / offset;
     }, [
         "number",
         "number"
@@ -25660,7 +26137,8 @@ var builtins = {
     ]),
     // 10.3.4.10 Context function
     "get value": fn(function(m, key) {
-        return getFromContext(key, m) || null;
+        var value = getFromContext(key, m);
+        return value != undefined ? value : null;
     }, [
         "context",
         "string"
@@ -25987,13 +26465,13 @@ function countSymbols(str) {
     // cf. https://mathiasbynens.be/notes/javascript-unicode
     return str.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length;
 }
-function round(n) {
-    var integral = Math.trunc(n);
-    if (n - integral > .5) {
-        return integral + 1;
-    } else {
-        return integral;
+function bankersRound(n) {
+    var floored = Math.floor(n);
+    var decimalPart = n - floored;
+    if (decimalPart === 0.5) {
+        return floored % 2 === 0 ? floored : floored + 1;
     }
+    return Math.round(n);
 }
 // adapted from https://stackoverflow.com/a/53577159
 function stddev(array) {
@@ -26074,17 +26552,19 @@ function ifValid(o) {
     return o.isValid ? o : null;
 }
 function parseExpression(expression) {
-    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
     return parser.configure({
         top: "Expression",
-        contextTracker: trackVariables(context)
+        contextTracker: trackVariables(context),
+        dialect: dialect
     }).parse(expression);
 }
 function parseUnaryTests(expression) {
-    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
     return parser.configure({
         top: "UnaryTests",
-        contextTracker: trackVariables(context)
+        contextTracker: trackVariables(context),
+        dialect: dialect
     }).parse(expression);
 }
 var SyntaxError$1 = /*#__PURE__*/ function(Error1) {
@@ -26153,8 +26633,8 @@ var Interpreter = /*#__PURE__*/ function() {
         {
             key: "evaluate",
             value: function evaluate(expression) {
-                var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-                var parseTree = parseExpression(expression, context);
+                var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
+                var parseTree = parseExpression(expression, context, dialect);
                 var root = this._buildExecutionTree(parseTree, expression);
                 return {
                     parseTree: parseTree,
@@ -26165,8 +26645,8 @@ var Interpreter = /*#__PURE__*/ function() {
         {
             key: "unaryTest",
             value: function unaryTest(expression) {
-                var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-                var parseTree = parseUnaryTests(expression, context);
+                var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
+                var parseTree = parseUnaryTests(expression, context, dialect);
                 var root = this._buildExecutionTree(parseTree, expression);
                 return {
                     parseTree: parseTree,
@@ -26180,8 +26660,8 @@ var Interpreter = /*#__PURE__*/ function() {
 var interpreter = new Interpreter();
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function evaluate(expression) {
-    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var root = interpreter.evaluate(expression, context).root;
+    var context = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, dialect = arguments.length > 2 ? arguments[2] : void 0;
+    var root = interpreter.evaluate(expression, context, dialect).root;
     // root = Expression :: fn(ctx)
     return root(context);
 }
@@ -26224,6 +26704,12 @@ function evalNode(node, input, args) {
                 switch(input){
                     case "+":
                         return nullable(function(a, b) {
+                            // flip these as luxon operations with durations aren't commutative
+                            if (isDuration(a) && !isDuration(b)) {
+                                var tmp = a;
+                                a = b;
+                                b = tmp;
+                            }
                             if (isType(a, "time") && isDuration(b)) {
                                 return a.plus(b).set({
                                     year: 1900,
@@ -26317,6 +26803,8 @@ function evalNode(node, input, args) {
                         };
                 }
             }, Test("boolean"));
+        case "BacktickIdentifier":
+            return input.replace(/`/g, "");
         case "Wildcard":
             return function(_context) {
                 return true;
@@ -26790,7 +27278,7 @@ function evalNode(node, input, args) {
                         if (isNumber(value)) {
                             filterFn.type = "number";
                         }
-                    } catch (err) {
+                    } catch (_err) {
                     // ignore
                     }
                 }
@@ -27253,7 +27741,6 @@ function parseString(str) {
     if (str.endsWith('"')) {
         str = str.slice(0, -1);
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return str.replace(/(\\")|(\\\\)|(\\u[a-fA-F0-9]{5,6})|((?:\\u[a-fA-F0-9]{1,4})+)/ig, function(substring) {
         for(var _len = arguments.length, groups = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
             groups[_key - 1] = arguments[_key];