@js-joda/core 6.1.0 → 6.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-joda/core",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "a date and time library for javascript",
   "repository": {
     "type": "git",
@@ -47,5 +47,5 @@
     "sourceMap": false,
     "instrument": false
   },
-  "gitHead": "d82df374b19b312796817f40945c22783536170b"
+  "gitHead": "bb36ea96b26ee93408068c8ad8ebe8b094e96a10"
 }

package/src/Duration.js

@@ -893,10 +893,18 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
         if (divisor === 1) {
             return this;
         }
-        const secs = MathUtil.intDiv(this._seconds, divisor);
-        const secsMod = MathUtil.roundDown(((this._seconds/ divisor) - secs) * LocalTime.NANOS_PER_SECOND);
-        let nos = MathUtil.intDiv(this._nanos, divisor);
-        nos = secsMod + nos;
+        // Give both components the same sign before truncating the quotient.
+        // Otherwise the positive nano adjustment of a negative duration is
+        // truncated separately and can move the result away from zero.
+        let seconds = this._seconds;
+        let nanos = this._nanos;
+        if (seconds < 0 && nanos > 0) {
+            seconds += 1;
+            nanos -= LocalTime.NANOS_PER_SECOND;
+        }
+        const secs = MathUtil.intDiv(seconds, divisor);
+        const remainder = MathUtil.intMod(seconds, divisor);
+        const nos = MathUtil.intDiv(remainder * LocalTime.NANOS_PER_SECOND + nanos, divisor);
         return Duration.ofSeconds(secs, nos);
     }
 

package/src/Instant.js

@@ -823,9 +823,17 @@ export class Instant extends Temporal {
      * @private
      */
     _microsUntil(end) {
-        const secsDiff = MathUtil.safeSubtract(end.epochSecond(), this.epochSecond());
+        let secsDiff = MathUtil.safeSubtract(end.epochSecond(), this.epochSecond());
+        let nanosDiff = end.nano() - this.nano();
+        if (secsDiff > 0 && nanosDiff < 0) {
+            secsDiff--;
+            nanosDiff += LocalTime.NANOS_PER_SECOND;
+        } else if (secsDiff < 0 && nanosDiff > 0) {
+            secsDiff++;
+            nanosDiff -= LocalTime.NANOS_PER_SECOND;
+        }
         const totalMicros = MathUtil.safeMultiply(secsDiff, 1000000);
-        return MathUtil.safeAdd(totalMicros, MathUtil.intDiv(end.nano() - this.nano(), 1000));
+        return MathUtil.safeAdd(totalMicros, MathUtil.intDiv(nanosDiff, 1000));
     }
 
     /**

package/src/format/DateTimeBuilder.js

@@ -14,6 +14,7 @@ import { ResolverStyle } from './ResolverStyle';
 import { IsoChronology } from '../chrono/IsoChronology';
 import { ChronoLocalDate } from '../chrono/ChronoLocalDate';
 import { ChronoField } from '../temporal/ChronoField';
+import { IsoFields } from '../temporal/IsoFields';
 import { TemporalAccessor } from '../temporal/TemporalAccessor';
 import { TemporalQueries } from '../temporal/TemporalQueries';
 
@@ -146,13 +147,11 @@ export class DateTimeBuilder extends TemporalAccessor {
         }
         // handle standard fields
         // this._mergeInstantFields();
+        if (this._resolveFields(resolverStyle)) {
+            // this._mergeInstantFields();
+        }
         this._mergeDate(resolverStyle);
         this._mergeTime(resolverStyle);
-        //if (resolveFields(resolverStyle)) {
-        //    mergeInstantFields();
-        //    mergeDate(resolverStyle);
-        //    mergeTime(resolverStyle);
-        //}
         this._resolveTimeInferZeroes(resolverStyle);
         //this._crossCheck();
         if (this.excessDays != null && this.excessDays.isZero() === false && this.date != null && this.time != null) {
@@ -164,6 +163,31 @@ export class DateTimeBuilder extends TemporalAccessor {
         return this;
     }
 
+    /**
+     * Resolves the date fields that are not {@link ChronoField}s by delegating to their own
+     * `resolve()`, the step java.time performs generically. As parsed values are held in a
+     * name-keyed map, the ISO fields that define a `resolve()` (week-of-week-based-year and
+     * day-of-quarter) are handled here. They do not depend on one another, so one pass is
+     * sufficient. Returns whether a date was produced.
+     *
+     * @param {ResolverStyle} resolverStyle
+     * @return {boolean}
+     * @private
+     */
+    _resolveFields(resolverStyle) {
+        let resolved = false;
+        for (const field of [IsoFields.WEEK_OF_WEEK_BASED_YEAR, IsoFields.DAY_OF_QUARTER]) {
+            if (this.fieldValues.containsKey(field)) {
+                const date = field.resolve(this.fieldValues, this, resolverStyle);
+                if (date != null) {
+                    this._checkDate(date);
+                    resolved = true;
+                }
+            }
+        }
+        return resolved;
+    }
+
     /**
      *
      * @param {ResolverStyle} resolverStyle

package/src/format/DateTimeFormatter.js

@@ -21,6 +21,7 @@ import { ResolverStyle } from './ResolverStyle';
 
 import { IsoChronology } from '../chrono/IsoChronology';
 import { ChronoField } from '../temporal/ChronoField';
+import { IsoFields } from '../temporal/IsoFields';
 import { createTemporalQuery } from '../temporal/TemporalQuery';
 
 /**
@@ -696,12 +697,13 @@ export function _init() {
         .toFormatter(ResolverStyle.STRICT);
 
     DateTimeFormatter.ISO_WEEK_DATE = new DateTimeFormatterBuilder()
-        .appendValue(ChronoField.YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
+        .parseCaseInsensitive()
+        .appendValue(IsoFields.WEEK_BASED_YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
         .appendLiteral('-W')
-        .appendValue(ChronoField.ALIGNED_WEEK_OF_YEAR)
+        .appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2)
         .appendLiteral('-')
-        .appendValue(ChronoField.DAY_OF_WEEK)
-        .toFormatter(ResolverStyle.STRICT);
+        .appendValue(ChronoField.DAY_OF_WEEK, 1)
+        .toFormatter(ResolverStyle.STRICT).withChronology(IsoChronology.INSTANCE);
 
     DateTimeFormatter.ISO_DATE = new DateTimeFormatterBuilder()
         .parseCaseInsensitive()