@naturalcycles/js-lib 14.97.0 → 14.98.1

package/dist/types.d.ts

@@ -5,7 +5,7 @@ import { Merge, Promisable } from './typeFest';
  * Alternative: Record<string, T | undefined>
  */
 export interface StringMap<T = string> {
-    [k: string]: T | undefined;
+    [k: string | number]: T | undefined;
 }
 /**
  * Object to be passed to pProps to resolve all promises into properties.
@@ -24,14 +24,37 @@ export interface CreatedUpdated {
     created: number;
     updated: number;
 }
-export interface CreatedUpdatedId<ID = string> extends CreatedUpdated {
+export interface CreatedUpdatedId<ID extends string | number = string | number> extends CreatedUpdated {
     id: ID;
 }
-export interface ObjectWithId<ID = string> {
+export interface ObjectWithId<ID extends string | number = string | number> {
     id: ID;
 }
-export interface AnyObjectWithId<ID = string> extends AnyObject, ObjectWithId<ID> {
+export interface AnyObjectWithId<ID extends string | number = string | number> extends AnyObject, ObjectWithId<ID> {
 }
+/**
+ * Base interface for any Entity that was saved to DB.
+ */
+export interface SavedDBEntity<ID extends string | number = string> {
+    id: ID;
+    /**
+     * unixTimestamp of when the entity was first created (in the DB).
+     */
+    created: UnixTimestampNumber;
+    /**
+     * unixTimestamp of when the entity was last updated (in the DB).
+     */
+    updated: UnixTimestampNumber;
+}
+/**
+ * Base interface for any Entity that can be saved to DB.
+ * This interface fits when entity was NOT YET saved to DB,
+ * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
+ * When it's known to be saved - `SavedDBEntity` interface can be used instead.
+ */
+export declare type BaseDBEntity<ID extends string | number = string> = Partial<SavedDBEntity<ID>>;
+export declare type Saved<T extends Partial<ObjectWithId>> = Merge<T, SavedDBEntity<Exclude<T['id'], undefined>>>;
+export declare type Unsaved<T extends ObjectWithId> = Merge<T, BaseDBEntity<T['id']>>;
 /**
  * Convenience type shorthand.
  * Because `Function` type is discouraged by eslint.
@@ -136,29 +159,6 @@ export declare type UnixTimestamp = number;
  * Same as `number`, but with semantic meaning that it's an Integer.
  */
 export declare type Integer = number;
-/**
- * Base interface for any Entity that was saved to DB.
- */
-export interface SavedDBEntity<ID = string> {
-    id: ID;
-    /**
-     * unixTimestamp of when the entity was first created (in the DB).
-     */
-    created: UnixTimestampNumber;
-    /**
-     * unixTimestamp of when the entity was last updated (in the DB).
-     */
-    updated: UnixTimestampNumber;
-}
-/**
- * Base interface for any Entity that can be saved to DB.
- * This interface fits when entity was NOT YET saved to DB,
- * hence `id`, `created` and `updated` fields CAN BE undefined (yet).
- * When it's known to be saved - `SavedDBEntity` interface can be used instead.
- */
-export declare type BaseDBEntity<ID = string> = Partial<SavedDBEntity<ID>>;
-export declare type Saved<E, ID = string> = Merge<E, SavedDBEntity<ID>>;
-export declare type Unsaved<E, ID = string> = Merge<E, BaseDBEntity<ID>>;
 /**
  * Named type for JSON.parse / JSON.stringify second argument
  */

package/dist-esm/datetime/dateInterval.js

@@ -27,14 +27,16 @@ export class DateInterval {
     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;
@@ -42,9 +44,14 @@ export class DateInterval {
     /**
      * Ranges of DateInterval (start, end) are INCLUSIVE.
      */
-    includes(d) {
+    includes(d, incl = '[]') {
         d = LocalDate.of(d);
-        return d.isSameOrAfter(this.start) && d.isSameOrBefore(this.end);
+        return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']');
+    }
+    intersects(int, inclusive = true) {
+        const $int = DateInterval.parse(int);
+        const incl = inclusive ? '[]' : '()';
+        return this.includes($int.start, incl) || this.includes($int.end, incl);
     }
     /**
      * DateIntervals compare by start date.
@@ -54,18 +61,14 @@ export class DateInterval {
         d = DateInterval.parse(d);
         return this.start.cmp(d.start) || this.end.cmp(d.end);
     }
+    getDays(incl = '[]') {
+        return LocalDate.range(this.start, this.end, incl, 1, 'day');
+    }
     /**
      * Returns an array of LocalDates that are included in the interval.
-     * Ranges are INCLUSIVE.
      */
-    getDays() {
-        const days = [];
-        let current = this.start;
-        do {
-            days.push(current);
-            current = current.add(1, 'day');
-        } while (current.isSameOrBefore(this.end));
-        return days;
+    range(incl = '[]', step = 1, stepUnit = 'day') {
+        return LocalDate.range(this.start, this.end, incl, step, stepUnit);
     }
     toString() {
         return [this.start, this.end].join('/');

package/dist-esm/datetime/localDate.js

@@ -1,8 +1,7 @@
 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
@@ -48,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 ||
@@ -61,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;
     }
@@ -88,32 +96,23 @@ 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;
-    }
-    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;
-        });
-    }
-    static rangeString(minIncl, maxExcl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, maxExcl, step, stepUnit).map(ld => ld.toString());
-    }
-    static rangeIncl(minIncl, maxIncl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit);
-    }
-    static rangeInclString(minIncl, maxIncl, step = 1, stepUnit = 'day') {
-        return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit).map(ld => ld.toString());
+        }
+        return dates;
     }
     get(unit) {
         return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
@@ -144,14 +143,16 @@ export class LocalDate {
         d = LocalDate.of(d);
         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;
@@ -241,24 +242,29 @@ export class LocalDate {
             $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) {
@@ -302,14 +308,10 @@ 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);

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;
     }
@@ -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/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/dist-esm/math/math.util.js

@@ -10,6 +10,12 @@ import { _sortNumbers } from '../number/number.util';
 export function _average(values) {
     return values.reduce((a, b) => a + b) / values.length;
 }
+/**
+ * Same as _average, but safely returns null if input array is empty or nullish.
+ */
+export function _averageOrNull(values) {
+    return (values === null || values === void 0 ? void 0 : values.length) ? values.reduce((a, b) => a + b) / values.length : null;
+}
 /**
  * valuesArray and weightsArray length is expected to be the same.
  */

package/dist-esm/math/sma.js

@@ -15,6 +15,10 @@ export class SimpleMovingAverage {
          */
         this.avg = 0;
     }
+    /**
+     * Push new value.
+     * Returns newly calculated average (using newly pushed value).
+     */
     push(n) {
         this.data[this.nextIndex] = n;
         this.nextIndex =

package/package.json

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

package/src/datetime/dateInterval.ts

@@ -1,6 +1,6 @@
-import { LocalDate, LocalDateConfig } from './localDate'
+import { Inclusiveness, LocalDate, LocalDateConfig, LocalDateUnit } from './localDate'
 
-export type DateIntervalConfig = DateInterval | string
+export type DateIntervalConfig = DateInterval | DateIntervalString
 export type DateIntervalString = string
 
 /**
@@ -34,16 +34,18 @@ export class DateInterval {
     return this.cmp(d) === 0
   }
 
-  isBefore(d: DateIntervalConfig): boolean {
-    return this.cmp(d) === -1
+  isBefore(d: DateIntervalConfig, inclusive = false): boolean {
+    const r = this.cmp(d)
+    return r === -1 || (r === 0 && inclusive)
   }
 
   isSameOrBefore(d: DateIntervalConfig): boolean {
     return this.cmp(d) <= 0
   }
 
-  isAfter(d: DateIntervalConfig): boolean {
-    return this.cmp(d) === 1
+  isAfter(d: DateIntervalConfig, inclusive = false): boolean {
+    const r = this.cmp(d)
+    return r === 1 || (r === 0 && inclusive)
   }
 
   isSameOrAfter(d: DateIntervalConfig): boolean {
@@ -53,9 +55,15 @@ export class DateInterval {
   /**
    * Ranges of DateInterval (start, end) are INCLUSIVE.
    */
-  includes(d: LocalDateConfig): boolean {
+  includes(d: LocalDateConfig, incl: Inclusiveness = '[]'): boolean {
     d = LocalDate.of(d)
-    return d.isSameOrAfter(this.start) && d.isSameOrBefore(this.end)
+    return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']')
+  }
+
+  intersects(int: DateIntervalConfig, inclusive = true): boolean {
+    const $int = DateInterval.parse(int)
+    const incl = inclusive ? '[]' : '()'
+    return this.includes($int.start, incl) || this.includes($int.end, incl)
   }
 
   /**
@@ -67,19 +75,15 @@ export class DateInterval {
     return this.start.cmp(d.start) || this.end.cmp(d.end)
   }
 
+  getDays(incl: Inclusiveness = '[]'): LocalDate[] {
+    return LocalDate.range(this.start, this.end, incl, 1, 'day')
+  }
+
   /**
    * Returns an array of LocalDates that are included in the interval.
-   * Ranges are INCLUSIVE.
    */
-  getDays(): LocalDate[] {
-    const days: LocalDate[] = []
-    let current = this.start
-    do {
-      days.push(current)
-      current = current.add(1, 'day')
-    } while (current.isSameOrBefore(this.end))
-
-    return days
+  range(incl: Inclusiveness = '[]', step = 1, stepUnit: LocalDateUnit = 'day'): LocalDate[] {
+    return LocalDate.range(this.start, this.end, incl, step, stepUnit)
   }
 
   toString(): DateIntervalString {