@js-joda/core 3.2.0 → 4.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-joda/core",
-  "version": "3.2.0",
+  "version": "4.2.1",
   "description": "a date and time library for javascript",
   "repository": {
     "type": "git",
@@ -18,17 +18,17 @@
     "README.md"
   ],
   "scripts": {
-    "prepublish": "npm run build-dist",
-    "test": "NODE_ENV=test ./node_modules/.bin/mocha --timeout 5000 --require @babel/register ./test/*Test_mochaOnly.js ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
-    "test-coverage": "NODE_ENV=test COVERAGE=1 ../../node_modules/.bin/nyc --report-dir=build/coverage --reporter=lcov --reporter html ./node_modules/.bin/mocha --timeout 5000 --require @babel/register --reporter progress ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
-    "test-browser": "./node_modules/.bin/karma start --reporters=dots --single-run",
-    "test-saucelabs": "./node_modules/.bin/karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox,sl_ios_simulator\" --single-run=true",
-    "test-ci": "npm run build-dist && npm run test && npm run test-browser -- --browsers \"Firefox,PhantomJS\" && npm run test-ts-definitions && npm run test-coverage",
+    "version": "npm run build-dist",
+    "test": "NODE_ENV=test npx mocha --timeout 5000 --require @babel/register ./test/*Test_mochaOnly.js ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
+    "test-coverage": "NODE_ENV=test COVERAGE=1 npx nyc --report-dir=build/coverage --reporter=lcov --reporter html npx mocha --timeout 5000 --require @babel/register --reporter progress ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
+    "test-browser": "npx karma start --reporters=dots --single-run",
+    "test-saucelabs": "npx karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox,sl_ios_simulator\" --single-run=true",
+    "test-ci": "npm run build-dist && npm run test && npm run test-browser && npm run test-ts-definitions && npm run test-coverage",
     "test-ts-definitions": "TS_NODE_PROJECT='test/typescript_definitions/tsconfig.json' NODE_ENV=test mocha --timeout 5000 --require ts-node/register ./test/typescript_definitions/*.ts",
     "build-dist": "npx rollup -c rollup.config.js",
-    "build-md-toc": "./node_modules/.bin/markdown-toc -i CheatSheet.md",
+    "build-md-toc": "npx markdown-toc -i CheatSheet.md",
     "build-gz-check": "gzip -kf dist/js-joda.min.js && ls -alh ./dist/js-joda.min.js*",
-    "lint": "../../node_modules/.bin/eslint  ./src ./test"
+    "lint": "npx eslint  ."
   },
   "keywords": [
     "date",
@@ -41,36 +41,6 @@
   },
   "author": "pithu",
   "homepage": "https://js-joda.github.io/js-joda",
-  "devDependencies": {
-    "@babel/cli": "^7.7.4",
-    "@babel/core": "^7.7.4",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/register": "^7.7.4",
-    "@types/chai": "^4.2.11",
-    "@types/mocha": "^7.0.2",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-istanbul": "^5.2.0",
-    "chai": "^4.2.0",
-    "coveralls": "^3.0.8",
-    "karma": "^4.4.1",
-    "karma-chai-plugins": "^0.9.0",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.2.0",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "karma-sauce-launcher": "^2.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^4.0.2",
-    "markdown-toc": "^1.2.0",
-    "mocha": "^6.2.2",
-    "phantomjs-prebuilt": "^2.1.16",
-    "rollup": "^1.27.4",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-uglify": "^6.0.3",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.7.2",
-    "webpack": "^4.41.2"
-  },
   "license": "BSD-3-Clause",
-  "dependencies": {}
+  "gitHead": "485c4b2be852563615e2d2a8c3f0bca22d86bcd4"
 }

package/src/Clock.js

@@ -4,10 +4,10 @@
  * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
  */
 
-import {abstractMethodFail, requireNonNull} from './assert';
-import {Instant} from './Instant';
-import {ZoneId} from './ZoneId';
-import {ZoneOffset} from './ZoneOffset';
+import { abstractMethodFail, requireNonNull } from './assert';
+import { Instant } from './Instant';
+import { ZoneId } from './ZoneId';
+import { ZoneOffset } from './ZoneOffset';
 
 /**
  * A clock providing access to the current instant, date and time using a time-zone.
@@ -121,7 +121,7 @@ export class Clock {
      * providing that the base clock is.
      *
      * @param baseClock  the base clock to add the duration to, not null
-     * @param offsetDuration  the duration to add, not null
+     * @param duration  the duration to add, not null
      * @return a clock based on the base clock with the duration added, not null
      */
     static offset(baseClock, duration) {
@@ -170,7 +170,6 @@ export class Clock {
      * to a date or time using a time-zone. This method returns a clock with
      * similar properties but using a different time-zone.
      *
-     * @param zone  the time-zone to change to, not null
      * @return a clock based on this clock with the specified time-zone, not null
      */
     withZone(){
@@ -238,7 +237,7 @@ class SystemClock extends Clock {
      * @returns {string}
      */
     toString(){
-        return 'SystemClock[' + this._zone.toString() + ']';
+        return `SystemClock[${this._zone.toString()}]`;
     }
 
 }
@@ -325,6 +324,6 @@ class OffsetClock extends Clock {
     }
     
     toString() {
-        return 'OffsetClock[' + this._baseClock + ',' + this._offset + ']';
+        return `OffsetClock[${this._baseClock},${this._offset}]`;
     }
-}
+}

package/src/DayOfWeek.js

@@ -4,16 +4,16 @@
  * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
  */
 
-import {DateTimeException, UnsupportedTemporalTypeException, NullPointerException} from './errors';
-import {MathUtil} from './MathUtil';
-import {assert, requireNonNull, requireInstance} from './assert';
+import { DateTimeException, UnsupportedTemporalTypeException, NullPointerException } from './errors';
+import { MathUtil } from './MathUtil';
+import { assert, requireNonNull, requireInstance } from './assert';
 
-import {ChronoField} from './temporal/ChronoField';
-import {ChronoUnit} from './temporal/ChronoUnit';
-import {IllegalArgumentException} from './errors';
-import {TemporalAccessor} from './temporal/TemporalAccessor';
-import {TemporalQueries} from './temporal/TemporalQueries';
-import {createTemporalQuery} from './temporal/TemporalQuery';
+import { ChronoField } from './temporal/ChronoField';
+import { ChronoUnit } from './temporal/ChronoUnit';
+import { IllegalArgumentException } from './errors';
+import { TemporalAccessor } from './temporal/TemporalAccessor';
+import { TemporalQueries } from './temporal/TemporalQueries';
+import { createTemporalQuery } from './temporal/TemporalQuery';
 
 /**
  * ### Static properties of Class {@link DayOfWeek}
@@ -93,7 +93,7 @@ export class DayOfWeek extends TemporalAccessor {
      */
     static of(dayOfWeek) {
         if (dayOfWeek < 1 || dayOfWeek > 7) {
-            throw new DateTimeException('Invalid value for DayOfWeek: ' + dayOfWeek);
+            throw new DateTimeException(`Invalid value for DayOfWeek: ${dayOfWeek}`);
         }
         return ENUMS[dayOfWeek - 1];
     }
@@ -122,8 +122,8 @@ export class DayOfWeek extends TemporalAccessor {
             return DayOfWeek.of(temporal.get(ChronoField.DAY_OF_WEEK));
         } catch (ex) {
             if(ex instanceof DateTimeException) {
-                throw new DateTimeException('Unable to obtain DayOfWeek from TemporalAccessor: ' +
-                    temporal + ', type ' + (temporal.constructor != null ? temporal.constructor.name : ''), ex);
+                throw new DateTimeException(`Unable to obtain DayOfWeek from TemporalAccessor: ${ 
+                    temporal}, type ${temporal.constructor != null ? temporal.constructor.name : ''}`, ex);
             } else {
                 throw ex;
             }
@@ -211,7 +211,7 @@ export class DayOfWeek extends TemporalAccessor {
         if (field === ChronoField.DAY_OF_WEEK) {
             return field.range();
         } else if (field instanceof ChronoField) {
-            throw new UnsupportedTemporalTypeException('Unsupported field: ' + field);
+            throw new UnsupportedTemporalTypeException(`Unsupported field: ${field}`);
         }
         return field.rangeRefinedBy(this);
     }
@@ -272,7 +272,7 @@ export class DayOfWeek extends TemporalAccessor {
         if (field === ChronoField.DAY_OF_WEEK) {
             return this.value();
         } else if (field instanceof ChronoField) {
-            throw new UnsupportedTemporalTypeException('Unsupported field: ' + field);
+            throw new UnsupportedTemporalTypeException(`Unsupported field: ${field}`);
         }
         return field.getFrom(this);
     }

package/src/Duration.js

@@ -3,16 +3,16 @@
  * @copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
  * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
  */
-import {requireNonNull, requireInstance} from './assert';
-import {ArithmeticException, DateTimeParseException, UnsupportedTemporalTypeException} from './errors';
-import {MathUtil, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER} from './MathUtil';
+import { requireNonNull, requireInstance } from './assert';
+import { ArithmeticException, DateTimeParseException, UnsupportedTemporalTypeException } from './errors';
+import { MathUtil, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } from './MathUtil';
 
-import {ChronoField} from './temporal/ChronoField';
-import {ChronoUnit} from './temporal/ChronoUnit';
-import {TemporalAmount} from './temporal/TemporalAmount';
-import {TemporalUnit} from './temporal/TemporalUnit';
+import { ChronoField } from './temporal/ChronoField';
+import { ChronoUnit } from './temporal/ChronoUnit';
+import { TemporalAmount } from './temporal/TemporalAmount';
+import { TemporalUnit } from './temporal/TemporalUnit';
 
-import {LocalTime} from './LocalTime';
+import { LocalTime } from './LocalTime';
 
 /**
  * A time-based amount of time, such as '34.5 seconds'.
@@ -355,7 +355,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
             }
             return MathUtil.safeMultiply(parseFloat(parsed), multiplier);
         } catch (ex) {
-            throw new DateTimeParseException('Text cannot be parsed to a Duration: ' + errorText, text, 0, ex);
+            throw new DateTimeParseException(`Text cannot be parsed to a Duration: ${errorText}`, text, 0, ex);
         }
     }
 
@@ -364,7 +364,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
         if (parsed == null || parsed.length === 0) {
             return 0;
         }
-        parsed = (parsed + '000000000').substring(0, 9);
+        parsed = (`${parsed}000000000`).substring(0, 9);
         return parseFloat(parsed) * negate;
     }
 
@@ -423,7 +423,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
         } else if (unit === ChronoUnit.NANOS) {
             return this._nanos;
         } else {
-            throw new UnsupportedTemporalTypeException('Unsupported unit: ' + unit);
+            throw new UnsupportedTemporalTypeException(`Unsupported unit: ${unit}`);
         }
     }
 
@@ -1151,10 +1151,10 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
         const secs = MathUtil.intMod(this._seconds, LocalTime.SECONDS_PER_MINUTE);
         let rval = 'PT';
         if (hours !== 0) {
-            rval += hours + 'H';
+            rval += `${hours}H`;
         }
         if (minutes !== 0) {
-            rval += minutes + 'M';
+            rval += `${minutes}M`;
         }
         if (secs === 0 && this._nanos === 0 && rval.length > 2) {
             return rval;
@@ -1172,9 +1172,9 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
             rval += '.';
             let nanoString;
             if (secs < 0) {
-                nanoString = '' + (2 * LocalTime.NANOS_PER_SECOND - this._nanos);
+                nanoString = `${2 * LocalTime.NANOS_PER_SECOND - this._nanos}`;
             } else {
-                nanoString = '' + (LocalTime.NANOS_PER_SECOND + this._nanos);
+                nanoString = `${LocalTime.NANOS_PER_SECOND + this._nanos}`;
             }
             // remove the leading '1'
             nanoString = nanoString.slice(1, nanoString.length);

package/src/Instant.js

@@ -4,22 +4,22 @@
  * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
  */
 
-import {requireNonNull, requireInstance} from './assert';
-import {DateTimeException, UnsupportedTemporalTypeException} from './errors';
-
-import {Clock} from './Clock';
-import {LocalTime} from './LocalTime';
-import {ZonedDateTime} from './ZonedDateTime';
-import {MathUtil} from './MathUtil';
-import {OffsetDateTime} from './OffsetDateTime';
-
-import {Temporal} from './temporal/Temporal';
-import {ChronoField} from './temporal/ChronoField';
-import {ChronoUnit} from './temporal/ChronoUnit';
-import {TemporalQueries} from './temporal/TemporalQueries';
-import {TemporalUnit} from './temporal/TemporalUnit';
-import {createTemporalQuery} from './temporal/TemporalQuery';
-import {DateTimeFormatter} from './format/DateTimeFormatter';
+import { requireNonNull, requireInstance } from './assert';
+import { DateTimeException, UnsupportedTemporalTypeException } from './errors';
+
+import { Clock } from './Clock';
+import { LocalTime } from './LocalTime';
+import { ZonedDateTime } from './ZonedDateTime';
+import { MathUtil } from './MathUtil';
+import { OffsetDateTime } from './OffsetDateTime';
+
+import { Temporal } from './temporal/Temporal';
+import { ChronoField } from './temporal/ChronoField';
+import { ChronoUnit } from './temporal/ChronoUnit';
+import { TemporalQueries } from './temporal/TemporalQueries';
+import { TemporalUnit } from './temporal/TemporalUnit';
+import { createTemporalQuery } from './temporal/TemporalQuery';
+import { DateTimeFormatter } from './format/DateTimeFormatter';
 
 const NANOS_PER_MILLI = 1000000;
 
@@ -194,8 +194,8 @@ export class Instant extends Temporal {
             const nanoOfSecond = temporal.get(ChronoField.NANO_OF_SECOND);
             return Instant.ofEpochSecond(instantSecs, nanoOfSecond);
         } catch (ex) {
-            throw new DateTimeException('Unable to obtain Instant from TemporalAccessor: ' +
-                    temporal + ', type ' + typeof temporal, ex);
+            throw new DateTimeException(`Unable to obtain Instant from TemporalAccessor: ${ 
+                temporal}, type ${typeof temporal}`, ex);
         }
     }
 
@@ -374,7 +374,7 @@ export class Instant extends Temporal {
                 case ChronoField.MILLI_OF_SECOND: return MathUtil.intDiv(this._nanos, NANOS_PER_MILLI);
                 case ChronoField.INSTANT_SECONDS: return this._seconds;
             }
-            throw new UnsupportedTemporalTypeException('Unsupported field: ' + field);
+            throw new UnsupportedTemporalTypeException(`Unsupported field: ${field}`);
         }
         return field.getFrom(this);
     }
@@ -405,30 +405,7 @@ export class Instant extends Temporal {
         return this._nanos;
     }
 
-    //-------------------------------------------------------------------------
-    /**
-     * Returns an adjusted copy of this instant.
-     *
-     * This returns a new {@link Instant}, based on this one, with the date adjusted.
-     * The adjustment takes place using the specified adjuster strategy object.
-     * Read the documentation of the adjuster to understand what adjustment will be made.
-     *
-     * The result of this method is obtained by invoking the
-     * {@link TemporalAdjuster#adjustInto} method on the
-     * specified adjuster passing `this` as the argument.
-     *
-     * This instance is immutable and unaffected by this method call.
-     *
-     * @param {!TemporalAdjuster} adjuster - the adjuster to use, not null
-     * @return {Instant} an {@link Instant} based on `this` with the adjustment made, not null
-     * @throws DateTimeException if the adjustment cannot be made
-     * @throws ArithmeticException if numeric overflow occurs
-     */
-    withAdjuster(adjuster) {
-        requireNonNull(adjuster, 'adjuster');
-        return adjuster.adjustInto(this);
-    }
-
+    //-----------------------------------------------------------------------
     /**
      * Returns a copy of this instant with the specified field set to a new value.
      *
@@ -472,7 +449,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException if the field cannot be set
      * @throws ArithmeticException if numeric overflow occurs
      */
-    withFieldValue(field, newValue) {
+    _withField(field, newValue) {
         requireNonNull(field, 'field');
         if (field instanceof ChronoField) {
             field.checkValidValue(newValue);
@@ -488,7 +465,7 @@ export class Instant extends Temporal {
                 case ChronoField.NANO_OF_SECOND: return (newValue !== this._nanos? Instant._create(this._seconds, newValue) : this);
                 case ChronoField.INSTANT_SECONDS: return (newValue !== this._seconds ? Instant._create(newValue, this._nanos) : this);
             }
-            throw new UnsupportedTemporalTypeException('Unsupported field: ' + field);
+            throw new UnsupportedTemporalTypeException(`Unsupported field: ${field}`);
         }
         return field.adjustInto(this, newValue);
     }
@@ -534,18 +511,6 @@ export class Instant extends Temporal {
     }
 
     //-----------------------------------------------------------------------
-
-    /**
-     * @param {!TemporalAmount} amount
-     * @return {Instant}
-     * @throws DateTimeException
-     * @throws ArithmeticException
-     */
-    plusAmount(amount) {
-        requireNonNull(amount, 'amount');
-        return amount.addTo(this);
-    }
-
     /**
      * @param {!number} amountToAdd
      * @param {!TemporalUnit} unit
@@ -553,7 +518,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    plusAmountUnit(amountToAdd, unit) {
+    _plusUnit(amountToAdd, unit) {
         requireNonNull(amountToAdd, 'amountToAdd');
         requireNonNull(unit, 'unit');
         requireInstance(unit, TemporalUnit);
@@ -568,7 +533,7 @@ export class Instant extends Temporal {
                 case ChronoUnit.HALF_DAYS: return this.plusSeconds(MathUtil.safeMultiply(amountToAdd, LocalTime.SECONDS_PER_DAY / 2));
                 case ChronoUnit.DAYS: return this.plusSeconds(MathUtil.safeMultiply(amountToAdd, LocalTime.SECONDS_PER_DAY));
             }
-            throw new UnsupportedTemporalTypeException('Unsupported unit: ' + unit);
+            throw new UnsupportedTemporalTypeException(`Unsupported unit: ${unit}`);
         }
         return unit.addTo(this, amountToAdd);
     }
@@ -635,17 +600,6 @@ export class Instant extends Temporal {
 
     //-----------------------------------------------------------------------
 
-    /**
-     * @param {!TemporalAmount} amount
-     * @return {Instant}
-     * @throws DateTimeException
-     * @throws ArithmeticException
-     */
-    minusAmount(amount) {
-        requireNonNull(amount, 'amount');
-        return amount.subtractFrom(this);
-    }
-
     /**
      * @param {!number} amountToSubtract
      * @param {!TemporalUnit} unit
@@ -653,8 +607,8 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    minusAmountUnit(amountToSubtract, unit) {
-        return this.plusAmountUnit(-1 * amountToSubtract, unit);
+    _minusUnit(amountToSubtract, unit) {
+        return this._plusUnit(-1 * amountToSubtract, unit);
     }
 
     /**
@@ -808,7 +762,7 @@ export class Instant extends Temporal {
         if (unit instanceof ChronoUnit) {
             switch (unit) {
                 case ChronoUnit.NANOS: return this._nanosUntil(end);
-                case ChronoUnit.MICROS: return MathUtil.intDiv(this._nanosUntil(end), 1000);
+                case ChronoUnit.MICROS: return this._microsUntil(end);
                 case ChronoUnit.MILLIS: return MathUtil.safeSubtract(end.toEpochMilli(), this.toEpochMilli());
                 case ChronoUnit.SECONDS: return this._secondsUntil(end);
                 case ChronoUnit.MINUTES: return MathUtil.intDiv(this._secondsUntil(end), LocalTime.SECONDS_PER_MINUTE);
@@ -816,11 +770,23 @@ export class Instant extends Temporal {
                 case ChronoUnit.HALF_DAYS: return MathUtil.intDiv(this._secondsUntil(end), (12 * LocalTime.SECONDS_PER_HOUR));
                 case ChronoUnit.DAYS: return MathUtil.intDiv(this._secondsUntil(end), LocalTime.SECONDS_PER_DAY);
             }
-            throw new UnsupportedTemporalTypeException('Unsupported unit: ' + unit);
+            throw new UnsupportedTemporalTypeException(`Unsupported unit: ${unit}`);
         }
         return unit.between(this, end);
     }
 
+    /**
+     *
+     * @param {Temporal} end
+     * @returns {number}
+     * @private
+     */
+    _microsUntil(end) {
+        const secsDiff = MathUtil.safeSubtract(end.epochSecond(), this.epochSecond());
+        const totalMicros = MathUtil.safeMultiply(secsDiff, 1000000);
+        return MathUtil.safeAdd(totalMicros, MathUtil.intDiv(end.nano() - this.nano(), 1000));
+    }
+
     /**
      *
      * @param {Temporal} end