@naturalcycles/js-lib 14.96.0 → 14.97.1

package/dist-esm/datetime/localDate.js

@@ -1,16 +1,16 @@
 import { _assert } from '../error/assert';
-import { Sequence } from '../seq/seq';
-import { END } from '../types';
 import { LocalTime } from './localTime';
-const m31 = new Set([1, 3, 5, 7, 8, 10, 12]);
+const MDAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+const DATE_REGEX = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
+/* eslint-disable no-dupe-class-members */
 /**
  * @experimental
  */
 export class LocalDate {
-    constructor(year, month, day) {
-        this.year = year;
-        this.month = month;
-        this.day = day;
+    constructor($year, $month, $day) {
+        this.$year = $year;
+        this.$month = $month;
+        this.$day = $day;
     }
     static create(year, month, day) {
         return new LocalDate(year, month, day);
@@ -47,8 +47,13 @@ export class LocalDate {
             return null;
         if (d instanceof LocalDate)
             return d;
-        // todo: explore more performant options
-        const [year, month, day] = d.slice(0, 10).split('-').map(Number);
+        // const [year, month, day] = d.slice(0, 10).split('-').map(Number)
+        const matches = DATE_REGEX.exec(d.slice(0, 10));
+        if (!matches)
+            return null;
+        const year = Number(matches[1]);
+        const month = Number(matches[2]);
+        const day = Number(matches[3]);
         if (!year ||
             !month ||
             month < 1 ||
@@ -60,6 +65,10 @@ export class LocalDate {
         }
         return new LocalDate(year, month, day);
     }
+    // Can use just .toString()
+    // static parseToString(d: LocalDateConfig): IsoDateString {
+    //   return typeof d === 'string' ? d : d.toString()
+    // }
     static isValid(iso) {
         return this.parseOrNull(iso) !== null;
     }
@@ -87,45 +96,63 @@ export class LocalDate {
         _assert(items.length, 'LocalDate.latest called on empty array');
         return items.reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
-    static range(minIncl, maxExcl, step = 1, stepUnit = 'day') {
-        const days = [];
-        let current = LocalDate.of(minIncl).startOf(stepUnit);
-        const max = LocalDate.of(maxExcl).startOf(stepUnit);
-        do {
-            days.push(current);
+    static range(min, max, incl = '[)', step = 1, stepUnit = 'day') {
+        const dates = [];
+        const $min = LocalDate.of(min);
+        const $max = LocalDate.of(max).startOf(stepUnit);
+        let current = $min.startOf(stepUnit);
+        if (current.isAfter($min, incl[0] === '[')) {
+            // ok
+        }
+        else {
+            current.add(1, stepUnit, true);
+        }
+        const incl2 = incl[1] === ']';
+        while (current.isBefore($max, incl2)) {
+            dates.push(current);
             current = current.add(step, stepUnit);
-        } while (current.isBefore(max));
-        return days;
+        }
+        return dates;
+    }
+    get(unit) {
+        return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
     }
-    static rangeSeq(minIncl, maxExcl, step = 1, stepUnit = 'day') {
-        const min = LocalDate.of(minIncl).startOf(stepUnit);
-        const max = LocalDate.of(maxExcl).startOf(stepUnit);
-        return Sequence.create(min, d => {
-            const next = d.add(step, stepUnit);
-            return next.isAfter(max) ? END : next;
-        });
+    set(unit, v, mutate = false) {
+        const t = mutate ? this : this.clone();
+        if (unit === 'year') {
+            t.$year = v;
+        }
+        else if (unit === 'month') {
+            t.$month = v;
+        }
+        else {
+            t.$day = v;
+        }
+        return t;
     }
-    static rangeString(minIncl, maxExcl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, maxExcl, step, stepUnit).map(ld => ld.toString());
+    year(v) {
+        return v === undefined ? this.$year : this.set('year', v);
     }
-    static rangeIncl(minIncl, maxIncl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit);
+    month(v) {
+        return v === undefined ? this.$month : this.set('month', v);
     }
-    static rangeInclString(minIncl, maxIncl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit).map(ld => ld.toString());
+    day(v) {
+        return v === undefined ? this.$day : this.set('day', v);
     }
     isSame(d) {
         d = LocalDate.of(d);
-        return this.day === d.day && this.month === d.month && this.year === d.year;
+        return this.$day === d.$day && this.$month === d.$month && this.$year === d.$year;
     }
-    isBefore(d) {
-        return this.cmp(d) === -1;
+    isBefore(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === -1 || (r === 0 && inclusive);
     }
     isSameOrBefore(d) {
         return this.cmp(d) <= 0;
     }
-    isAfter(d) {
-        return this.cmp(d) === 1;
+    isAfter(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === 1 || (r === 0 && inclusive);
     }
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
@@ -146,17 +173,17 @@ export class LocalDate {
      */
     cmp(d) {
         d = LocalDate.of(d);
-        if (this.year < d.year)
+        if (this.$year < d.$year)
             return -1;
-        if (this.year > d.year)
+        if (this.$year > d.$year)
             return 1;
-        if (this.month < d.month)
+        if (this.$month < d.$month)
             return -1;
-        if (this.month > d.month)
+        if (this.$month > d.$month)
             return 1;
-        if (this.day < d.day)
+        if (this.$day < d.$day)
             return -1;
-        if (this.day > d.day)
+        if (this.$day > d.$day)
             return 1;
         return 0;
     }
@@ -174,82 +201,87 @@ export class LocalDate {
     diff(d, unit) {
         d = LocalDate.of(d);
         if (unit === 'year') {
-            return this.year - d.year;
+            return this.$year - d.$year;
         }
         if (unit === 'month') {
-            return (this.year - d.year) * 12 + (this.month - d.month);
+            return (this.$year - d.$year) * 12 + (this.$month - d.$month);
         }
         // unit is 'day'
-        let days = this.day - d.day;
-        if (d.year < this.year) {
-            for (let year = d.year; year < this.year; year++) {
+        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++) {
+        else if (this.$year < d.$year) {
+            for (let year = this.$year; year < d.$year; year++) {
                 days -= LocalDate.getYearLength(year);
             }
         }
-        if (d.month < this.month) {
-            for (let month = d.month; month < this.month; month++) {
-                days += LocalDate.getMonthLength(this.year, month);
+        if (d.$month < this.$month) {
+            for (let month = d.$month; month < this.$month; month++) {
+                days += LocalDate.getMonthLength(this.$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 (this.$month < d.$month) {
+            for (let month = this.$month; month < d.$month; month++) {
+                days -= LocalDate.getMonthLength(d.$year, month);
             }
         }
         return days;
     }
     add(num, unit, mutate = false) {
-        let { day, month, year } = this;
+        let { $day, $month, $year } = this;
         if (unit === 'day') {
-            day += num;
+            $day += num;
         }
         else if (unit === 'month') {
-            month += num;
+            $month += num;
         }
         else if (unit === 'year') {
-            year += num;
+            $year += num;
         }
         // check day overflow
-        let monLen = LocalDate.getMonthLength(year, month);
-        while (day > monLen) {
-            day -= monLen;
-            month += 1;
-            if (month > 12) {
-                year += 1;
-                month -= 12;
+        if (unit === 'day') {
+            if ($day < 1) {
+                while ($day < 1) {
+                    $month -= 1;
+                    if ($month < 1) {
+                        $year -= 1;
+                        $month += 12;
+                    }
+                    $day += LocalDate.getMonthLength($year, $month);
+                }
             }
-            monLen = LocalDate.getMonthLength(year, month);
-        }
-        while (day < 1) {
-            day += monLen;
-            month -= 1;
-            if (month < 1) {
-                year -= 1;
-                month += 12;
+            else {
+                let monLen = LocalDate.getMonthLength($year, $month);
+                while ($day > monLen) {
+                    $day -= monLen;
+                    $month += 1;
+                    if ($month > 12) {
+                        $year += 1;
+                        $month -= 12;
+                    }
+                    monLen = LocalDate.getMonthLength($year, $month);
+                }
             }
-            monLen = LocalDate.getMonthLength(year, month);
         }
         // check month overflow
-        while (month > 12) {
-            year += 1;
-            month -= 12;
+        while ($month > 12) {
+            $year += 1;
+            $month -= 12;
         }
-        while (month < 1) {
-            year -= 1;
-            month += 12;
+        while ($month < 1) {
+            $year -= 1;
+            $month += 12;
         }
         if (mutate) {
-            this.year = year;
-            this.month = month;
-            this.day = day;
+            this.$year = $year;
+            this.$month = $month;
+            this.$day = $day;
             return this;
         }
-        return new LocalDate(year, month, day);
+        return new LocalDate($year, $month, $day);
     }
     subtract(num, unit, mutate = false) {
         return this.add(-num, unit, mutate);
@@ -258,17 +290,17 @@ export class LocalDate {
         if (unit === 'day')
             return this;
         if (unit === 'month')
-            return LocalDate.create(this.year, this.month, 1);
+            return LocalDate.create(this.$year, this.$month, 1);
         // year
-        return LocalDate.create(this.year, 1, 1);
+        return LocalDate.create(this.$year, 1, 1);
     }
     endOf(unit) {
         if (unit === 'day')
             return this;
         if (unit === 'month')
-            return LocalDate.create(this.year, this.month, LocalDate.getMonthLength(this.year, this.month));
+            return LocalDate.create(this.$year, this.$month, LocalDate.getMonthLength(this.$year, this.$month));
         // year
-        return LocalDate.create(this.year, 12, 31);
+        return LocalDate.create(this.$year, 12, 31);
     }
     static getYearLength(year) {
         return this.isLeapYear(year) ? 366 : 365;
@@ -276,17 +308,13 @@ export class LocalDate {
     static getMonthLength(year, month) {
         if (month === 2)
             return this.isLeapYear(year) ? 29 : 28;
-        return m31.has(month) ? 31 : 30;
+        return MDAYS[month];
     }
     static isLeapYear(year) {
-        if (year % 4 !== 0)
-            return false;
-        if (year % 100 !== 0)
-            return true;
-        return year % 400 === 0;
+        return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
     }
     clone() {
-        return new LocalDate(this.year, this.month, this.day);
+        return new LocalDate(this.$year, this.$month, this.$day);
     }
     /**
      * Converts LocalDate into instance of Date.
@@ -295,7 +323,7 @@ export class LocalDate {
      * Timezone will match local timezone.
      */
     toDate() {
-        return new Date(this.year, this.month - 1, this.day);
+        return new Date(this.$year, this.$month - 1, this.$day);
     }
     toLocalTime() {
         return LocalTime.of(this.toDate());
@@ -305,16 +333,16 @@ export class LocalDate {
     }
     toString() {
         return [
-            String(this.year).padStart(4, '0'),
-            String(this.month).padStart(2, '0'),
-            String(this.day).padStart(2, '0'),
+            String(this.$year).padStart(4, '0'),
+            String(this.$month).padStart(2, '0'),
+            String(this.$day).padStart(2, '0'),
         ].join('-');
     }
     toStringCompact() {
         return [
-            String(this.year).padStart(4, '0'),
-            String(this.month).padStart(2, '0'),
-            String(this.day).padStart(2, '0'),
+            String(this.$year).padStart(4, '0'),
+            String(this.$month).padStart(2, '0'),
+            String(this.$day).padStart(2, '0'),
         ].join('');
     }
     // May be not optimal, as LocalTime better suits it

package/dist-esm/datetime/localTime.js

@@ -45,7 +45,7 @@ export class LocalTime {
             date = new Date(d * 1000);
         }
         else {
-            date = new Date(d);
+            date = new Date(d.slice(0, 19));
         }
         // validation
         if (isNaN(date.getDate())) {
@@ -57,6 +57,28 @@ export class LocalTime {
         // }
         return new LocalTime(date, false);
     }
+    static parseToDate(d) {
+        if (d instanceof LocalTime)
+            return d.$date;
+        if (d instanceof Date)
+            return d;
+        const date = typeof d === 'number' ? new Date(d * 1000) : new Date(d);
+        if (isNaN(date.getDate())) {
+            throw new TypeError(`Cannot parse "${d}" to Date`);
+        }
+        return date;
+    }
+    static parseToUnixTimestamp(d) {
+        if (typeof d === 'number')
+            return d;
+        if (d instanceof LocalTime)
+            return d.unix();
+        const date = d instanceof Date ? d : new Date(d);
+        if (isNaN(date.getDate())) {
+            throw new TypeError(`Cannot parse "${d}" to UnixTimestamp`);
+        }
+        return date.valueOf() / 1000;
+    }
     static isValid(d) {
         return this.parseOrNull(d) !== null;
     }
@@ -115,7 +137,7 @@ export class LocalTime {
     month(v) {
         return v === undefined ? this.get('month') : this.set('month', v);
     }
-    date(v) {
+    day(v) {
         return v === undefined ? this.get('day') : this.set('day', v);
     }
     hour(v) {
@@ -161,7 +183,7 @@ export class LocalTime {
         return Math.abs(this.diff(other, unit));
     }
     diff(other, unit) {
-        const date2 = LocalTime.of(other).$date;
+        const date2 = LocalTime.parseToDate(other);
         if (unit === 'year') {
             return this.$date.getFullYear() - date2.getFullYear();
         }
@@ -238,14 +260,16 @@ export class LocalTime {
     isSame(d) {
         return this.cmp(d) === 0;
     }
-    isBefore(d) {
-        return this.cmp(d) === -1;
+    isBefore(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === -1 || (r === 0 && inclusive);
     }
     isSameOrBefore(d) {
         return this.cmp(d) <= 0;
     }
-    isAfter(d) {
-        return this.cmp(d) === 1;
+    isAfter(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === 1 || (r === 0 && inclusive);
     }
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
@@ -266,7 +290,7 @@ export class LocalTime {
      */
     cmp(d) {
         const t1 = this.$date.valueOf();
-        const t2 = LocalTime.of(d).$date.valueOf();
+        const t2 = LocalTime.parseToDate(d).valueOf();
         if (t1 === t2)
             return 0;
         return t1 < t2 ? -1 : 1;
@@ -292,8 +316,8 @@ export class LocalTime {
             second: this.$date.getSeconds(),
         };
     }
-    fromNow(now = LocalTime.now()) {
-        const msDiff = LocalTime.of(now).unixMillis() - this.unixMillis();
+    fromNow(now = new Date()) {
+        const msDiff = LocalTime.parseToDate(now).valueOf() - this.$date.valueOf();
         if (msDiff === 0)
             return 'now';
         if (msDiff >= 0) {
@@ -403,4 +427,3 @@ export class LocalTime {
 export function localTime(d) {
     return d ? LocalTime.of(d) : LocalTime.now();
 }
-// todo: range

package/dist-esm/datetime/timeInterval.js

@@ -0,0 +1,87 @@
+import { LocalTime } from './localTime';
+/**
+ * Class that supports an "interval of time" between 2 timestamps - start and end.
+ * Example: `1649267185/1649267187`.
+ *
+ * @experimental
+ */
+export class TimeInterval {
+    constructor($start, $end) {
+        this.$start = $start;
+        this.$end = $end;
+    }
+    static of(start, end) {
+        return new TimeInterval(LocalTime.parseToUnixTimestamp(start), LocalTime.parseToUnixTimestamp(end));
+    }
+    get start() {
+        return this.$start;
+    }
+    get end() {
+        return this.$end;
+    }
+    get startTime() {
+        return LocalTime.of(this.$start);
+    }
+    get endTime() {
+        return LocalTime.of(this.$end);
+    }
+    /**
+     * Parses string like `1649267185/1649267187` into a TimeInterval.
+     */
+    static parse(d) {
+        if (d instanceof TimeInterval)
+            return d;
+        const [start, end] = d.split('/').map(Number);
+        if (!end || !start) {
+            throw new Error(`Cannot parse "${d}" into TimeInterval`);
+        }
+        return new TimeInterval(start, end);
+    }
+    isSame(d) {
+        return this.cmp(d) === 0;
+    }
+    isBefore(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === -1 || (r === 0 && inclusive);
+    }
+    isSameOrBefore(d) {
+        return this.cmp(d) <= 0;
+    }
+    isAfter(d, inclusive = false) {
+        const r = this.cmp(d);
+        return r === 1 || (r === 0 && inclusive);
+    }
+    isSameOrAfter(d) {
+        return this.cmp(d) >= 0;
+    }
+    includes(d, incl = '[)') {
+        d = LocalTime.parseToUnixTimestamp(d);
+        if (d < this.$start || (d === this.$start && incl[0] === '('))
+            return false;
+        if (d > this.$end || (d === this.$end && incl[1] === ')'))
+            return false;
+        return true;
+    }
+    /**
+     * TimeIntervals compare by start date.
+     * If it's the same - then by end date.
+     */
+    cmp(d) {
+        d = TimeInterval.parse(d);
+        if (this.$start > d.$start)
+            return 1;
+        if (this.$start < d.$start)
+            return -1;
+        if (this.$end > d.$end)
+            return 1;
+        if (this.$end < d.$end)
+            return -1;
+        return 0;
+    }
+    toString() {
+        return [this.$start, this.$end].join('/');
+    }
+    toJSON() {
+        return this.toString();
+    }
+}

package/dist-esm/error/try.js

@@ -9,6 +9,12 @@ import { AppError } from './app.error';
  * For convenience, second argument type is non-optional,
  * so you can use it without `!`. But you SHOULD always check `if (err)` first!
  *
+ * ERR is typed as Error, not `unknown`. While unknown would be more correct,
+ * according to recent TypeScript, Error gives more developer convenience.
+ * In our code we NEVER throw non-errors.
+ * Only possibility of non-error is in the 3rd-party library code, in these cases it
+ * can be manually cast to `unknown` for extra safety.
+ *
  * @example
  *
  * const [err, v] = _try(() => someFunction())
@@ -44,7 +50,7 @@ export async function pTry(promise) {
  */
 export class UnexpectedPassError extends AppError {
     constructor() {
-        super('_expectedError passed unexpectedly');
+        super('expected error was not thrown');
     }
 }
 /**

package/dist-esm/error/tryCatch.js

@@ -1,4 +1,4 @@
-import { _since, _stringifyAny } from '../index';
+import { _anyToError, _since, _stringifyAny } from '../index';
 /**
  * Decorates a function with "try/catch", so it'll never reject/throw.
  * Only applies to async functions (or, turns sync function into async).
@@ -27,7 +27,7 @@ export function _tryCatch(fn, opt = {}) {
             }
             if (onError) {
                 try {
-                    return await onError(err); // eslint-disable-line @typescript-eslint/return-await
+                    return await onError(_anyToError(err)); // eslint-disable-line @typescript-eslint/return-await
                 }
                 catch (_a) { }
             }

package/dist-esm/index.js

@@ -59,4 +59,5 @@ export * from './string/leven';
 export * from './datetime/localDate';
 export * from './datetime/localTime';
 export * from './datetime/dateInterval';
+export * from './datetime/timeInterval';
 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.96.0",
+  "version": "14.97.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",