@naturalcycles/js-lib 14.99.1 → 14.99.4

package/src/datetime/localTime.ts

@@ -40,7 +40,7 @@ const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7])
  * @experimental
  */
 export class LocalTime {
-  private constructor(private $date: Date, public utcMode: boolean) {}
+  private constructor(private $date: Date) {}
 
   /**
    * Parses input String into LocalDate.
@@ -56,16 +56,6 @@ export class LocalTime {
     return t
   }
 
-  utc(): this {
-    this.utcMode = true
-    return this
-  }
-
-  local(): this {
-    this.utcMode = false
-    return this
-  }
-
   /**
    * Returns null if invalid
    */
@@ -93,7 +83,7 @@ export class LocalTime {
     //   date.setMinutes(date.getMinutes() + date.getTimezoneOffset())
     // }
 
-    return new LocalTime(date, false)
+    return new LocalTime(date)
   }
 
   static parseToDate(d: LocalTimeConfig): Date {
@@ -127,58 +117,58 @@ export class LocalTime {
   }
 
   static now(): LocalTime {
-    return new LocalTime(new Date(), false)
+    return new LocalTime(new Date())
   }
 
   static fromComponents(
     c: { year: number; month: number } & Partial<LocalTimeComponents>,
   ): LocalTime {
-    return new LocalTime(new Date(c.year, c.month - 1, c.day, c.hour, c.minute, c.second), false)
+    return new LocalTime(
+      new Date(c.year, c.month - 1, c.day || 1, c.hour || 0, c.minute || 0, c.second || 0),
+    )
   }
 
   get(unit: LocalTimeUnit): number {
     if (unit === 'year') {
-      return this.utcMode ? this.$date.getUTCFullYear() : this.$date.getFullYear()
+      return this.$date.getFullYear()
     }
     if (unit === 'month') {
-      return (this.utcMode ? this.$date.getUTCMonth() : this.$date.getMonth()) + 1
+      return this.$date.getMonth() + 1
     }
     if (unit === 'day') {
-      return this.utcMode ? this.$date.getUTCDate() : this.$date.getDate()
+      return this.$date.getDate()
     }
     if (unit === 'hour') {
-      return this.utcMode ? this.$date.getUTCHours() : this.$date.getHours()
+      return this.$date.getHours()
     }
     if (unit === 'minute') {
-      return this.utcMode ? this.$date.getUTCMinutes() : this.$date.getMinutes()
+      return this.$date.getMinutes()
     }
     if (unit === 'week') {
       return getWeek(this.$date)
     }
     // second
-    return this.utcMode ? this.$date.getUTCSeconds() : this.$date.getSeconds()
+    return this.$date.getSeconds()
   }
 
   set(unit: LocalTimeUnit, v: number, mutate = false): LocalTime {
     const t = mutate ? this : this.clone()
 
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
     if (unit === 'year') {
-      this.utcMode ? t.$date.setUTCFullYear(v) : t.$date.setFullYear(v)
+      t.$date.setFullYear(v)
     } else if (unit === 'month') {
-      this.utcMode ? t.$date.setUTCMonth(v - 1) : t.$date.setMonth(v - 1)
+      t.$date.setMonth(v - 1)
     } else if (unit === 'day') {
-      this.utcMode ? t.$date.setUTCDate(v) : t.$date.setDate(v)
+      t.$date.setDate(v)
     } else if (unit === 'hour') {
-      this.utcMode ? t.$date.setUTCHours(v) : t.$date.setHours(v)
+      t.$date.setHours(v)
     } else if (unit === 'minute') {
-      this.utcMode ? t.$date.setUTCMinutes(v) : t.$date.setMinutes(v)
+      t.$date.setMinutes(v)
     } else if (unit === 'second') {
-      this.utcMode ? t.$date.setUTCSeconds(v) : t.$date.setSeconds(v)
+      t.$date.setSeconds(v)
     } else if (unit === 'week') {
       setWeek(t.$date, v, true)
     }
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
 
     return t
   }
@@ -239,28 +229,26 @@ export class LocalTime {
   setComponents(c: Partial<LocalTimeComponents>, mutate = false): LocalTime {
     const d = mutate ? this.$date : new Date(this.$date)
 
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
-    if (c.year) {
-      this.utcMode ? d.setUTCFullYear(c.year) : d.setFullYear(c.year)
-    }
-    if (c.month) {
-      this.utcMode ? d.setUTCMonth(c.month - 1) : d.setMonth(c.month - 1)
-    }
-    if (c.day) {
-      this.utcMode ? d.setUTCDate(c.day) : d.setDate(c.day)
+    // Year, month and day set all-at-once, to avoid 30/31 (and 28/29) mishap
+    if (c.day || c.month !== undefined || c.year !== undefined) {
+      d.setFullYear(
+        c.year ?? d.getFullYear(),
+        c.month ? c.month - 1 : d.getMonth(),
+        c.day || d.getDate(),
+      )
     }
+
     if (c.hour !== undefined) {
-      this.utcMode ? d.setUTCHours(c.hour) : d.setHours(c.hour)
+      d.setHours(c.hour)
     }
     if (c.minute !== undefined) {
-      this.utcMode ? d.setUTCMinutes(c.minute) : d.setMinutes(c.minute)
+      d.setMinutes(c.minute)
     }
     if (c.second !== undefined) {
-      this.utcMode ? d.setUTCSeconds(c.second) : d.setSeconds(c.second)
+      d.setSeconds(c.second)
     }
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
 
-    return mutate ? this : new LocalTime(d, this.utcMode)
+    return mutate ? this : new LocalTime(d)
   }
 
   add(num: number, unit: LocalTimeUnit, mutate = false): LocalTime {
@@ -268,6 +256,12 @@ export class LocalTime {
       num *= 7
       unit = 'day'
     }
+
+    if (unit === 'year' || unit === 'month') {
+      const d = addMonths(this.$date, unit === 'month' ? num : num * 12, mutate)
+      return mutate ? this : LocalTime.of(d)
+    }
+
     return this.set(unit, this.get(unit) + num, mutate)
   }
 
@@ -285,37 +279,13 @@ export class LocalTime {
     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') {
+    if (unit === 'year') {
+      r = differenceInMonths(this.getDate(), date2) / 12
+    } else if (unit === 'month') {
+      r = differenceInMonths(this.getDate(), date2)
+    } else if (unit === 'day') {
       r = secDiff / SECONDS_IN_DAY
     } else if (unit === 'week') {
       r = secDiff / (7 * 24 * 60 * 60)
@@ -337,19 +307,18 @@ export class LocalTime {
     const d = mutate ? this.$date : new Date(this.$date)
     d.setSeconds(0, 0)
 
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
     if (unit !== 'minute') {
-      this.utcMode ? d.setUTCMinutes(0) : d.setMinutes(0)
+      d.setMinutes(0)
       if (unit !== 'hour') {
-        this.utcMode ? d.setUTCHours(0) : d.setHours(0)
+        d.setHours(0)
         if (unit !== 'day') {
           // year, month or week
 
           if (unit === 'year') {
-            this.utcMode ? d.setUTCMonth(0) : d.setMonth(0)
-            this.utcMode ? d.setUTCDate(1) : d.setDate(1)
+            d.setMonth(0)
+            d.setDate(1)
           } else if (unit === 'month') {
-            this.utcMode ? d.setUTCDate(1) : d.setDate(1)
+            d.setDate(1)
           } else {
             // week
             startOfWeek(d, true)
@@ -357,9 +326,8 @@ export class LocalTime {
         }
       }
     }
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
 
-    return mutate ? this : new LocalTime(d, this.utcMode)
+    return mutate ? this : new LocalTime(d)
   }
 
   endOf(unit: LocalTimeUnit, mutate = false): LocalTime {
@@ -367,16 +335,15 @@ export class LocalTime {
     const d = mutate ? this.$date : new Date(this.$date)
     d.setSeconds(59, 0)
 
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
     if (unit !== 'minute') {
-      this.utcMode ? d.setUTCMinutes(59) : d.setMinutes(59)
+      d.setMinutes(59)
       if (unit !== 'hour') {
-        this.utcMode ? d.setUTCHours(23) : d.setHours(23)
+        d.setHours(23)
         if (unit !== 'day') {
           // year, month or week
 
           if (unit === 'year') {
-            this.utcMode ? d.setUTCMonth(11) : d.setMonth(11)
+            d.setMonth(11)
           }
 
           if (unit === 'week') {
@@ -384,14 +351,13 @@ export class LocalTime {
           } else {
             // year or month
             const lastDay = LocalDate.getMonthLength(d.getFullYear(), d.getMonth() + 1)
-            this.utcMode ? d.setUTCDate(lastDay) : d.setDate(lastDay)
+            d.setDate(lastDay)
           }
         }
       }
     }
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
 
-    return mutate ? this : new LocalTime(d, this.utcMode)
+    return mutate ? this : new LocalTime(d)
   }
 
   static sort(items: LocalTime[], mutate = false, descending = false): LocalTime[] {
@@ -471,17 +437,6 @@ export class LocalTime {
   }
 
   components(): LocalTimeComponents {
-    if (this.utcMode) {
-      return {
-        year: this.$date.getUTCFullYear(),
-        month: this.$date.getUTCMonth() + 1,
-        day: this.$date.getUTCDate(),
-        hour: this.$date.getUTCHours(),
-        minute: this.$date.getUTCMinutes(),
-        second: this.$date.getSeconds(),
-      }
-    }
-
     return {
       year: this.$date.getFullYear(),
       month: this.$date.getMonth() + 1,
@@ -509,7 +464,7 @@ export class LocalTime {
   }
 
   clone(): LocalTime {
-    return new LocalTime(new Date(this.$date), this.utcMode)
+    return new LocalTime(new Date(this.$date))
   }
 
   unix(): UnixTimestampNumber {
@@ -525,14 +480,6 @@ export class LocalTime {
   }
 
   toLocalDate(): LocalDate {
-    if (this.utcMode) {
-      return LocalDate.create(
-        this.$date.getUTCFullYear(),
-        this.$date.getUTCMonth() + 1,
-        this.$date.getUTCDate(),
-      )
-    }
-
     return LocalDate.create(
       this.$date.getFullYear(),
       this.$date.getMonth() + 1,
@@ -622,7 +569,7 @@ export class LocalTime {
   }
 
   toString(): string {
-    return String(this.unix())
+    return this.toISODateTime()
   }
 
   toJSON(): UnixTimestampNumber {
@@ -686,32 +633,6 @@ function getWeekYear(date: Date): number {
   }
 }
 
-// function setWeekYear(
-//   date: Date,
-//   year: number,
-// ): Date {
-//   const diff = differenceInCalendarDays(date, startOfWeekYear(date))
-//   const fourthOfJanuary = new Date(0)
-//   fourthOfJanuary.setFullYear(year, 0, 4)
-//   fourthOfJanuary.setHours(0, 0, 0, 0)
-//   date = startOfWeekYear(fourthOfJanuary)
-//   date.setDate(date.getDate() + diff)
-//   return date
-// }
-
-// function differenceInCalendarDays(
-//   dateLeft: Date,
-//   dateRight: Date,
-// ): number {
-//   return Math.round((startOfDay(dateLeft).getTime() - startOfDay(dateRight).getTime()) / MILLISECONDS_IN_DAY)
-// }
-
-// function startOfDay(date: Date, mutate = false): Date {
-//   const d = mutate ? date : new Date(date)
-//   d.setHours(0, 0, 0, 0)
-//   return d
-// }
-
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/startOfWeek/index.ts
 function startOfWeek(date: Date, mutate = false): Date {
   const d = mutate ? date : new Date(date)
@@ -734,3 +655,41 @@ function endOfWeek(date: Date, mutate = false): Date {
   d.setDate(d.getDate() + diff)
   return d
 }
+
+function addMonths(d: Date, num: number, mutate = false): Date {
+  if (!mutate) d = new Date(d)
+
+  let day = d.getDate()
+  let month = d.getMonth() + 1 + num
+
+  if (day < 29) {
+    d.setMonth(month - 1)
+    return d
+  }
+
+  let year = d.getFullYear()
+
+  while (month > 12) {
+    year++
+    month -= 12
+  }
+  while (month < 1) {
+    year--
+    month += 12
+  }
+
+  const monthLen = LocalDate.getMonthLength(year, month)
+  if (day > monthLen) day = monthLen
+
+  d.setFullYear(year, month - 1, day)
+  return d
+}
+
+function differenceInMonths(a: Date, b: Date): number {
+  if (a.getDate() < b.getDate()) return -differenceInMonths(b, a)
+  const wholeMonthDiff = (b.getFullYear() - a.getFullYear()) * 12 + (b.getMonth() - a.getMonth())
+  const anchor = addMonths(a, wholeMonthDiff).getTime()
+  const sign = b.getTime() - anchor >= 0 ? 1 : -1
+  const anchor2 = addMonths(a, wholeMonthDiff + sign).getTime()
+  return -(wholeMonthDiff + ((b.getTime() - anchor) / (anchor2 - anchor)) * sign)
+}