@js-joda/core 1.12.0 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-joda/core",
-  "version": "1.12.0",
+  "version": "3.2.0",
   "description": "a date and time library for javascript",
   "repository": {
     "type": "git",
@@ -19,12 +19,12 @@
   ],
   "scripts": {
     "prepublish": "npm run build-dist",
-    "test": "NODE_ENV=test ./node_modules/.bin/mocha --timeout 5000 --require @babel/register ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js ./test/*Test_mochaOnly.js",
+    "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_android_simulator,sl_ios_simulator\" --single-run=true",
+    "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",
-    "test-ts-definitions": "tsc --noImplicitAny --strict --noEmit --pretty --lib ES6 test/typescript_definitions/js-joda-tests.ts",
+    "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-gz-check": "gzip -kf dist/js-joda.min.js && ls -alh ./dist/js-joda.min.js*",
@@ -42,31 +42,34 @@
   "author": "pithu",
   "homepage": "https://js-joda.github.io/js-joda",
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.3.4",
-    "@babel/preset-env": "^7.3.4",
-    "@babel/register": "^7.0.0",
-    "babel-loader": "^8.0.5",
-    "babel-plugin-istanbul": "^5.1.1",
+    "@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.4",
-    "karma": "^4.1.0",
+    "coveralls": "^3.0.8",
+    "karma": "^4.4.1",
     "karma-chai-plugins": "^0.9.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-firefox-launcher": "^1.1.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": "^3.0.5",
+    "karma-webpack": "^4.0.2",
     "markdown-toc": "^1.2.0",
-    "mocha": "^6.0.2",
+    "mocha": "^6.2.2",
     "phantomjs-prebuilt": "^2.1.16",
-    "rollup": "^1.4.0",
-    "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-uglify": "^6.0.2",
-    "typescript": "^3.3.3333",
-    "webpack": "^4.29.6"
+    "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": {}

package/src/DayOfWeek.js

@@ -11,7 +11,7 @@ import {assert, requireNonNull, requireInstance} from './assert';
 import {ChronoField} from './temporal/ChronoField';
 import {ChronoUnit} from './temporal/ChronoUnit';
 import {IllegalArgumentException} from './errors';
-import {Temporal} from './temporal/Temporal';
+import {TemporalAccessor} from './temporal/TemporalAccessor';
 import {TemporalQueries} from './temporal/TemporalQueries';
 import {createTemporalQuery} from './temporal/TemporalQuery';
 
@@ -27,7 +27,7 @@ import {createTemporalQuery} from './temporal/TemporalQuery';
  * DayOfWeek.SUNDAY
  *
  */
-export class DayOfWeek extends Temporal {
+export class DayOfWeek extends TemporalAccessor {
 
     /**
      *
@@ -155,7 +155,7 @@ export class DayOfWeek extends Temporal {
      * @return {string} the text value of the day-of-week, not null
      */
     // eslint-disable-next-line no-unused-vars
-    getDisplayName(style, locale) {
+    displayName(style, locale) {
         throw new IllegalArgumentException('Pattern using (localized) text not implemented yet!');
         // return new DateTimeFormatterBuilder().appendText(ChronoField.DAY_OF_WEEK, style).toFormatter(locale).format(this);
     }

package/src/Duration.js

@@ -398,7 +398,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
      * @param {Number} nanoAdjustment - the nanosecond adjustment within the second, from 0 to 999,999,999
      */
     static _createSecondsNanos(seconds = 0, nanoAdjustment = 0) {
-        if ((seconds | nanoAdjustment) === 0) {
+        if (seconds === 0 && nanoAdjustment === 0) {
             return Duration.ZERO;
         }
         return new Duration(seconds, nanoAdjustment);
@@ -442,7 +442,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
      * @return {boolean} true if this duration has a total length equal to zero
      */
     isZero() {
-        return (this._seconds | this._nanos) === 0;
+        return this._seconds === 0 && this._nanos === 0;
     }
 
     /**
@@ -701,7 +701,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
     plusSecondsNanos(secondsToAdd, nanosToAdd) {
         requireNonNull(secondsToAdd, 'secondsToAdd');
         requireNonNull(nanosToAdd, 'nanosToAdd');
-        if ((secondsToAdd | nanosToAdd) === 0) {
+        if (secondsToAdd === 0 && nanosToAdd === 0) {
             return this;
         }
         let epochSec = MathUtil.safeAdd(this._seconds, secondsToAdd);
@@ -720,7 +720,7 @@ export class Duration extends TemporalAmount /*implements TemporalAmount, Compar
      * Otherwise {@link Duration.minusAmountUnit} is executed.
      *
      * @param {!(Duration|number)} durationOrNumber
-     * @param {?ChronoUnit} unit
+     * @param {?TemporalUnit} unit
      * @return {Duration}
      */
     minus(durationOrNumber, unit) {

package/src/Instant.js

@@ -11,6 +11,7 @@ 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';
@@ -405,23 +406,6 @@ export class Instant extends Temporal {
     }
 
     //-------------------------------------------------------------------------
-    /**
-     * function overloading for {@link Instant.with}
-     *
-     * if called with 1 argument {@link Instant.withTemporalAdjuster} is called
-     * otherwise {@link Instant.with2}
-     *
-     * @param {!(TemporalAdjuster|TemporalField)} adjusterOrField
-     * @param {number} newValue
-     * @returns {Instant}
-     */
-    with(adjusterOrField, newValue){
-        if(arguments.length === 1){
-            return this.withTemporalAdjuster(adjusterOrField);
-        } else {
-            return this.with2(adjusterOrField, newValue);
-        }
-    }
     /**
      * Returns an adjusted copy of this instant.
      *
@@ -440,7 +424,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException if the adjustment cannot be made
      * @throws ArithmeticException if numeric overflow occurs
      */
-    withTemporalAdjuster(adjuster) {
+    withAdjuster(adjuster) {
         requireNonNull(adjuster, 'adjuster');
         return adjuster.adjustInto(this);
     }
@@ -488,7 +472,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException if the field cannot be set
      * @throws ArithmeticException if numeric overflow occurs
      */
-    with2(field, newValue) {
+    withFieldValue(field, newValue) {
         requireNonNull(field, 'field');
         if (field instanceof ChronoField) {
             field.checkValidValue(newValue);
@@ -550,19 +534,6 @@ export class Instant extends Temporal {
     }
 
     //-----------------------------------------------------------------------
-    /**
-     *
-     * @param {TemporalAmount|number} amount
-     * @param {TemporalUnit} unit - only required if first param is a TemporalAmount
-     * @return {Instant}
-     */
-    plus(amount, unit){
-        if(arguments.length === 1){
-            return this.plus1(amount);
-        } else {
-            return this.plus2(amount, unit);
-        }
-    }
 
     /**
      * @param {!TemporalAmount} amount
@@ -570,7 +541,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    plus1(amount) {
+    plusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.addTo(this);
     }
@@ -582,7 +553,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    plus2(amountToAdd, unit) {
+    plusAmountUnit(amountToAdd, unit) {
         requireNonNull(amountToAdd, 'amountToAdd');
         requireNonNull(unit, 'unit');
         requireInstance(unit, TemporalUnit);
@@ -653,7 +624,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException if the result exceeds the maximum or minimum instant
      */
     _plus(secondsToAdd, nanosToAdd) {
-        if ((secondsToAdd | nanosToAdd) === 0) {
+        if (secondsToAdd === 0 && nanosToAdd === 0) {
             return this;
         }
         let epochSec = this._seconds + secondsToAdd;
@@ -663,19 +634,6 @@ export class Instant extends Temporal {
     }
 
     //-----------------------------------------------------------------------
-    /**
-     *
-     * @param {TemporalAmount|number} amount
-     * @param {TemporalUnit} unit - only required if first param is a TemporalAmount
-     * @return {Instant}
-     */
-    minus(amount, unit){
-        if(arguments.length === 1){
-            return this.minus1(amount);
-        } else {
-            return this.minus2(amount, unit);
-        }
-    }
 
     /**
      * @param {!TemporalAmount} amount
@@ -683,7 +641,7 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    minus1(amount) {
+    minusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.subtractFrom(this);
     }
@@ -695,8 +653,8 @@ export class Instant extends Temporal {
      * @throws DateTimeException
      * @throws ArithmeticException
      */
-    minus2(amountToSubtract, unit) {
-        return this.plus2(-1 * amountToSubtract, unit);
+    minusAmountUnit(amountToSubtract, unit) {
+        return this.plusAmountUnit(-1 * amountToSubtract, unit);
     }
 
     /**
@@ -906,9 +864,9 @@ export class Instant extends Temporal {
      * @return {OffsetDateTime} the offset date-time formed from this instant and the specified offset, not null
      * @throws DateTimeException if the result exceeds the supported range
      */
-    //atOffset(offset) {
-    //    return OffsetDateTime.ofInstant(this, offset);
-    //}
+    atOffset(offset) {
+        return OffsetDateTime.ofInstant(this, offset);
+    }
 
     /**
      * Combines this instant with a time-zone to create a {@link ZonedDateTime}.

package/src/LocalDate.js

@@ -20,6 +20,8 @@ import {DateTimeFormatter} from './format/DateTimeFormatter';
 
 import {Clock} from './Clock';
 import {DayOfWeek} from './DayOfWeek';
+import {OffsetDateTime} from './OffsetDateTime';
+import {OffsetTime} from './OffsetTime';
 import {Month} from './Month';
 import {Period} from './Period';
 import {YearConstants} from './YearConstants';
@@ -279,6 +281,10 @@ export class LocalDate extends ChronoLocalDate{
      */
     constructor(year, month, dayOfMonth){
         super();
+        requireNonNull(year, 'year');
+        requireNonNull(month, 'month');
+        requireNonNull(dayOfMonth, 'dayOfMonth');
+
         if (month instanceof Month) {
             month = month.value();
         }
@@ -612,27 +618,6 @@ export class LocalDate extends ChronoLocalDate{
         return (this.isLeapYear() ? 366 : 365);
     }
 
-    /**
-     * function overloading for the {@link LocalDate.with} method.
-     *
-     * calling "with" with one (or less) argument, assumes that the argument is an TemporalAdjuster
-     * and {@link LocalDate.withTemporalAdjuster} is called.
-     *
-     * Otherwise a TemporalField and newValue argument is expected and
-     * {@link LocalDate.withFieldAndValue} is called.
-     *
-     * @param {!(TemporalAdjuster|TemporalField)} fieldOrAdjuster
-     * @param {number} newValue - required if first argument is a TemporalField
-     * @return {LocalDate} the new LocalDate with the newValue set.
-     */
-    with(fieldOrAdjuster, newValue){
-        if(arguments.length < 2){
-            return this.withTemporalAdjuster(fieldOrAdjuster);
-        } else {
-            return this.withFieldAndValue(fieldOrAdjuster, newValue);
-        }
-    }
-
     /**
      * Returns an adjusted copy of this date.
      *
@@ -666,7 +651,7 @@ export class LocalDate extends ChronoLocalDate{
      * @throws {DateTimeException} if the adjustment cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    withTemporalAdjuster(adjuster) {
+    withAdjuster(adjuster) {
         requireNonNull(adjuster, 'adjuster');
         // optimizations
         if (adjuster instanceof LocalDate) {
@@ -776,7 +761,7 @@ export class LocalDate extends ChronoLocalDate{
      * @throws {DateTimeException} if the field cannot be set
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    withFieldAndValue(field, newValue) {
+    withFieldValue(field, newValue) {
         assert(field != null, 'field', NullPointerException);
         if (field instanceof ChronoField) {
             const f = field;
@@ -867,26 +852,6 @@ export class LocalDate extends ChronoLocalDate{
         return LocalDate.ofYearDay(this._year, dayOfYear);
     }
 
-    /**
-     * function overloading for plus
-     *
-     * called with 1 (or less) arguments, p1 is expected to be a TemporalAmount and {@link LocalDate.plus1}
-     * is called.
-     *
-     * Otherwise {@link LocalDate.plus2} is called.
-     *
-     * @param {!(TemporalAmount|number)} p1
-     * @param {TemporalUnit} p2 - required if called with 2 arguments
-     * @return {LocalDate}
-     */
-    plus(p1, p2){
-        if(arguments.length < 2){
-            return this.plus1(p1);
-        } else {
-            return this.plus2(p1, p2);
-        }
-    }
-
     /**
      * Returns a copy of this date with the specified period added.
      *
@@ -894,14 +859,14 @@ export class LocalDate extends ChronoLocalDate{
      * The amount is typically {@link Period} but may be any other type implementing
      * the {@link TemporalAmount} interface.
      * The calculation is delegated to the specified adjuster, which typically calls
-     * back to {@link LocalDate.plus2}.
+     * back to {@link LocalDate.plusAmountUnit}.
      *
      * @param {!TemporalAmount} amount - the amount to add, not null
      * @return {LocalDate} a {@link LocalDate} based on this date with the addition made, not null
      * @throws {DateTimeException} if the addition cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    plus1(amount) {
+    plusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.addTo(this);
     }
@@ -919,7 +884,7 @@ export class LocalDate extends ChronoLocalDate{
      * @return {LocalDate} a {@link LocalDate} based on this date with the specified period added, not null
      * @throws {DateTimeException} if the unit cannot be added to this type
      */
-    plus2(amountToAdd, unit) {
+    plusAmountUnit(amountToAdd, unit) {
         requireNonNull(amountToAdd, 'amountToAdd');
         requireNonNull(unit, 'unit');
         if (unit instanceof ChronoUnit) {
@@ -1030,26 +995,6 @@ export class LocalDate extends ChronoLocalDate{
         return LocalDate.ofEpochDay(mjDay);
     }
 
-    /**
-      * function overloading for minus
-      *
-      * called with 1 (or less) arguments, p1 is expected to be a TemporalAmount and {@link LocalDate.minus1}
-      * is called.
-      *
-      * Otherwise {@link LocalDate.minus2} is called.
-      *
-      * @param {!(TemporalAmount|number)} p1
-      * @param {TemporalUnit} p2 - required if called with 2 arguments
-      * @return {LocalDate}
-      */
-    minus(p1, p2){
-        if(arguments.length < 2){
-            return this.minus1(p1);
-        } else {
-            return this.minus2(p1, p2);
-        }
-    }
-
     /**
      * Returns a copy of this date with the specified period subtracted.
      *
@@ -1064,7 +1009,7 @@ export class LocalDate extends ChronoLocalDate{
      * @throws {DateTimeException} if the subtraction cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    minus1(amount) {
+    minusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.subtractFrom(this);
     }
@@ -1082,10 +1027,10 @@ export class LocalDate extends ChronoLocalDate{
      * @return {LocalDate} a {@link LocalDate} based on this date with the specified period subtracted, not null
      * @throws {DateTimeException} if the unit cannot be added to this type
      */
-    minus2(amountToSubtract, unit) {
+    minusAmountUnit(amountToSubtract, unit) {
         requireNonNull(amountToSubtract, 'amountToSubtract');
         requireNonNull(unit, 'unit');
-        return this.plus2(-1 * amountToSubtract, unit);
+        return this.plusAmountUnit(-1 * amountToSubtract, unit);
     }
 
     /**
@@ -1373,7 +1318,7 @@ export class LocalDate extends ChronoLocalDate{
      * if called with 1 argument {@link LocalDate.atTime1} is called
      * otherwise {@link LocalDate.atTime4}
      *
-     * @return {LocalDateTime} the local date-time formed from this date and the specified params
+     * @return {LocalDateTime|OffsetDateTime} the local date-time formed from this date and the specified params
      */
     atTime(){
         if(arguments.length===1){
@@ -1390,10 +1335,18 @@ export class LocalDate extends ChronoLocalDate{
      * All possible combinations of date and time are valid.
      *
      * @param {LocalTime} time - the time to combine with, not null
-     * @return {LocalDateTime} the local date-time formed from this date and the specified time, not null
+     * @return {LocalDateTime|OffsetDateTime} the date-time formed from this date and the specified time, not null
      */
     atTime1(time) {
-        return LocalDateTime.of(this, time);
+        requireNonNull(time, 'time');
+        if (time instanceof LocalTime) {
+            return LocalDateTime.of(this, time);
+        } else if (time instanceof OffsetTime) {
+            return this._atTimeOffsetTime(time);
+        } else {
+            throw new IllegalArgumentException('time must be an instance of LocalTime or OffsetTime' +
+                (time && time.constructor && time.constructor.name ? ', but is ' + time.constructor.name : ''));
+        }
     }
 
     /**
@@ -1424,11 +1377,9 @@ export class LocalDate extends ChronoLocalDate{
      * @param {OffsetTime} time - the time to combine with, not null
      * @return {OffsetDateTime} the offset date-time formed from this date and the specified time, not null
      */
-    /*
     _atTimeOffsetTime(time) { // atTime(offsetTime)
-        return OffsetDateTime.of(LocalDateTime.of(this, time.toLocalTime()), time.getOffset());
+        return OffsetDateTime.of(LocalDateTime.of(this, time.toLocalTime()), time.offset());
     }
-*/
 
     /**
      * Combines this date with the time of midnight to create a {@link LocalDateTime}

package/src/LocalDateTime.js

@@ -12,6 +12,7 @@ import {Clock} from './Clock';
 import {Instant} from './Instant';
 import {LocalDate} from './LocalDate';
 import {LocalTime} from './LocalTime';
+import {OffsetDateTime} from './OffsetDateTime';
 import {ZonedDateTime} from './ZonedDateTime';
 import {ZoneId} from './ZoneId';
 import {ZoneOffset} from './ZoneOffset';
@@ -316,7 +317,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @return {LocalDateTime} the date-time, not null
      */
     _withDateTime(newDate, newTime) {
-        if (this._date === newDate && this._time === newTime) {
+        if (this._date.equals(newDate) && this._time.equals(newTime)) {
             return this;
         }
         return new LocalDateTime(newDate, newTime);
@@ -593,23 +594,6 @@ implements Temporal, TemporalAdjuster, Serializable */ {
     }
 
     //-----------------------------------------------------------------------
-    /**
-     * function overloading for {@link LocalDateTime.with}
-     *
-     * if called with 1 argument, {@link LocalDateTime.withTemporalAdjuster} is applied,
-     * otherwise {@link LocalDateTime.with2}.
-     *
-     * @param {!(TemporalAdjuster|TemporalField)} adjusterOrField
-     * @param {number} newValue - only require if first argument is a TemporalField
-     * @returns {LocalDateTime}
-     */
-    with(adjusterOrField, newValue){
-        if(arguments.length === 1){
-            return this.withTemporalAdjuster(adjusterOrField);
-        } else {
-            return this.with2(adjusterOrField, newValue);
-        }
-    }
 
     /**
      * Returns an adjusted copy of this date-time.
@@ -653,7 +637,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @throws {DateTimeException} if the adjustment cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    withTemporalAdjuster(adjuster) {
+    withAdjuster(adjuster) {
         requireNonNull(adjuster, 'adjuster');
         // optimizations
         if (adjuster instanceof LocalDate) {
@@ -699,7 +683,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @throws {DateTimeException} if the field cannot be set
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    with2(field, newValue) {
+    withFieldValue(field, newValue) {
         requireNonNull(field, 'field');
         if (field instanceof ChronoField) {
             if (field.isTimeBased()) {
@@ -855,23 +839,6 @@ implements Temporal, TemporalAdjuster, Serializable */ {
     }
 
     //-----------------------------------------------------------------------
-    /**
-     * function overloading for {@link LocalDateTime.plus}
-     *
-     * if called with 1 argument {@link LocalDateTime.plusTemporalAmount} is applied,
-     * otherwise {@link LocalDateTime.plus2}
-     *
-     * @param {!(TemporalAmount|number)} amount
-     * @param {TemporalUnit} unit
-     * @returns {LocalDateTime}
-     */
-    plus(amount, unit){
-        if(arguments.length === 1){
-            return this.plusTemporalAmount(amount);
-        } else {
-            return this.plus2(amount, unit);
-        }
-    }
 
     /**
      * Returns a copy of this date-time with the specified period added.
@@ -889,7 +856,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @throws {DateTimeException} if the addition cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    plusTemporalAmount(amount) {
+    plusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.addTo(this);
     }
@@ -909,7 +876,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @return {LocalDateTime} a {@link LocalDateTime} based on this date-time with the specified period added, not null
      * @throws {DateTimeException} if the unit cannot be added to this type
      */
-    plus2(amountToAdd, unit) {
+    plusAmountUnit(amountToAdd, unit) {
         requireNonNull(unit, 'unit');
         if (unit instanceof ChronoUnit) {
             switch (unit) {
@@ -1069,23 +1036,6 @@ implements Temporal, TemporalAdjuster, Serializable */ {
     }
 
     //-----------------------------------------------------------------------
-    /**
-     * function overloading for {@link LocalDateTime.minus}
-     *
-     * if called with 1 argument {@link LocalDateTime.minusTemporalAmount} is applied,
-     * otherwise {@link LocalDateTime.minus2}
-     *
-     * @param {!(TemporalAmount|number)} amount
-     * @param {TemporalUnit} unit
-     * @returns {LocalDateTime}
-     */
-    minus(amount, unit){
-        if(arguments.length === 1){
-            return this.minusTemporalAmount(amount);
-        } else {
-            return this.minus2(amount, unit);
-        }
-    }
 
     /**
      * Returns a copy of this date-time with the specified period subtracted.
@@ -1103,7 +1053,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @throws {DateTimeException} if the subtraction cannot be made
      * @throws {ArithmeticException} if numeric overflow occurs
      */
-    minusTemporalAmount(amount) {
+    minusAmount(amount) {
         requireNonNull(amount, 'amount');
         return amount.subtractFrom(this);
     }
@@ -1123,9 +1073,9 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @return {LocalDateTime} a {@link LocalDateTime} based on this date-time with the specified period subtracted, not null
      * @throws {DateTimeException} if the unit cannot be added to this type
      */
-    minus2(amountToSubtract, unit) {
+    minusAmountUnit(amountToSubtract, unit) {
         requireNonNull(unit, 'unit');
-        return this.plus2(-1 * amountToSubtract, unit);
+        return this.plusAmountUnit(-1 * amountToSubtract, unit);
     }
 
     //-----------------------------------------------------------------------
@@ -1282,7 +1232,7 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      */
     _plusWithOverflow(newDate, hours, minutes, seconds, nanos, sign) {
         // 9223372036854775808 long, 2147483648 int
-        if ((hours | minutes | seconds | nanos) === 0) {
+        if (hours === 0 && minutes === 0 && seconds === 0 && nanos === 0) {
             return this._withDateTime(newDate, this._time);
         }
         let totDays = MathUtil.intDiv(nanos, LocalTime.NANOS_PER_DAY) +             //   max/24*60*60*1B
@@ -1465,11 +1415,9 @@ implements Temporal, TemporalAdjuster, Serializable */ {
      * @param {ZoneOffset} offset  the offset to combine with, not null
      * @return {OffsetDateTime} the offset date-time formed from this date-time and the specified offset, not null
      */
-    /*
     atOffset(offset) {
         return OffsetDateTime.of(this, offset);
     }
-*/
 
     /**
      * Combines this date-time with a time-zone to create a {@link ZonedDateTime}.