@naturalcycles/js-lib 14.99.0 → 14.99.1

package/dist/datetime/localDate.d.ts

@@ -60,7 +60,7 @@ export declare class LocalDate {
      */
     absDiff(d: LocalDateConfig, unit: LocalDateUnit): number;
     /**
-     * Returns the number of **full** units difference (aka `Math.ceil`).
+     * Returns the number of **full** units difference (aka `Math.floor`).
      *
      * a.diff(b) means "a minus b"
      */

package/dist/datetime/localDate.js

@@ -205,44 +205,51 @@ class LocalDate {
         return Math.abs(this.diff(d, unit));
     }
     /**
-     * Returns the number of **full** units difference (aka `Math.ceil`).
+     * Returns the number of **full** units difference (aka `Math.floor`).
      *
      * a.diff(b) means "a minus b"
      */
     diff(d, unit) {
         d = LocalDate.of(d);
+        const sign = this.cmp(d);
+        if (!sign)
+            return 0;
+        // Put items in descending order: "big minus small"
+        const [big, small] = sign === 1 ? [this, d] : [d, this];
         if (unit === 'year') {
-            return this.$year - d.$year;
+            let years = big.$year - small.$year;
+            if (big.$month < small.$month || (big.$month === small.$month && big.$day < small.$day)) {
+                years--;
+            }
+            return years * sign || 0;
         }
         if (unit === 'month') {
-            return (this.$year - d.$year) * 12 + (this.$month - d.$month);
+            let months = (big.$year - small.$year) * 12 + (big.$month - small.$month);
+            if (big.$day < small.$day)
+                months--;
+            return months * sign || 0;
         }
         // unit is 'day' or 'week'
-        let days = this.$day - d.$day;
-        if (d.$year < this.$year) {
-            for (let year = d.$year; year < this.$year; year++) {
-                days += LocalDate.getYearLength(year);
-            }
-        }
-        else if (this.$year < d.$year) {
-            for (let year = this.$year; year < d.$year; year++) {
-                days -= LocalDate.getYearLength(year);
-            }
+        let days = big.$day - small.$day;
+        // If small date is after 1st of March - next year's "leapness" should be used
+        const offsetYear = small.$month >= 3 ? 1 : 0;
+        for (let year = small.$year; year < big.$year; year++) {
+            days += LocalDate.getYearLength(year + offsetYear);
         }
-        if (d.$month < this.$month) {
-            for (let month = d.$month; month < this.$month; month++) {
-                days += LocalDate.getMonthLength(this.$year, month);
+        if (small.$month < big.$month) {
+            for (let month = small.$month; month < big.$month; month++) {
+                days += LocalDate.getMonthLength(big.$year, month);
             }
         }
-        else if (this.$month < d.$month) {
-            for (let month = this.$month; month < d.$month; month++) {
-                days -= LocalDate.getMonthLength(d.$year, month);
+        else if (big.$month < small.$month) {
+            for (let month = big.$month; month < small.$month; month++) {
+                days -= LocalDate.getMonthLength(big.$year, month);
             }
         }
         if (unit === 'week') {
-            return Math.floor(days / 7);
+            return Math.trunc(days / 7) * sign || 0;
         }
-        return days;
+        return days * sign || 0;
     }
     add(num, unit, mutate = false) {
         let { $day, $month, $year } = this;

package/dist/datetime/localTime.js

@@ -16,6 +16,7 @@ var ISODayOfWeek;
 })(ISODayOfWeek = exports.ISODayOfWeek || (exports.ISODayOfWeek = {}));
 const weekStartsOn = 1; // mon, as per ISO
 const MILLISECONDS_IN_WEEK = 604800000;
+const SECONDS_IN_DAY = 86400;
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
 const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
@@ -224,24 +225,43 @@ class LocalTime {
     }
     diff(other, unit) {
         const date2 = LocalTime.parseToDate(other);
-        if (unit === 'year') {
-            return this.$date.getFullYear() - date2.getFullYear();
-        }
-        if (unit === 'month') {
-            return ((this.$date.getFullYear() - date2.getFullYear()) * 12 +
-                this.$date.getMonth() -
-                date2.getMonth());
-        }
         const secDiff = (this.$date.valueOf() - date2.valueOf()) / 1000;
+        if (!secDiff)
+            return 0;
+        if (unit === 'year' || unit === 'month') {
+            const sign = secDiff > 0 ? 1 : -1;
+            // Put items in descending order: "big minus small"
+            const [big, small] = sign === 1 ? [this.$date, date2] : [date2, this.$date];
+            if (unit === 'year') {
+                let years = big.getFullYear() - small.getFullYear();
+                const big2 = new Date(big);
+                const small2 = new Date(small);
+                big2.setFullYear(1584);
+                small2.setFullYear(1584);
+                if (big2 < small2)
+                    years--;
+                return years * sign || 0;
+            }
+            if (unit === 'month') {
+                let months = (big.getFullYear() - small.getFullYear()) * 12 + big.getMonth() - small.getMonth();
+                const big2 = new Date(big);
+                const small2 = new Date(small);
+                big2.setFullYear(1584, 0);
+                small2.setFullYear(1584, 0);
+                if (big2 < small2)
+                    months--;
+                return months * sign || 0;
+            }
+        }
         let r;
         if (unit === 'day') {
-            r = secDiff / (24 * 60 * 60);
+            r = secDiff / SECONDS_IN_DAY;
         }
         else if (unit === 'week') {
             r = secDiff / (7 * 24 * 60 * 60);
         }
         else if (unit === 'hour') {
-            r = secDiff / (60 * 60);
+            r = secDiff / 3600;
         }
         else if (unit === 'minute') {
             r = secDiff / 60;
@@ -250,10 +270,8 @@ class LocalTime {
             // unit === 'second'
             r = secDiff;
         }
-        r = Math.trunc(r);
-        if (Object.is(r, -0))
-            return 0;
-        return r;
+        // `|| 0` is to avoid returning -0
+        return Math.trunc(r) || 0;
     }
     startOf(unit, mutate = false) {
         if (unit === 'second')

package/dist-esm/datetime/localDate.js

@@ -202,44 +202,51 @@ export class LocalDate {
         return Math.abs(this.diff(d, unit));
     }
     /**
-     * Returns the number of **full** units difference (aka `Math.ceil`).
+     * Returns the number of **full** units difference (aka `Math.floor`).
      *
      * a.diff(b) means "a minus b"
      */
     diff(d, unit) {
         d = LocalDate.of(d);
+        const sign = this.cmp(d);
+        if (!sign)
+            return 0;
+        // Put items in descending order: "big minus small"
+        const [big, small] = sign === 1 ? [this, d] : [d, this];
         if (unit === 'year') {
-            return this.$year - d.$year;
+            let years = big.$year - small.$year;
+            if (big.$month < small.$month || (big.$month === small.$month && big.$day < small.$day)) {
+                years--;
+            }
+            return years * sign || 0;
         }
         if (unit === 'month') {
-            return (this.$year - d.$year) * 12 + (this.$month - d.$month);
+            let months = (big.$year - small.$year) * 12 + (big.$month - small.$month);
+            if (big.$day < small.$day)
+                months--;
+            return months * sign || 0;
         }
         // unit is 'day' or 'week'
-        let days = this.$day - d.$day;
-        if (d.$year < this.$year) {
-            for (let year = d.$year; year < this.$year; year++) {
-                days += LocalDate.getYearLength(year);
-            }
-        }
-        else if (this.$year < d.$year) {
-            for (let year = this.$year; year < d.$year; year++) {
-                days -= LocalDate.getYearLength(year);
-            }
+        let days = big.$day - small.$day;
+        // If small date is after 1st of March - next year's "leapness" should be used
+        const offsetYear = small.$month >= 3 ? 1 : 0;
+        for (let year = small.$year; year < big.$year; year++) {
+            days += LocalDate.getYearLength(year + offsetYear);
         }
-        if (d.$month < this.$month) {
-            for (let month = d.$month; month < this.$month; month++) {
-                days += LocalDate.getMonthLength(this.$year, month);
+        if (small.$month < big.$month) {
+            for (let month = small.$month; month < big.$month; month++) {
+                days += LocalDate.getMonthLength(big.$year, month);
             }
         }
-        else if (this.$month < d.$month) {
-            for (let month = this.$month; month < d.$month; month++) {
-                days -= LocalDate.getMonthLength(d.$year, month);
+        else if (big.$month < small.$month) {
+            for (let month = big.$month; month < small.$month; month++) {
+                days -= LocalDate.getMonthLength(big.$year, month);
             }
         }
         if (unit === 'week') {
-            return Math.floor(days / 7);
+            return Math.trunc(days / 7) * sign || 0;
         }
-        return days;
+        return days * sign || 0;
     }
     add(num, unit, mutate = false) {
         let { $day, $month, $year } = this;

package/dist-esm/datetime/localTime.js

@@ -13,6 +13,7 @@ export var ISODayOfWeek;
 })(ISODayOfWeek || (ISODayOfWeek = {}));
 const weekStartsOn = 1; // mon, as per ISO
 const MILLISECONDS_IN_WEEK = 604800000;
+const SECONDS_IN_DAY = 86400;
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
 const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
@@ -221,24 +222,43 @@ export class LocalTime {
     }
     diff(other, unit) {
         const date2 = LocalTime.parseToDate(other);
-        if (unit === 'year') {
-            return this.$date.getFullYear() - date2.getFullYear();
-        }
-        if (unit === 'month') {
-            return ((this.$date.getFullYear() - date2.getFullYear()) * 12 +
-                this.$date.getMonth() -
-                date2.getMonth());
-        }
         const secDiff = (this.$date.valueOf() - date2.valueOf()) / 1000;
+        if (!secDiff)
+            return 0;
+        if (unit === 'year' || unit === 'month') {
+            const sign = secDiff > 0 ? 1 : -1;
+            // Put items in descending order: "big minus small"
+            const [big, small] = sign === 1 ? [this.$date, date2] : [date2, this.$date];
+            if (unit === 'year') {
+                let years = big.getFullYear() - small.getFullYear();
+                const big2 = new Date(big);
+                const small2 = new Date(small);
+                big2.setFullYear(1584);
+                small2.setFullYear(1584);
+                if (big2 < small2)
+                    years--;
+                return years * sign || 0;
+            }
+            if (unit === 'month') {
+                let months = (big.getFullYear() - small.getFullYear()) * 12 + big.getMonth() - small.getMonth();
+                const big2 = new Date(big);
+                const small2 = new Date(small);
+                big2.setFullYear(1584, 0);
+                small2.setFullYear(1584, 0);
+                if (big2 < small2)
+                    months--;
+                return months * sign || 0;
+            }
+        }
         let r;
         if (unit === 'day') {
-            r = secDiff / (24 * 60 * 60);
+            r = secDiff / SECONDS_IN_DAY;
         }
         else if (unit === 'week') {
             r = secDiff / (7 * 24 * 60 * 60);
         }
         else if (unit === 'hour') {
-            r = secDiff / (60 * 60);
+            r = secDiff / 3600;
         }
         else if (unit === 'minute') {
             r = secDiff / 60;
@@ -247,10 +267,8 @@ export class LocalTime {
             // unit === 'second'
             r = secDiff;
         }
-        r = Math.trunc(r);
-        if (Object.is(r, -0))
-            return 0;
-        return r;
+        // `|| 0` is to avoid returning -0
+        return Math.trunc(r) || 0;
     }
     startOf(unit, mutate = false) {
         if (unit === 'second')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.99.0",
+  "version": "14.99.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/datetime/localDate.ts

@@ -253,49 +253,59 @@ export class LocalDate {
   }
 
   /**
-   * Returns the number of **full** units difference (aka `Math.ceil`).
+   * Returns the number of **full** units difference (aka `Math.floor`).
    *
    * a.diff(b) means "a minus b"
    */
   diff(d: LocalDateConfig, unit: LocalDateUnit): number {
     d = LocalDate.of(d)
 
+    const sign = this.cmp(d)
+    if (!sign) return 0
+
+    // Put items in descending order: "big minus small"
+    const [big, small] = sign === 1 ? [this, d] : [d, this]
+
     if (unit === 'year') {
-      return this.$year - d.$year
+      let years = big.$year - small.$year
+
+      if (big.$month < small.$month || (big.$month === small.$month && big.$day < small.$day)) {
+        years--
+      }
+
+      return years * sign || 0
     }
 
     if (unit === 'month') {
-      return (this.$year - d.$year) * 12 + (this.$month - d.$month)
+      let months = (big.$year - small.$year) * 12 + (big.$month - small.$month)
+      if (big.$day < small.$day) months--
+      return months * sign || 0
     }
 
     // unit is 'day' or 'week'
-    let days = this.$day - d.$day
+    let days = big.$day - small.$day
 
-    if (d.$year < this.$year) {
-      for (let year = d.$year; year < this.$year; year++) {
-        days += LocalDate.getYearLength(year)
-      }
-    } else if (this.$year < d.$year) {
-      for (let year = this.$year; year < d.$year; year++) {
-        days -= LocalDate.getYearLength(year)
-      }
+    // If small date is after 1st of March - next year's "leapness" should be used
+    const offsetYear = small.$month >= 3 ? 1 : 0
+    for (let year = small.$year; year < big.$year; year++) {
+      days += LocalDate.getYearLength(year + offsetYear)
     }
 
-    if (d.$month < this.$month) {
-      for (let month = d.$month; month < this.$month; month++) {
-        days += LocalDate.getMonthLength(this.$year, month)
+    if (small.$month < big.$month) {
+      for (let month = small.$month; month < big.$month; month++) {
+        days += LocalDate.getMonthLength(big.$year, month)
       }
-    } else if (this.$month < d.$month) {
-      for (let month = this.$month; month < d.$month; month++) {
-        days -= LocalDate.getMonthLength(d.$year, month)
+    } else if (big.$month < small.$month) {
+      for (let month = big.$month; month < small.$month; month++) {
+        days -= LocalDate.getMonthLength(big.$year, month)
       }
     }
 
     if (unit === 'week') {
-      return Math.floor(days / 7)
+      return Math.trunc(days / 7) * sign || 0
     }
 
-    return days
+    return days * sign || 0
   }
 
   add(num: number, unit: LocalDateUnit, mutate = false): LocalDate {

package/src/datetime/localTime.ts

@@ -29,6 +29,7 @@ export interface LocalTimeComponents {
 
 const weekStartsOn = 1 // mon, as per ISO
 const MILLISECONDS_IN_WEEK = 604800000
+const SECONDS_IN_DAY = 86400
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
 const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7])
@@ -281,26 +282,45 @@ export class LocalTime {
   diff(other: LocalTimeConfig, unit: LocalTimeUnit): number {
     const date2 = LocalTime.parseToDate(other)
 
-    if (unit === 'year') {
-      return this.$date.getFullYear() - date2.getFullYear()
-    }
-    if (unit === 'month') {
-      return (
-        (this.$date.getFullYear() - date2.getFullYear()) * 12 +
-        this.$date.getMonth() -
-        date2.getMonth()
-      )
+    const secDiff = (this.$date.valueOf() - date2.valueOf()) / 1000
+    if (!secDiff) return 0
+
+    if (unit === 'year' || unit === 'month') {
+      const sign = secDiff > 0 ? 1 : -1
+
+      // Put items in descending order: "big minus small"
+      const [big, small] = sign === 1 ? [this.$date, date2] : [date2, this.$date]
+
+      if (unit === 'year') {
+        let years = big.getFullYear() - small.getFullYear()
+        const big2 = new Date(big)
+        const small2 = new Date(small)
+        big2.setFullYear(1584)
+        small2.setFullYear(1584)
+        if (big2 < small2) years--
+        return years * sign || 0
+      }
+
+      if (unit === 'month') {
+        let months =
+          (big.getFullYear() - small.getFullYear()) * 12 + big.getMonth() - small.getMonth()
+        const big2 = new Date(big)
+        const small2 = new Date(small)
+        big2.setFullYear(1584, 0)
+        small2.setFullYear(1584, 0)
+        if (big2 < small2) months--
+        return months * sign || 0
+      }
     }
 
-    const secDiff = (this.$date.valueOf() - date2.valueOf()) / 1000
     let r
 
     if (unit === 'day') {
-      r = secDiff / (24 * 60 * 60)
+      r = secDiff / SECONDS_IN_DAY
     } else if (unit === 'week') {
       r = secDiff / (7 * 24 * 60 * 60)
     } else if (unit === 'hour') {
-      r = secDiff / (60 * 60)
+      r = secDiff / 3600
     } else if (unit === 'minute') {
       r = secDiff / 60
     } else {
@@ -308,9 +328,8 @@ export class LocalTime {
       r = secDiff
     }
 
-    r = Math.trunc(r)
-    if (Object.is(r, -0)) return 0
-    return r
+    // `|| 0` is to avoid returning -0
+    return Math.trunc(r) || 0
   }
 
   startOf(unit: LocalTimeUnit, mutate = false): LocalTime {