@naturalcycles/js-lib 14.98.3 → 14.99.2

package/dist-esm/datetime/localTime.js

@@ -1,14 +1,29 @@
 import { _assert } from '../error/assert';
 import { _ms } from '../time/time.util';
 import { LocalDate } from './localDate';
+export var ISODayOfWeek;
+(function (ISODayOfWeek) {
+    ISODayOfWeek[ISODayOfWeek["MONDAY"] = 1] = "MONDAY";
+    ISODayOfWeek[ISODayOfWeek["TUESDAY"] = 2] = "TUESDAY";
+    ISODayOfWeek[ISODayOfWeek["WEDNESDAY"] = 3] = "WEDNESDAY";
+    ISODayOfWeek[ISODayOfWeek["THURSDAY"] = 4] = "THURSDAY";
+    ISODayOfWeek[ISODayOfWeek["FRIDAY"] = 5] = "FRIDAY";
+    ISODayOfWeek[ISODayOfWeek["SATURDAY"] = 6] = "SATURDAY";
+    ISODayOfWeek[ISODayOfWeek["SUNDAY"] = 7] = "SUNDAY";
+})(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]);
 /* eslint-disable no-dupe-class-members */
 /**
  * @experimental
  */
 export class LocalTime {
-    constructor($date, utcMode) {
+    constructor($date) {
         this.$date = $date;
-        this.utcMode = utcMode;
     }
     /**
      * Parses input String into LocalDate.
@@ -21,14 +36,6 @@ export class LocalTime {
         }
         return t;
     }
-    utc() {
-        this.utcMode = true;
-        return this;
-    }
-    local() {
-        this.utcMode = false;
-        return this;
-    }
     /**
      * Returns null if invalid
      */
@@ -55,7 +62,7 @@ export class LocalTime {
         // if (utc) {
         //   date.setMinutes(date.getMinutes() + date.getTimezoneOffset())
         // }
-        return new LocalTime(date, false);
+        return new LocalTime(date);
     }
     static parseToDate(d) {
         if (d instanceof LocalTime)
@@ -83,52 +90,56 @@ export class LocalTime {
         return this.parseOrNull(d) !== null;
     }
     static now() {
-        return new LocalTime(new Date(), false);
+        return new LocalTime(new Date());
     }
     static fromComponents(c) {
-        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, c.hour, c.minute, c.second));
     }
     get(unit) {
         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, v, mutate = false) {
         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;
     }
     year(v) {
@@ -137,9 +148,21 @@ export class LocalTime {
     month(v) {
         return v === undefined ? this.get('month') : this.set('month', v);
     }
+    week(v) {
+        return v === undefined ? getWeek(this.$date) : this.set('week', v);
+    }
     day(v) {
         return v === undefined ? this.get('day') : this.set('day', v);
     }
+    dayOfWeek(v) {
+        const dow = (this.$date.getDay() || 7);
+        if (v === undefined) {
+            return dow;
+        }
+        if (!VALID_DAYS_OF_WEEK.has(v))
+            throw new Error(`Invalid dayOfWeek: ${v}`);
+        return this.add(v - dow, 'day');
+    }
     hour(v) {
         return v === undefined ? this.get('hour') : this.set('hour', v);
     }
@@ -151,29 +174,31 @@ export class LocalTime {
     }
     setComponents(c, mutate = false) {
         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);
+            d.setFullYear(c.year);
         }
         if (c.month) {
-            this.utcMode ? d.setUTCMonth(c.month - 1) : d.setMonth(c.month - 1);
+            d.setMonth(c.month - 1);
         }
         if (c.day) {
-            this.utcMode ? d.setUTCDate(c.day) : d.setDate(c.day);
+            d.setDate(c.day);
         }
         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, unit, mutate = false) {
+        if (unit === 'week') {
+            num *= 7;
+            unit = 'day';
+        }
         return this.set(unit, this.get(unit) + num, mutate);
     }
     subtract(num, unit, mutate = false) {
@@ -184,21 +209,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;
@@ -207,32 +254,62 @@ export class LocalTime {
             // unit === 'second'
             r = secDiff;
         }
-        r = r < 0 ? -Math.floor(-r) : Math.floor(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')
             return this;
         const d = mutate ? this.$date : new Date(this.$date);
-        d.setMilliseconds(0);
-        d.setSeconds(0);
-        /* eslint-disable @typescript-eslint/no-unused-expressions */
+        d.setSeconds(0, 0);
         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') {
-                    this.utcMode ? d.setUTCDate(0) : d.setDate(0);
-                    if (unit !== 'month') {
-                        this.utcMode ? d.setUTCMonth(0) : d.setMonth(0);
+                    // year, month or week
+                    if (unit === 'year') {
+                        d.setMonth(0);
+                        d.setDate(1);
+                    }
+                    else if (unit === 'month') {
+                        d.setDate(1);
+                    }
+                    else {
+                        // week
+                        startOfWeek(d, true);
                     }
                 }
             }
         }
-        /* eslint-enable @typescript-eslint/no-unused-expressions */
-        return mutate ? this : new LocalTime(d, this.utcMode);
+        return mutate ? this : new LocalTime(d);
+    }
+    endOf(unit, mutate = false) {
+        if (unit === 'second')
+            return this;
+        const d = mutate ? this.$date : new Date(this.$date);
+        d.setSeconds(59, 0);
+        if (unit !== 'minute') {
+            d.setMinutes(59);
+            if (unit !== 'hour') {
+                d.setHours(23);
+                if (unit !== 'day') {
+                    // year, month or week
+                    if (unit === 'year') {
+                        d.setMonth(11);
+                    }
+                    if (unit === 'week') {
+                        endOfWeek(d, true);
+                    }
+                    else {
+                        // year or month
+                        const lastDay = LocalDate.getMonthLength(d.getFullYear(), d.getMonth() + 1);
+                        d.setDate(lastDay);
+                    }
+                }
+            }
+        }
+        return mutate ? this : new LocalTime(d);
     }
     static sort(items, mutate = false, descending = false) {
         const mod = descending ? -1 : 1;
@@ -249,14 +326,18 @@ export class LocalTime {
     }
     static earliest(items) {
         _assert(items.length, 'LocalTime.earliest called on empty array');
-        return items.reduce((min, item) => (min.isSameOrBefore(item) ? min : item));
+        return items
+            .map(i => LocalTime.of(i))
+            .reduce((min, item) => (min.isSameOrBefore(item) ? min : item));
     }
     static latestOrUndefined(items) {
         return items.length ? LocalTime.latest(items) : undefined;
     }
     static latest(items) {
         _assert(items.length, 'LocalTime.latest called on empty array');
-        return items.reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
+        return items
+            .map(i => LocalTime.of(i))
+            .reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
     isSame(d) {
         return this.cmp(d) === 0;
@@ -296,18 +377,7 @@ export class LocalTime {
             return 0;
         return t1 < t2 ? -1 : 1;
     }
-    // todo: endOf
     components() {
-        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,
@@ -330,7 +400,7 @@ export class LocalTime {
         return this.$date;
     }
     clone() {
-        return new LocalTime(new Date(this.$date), this.utcMode);
+        return new LocalTime(new Date(this.$date));
     }
     unix() {
         return Math.floor(this.$date.valueOf() / 1000);
@@ -342,9 +412,6 @@ export class LocalTime {
         return Math.floor(this.$date.valueOf() / 1000);
     }
     toLocalDate() {
-        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, this.$date.getDate());
     }
     toPretty(seconds = true) {
@@ -421,6 +488,9 @@ export class LocalTime {
     toJSON() {
         return this.unix();
     }
+    format(fmt) {
+        return fmt(this);
+    }
 }
 /**
  * Shortcut wrapper around `LocalDate.parse` / `LocalDate.today`
@@ -428,3 +498,83 @@ export class LocalTime {
 export function localTime(d) {
     return d ? LocalTime.of(d) : LocalTime.now();
 }
+// based on: https://github.com/date-fns/date-fns/blob/master/src/getISOWeek/index.ts
+function getWeek(date) {
+    const diff = startOfWeek(date).getTime() - startOfWeekYear(date).getTime();
+    return Math.round(diff / MILLISECONDS_IN_WEEK) + 1;
+}
+function setWeek(date, week, mutate = false) {
+    const d = mutate ? date : new Date(date);
+    const diff = getWeek(d) - week;
+    d.setDate(d.getDate() - diff * 7);
+    return d;
+}
+// based on: https://github.com/date-fns/date-fns/blob/master/src/startOfISOWeekYear/index.ts
+function startOfWeekYear(date) {
+    const year = getWeekYear(date);
+    const fourthOfJanuary = new Date(0);
+    fourthOfJanuary.setFullYear(year, 0, 4);
+    fourthOfJanuary.setHours(0, 0, 0, 0);
+    return startOfWeek(fourthOfJanuary, true);
+}
+// based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/getISOWeekYear/index.ts
+function getWeekYear(date) {
+    const year = date.getFullYear();
+    const fourthOfJanuaryOfNextYear = new Date(0);
+    fourthOfJanuaryOfNextYear.setFullYear(year + 1, 0, 4);
+    fourthOfJanuaryOfNextYear.setHours(0, 0, 0, 0);
+    const startOfNextYear = startOfWeek(fourthOfJanuaryOfNextYear, true);
+    const fourthOfJanuaryOfThisYear = new Date(0);
+    fourthOfJanuaryOfThisYear.setFullYear(year, 0, 4);
+    fourthOfJanuaryOfThisYear.setHours(0, 0, 0, 0);
+    const startOfThisYear = startOfWeek(fourthOfJanuaryOfThisYear, true);
+    if (date.getTime() >= startOfNextYear.getTime()) {
+        return year + 1;
+    }
+    else if (date.getTime() >= startOfThisYear.getTime()) {
+        return year;
+    }
+    else {
+        return year - 1;
+    }
+}
+// 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, mutate = false) {
+    const d = mutate ? date : new Date(date);
+    const day = d.getDay();
+    const diff = (day < weekStartsOn ? 7 : 0) + day - weekStartsOn;
+    d.setDate(d.getDate() - diff);
+    d.setHours(0, 0, 0, 0);
+    return d;
+}
+// based on: https://github.com/date-fns/date-fns/blob/master/src/endOfWeek/index.ts
+function endOfWeek(date, mutate = false) {
+    const d = mutate ? date : new Date(date);
+    const day = d.getDay();
+    const diff = (day < weekStartsOn ? -7 : 0) + 6 - (day - weekStartsOn);
+    d.setDate(d.getDate() + diff);
+    return d;
+}

package/dist-esm/index.js

@@ -60,4 +60,5 @@ export * from './datetime/localDate';
 export * from './datetime/localTime';
 export * from './datetime/dateInterval';
 export * from './datetime/timeInterval';
+import { ISODayOfWeek, } from './datetime/localTime';
 export { is, _createPromiseDecorator, _stringMapValues, _stringMapEntries, _objectKeys, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, PQueue, END, SKIP, };

package/package.json

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

package/src/array/array.util.ts

@@ -272,9 +272,38 @@ export function _shuffle<T>(array: T[], mutate = false): T[] {
   return a
 }
 
+/**
+ * Returns last item of non-empty array.
+ * Throws if array is empty.
+ */
+export function _last<T>(array: T[]): T {
+  if (!array.length) throw new Error('_last called on empty array')
+  return array[array.length - 1]!
+}
+
 /**
  * Returns last item of the array (or undefined if array is empty).
  */
-export function _last<T>(array: T[]): T | undefined {
+export function _lastOrUndefined<T>(array: T[]): T | undefined {
   return array[array.length - 1]
 }
+
+export function _minOrUndefined<T>(array: T[]): T | undefined {
+  if (!array.length) return
+  return _min(array)
+}
+
+export function _min<T>(array: T[]): T {
+  if (!array.length) throw new Error('_min called on empty array')
+  return array.reduce((min, item) => (min <= item ? min : item))
+}
+
+export function _maxOrUndefined<T>(array: T[]): T | undefined {
+  if (!array.length) return
+  return _max(array)
+}
+
+export function _max<T>(array: T[]): T {
+  if (!array.length) throw new Error('_max called on empty array')
+  return array.reduce((max, item) => (max >= item ? max : item))
+}