@js-joda/core 6.0.0 → 6.1.0

package/dist/js-joda.js

@@ -1,4 +1,4 @@
-//! @version @js-joda/core - 6.0.0
+//! @version @js-joda/core - 6.1.0
 //! @copyright (c) 2015-present, Philipp Thürwächter, Pattrick Hüper & js-joda contributors
 //! @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
 //! @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
@@ -76,23 +76,17 @@
       };
     }
 
-    function _inheritsLoose(subClass, superClass) {
-      subClass.prototype = Object.create(superClass.prototype);
-      subClass.prototype.constructor = subClass;
-      _setPrototypeOf(subClass, superClass);
+    function _assertThisInitialized(e) {
+      if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+      return e;
     }
-    function _setPrototypeOf(o, p) {
-      _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-      };
-      return _setPrototypeOf(o, p);
+    function _inheritsLoose(t, o) {
+      t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
     }
-    function _assertThisInitialized(self) {
-      if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-      }
-      return self;
+    function _setPrototypeOf(t, e) {
+      return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+        return t.__proto__ = e, t;
+      }, _setPrototypeOf(t, e);
     }
 
     /**
@@ -211,18 +205,10 @@
         }
         return r;
       };
-      MathUtil.parseInt = function (_parseInt) {
-        function parseInt(_x) {
-          return _parseInt.apply(this, arguments);
-        }
-        parseInt.toString = function () {
-          return _parseInt.toString();
-        };
-        return parseInt;
-      }(function (value) {
+      MathUtil.parseInt = function (value) {
         var r = parseInt(value);
         return MathUtil.safeToInt(r);
-      });
+      };
       MathUtil.safeToInt = function safeToInt(value) {
         MathUtil.verifyInt(value);
         return MathUtil.safeZero(value);
@@ -369,7 +355,6 @@
     }();
 
     var Duration = function (_TemporalAmount) {
-      _inheritsLoose(Duration, _TemporalAmount);
       function Duration(seconds, nanos) {
         var _this;
         _this = _TemporalAmount.call(this) || this;
@@ -377,6 +362,7 @@
         _this._nanos = MathUtil.safeToInt(nanos);
         return _this;
       }
+      _inheritsLoose(Duration, _TemporalAmount);
       Duration.ofDays = function ofDays(days) {
         return Duration._create(MathUtil.safeMultiply(days, LocalTime.SECONDS_PER_DAY), 0);
       };
@@ -767,9 +753,12 @@
         if (this === Duration.ZERO) {
           return 'PT0S';
         }
-        var hours = MathUtil.intDiv(this._seconds, LocalTime.SECONDS_PER_HOUR);
-        var minutes = MathUtil.intDiv(MathUtil.intMod(this._seconds, LocalTime.SECONDS_PER_HOUR), LocalTime.SECONDS_PER_MINUTE);
-        var secs = MathUtil.intMod(this._seconds, LocalTime.SECONDS_PER_MINUTE);
+        var negativeFraction = this._seconds < 0 && this._nanos > 0;
+        var wholeSeconds = negativeFraction ? this._seconds + 1 : this._seconds;
+        var fractionNanos = negativeFraction ? LocalTime.NANOS_PER_SECOND - this._nanos : this._nanos;
+        var hours = MathUtil.intDiv(wholeSeconds, LocalTime.SECONDS_PER_HOUR);
+        var minutes = MathUtil.intDiv(MathUtil.intMod(wholeSeconds, LocalTime.SECONDS_PER_HOUR), LocalTime.SECONDS_PER_MINUTE);
+        var secs = MathUtil.intMod(wholeSeconds, LocalTime.SECONDS_PER_MINUTE);
         var rval = 'PT';
         if (hours !== 0) {
           rval += hours + "H";
@@ -777,31 +766,23 @@
         if (minutes !== 0) {
           rval += minutes + "M";
         }
-        if (secs === 0 && this._nanos === 0 && rval.length > 2) {
+        if (secs === 0 && fractionNanos === 0 && rval.length > 2) {
           return rval;
         }
-        if (secs < 0 && this._nanos > 0) {
-          if (secs === -1) {
-            rval += '-0';
-          } else {
-            rval += secs + 1;
-          }
+        if (secs === 0 && negativeFraction) {
+          rval += '-0';
         } else {
-          rval += secs;
+          rval += "" + secs;
         }
-        if (this._nanos > 0) {
-          rval += '.';
-          var nanoString;
-          if (secs < 0) {
-            nanoString = "" + (2 * LocalTime.NANOS_PER_SECOND - this._nanos);
-          } else {
-            nanoString = "" + (LocalTime.NANOS_PER_SECOND + this._nanos);
+        if (fractionNanos > 0) {
+          var fraction = "" + fractionNanos;
+          while (fraction.length < 9) {
+            fraction = "0" + fraction;
           }
-          nanoString = nanoString.slice(1, nanoString.length);
-          rval += nanoString;
-          while (rval.charAt(rval.length - 1) === '0') {
-            rval = rval.slice(0, rval.length - 1);
+          while (fraction.charAt(fraction.length - 1) === '0') {
+            fraction = fraction.slice(0, fraction.length - 1);
           }
+          rval += "." + fraction;
         }
         rval += 'S';
         return rval;
@@ -825,7 +806,6 @@
     }
 
     var ChronoUnit = function (_TemporalUnit) {
-      _inheritsLoose(ChronoUnit, _TemporalUnit);
       function ChronoUnit(name, estimatedDuration) {
         var _this;
         _this = _TemporalUnit.call(this) || this;
@@ -833,6 +813,7 @@
         _this._duration = estimatedDuration;
         return _this;
       }
+      _inheritsLoose(ChronoUnit, _TemporalUnit);
       var _proto = ChronoUnit.prototype;
       _proto.duration = function duration() {
         return this._duration;
@@ -1034,6 +1015,15 @@
     }();
 
     var ChronoField = function (_TemporalField) {
+      function ChronoField(name, baseUnit, rangeUnit, range) {
+        var _this;
+        _this = _TemporalField.call(this) || this;
+        _this._name = name;
+        _this._baseUnit = baseUnit;
+        _this._rangeUnit = rangeUnit;
+        _this._range = range;
+        return _this;
+      }
       _inheritsLoose(ChronoField, _TemporalField);
       ChronoField.byName = function byName(fieldName) {
         for (var prop in ChronoField) {
@@ -1044,15 +1034,6 @@
           }
         }
       };
-      function ChronoField(name, baseUnit, rangeUnit, range) {
-        var _this;
-        _this = _TemporalField.call(this) || this;
-        _this._name = name;
-        _this._baseUnit = baseUnit;
-        _this._rangeUnit = rangeUnit;
-        _this._range = range;
-        return _this;
-      }
       var _proto = ChronoField.prototype;
       _proto.name = function name() {
         return this._name;
@@ -1203,10 +1184,10 @@
     }();
 
     var TemporalQuery = function (_Enum) {
-      _inheritsLoose(TemporalQuery, _Enum);
       function TemporalQuery() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(TemporalQuery, _Enum);
       var _proto = TemporalQuery.prototype;
       _proto.queryFrom = function queryFrom(temporal) {
         abstractMethodFail('queryFrom');
@@ -1215,10 +1196,10 @@
     }(Enum);
     function createTemporalQuery(name, queryFromFunction) {
       var ExtendedTemporalQuery = function (_TemporalQuery) {
-        _inheritsLoose(ExtendedTemporalQuery, _TemporalQuery);
         function ExtendedTemporalQuery() {
           return _TemporalQuery.apply(this, arguments) || this;
         }
+        _inheritsLoose(ExtendedTemporalQuery, _TemporalQuery);
         return ExtendedTemporalQuery;
       }(TemporalQuery);
       ExtendedTemporalQuery.prototype.queryFrom = queryFromFunction;
@@ -1226,7 +1207,6 @@
     }
 
     var DayOfWeek = function (_TemporalAccessor) {
-      _inheritsLoose(DayOfWeek, _TemporalAccessor);
       function DayOfWeek(ordinal, name) {
         var _this;
         _this = _TemporalAccessor.call(this) || this;
@@ -1234,6 +1214,7 @@
         _this._name = name;
         return _this;
       }
+      _inheritsLoose(DayOfWeek, _TemporalAccessor);
       var _proto = DayOfWeek.prototype;
       _proto.ordinal = function ordinal() {
         return this._ordinal;
@@ -1360,7 +1341,6 @@
     }
 
     var Month = function (_TemporalAccessor) {
-      _inheritsLoose(Month, _TemporalAccessor);
       function Month(value, name) {
         var _this;
         _this = _TemporalAccessor.call(this) || this;
@@ -1368,6 +1348,7 @@
         _this._name = name;
         return _this;
       }
+      _inheritsLoose(Month, _TemporalAccessor);
       var _proto = Month.prototype;
       _proto.value = function value() {
         return this._value;
@@ -1605,7 +1586,6 @@
 
     var PATTERN = /([-+]?)P(?:([-+]?[0-9]+)Y)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)W)?(?:([-+]?[0-9]+)D)?/;
     var Period = function (_TemporalAmount) {
-      _inheritsLoose(Period, _TemporalAmount);
       function Period(years, months, days) {
         var _this;
         _this = _TemporalAmount.call(this) || this;
@@ -1617,7 +1597,7 @@
             _this._years = _years;
             _this._months = _months;
             _this._days = _days;
-            Period.ZERO = _assertThisInitialized(_this);
+            Period.ZERO = _this;
           }
           return Period.ZERO || _assertThisInitialized(_this);
         }
@@ -1626,6 +1606,7 @@
         _this._days = _days;
         return _this;
       }
+      _inheritsLoose(Period, _TemporalAmount);
       Period.ofYears = function ofYears(years) {
         return Period.create(years, 0, 0);
       };
@@ -1969,10 +1950,10 @@
     }();
 
     var ResolverStyle = function (_Enum) {
-      _inheritsLoose(ResolverStyle, _Enum);
       function ResolverStyle() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(ResolverStyle, _Enum);
       return ResolverStyle;
     }(Enum);
     ResolverStyle.STRICT = new ResolverStyle('STRICT');
@@ -1980,10 +1961,10 @@
     ResolverStyle.LENIENT = new ResolverStyle('LENIENT');
 
     var Temporal = function (_TemporalAccessor) {
-      _inheritsLoose(Temporal, _TemporalAccessor);
       function Temporal() {
         return _TemporalAccessor.apply(this, arguments) || this;
       }
+      _inheritsLoose(Temporal, _TemporalAccessor);
       var _proto = Temporal.prototype;
       _proto.isSupported = function isSupported(fieldOrUnit) {
         abstractMethodFail('isSupported');
@@ -2051,10 +2032,10 @@
     }
 
     var ChronoLocalDate = function (_Temporal) {
-      _inheritsLoose(ChronoLocalDate, _Temporal);
       function ChronoLocalDate() {
         return _Temporal.apply(this, arguments) || this;
       }
+      _inheritsLoose(ChronoLocalDate, _Temporal);
       var _proto = ChronoLocalDate.prototype;
       _proto.isSupported = function isSupported(fieldOrUnit) {
         if (fieldOrUnit instanceof ChronoField) {
@@ -2236,13 +2217,13 @@
       return ZoneRules;
     }();
     var Fixed = function (_ZoneRules) {
-      _inheritsLoose(Fixed, _ZoneRules);
       function Fixed(offset) {
         var _this;
         _this = _ZoneRules.call(this) || this;
         _this._offset = offset;
         return _this;
       }
+      _inheritsLoose(Fixed, _ZoneRules);
       var _proto2 = Fixed.prototype;
       _proto2.isFixedOffset = function isFixedOffset() {
         return true;
@@ -2304,16 +2285,16 @@
     var SECONDS_CACHE = {};
     var ID_CACHE = {};
     var ZoneOffset = function (_ZoneId) {
-      _inheritsLoose(ZoneOffset, _ZoneId);
       function ZoneOffset(totalSeconds) {
         var _this;
         _this = _ZoneId.call(this) || this;
         ZoneOffset._validateTotalSeconds(totalSeconds);
         _this._totalSeconds = MathUtil.safeToInt(totalSeconds);
-        _this._rules = ZoneRules.of(_assertThisInitialized(_this));
+        _this._rules = ZoneRules.of(_this);
         _this._id = ZoneOffset._buildId(totalSeconds);
         return _this;
       }
+      _inheritsLoose(ZoneOffset, _ZoneId);
       var _proto = ZoneOffset.prototype;
       _proto.totalSeconds = function totalSeconds() {
         return this._totalSeconds;
@@ -2509,12 +2490,6 @@
     }
 
     var DateTimeBuilder = function (_TemporalAccessor) {
-      _inheritsLoose(DateTimeBuilder, _TemporalAccessor);
-      DateTimeBuilder.create = function create(field, value) {
-        var dtb = new DateTimeBuilder();
-        dtb._addFieldValue(field, value);
-        return dtb;
-      };
       function DateTimeBuilder() {
         var _this;
         _this = _TemporalAccessor.call(this) || this;
@@ -2527,6 +2502,12 @@
         _this.excessDays = null;
         return _this;
       }
+      _inheritsLoose(DateTimeBuilder, _TemporalAccessor);
+      DateTimeBuilder.create = function create(field, value) {
+        var dtb = new DateTimeBuilder();
+        dtb._addFieldValue(field, value);
+        return dtb;
+      };
       var _proto = DateTimeBuilder.prototype;
       _proto.getFieldValue0 = function getFieldValue0(field) {
         return this.fieldValues.get(field);
@@ -2964,7 +2945,6 @@
       return DateTimeParseContext;
     }();
     var Parsed = function (_Temporal) {
-      _inheritsLoose(Parsed, _Temporal);
       function Parsed(dateTimeParseContext) {
         var _this;
         _this = _Temporal.call(this) || this;
@@ -2972,9 +2952,11 @@
         _this.zone = null;
         _this.fieldValues = new EnumMap();
         _this.leapSecond = false;
+        _this.excessDays = Period.ZERO;
         _this.dateTimeParseContext = dateTimeParseContext;
         return _this;
       }
+      _inheritsLoose(Parsed, _Temporal);
       var _proto2 = Parsed.prototype;
       _proto2.copy = function copy() {
         var cloned = new Parsed();
@@ -3088,10 +3070,10 @@
     var IsoFields = {};
     var QUARTER_DAYS = [0, 90, 181, 273, 0, 91, 182, 274];
     var Field = function (_TemporalField) {
-      _inheritsLoose(Field, _TemporalField);
       function Field() {
         return _TemporalField.apply(this, arguments) || this;
       }
+      _inheritsLoose(Field, _TemporalField);
       var _proto = Field.prototype;
       _proto.isDateBased = function isDateBased() {
         return true;
@@ -3163,10 +3145,10 @@
       return Field;
     }(TemporalField);
     var DAY_OF_QUARTER_FIELD = function (_Field) {
-      _inheritsLoose(DAY_OF_QUARTER_FIELD, _Field);
       function DAY_OF_QUARTER_FIELD() {
         return _Field.apply(this, arguments) || this;
       }
+      _inheritsLoose(DAY_OF_QUARTER_FIELD, _Field);
       var _proto2 = DAY_OF_QUARTER_FIELD.prototype;
       _proto2.toString = function toString() {
         return 'DayOfQuarter';
@@ -3249,10 +3231,10 @@
       return DAY_OF_QUARTER_FIELD;
     }(Field);
     var QUARTER_OF_YEAR_FIELD = function (_Field2) {
-      _inheritsLoose(QUARTER_OF_YEAR_FIELD, _Field2);
       function QUARTER_OF_YEAR_FIELD() {
         return _Field2.apply(this, arguments) || this;
       }
+      _inheritsLoose(QUARTER_OF_YEAR_FIELD, _Field2);
       var _proto3 = QUARTER_OF_YEAR_FIELD.prototype;
       _proto3.toString = function toString() {
         return 'QuarterOfYear';
@@ -3287,10 +3269,10 @@
       return QUARTER_OF_YEAR_FIELD;
     }(Field);
     var WEEK_OF_WEEK_BASED_YEAR_FIELD = function (_Field3) {
-      _inheritsLoose(WEEK_OF_WEEK_BASED_YEAR_FIELD, _Field3);
       function WEEK_OF_WEEK_BASED_YEAR_FIELD() {
         return _Field3.apply(this, arguments) || this;
       }
+      _inheritsLoose(WEEK_OF_WEEK_BASED_YEAR_FIELD, _Field3);
       var _proto4 = WEEK_OF_WEEK_BASED_YEAR_FIELD.prototype;
       _proto4.toString = function toString() {
         return 'WeekOfWeekBasedYear';
@@ -3365,10 +3347,10 @@
       return WEEK_OF_WEEK_BASED_YEAR_FIELD;
     }(Field);
     var WEEK_BASED_YEAR_FIELD = function (_Field4) {
-      _inheritsLoose(WEEK_BASED_YEAR_FIELD, _Field4);
       function WEEK_BASED_YEAR_FIELD() {
         return _Field4.apply(this, arguments) || this;
       }
+      _inheritsLoose(WEEK_BASED_YEAR_FIELD, _Field4);
       var _proto5 = WEEK_BASED_YEAR_FIELD.prototype;
       _proto5.toString = function toString() {
         return 'WeekBasedYear';
@@ -3413,7 +3395,6 @@
       return WEEK_BASED_YEAR_FIELD;
     }(Field);
     var Unit = function (_TemporalUnit) {
-      _inheritsLoose(Unit, _TemporalUnit);
       function Unit(name, estimatedDuration) {
         var _this;
         _this = _TemporalUnit.call(this) || this;
@@ -3421,6 +3402,7 @@
         _this._duration = estimatedDuration;
         return _this;
       }
+      _inheritsLoose(Unit, _TemporalUnit);
       var _proto6 = Unit.prototype;
       _proto6.duration = function duration() {
         return this._duration;
@@ -3584,10 +3566,10 @@
     DecimalStyle.STANDARD = new DecimalStyle('0', '+', '-', '.');
 
     var SignStyle = function (_Enum) {
-      _inheritsLoose(SignStyle, _Enum);
       function SignStyle() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(SignStyle, _Enum);
       var _proto = SignStyle.prototype;
       _proto.parse = function parse(positive, strict, fixedWidth) {
         switch (this) {
@@ -3609,10 +3591,10 @@
     SignStyle.NOT_NEGATIVE = new SignStyle('NOT_NEGATIVE');
 
     var TextStyle = function (_Enum) {
-      _inheritsLoose(TextStyle, _Enum);
       function TextStyle() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(TextStyle, _Enum);
       var _proto = TextStyle.prototype;
       _proto.isStandalone = function isStandalone() {
         switch (this) {
@@ -4073,7 +4055,6 @@
       return NumberPrinterParser;
     }();
     var ReducedPrinterParser = function (_NumberPrinterParser) {
-      _inheritsLoose(ReducedPrinterParser, _NumberPrinterParser);
       function ReducedPrinterParser(field, width, maxWidth, baseValue, baseDate) {
         var _this;
         _this = _NumberPrinterParser.call(this, field, width, maxWidth, SignStyle.NOT_NEGATIVE) || this;
@@ -4098,6 +4079,7 @@
         _this._baseDate = baseDate;
         return _this;
       }
+      _inheritsLoose(ReducedPrinterParser, _NumberPrinterParser);
       var _proto2 = ReducedPrinterParser.prototype;
       _proto2._getValue = function _getValue(context, value) {
         var absValue = Math.abs(value);
@@ -4334,10 +4316,10 @@
     }();
 
     var SettingsParser = function (_Enum) {
-      _inheritsLoose(SettingsParser, _Enum);
       function SettingsParser() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(SettingsParser, _Enum);
       var _proto = SettingsParser.prototype;
       _proto.print = function print() {
         return true;
@@ -4426,11 +4408,6 @@
     }();
 
     var ZoneRegion = function (_ZoneId) {
-      _inheritsLoose(ZoneRegion, _ZoneId);
-      ZoneRegion.ofId = function ofId(zoneId) {
-        var rules = ZoneRulesProvider.getRules(zoneId);
-        return new ZoneRegion(zoneId, rules);
-      };
       function ZoneRegion(id, rules) {
         var _this;
         _this = _ZoneId.call(this) || this;
@@ -4438,6 +4415,11 @@
         _this._rules = rules;
         return _this;
       }
+      _inheritsLoose(ZoneRegion, _ZoneId);
+      ZoneRegion.ofId = function ofId(zoneId) {
+        var rules = ZoneRulesProvider.getRules(zoneId);
+        return new ZoneRegion(zoneId, rules);
+      };
       var _proto = ZoneRegion.prototype;
       _proto.id = function id() {
         return this._id;
@@ -4476,6 +4458,45 @@
         if (position === length) {
           return ~position;
         }
+        var region = this._parseRegion(text, position);
+        var fixedEndPos = this._parseFixedId(context, text, position);
+        var fixedLength = fixedEndPos >= 0 ? fixedEndPos - position : 0;
+        if (region != null && region.parseLength > fixedLength) {
+          context.setParsedZone(ZoneRegion.ofId(region.parsedZoneId));
+          return position + region.parseLength;
+        }
+        return fixedEndPos;
+      };
+      _proto._parseRegion = function _parseRegion(text, position) {
+        var availableZoneIds = ZoneRulesProvider.getAvailableZoneIds();
+        if (availableZoneIds.length === 0) {
+          return null;
+        }
+        if (zoneIdTree.size !== availableZoneIds.length) {
+          zoneIdTree = ZoneIdTree.createTreeMap(availableZoneIds);
+        }
+        var maxParseLength = text.length - position;
+        var treeMap = zoneIdTree.treeMap;
+        var parsedZoneId = null;
+        var parseLength = 0;
+        while (treeMap != null) {
+          var parsedSubZoneId = text.substr(position, Math.min(treeMap.length, maxParseLength));
+          treeMap = treeMap.get(parsedSubZoneId);
+          if (treeMap != null && treeMap.isLeaf) {
+            parsedZoneId = parsedSubZoneId;
+            parseLength = treeMap.length;
+          }
+        }
+        if (parsedZoneId == null) {
+          return null;
+        }
+        return {
+          parsedZoneId: parsedZoneId,
+          parseLength: parseLength
+        };
+      };
+      _proto._parseFixedId = function _parseFixedId(context, text, position) {
+        var length = text.length;
         var nextChar = text.charAt(position);
         if (nextChar === '+' || nextChar === '-') {
           var newContext = context.copy();
@@ -4484,8 +4505,7 @@
             return endPos;
           }
           var offset = newContext.getParsed(ChronoField.OFFSET_SECONDS);
-          var zone = ZoneOffset.ofTotalSeconds(offset);
-          context.setParsedZone(zone);
+          context.setParsedZone(ZoneOffset.ofTotalSeconds(offset));
           return endPos;
         } else if (length >= position + 2) {
           var nextNextChar = text.charAt(position + 1);
@@ -4506,26 +4526,6 @@
           context.setParsedZone(ZoneOffset.UTC);
           return position + 1;
         }
-        var availableZoneIds = ZoneRulesProvider.getAvailableZoneIds();
-        if (zoneIdTree.size !== availableZoneIds.length) {
-          zoneIdTree = ZoneIdTree.createTreeMap(availableZoneIds);
-        }
-        var maxParseLength = length - position;
-        var treeMap = zoneIdTree.treeMap;
-        var parsedZoneId = null;
-        var parseLength = 0;
-        while (treeMap != null) {
-          var parsedSubZoneId = text.substr(position, Math.min(treeMap.length, maxParseLength));
-          treeMap = treeMap.get(parsedSubZoneId);
-          if (treeMap != null && treeMap.isLeaf) {
-            parsedZoneId = parsedSubZoneId;
-            parseLength = treeMap.length;
-          }
-        }
-        if (parsedZoneId != null) {
-          context.setParsedZone(ZoneRegion.ofId(parsedZoneId));
-          return position + parseLength;
-        }
         return ~position;
       };
       _proto._parsePrefixedOffset = function _parsePrefixedOffset(context, text, prefixPos, position) {
@@ -4551,6 +4551,10 @@
       return ZoneIdPrinterParser;
     }();
     var ZoneIdTree = function () {
+      function ZoneIdTree(size, treeMap) {
+        this.size = size;
+        this.treeMap = treeMap;
+      }
       ZoneIdTree.createTreeMap = function createTreeMap(availableZoneIds) {
         var sortedZoneIds = availableZoneIds.sort(function (a, b) {
           return a.length - b.length;
@@ -4561,10 +4565,6 @@
         }
         return new ZoneIdTree(sortedZoneIds.length, treeMap);
       };
-      function ZoneIdTree(size, treeMap) {
-        this.size = size;
-        this.treeMap = treeMap;
-      }
       return ZoneIdTree;
     }();
     var ZoneIdTreeMap = function () {
@@ -5249,7 +5249,7 @@
         var newContext = context.copy();
         var minDigits = this.fractionalDigits < 0 ? 0 : this.fractionalDigits;
         var maxDigits = this.fractionalDigits < 0 ? 9 : this.fractionalDigits;
-        var parser = new DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE).appendLiteral('T').appendValue(ChronoField.HOUR_OF_DAY, 2).appendLiteral(':').appendValue(ChronoField.MINUTE_OF_HOUR, 2).appendLiteral(':').appendValue(ChronoField.SECOND_OF_MINUTE, 2).appendFraction(ChronoField.NANO_OF_SECOND, minDigits, maxDigits, true).appendLiteral('Z').toFormatter()._toPrinterParser(false);
+        var parser = new DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE).appendLiteral('T').appendValue(ChronoField.HOUR_OF_DAY, 2).appendLiteral(':').appendValue(ChronoField.MINUTE_OF_HOUR, 2).appendLiteral(':').appendValue(ChronoField.SECOND_OF_MINUTE, 2).appendFraction(ChronoField.NANO_OF_SECOND, minDigits, maxDigits, true).appendOffsetId().toFormatter()._toPrinterParser(false);
         var pos = parser.parse(newContext, text, position);
         if (pos < 0) {
           return pos;
@@ -5261,6 +5261,8 @@
         var min = newContext.getParsed(ChronoField.MINUTE_OF_HOUR);
         var secVal = newContext.getParsed(ChronoField.SECOND_OF_MINUTE);
         var nanoVal = newContext.getParsed(ChronoField.NANO_OF_SECOND);
+        var offsetSecs = newContext.getParsed(ChronoField.OFFSET_SECONDS);
+        var offset = offsetSecs != null ? offsetSecs : 0;
         var sec = secVal != null ? secVal : 0;
         var nano = nanoVal != null ? nanoVal : 0;
         var year = MathUtil.intMod(yearParsed, 10000);
@@ -5275,7 +5277,7 @@
         var instantSecs;
         try {
           var ldt = LocalDateTime.of(year, month, day, hour, min, sec, 0).plusDays(days);
-          instantSecs = ldt.toEpochSecond(ZoneOffset.UTC);
+          instantSecs = ldt.toEpochSecond(ZoneOffset.ofTotalSeconds(offset));
           instantSecs += MathUtil.safeMultiply(MathUtil.intDiv(yearParsed, 10000), SECONDS_PER_10000_YEARS);
         } catch (ex) {
           return ~position;
@@ -5365,15 +5367,6 @@
      */
 
     var DateTimeFormatter = function () {
-      DateTimeFormatter.parsedExcessDays = function parsedExcessDays() {
-        return DateTimeFormatter.PARSED_EXCESS_DAYS;
-      };
-      DateTimeFormatter.parsedLeapSecond = function parsedLeapSecond() {
-        return DateTimeFormatter.PARSED_LEAP_SECOND;
-      };
-      DateTimeFormatter.ofPattern = function ofPattern(pattern) {
-        return new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
-      };
       function DateTimeFormatter(printerParser, locale, decimalStyle, resolverStyle, resolverFields, chrono, zone) {
         if (chrono === void 0) {
           chrono = IsoChronology.INSTANCE;
@@ -5389,6 +5382,15 @@
         this._chrono = chrono;
         this._zone = zone;
       }
+      DateTimeFormatter.parsedExcessDays = function parsedExcessDays() {
+        return DateTimeFormatter.PARSED_EXCESS_DAYS;
+      };
+      DateTimeFormatter.parsedLeapSecond = function parsedLeapSecond() {
+        return DateTimeFormatter.PARSED_LEAP_SECOND;
+      };
+      DateTimeFormatter.ofPattern = function ofPattern(pattern) {
+        return new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
+      };
       var _proto = DateTimeFormatter.prototype;
       _proto.locale = function locale() {
         return this._locale;
@@ -5543,6 +5545,13 @@
     }
 
     var MonthDay = function (_TemporalAccessor) {
+      function MonthDay(month, dayOfMonth) {
+        var _this;
+        _this = _TemporalAccessor.call(this) || this;
+        _this._month = MathUtil.safeToInt(month);
+        _this._day = MathUtil.safeToInt(dayOfMonth);
+        return _this;
+      }
       _inheritsLoose(MonthDay, _TemporalAccessor);
       MonthDay.now = function now(zoneIdOrClock) {
         if (arguments.length === 0) {
@@ -5613,13 +5622,6 @@
         requireInstance(formatter, DateTimeFormatter, 'formatter');
         return formatter.parse(text, MonthDay.FROM);
       };
-      function MonthDay(month, dayOfMonth) {
-        var _this;
-        _this = _TemporalAccessor.call(this) || this;
-        _this._month = MathUtil.safeToInt(month);
-        _this._day = MathUtil.safeToInt(dayOfMonth);
-        return _this;
-      }
       var _proto = MonthDay.prototype;
       _proto.monthValue = function monthValue() {
         return this._month;
@@ -5747,6 +5749,13 @@
     }
 
     var YearMonth = function (_Temporal) {
+      function YearMonth(year, month) {
+        var _this;
+        _this = _Temporal.call(this) || this;
+        _this._year = MathUtil.safeToInt(year);
+        _this._month = MathUtil.safeToInt(month);
+        return _this;
+      }
       _inheritsLoose(YearMonth, _Temporal);
       YearMonth.now = function now(zoneIdOrClock) {
         if (arguments.length === 0) {
@@ -5811,13 +5820,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, YearMonth.FROM);
       };
-      function YearMonth(year, month) {
-        var _this;
-        _this = _Temporal.call(this) || this;
-        _this._year = MathUtil.safeToInt(year);
-        _this._month = MathUtil.safeToInt(month);
-        return _this;
-      }
       var _proto = YearMonth.prototype;
       _proto.isSupported = function isSupported(fieldOrUnit) {
         if (arguments.length === 1 && fieldOrUnit instanceof TemporalField) {
@@ -6071,13 +6073,13 @@
     }
 
     var Year = function (_Temporal) {
-      _inheritsLoose(Year, _Temporal);
       function Year(value) {
         var _this;
         _this = _Temporal.call(this) || this;
         _this._year = MathUtil.safeToInt(value);
         return _this;
       }
+      _inheritsLoose(Year, _Temporal);
       var _proto = Year.prototype;
       _proto.value = function value() {
         return this._year;
@@ -6418,13 +6420,13 @@
       return TemporalAdjusters;
     }();
     var Impl = function (_TemporalAdjuster) {
-      _inheritsLoose(Impl, _TemporalAdjuster);
       function Impl(ordinal) {
         var _this;
         _this = _TemporalAdjuster.call(this) || this;
         _this._ordinal = ordinal;
         return _this;
       }
+      _inheritsLoose(Impl, _TemporalAdjuster);
       var _proto = Impl.prototype;
       _proto.adjustInto = function adjustInto(temporal) {
         switch (this._ordinal) {
@@ -6452,7 +6454,6 @@
     Impl.LAST_DAY_OF_YEAR = new Impl(4);
     Impl.FIRST_DAY_OF_NEXT_YEAR = new Impl(5);
     var DayOfWeekInMonth = function (_TemporalAdjuster2) {
-      _inheritsLoose(DayOfWeekInMonth, _TemporalAdjuster2);
       function DayOfWeekInMonth(ordinal, dow) {
         var _this2;
         _this2 = _TemporalAdjuster2.call(this) || this;
@@ -6460,6 +6461,7 @@
         _this2._dowValue = dow.value();
         return _this2;
       }
+      _inheritsLoose(DayOfWeekInMonth, _TemporalAdjuster2);
       var _proto2 = DayOfWeekInMonth.prototype;
       _proto2.adjustInto = function adjustInto(temporal) {
         if (this._ordinal >= 0) {
@@ -6480,7 +6482,6 @@
       return DayOfWeekInMonth;
     }(TemporalAdjuster);
     var RelativeDayOfWeek = function (_TemporalAdjuster3) {
-      _inheritsLoose(RelativeDayOfWeek, _TemporalAdjuster3);
       function RelativeDayOfWeek(relative, dayOfWeek) {
         var _this3;
         _this3 = _TemporalAdjuster3.call(this) || this;
@@ -6489,6 +6490,7 @@
         _this3._dowValue = dayOfWeek.value();
         return _this3;
       }
+      _inheritsLoose(RelativeDayOfWeek, _TemporalAdjuster3);
       var _proto3 = RelativeDayOfWeek.prototype;
       _proto3.adjustInto = function adjustInto(temporal) {
         var calDow = temporal.get(ChronoField.DAY_OF_WEEK);
@@ -6507,10 +6509,10 @@
     }(TemporalAdjuster);
 
     var IsoChronology = function (_Enum) {
-      _inheritsLoose(IsoChronology, _Enum);
       function IsoChronology() {
         return _Enum.apply(this, arguments) || this;
       }
+      _inheritsLoose(IsoChronology, _Enum);
       IsoChronology.isLeapYear = function isLeapYear(prolepticYear) {
         return (prolepticYear & 3) === 0 && (prolepticYear % 100 !== 0 || prolepticYear % 400 === 0);
       };
@@ -6640,6 +6642,17 @@
     }
 
     var OffsetTime = function (_Temporal) {
+      function OffsetTime(time, offset) {
+        var _this;
+        _this = _Temporal.call(this) || this;
+        requireNonNull(time, 'time');
+        requireInstance(time, LocalTime, 'time');
+        requireNonNull(offset, 'offset');
+        requireInstance(offset, ZoneOffset, 'offset');
+        _this._time = time;
+        _this._offset = offset;
+        return _this;
+      }
       _inheritsLoose(OffsetTime, _Temporal);
       OffsetTime.from = function from(temporal) {
         requireNonNull(temporal, 'temporal');
@@ -6706,17 +6719,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, OffsetTime.FROM);
       };
-      function OffsetTime(time, offset) {
-        var _this;
-        _this = _Temporal.call(this) || this;
-        requireNonNull(time, 'time');
-        requireInstance(time, LocalTime, 'time');
-        requireNonNull(offset, 'offset');
-        requireInstance(offset, ZoneOffset, 'offset');
-        _this._time = time;
-        _this._offset = offset;
-        return _this;
-      }
       var _proto = OffsetTime.prototype;
       _proto.adjustInto = function adjustInto(temporal) {
         return temporal.with(ChronoField.NANO_OF_DAY, this._time.toNanoOfDay()).with(ChronoField.OFFSET_SECONDS, this.offset().totalSeconds());
@@ -6967,10 +6969,10 @@
     }
 
     var ChronoZonedDateTime = function (_Temporal) {
-      _inheritsLoose(ChronoZonedDateTime, _Temporal);
       function ChronoZonedDateTime() {
         return _Temporal.apply(this, arguments) || this;
       }
+      _inheritsLoose(ChronoZonedDateTime, _Temporal);
       var _proto = ChronoZonedDateTime.prototype;
       _proto.query = function query(_query) {
         if (_query === TemporalQueries.zoneId() || _query === TemporalQueries.zone()) {
@@ -7053,6 +7055,17 @@
     }
 
     var ZonedDateTime = function (_ChronoZonedDateTime) {
+      function ZonedDateTime(dateTime, offset, zone) {
+        var _this;
+        requireNonNull(dateTime, 'dateTime');
+        requireNonNull(offset, 'offset');
+        requireNonNull(zone, 'zone');
+        _this = _ChronoZonedDateTime.call(this) || this;
+        _this._dateTime = dateTime;
+        _this._offset = offset;
+        _this._zone = zone;
+        return _this;
+      }
       _inheritsLoose(ZonedDateTime, _ChronoZonedDateTime);
       ZonedDateTime.now = function now(clockOrZone) {
         var clock;
@@ -7188,17 +7201,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, ZonedDateTime.FROM);
       };
-      function ZonedDateTime(dateTime, offset, zone) {
-        var _this;
-        requireNonNull(dateTime, 'dateTime');
-        requireNonNull(offset, 'offset');
-        requireNonNull(zone, 'zone');
-        _this = _ChronoZonedDateTime.call(this) || this;
-        _this._dateTime = dateTime;
-        _this._offset = offset;
-        _this._zone = zone;
-        return _this;
-      }
       var _proto = ZonedDateTime.prototype;
       _proto._resolveLocal = function _resolveLocal(newDateTime) {
         requireNonNull(newDateTime, 'newDateTime');
@@ -7499,6 +7501,17 @@
     }
 
     var OffsetDateTime = function (_Temporal) {
+      function OffsetDateTime(dateTime, offset) {
+        var _this;
+        _this = _Temporal.call(this) || this;
+        requireNonNull(dateTime, 'dateTime');
+        requireInstance(dateTime, LocalDateTime, 'dateTime');
+        requireNonNull(offset, 'offset');
+        requireInstance(offset, ZoneOffset, 'offset');
+        _this._dateTime = dateTime;
+        _this._offset = offset;
+        return _this;
+      }
       _inheritsLoose(OffsetDateTime, _Temporal);
       OffsetDateTime.from = function from(temporal) {
         requireNonNull(temporal, 'temporal');
@@ -7526,8 +7539,8 @@
           if (clockOrZone instanceof ZoneId) {
             return OffsetDateTime.now(Clock.system(clockOrZone));
           } else if (clockOrZone instanceof Clock) {
-            var now = clockOrZone.instant();
-            return OffsetDateTime.ofInstant(now, clockOrZone.zone().rules().offset(now));
+            var _now = clockOrZone.instant();
+            return OffsetDateTime.ofInstant(_now, clockOrZone.zone().rules().offset(_now));
           } else {
             throw new IllegalArgumentException('clockOrZone must be an instance of ZoneId or Clock');
           }
@@ -7580,17 +7593,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, OffsetDateTime.FROM);
       };
-      function OffsetDateTime(dateTime, offset) {
-        var _this;
-        _this = _Temporal.call(this) || this;
-        requireNonNull(dateTime, 'dateTime');
-        requireInstance(dateTime, LocalDateTime, 'dateTime');
-        requireNonNull(offset, 'offset');
-        requireInstance(offset, ZoneOffset, 'offset');
-        _this._dateTime = dateTime;
-        _this._offset = offset;
-        return _this;
-      }
       var _proto = OffsetDateTime.prototype;
       _proto.adjustInto = function adjustInto(temporal) {
         return temporal.with(ChronoField.EPOCH_DAY, this.toLocalDate().toEpochDay()).with(ChronoField.NANO_OF_DAY, this.toLocalTime().toNanoOfDay()).with(ChronoField.OFFSET_SECONDS, this.offset().totalSeconds());
@@ -7928,6 +7930,21 @@
     var DAYS_PER_CYCLE = 146097;
     var DAYS_0000_TO_1970 = DAYS_PER_CYCLE * 5 - (30 * 365 + 7);
     var LocalDate = function (_ChronoLocalDate) {
+      function LocalDate(year, month, dayOfMonth) {
+        var _this;
+        _this = _ChronoLocalDate.call(this) || this;
+        requireNonNull(year, 'year');
+        requireNonNull(month, 'month');
+        requireNonNull(dayOfMonth, 'dayOfMonth');
+        if (month instanceof Month) {
+          month = month.value();
+        }
+        _this._year = MathUtil.safeToInt(year);
+        _this._month = MathUtil.safeToInt(month);
+        _this._day = MathUtil.safeToInt(dayOfMonth);
+        LocalDate._validate(_this._year, _this._month, _this._day);
+        return _this;
+      }
       _inheritsLoose(LocalDate, _ChronoLocalDate);
       LocalDate.now = function now(clockOrZone) {
         var clock;
@@ -8024,21 +8041,6 @@
         }
         return LocalDate.of(year, month, day);
       };
-      function LocalDate(year, month, dayOfMonth) {
-        var _this;
-        _this = _ChronoLocalDate.call(this) || this;
-        requireNonNull(year, 'year');
-        requireNonNull(month, 'month');
-        requireNonNull(dayOfMonth, 'dayOfMonth');
-        if (month instanceof Month) {
-          month = month.value();
-        }
-        _this._year = MathUtil.safeToInt(year);
-        _this._month = MathUtil.safeToInt(month);
-        _this._day = MathUtil.safeToInt(dayOfMonth);
-        LocalDate._validate(_this._year, _this._month, _this._day);
-        return _this;
-      }
       LocalDate._validate = function _validate(year, month, dayOfMonth) {
         var dom;
         ChronoField.YEAR.checkValidValue(year);
@@ -8537,10 +8539,10 @@
     }
 
     var ChronoLocalDateTime = function (_Temporal) {
-      _inheritsLoose(ChronoLocalDateTime, _Temporal);
       function ChronoLocalDateTime() {
         return _Temporal.apply(this, arguments) || this;
       }
+      _inheritsLoose(ChronoLocalDateTime, _Temporal);
       var _proto = ChronoLocalDateTime.prototype;
       _proto.chronology = function chronology() {
         return this.toLocalDate().chronology();
@@ -8577,6 +8579,15 @@
     }(Temporal);
 
     var LocalDateTime = function (_ChronoLocalDateTime) {
+      function LocalDateTime(date, time) {
+        var _this;
+        _this = _ChronoLocalDateTime.call(this) || this;
+        requireInstance(date, LocalDate, 'date');
+        requireInstance(time, LocalTime, 'time');
+        _this._date = date;
+        _this._time = time;
+        return _this;
+      }
       _inheritsLoose(LocalDateTime, _ChronoLocalDateTime);
       LocalDateTime.now = function now(clockOrZone) {
         if (clockOrZone == null) {
@@ -8680,15 +8691,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, LocalDateTime.FROM);
       };
-      function LocalDateTime(date, time) {
-        var _this;
-        _this = _ChronoLocalDateTime.call(this) || this;
-        requireInstance(date, LocalDate, 'date');
-        requireInstance(time, LocalTime, 'time');
-        _this._date = date;
-        _this._time = time;
-        return _this;
-      }
       var _proto = LocalDateTime.prototype;
       _proto._withDateTime = function _withDateTime(newDate, newTime) {
         if (this._date.equals(newDate) && this._time.equals(newTime)) {
@@ -9027,6 +9029,42 @@
     }
 
     var LocalTime = function (_Temporal) {
+      function LocalTime(hour, minute, second, nanoOfSecond) {
+        var _this;
+        if (hour === void 0) {
+          hour = 0;
+        }
+        if (minute === void 0) {
+          minute = 0;
+        }
+        if (second === void 0) {
+          second = 0;
+        }
+        if (nanoOfSecond === void 0) {
+          nanoOfSecond = 0;
+        }
+        _this = _Temporal.call(this) || this;
+        var _hour = MathUtil.safeToInt(hour);
+        var _minute = MathUtil.safeToInt(minute);
+        var _second = MathUtil.safeToInt(second);
+        var _nanoOfSecond = MathUtil.safeToInt(nanoOfSecond);
+        LocalTime._validate(_hour, _minute, _second, _nanoOfSecond);
+        if (_minute === 0 && _second === 0 && _nanoOfSecond === 0) {
+          if (!LocalTime.HOURS[_hour]) {
+            _this._hour = _hour;
+            _this._minute = _minute;
+            _this._second = _second;
+            _this._nano = _nanoOfSecond;
+            LocalTime.HOURS[_hour] = _this;
+          }
+          return LocalTime.HOURS[_hour] || _assertThisInitialized(_this);
+        }
+        _this._hour = _hour;
+        _this._minute = _minute;
+        _this._second = _second;
+        _this._nano = _nanoOfSecond;
+        return _this;
+      }
       _inheritsLoose(LocalTime, _Temporal);
       LocalTime.now = function now(clockOrZone) {
         if (clockOrZone == null) {
@@ -9102,42 +9140,6 @@
         requireNonNull(formatter, 'formatter');
         return formatter.parse(text, LocalTime.FROM);
       };
-      function LocalTime(hour, minute, second, nanoOfSecond) {
-        var _this;
-        if (hour === void 0) {
-          hour = 0;
-        }
-        if (minute === void 0) {
-          minute = 0;
-        }
-        if (second === void 0) {
-          second = 0;
-        }
-        if (nanoOfSecond === void 0) {
-          nanoOfSecond = 0;
-        }
-        _this = _Temporal.call(this) || this;
-        var _hour = MathUtil.safeToInt(hour);
-        var _minute = MathUtil.safeToInt(minute);
-        var _second = MathUtil.safeToInt(second);
-        var _nanoOfSecond = MathUtil.safeToInt(nanoOfSecond);
-        LocalTime._validate(_hour, _minute, _second, _nanoOfSecond);
-        if (_minute === 0 && _second === 0 && _nanoOfSecond === 0) {
-          if (!LocalTime.HOURS[_hour]) {
-            _this._hour = _hour;
-            _this._minute = _minute;
-            _this._second = _second;
-            _this._nano = _nanoOfSecond;
-            LocalTime.HOURS[_hour] = _assertThisInitialized(_this);
-          }
-          return LocalTime.HOURS[_hour] || _assertThisInitialized(_this);
-        }
-        _this._hour = _hour;
-        _this._minute = _minute;
-        _this._second = _second;
-        _this._nano = _nanoOfSecond;
-        return _this;
-      }
       LocalTime._validate = function _validate(hour, minute, second, nanoOfSecond) {
         ChronoField.HOUR_OF_DAY.checkValidValue(hour);
         ChronoField.MINUTE_OF_HOUR.checkValidValue(minute);
@@ -9562,6 +9564,14 @@
 
     var NANOS_PER_MILLI = 1000000;
     var Instant = function (_Temporal) {
+      function Instant(seconds, nanoOfSecond) {
+        var _this;
+        _this = _Temporal.call(this) || this;
+        Instant._validate(seconds, nanoOfSecond);
+        _this._seconds = MathUtil.safeToInt(seconds);
+        _this._nanos = MathUtil.safeToInt(nanoOfSecond);
+        return _this;
+      }
       _inheritsLoose(Instant, _Temporal);
       Instant.now = function now(clock) {
         if (clock === void 0) {
@@ -9613,14 +9623,6 @@
           throw new DateTimeException('Instant exceeds minimum or maximum instant');
         }
       };
-      function Instant(seconds, nanoOfSecond) {
-        var _this;
-        _this = _Temporal.call(this) || this;
-        Instant._validate(seconds, nanoOfSecond);
-        _this._seconds = MathUtil.safeToInt(seconds);
-        _this._nanos = MathUtil.safeToInt(nanoOfSecond);
-        return _this;
-      }
       var _proto = Instant.prototype;
       _proto.isSupported = function isSupported(fieldOrUnit) {
         if (fieldOrUnit instanceof ChronoField) {
@@ -9697,7 +9699,7 @@
           throw new DateTimeException('Unit must divide into a standard day without remainder');
         }
         var nod = MathUtil.intMod(this._seconds, LocalTime.SECONDS_PER_DAY) * LocalTime.NANOS_PER_SECOND + this._nanos;
-        var result = MathUtil.intDiv(nod, dur) * dur;
+        var result = MathUtil.floorDiv(nod, dur) * dur;
         return this.plusNanos(result - nod);
       };
       _proto._plusUnit = function _plusUnit(amountToAdd, unit) {
@@ -9913,7 +9915,6 @@
       return Clock;
     }();
     var SystemClock = function (_Clock) {
-      _inheritsLoose(SystemClock, _Clock);
       function SystemClock(zone) {
         var _this;
         requireNonNull(zone, 'zone');
@@ -9921,6 +9922,7 @@
         _this._zone = zone;
         return _this;
       }
+      _inheritsLoose(SystemClock, _Clock);
       var _proto2 = SystemClock.prototype;
       _proto2.zone = function zone() {
         return this._zone;
@@ -9949,7 +9951,6 @@
       return SystemClock;
     }(Clock);
     var FixedClock = function (_Clock2) {
-      _inheritsLoose(FixedClock, _Clock2);
       function FixedClock(fixedInstant, zoneId) {
         var _this2;
         _this2 = _Clock2.call(this) || this;
@@ -9957,6 +9958,7 @@
         _this2._zoneId = zoneId;
         return _this2;
       }
+      _inheritsLoose(FixedClock, _Clock2);
       var _proto3 = FixedClock.prototype;
       _proto3.instant = function instant() {
         return this._instant;
@@ -9985,7 +9987,6 @@
       return FixedClock;
     }(Clock);
     var OffsetClock = function (_Clock3) {
-      _inheritsLoose(OffsetClock, _Clock3);
       function OffsetClock(baseClock, offset) {
         var _this3;
         _this3 = _Clock3.call(this) || this;
@@ -9993,6 +9994,7 @@
         _this3._offset = offset;
         return _this3;
       }
+      _inheritsLoose(OffsetClock, _Clock3);
       var _proto4 = OffsetClock.prototype;
       _proto4.zone = function zone() {
         return this._baseClock.zone();
@@ -10028,9 +10030,6 @@
      */
 
     var ZoneOffsetTransition = function () {
-      ZoneOffsetTransition.of = function of(transition, offsetBefore, offsetAfter) {
-        return new ZoneOffsetTransition(transition, offsetBefore, offsetAfter);
-      };
       function ZoneOffsetTransition(transition, offsetBefore, offsetAfter) {
         requireNonNull(transition, 'transition');
         requireNonNull(offsetBefore, 'offsetBefore');
@@ -10049,6 +10048,9 @@
         this._offsetBefore = offsetBefore;
         this._offsetAfter = offsetAfter;
       }
+      ZoneOffsetTransition.of = function of(transition, offsetBefore, offsetAfter) {
+        return new ZoneOffsetTransition(transition, offsetBefore, offsetAfter);
+      };
       var _proto = ZoneOffsetTransition.prototype;
       _proto.instant = function instant() {
         return this._transition.toInstant(this._offsetBefore);
@@ -10153,10 +10155,10 @@
     }
 
     var SystemDefaultZoneRules = function (_ZoneRules) {
-      _inheritsLoose(SystemDefaultZoneRules, _ZoneRules);
       function SystemDefaultZoneRules() {
         return _ZoneRules.apply(this, arguments) || this;
       }
+      _inheritsLoose(SystemDefaultZoneRules, _ZoneRules);
       var _proto = SystemDefaultZoneRules.prototype;
       _proto.isFixedOffset = function isFixedOffset() {
         return false;
@@ -10223,13 +10225,13 @@
     }(ZoneRules);
 
     var SystemDefaultZoneId = function (_ZoneId) {
-      _inheritsLoose(SystemDefaultZoneId, _ZoneId);
       function SystemDefaultZoneId() {
         var _this;
         _this = _ZoneId.call(this) || this;
         _this._rules = new SystemDefaultZoneRules();
         return _this;
       }
+      _inheritsLoose(SystemDefaultZoneId, _ZoneId);
       var _proto = SystemDefaultZoneId.prototype;
       _proto.rules = function rules() {
         return this._rules;