@js-joda/core 6.0.1 → 6.1.0

package/dist/js-joda.cjs.js

@@ -1,4 +1,4 @@
-//! @version @js-joda/core - 6.0.1
+//! @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)
@@ -749,9 +749,12 @@ var Duration = function (_TemporalAmount) {
     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";
@@ -759,31 +762,23 @@ var Duration = function (_TemporalAmount) {
     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;
@@ -2953,6 +2948,7 @@ var Parsed = function (_Temporal) {
     _this.zone = null;
     _this.fieldValues = new EnumMap();
     _this.leapSecond = false;
+    _this.excessDays = Period.ZERO;
     _this.dateTimeParseContext = dateTimeParseContext;
     return _this;
   }
@@ -4458,6 +4454,45 @@ var ZoneIdPrinterParser = function () {
     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();
@@ -4466,8 +4501,7 @@ var ZoneIdPrinterParser = function () {
         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);
@@ -4488,26 +4522,6 @@ var ZoneIdPrinterParser = function () {
       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) {
@@ -5231,7 +5245,7 @@ var InstantPrinterParser = function () {
     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;
@@ -5243,6 +5257,8 @@ var InstantPrinterParser = function () {
     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);
@@ -5257,7 +5273,7 @@ var InstantPrinterParser = function () {
     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;
@@ -9679,7 +9695,7 @@ var Instant = function (_Temporal) {
       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) {