@naturalcycles/js-lib 14.243.1 → 14.245.0

package/dist-esm/datetime/localTime.js

@@ -19,10 +19,22 @@ 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]);
-// It supports 2 forms:
-// 1. 2023-03-03
-// 2. 2023-03-03T05:10:02
-const DATE_TIME_REGEX = /^(\d{4})-(\d{2})-(\d{2})([T\s](\d{2}):(\d{2}):(\d{2}))?/;
+/**
+ * It supports 2 forms:
+ * 1. 2023-03-03
+ * 2. 2023-03-03T05:10:02
+ * // todo: make it even looser, like Day.js
+ */
+const DATE_TIME_REGEX_LOOSE = /^(\d{4})-(\d{2})-(\d{2})([Tt\s](\d{2}):?(\d{2})?:?(\d{2})?)?/;
+/**
+ * Supports 2 forms:
+ * 1. 2023-03-03
+ * 2. 2023-03-03T05:10:02
+ * Ok, now it allows arbitrary stuff after `:ss`, to allow millis/timezone info,
+ * but it will not take it into account.
+ */
+const DATE_TIME_REGEX_STRICT = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})/;
+const DATE_REGEX_STRICT = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
 export class LocalTime {
     constructor($date) {
         this.$date = $date;
@@ -31,14 +43,14 @@ export class LocalTime {
      * Returns [cloned] LocalTime that is based on the same unixtimestamp, but in UTC timezone.
      * Opposite of `.local()` method.
      */
-    utc() {
+    toUTC() {
         return new LocalTime(new Date(this.$date.toISOString()));
     }
     /**
      * Returns [cloned] LocalTime that is based on the same unixtimestamp, but in local timezone.
      * Opposite of `.utc()` method.
      */
-    local() {
+    toLocal() {
         return new LocalTime(new Date(this.$date.getTime()));
     }
     /**
@@ -160,34 +172,58 @@ export class LocalTime {
         }
         return t;
     }
-    year(v) {
-        return v === undefined ? this.get('year') : this.set('year', v);
+    get year() {
+        return this.$date.getFullYear();
     }
-    month(v) {
-        return v === undefined ? this.get('month') : this.set('month', v);
+    setYear(v) {
+        return this.set('year', v);
     }
-    week(v) {
-        return v === undefined ? getWeek(this.$date) : this.set('week', v);
+    get month() {
+        return this.$date.getMonth() + 1;
     }
-    day(v) {
-        return v === undefined ? this.get('day') : this.set('day', v);
+    setMonth(v) {
+        return this.set('month', v);
     }
-    dayOfWeek(v) {
-        const dow = (this.$date.getDay() || 7);
-        if (v === undefined) {
-            return dow;
-        }
-        _assert(VALID_DAYS_OF_WEEK.has(v), `Invalid dayOfWeek: ${v}`);
-        return this.plus(v - dow, 'day');
+    get week() {
+        return getWeek(this.$date);
+    }
+    setWeek(v) {
+        return this.set('week', v);
+    }
+    get day() {
+        return this.$date.getDate();
+    }
+    setDay(v) {
+        return this.set('day', v);
+    }
+    get hour() {
+        return this.$date.getHours();
     }
-    hour(v) {
-        return v === undefined ? this.get('hour') : this.set('hour', v);
+    setHour(v) {
+        return this.set('hour', v);
     }
-    minute(v) {
-        return v === undefined ? this.get('minute') : this.set('minute', v);
+    get minute() {
+        return this.$date.getMinutes();
     }
-    second(v) {
-        return v === undefined ? this.get('second') : this.set('second', v);
+    setMinute(v) {
+        return this.set('minute', v);
+    }
+    get second() {
+        return this.$date.getSeconds();
+    }
+    setSecond(v) {
+        return this.set('second', v);
+    }
+    /**
+     * Based on ISO: 1-7 is Mon-Sun.
+     */
+    get dayOfWeek() {
+        return (this.$date.getDay() || 7);
+    }
+    setDayOfWeek(v) {
+        _assert(VALID_DAYS_OF_WEEK.has(v), `Invalid dayOfWeek: ${v}`);
+        const dow = this.$date.getDay() || 7;
+        return this.plus(v - dow, 'day');
     }
     setComponents(c, mutate = false) {
         const d = mutate ? this.$date : new Date(this.$date);
@@ -255,7 +291,7 @@ export class LocalTime {
         }
         if (unit === 'year' || unit === 'month') {
             const d = addMonths(this.$date, unit === 'month' ? num : num * 12, mutate);
-            return mutate ? this : localTime.of(d);
+            return mutate ? this : localTime.fromInput(d);
         }
         return this.set(unit, this.get(unit) + num, mutate);
     }
@@ -266,7 +302,7 @@ export class LocalTime {
         return Math.abs(this.diff(other, unit));
     }
     diff(other, unit) {
-        const date2 = localTime.of(other).$date;
+        const date2 = localTime.fromInput(other).$date;
         const secDiff = (this.$date.valueOf() - date2.valueOf()) / 1000;
         if (!secDiff)
             return 0;
@@ -354,32 +390,32 @@ export class LocalTime {
      * Returns how many days are in the current month.
      * E.g 31 for January.
      */
-    daysInMonth() {
+    get daysInMonth() {
         return localDate.getMonthLength(this.$date.getFullYear(), this.$date.getMonth() + 1);
     }
     isSame(d) {
-        return this.cmp(d) === 0;
+        return this.compare(d) === 0;
     }
     isBefore(d, inclusive = false) {
-        const r = this.cmp(d);
+        const r = this.compare(d);
         return r === -1 || (r === 0 && inclusive);
     }
     isSameOrBefore(d) {
-        return this.cmp(d) <= 0;
+        return this.compare(d) <= 0;
     }
     isAfter(d, inclusive = false) {
-        const r = this.cmp(d);
+        const r = this.compare(d);
         return r === 1 || (r === 0 && inclusive);
     }
     isSameOrAfter(d) {
-        return this.cmp(d) >= 0;
+        return this.compare(d) >= 0;
     }
     isBetween(min, max, incl = '[)') {
-        let r = this.cmp(min);
+        let r = this.compare(min);
         // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (r < 0 || (r === 0 && incl[0] === '('))
             return false;
-        r = this.cmp(max);
+        r = this.compare(max);
         if (r > 0 || (r === 0 && incl[1] === ')'))
             return false;
         return true;
@@ -394,13 +430,13 @@ export class LocalTime {
      * Third argument allows to override "now".
      */
     isOlderThan(n, unit, now) {
-        return this.isBefore(localTime.of(now ?? new Date()).plus(-n, unit));
+        return this.isBefore(localTime.fromInput(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is same or older (<=) than "now" by X units.
      */
     isSameOrOlderThan(n, unit, now) {
-        return this.isSameOrBefore(localTime.of(now ?? new Date()).plus(-n, unit));
+        return this.isSameOrBefore(localTime.fromInput(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is younger (>) than "now" by X units.
@@ -412,13 +448,13 @@ export class LocalTime {
      * Third argument allows to override "now".
      */
     isYoungerThan(n, unit, now) {
-        return this.isAfter(localTime.of(now ?? new Date()).plus(-n, unit));
+        return this.isAfter(localTime.fromInput(now ?? new Date()).plus(-n, unit));
     }
     /**
      * Checks if this localTime is same or younger (>=) than "now" by X units.
      */
     isSameOrYoungerThan(n, unit, now) {
-        return this.isSameOrAfter(localTime.of(now ?? new Date()).plus(-n, unit));
+        return this.isSameOrAfter(localTime.fromInput(now ?? new Date()).plus(-n, unit));
     }
     getAgeInYears(now) {
         return this.getAgeIn('year', now);
@@ -439,42 +475,42 @@ export class LocalTime {
         return this.getAgeIn('second', now);
     }
     getAgeIn(unit, now) {
-        return localTime.of(now ?? new Date()).diff(this, unit);
+        return localTime.fromInput(now ?? new Date()).diff(this, unit);
     }
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal
      * returns -1 if this < d
      */
-    cmp(d) {
+    compare(d) {
         const t1 = this.$date.valueOf();
-        const t2 = localTime.of(d).$date.valueOf();
+        const t2 = localTime.fromInput(d).$date.valueOf();
         if (t1 === t2)
             return 0;
         return t1 < t2 ? -1 : 1;
     }
-    getDateTimeObject() {
+    toDateTimeObject() {
         return {
-            ...this.getDateObject(),
-            ...this.getTimeObject(),
+            ...this.toDateObject(),
+            ...this.toTimeObject(),
         };
     }
-    getDateObject() {
+    toDateObject() {
         return {
             year: this.$date.getFullYear(),
             month: this.$date.getMonth() + 1,
             day: this.$date.getDate(),
         };
     }
-    getTimeObject() {
+    toTimeObject() {
         return {
             hour: this.$date.getHours(),
             minute: this.$date.getMinutes(),
             second: this.$date.getSeconds(),
         };
     }
-    fromNow(now = new Date()) {
-        const msDiff = localTime.of(now).$date.valueOf() - this.$date.valueOf();
+    toFromNowString(now = new Date()) {
+        const msDiff = localTime.fromInput(now).$date.valueOf() - this.$date.valueOf();
         if (msDiff === 0)
             return 'now';
         if (msDiff >= 0) {
@@ -482,16 +518,16 @@ export class LocalTime {
         }
         return `in ${_ms(msDiff * -1)}`;
     }
-    getDate() {
+    toDate() {
         return this.$date;
     }
     clone() {
         return new LocalTime(new Date(this.$date));
     }
-    unix() {
+    get unix() {
         return Math.floor(this.$date.valueOf() / 1000);
     }
-    unixMillis() {
+    get unixMillis() {
         return this.$date.valueOf();
     }
     valueOf() {
@@ -523,7 +559,7 @@ export class LocalTime {
      * Returns e.g: `1984-06-21`, only the date part of DateTime
      */
     toISODate() {
-        const { year, month, day } = this.getDateObject();
+        const { year, month, day } = this.toDateObject();
         return [
             String(year).padStart(4, '0'),
             String(month).padStart(2, '0'),
@@ -536,7 +572,7 @@ export class LocalTime {
      * Returns e.g: `17:03:15` (or `17:03` with seconds=false)
      */
     toISOTime(seconds = true) {
-        const { hour, minute, second } = this.getTimeObject();
+        const { hour, minute, second } = this.toTimeObject();
         return [
             String(hour).padStart(2, '0'),
             String(minute).padStart(2, '0'),
@@ -551,7 +587,7 @@ export class LocalTime {
      * Returns e.g: `19840621_1705`
      */
     toStringCompact(seconds = false) {
-        const { year, month, day, hour, minute, second } = this.getDateTimeObject();
+        const { year, month, day, hour, minute, second } = this.toDateTimeObject();
         return [
             String(year).padStart(4, '0'),
             String(month).padStart(2, '0'),
@@ -566,7 +602,7 @@ export class LocalTime {
         return this.toISODateTime();
     }
     toJSON() {
-        return this.unix();
+        return this.unix;
     }
     toMonthId() {
         return this.toISODate().slice(0, 7);
@@ -580,105 +616,198 @@ export class LocalTime {
 }
 class LocalTimeFactory {
     /**
-     * Parses input String into LocalDate.
-     * Input can already be a LocalDate - it is returned as-is in that case.
+     * Creates a LocalTime from the input, unless it's falsy - then returns undefined.
+     *
+     * `localTime` function will instead return LocalTime of `now` for falsy input.
      */
-    of(d) {
-        const t = this.parseOrNull(d);
-        _assert(t !== null, `Cannot parse "${d}" into LocalTime`, {
-            input: d,
-        });
-        return t;
+    orUndefined(input) {
+        return input || input === 0 ? this.fromInput(input) : undefined;
     }
     /**
-     * Create LocalTime from unixTimestamp in milliseconds (not in seconds).
+     * Creates a LocalTime from the input, unless it's falsy - then returns LocalTime.now
      */
-    ofMillis(millis) {
-        return this.of(new Date(millis));
+    orNow(input) {
+        return input || input === 0 ? this.fromInput(input) : this.now();
+    }
+    now() {
+        return new LocalTime(new Date());
     }
     /**
-     * Returns null if invalid
+     Convenience function to return current Unix timestamp in seconds.
+     Like Date.now(), but in seconds.
      */
-    parseOrNull(d) {
-        if (d instanceof LocalTime)
-            return d;
-        let date;
-        if (d instanceof Date) {
-            date = d;
-        }
-        else if (typeof d === 'number') {
-            date = new Date(d * 1000);
-        }
-        else if (!d) {
-            // This check is after checking the number, to support `0`
-            return null;
-        }
-        else if (typeof d !== 'string') {
-            // unexpected type, e.g Function or something
-            return null;
+    nowUnix() {
+        return Math.floor(Date.now() / 1000);
+    }
+    /**
+     * Create LocalTime from LocalTimeInput.
+     * Input can already be a LocalTime - it is returned as-is in that case.
+     * Date - will be used as-is.
+     * String - will be parsed as strict `yyyy-mm-ddThh:mm:ss`.
+     * Number - will be treated as unix timestamp in seconds.
+     */
+    fromInput(input) {
+        if (input instanceof LocalTime)
+            return input;
+        if (input instanceof Date) {
+            return this.fromDate(input);
         }
-        else {
-            date = this.parseStringToDateOrNull(d);
-            if (date === null)
-                return null;
+        if (typeof input === 'number') {
+            return this.fromUnix(input);
         }
+        // It means it's a string
+        // Will parse it STRICTLY
+        return this.fromIsoDateTimeString(input);
+    }
+    /**
+     * Returns true if input is valid to create LocalTime.
+     */
+    isValid(input) {
+        if (!input)
+            return false;
+        if (input instanceof LocalTime)
+            return true;
+        if (input instanceof Date)
+            return !isNaN(input.getDate());
+        // We currently don't validate Unixtimestamp input, treat it as always valid
+        if (typeof input === 'number')
+            return true;
+        return this.isValidString(input);
+    }
+    /**
+     * Returns true if isoString is a valid iso8601 string like `yyyy-mm-ddThh:mm:dd`.
+     */
+    isValidString(isoString) {
+        return !!this.parseStrictlyOrUndefined(isoString);
+    }
+    /**
+     * Tries to convert/parse the input into LocalTime.
+     * Uses LOOSE parsing.
+     * If invalid - doesn't throw, but returns undefined instead.
+     */
+    try(input) {
+        if (input instanceof LocalTime)
+            return input;
+        if (input instanceof Date) {
+            if (isNaN(input.getDate()))
+                return;
+            return new LocalTime(input);
+        }
+        if (typeof input === 'number') {
+            return this.fromUnix(input);
+        }
+        if (!input)
+            return;
+        const date = this.parseLooselyOrUndefined(input);
+        return date ? new LocalTime(date) : undefined;
+    }
+    /**
+     * Performs STRICT parsing.
+     * Only allows IsoDateTimeString or IsoDateString input, nothing else.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
+    fromIsoDateTimeString(s) {
+        const d = this.parseStrictlyOrUndefined(s);
+        _assert(d, `Cannot parse "${s}" into LocalTime`);
+        return new LocalTime(d);
+    }
+    /**
+     * Performs LOOSE parsing.
+     * Tries to coerce imprefect/incorrect string input into IsoDateTimeString.
+     * Use with caution.
+     * Allows to input IsoDateString, will set h:m:s to zeros.
+     */
+    parse(s) {
+        const d = this.parseLooselyOrUndefined(String(s));
+        _assert(d, `Cannot parse "${s}" into LocalTime`);
+        return new LocalTime(d);
+    }
+    parseStrictlyOrUndefined(s) {
+        if (!s || typeof s !== 'string')
+            return;
+        let m = DATE_TIME_REGEX_STRICT.exec(s);
+        if (!m) {
+            // DateTime regex didn't match, try just-Date regex
+            m = DATE_REGEX_STRICT.exec(s);
+            if (!m)
+                return;
+        }
+        const o = {
+            year: Number(m[1]),
+            month: Number(m[2]),
+            day: Number(m[3]),
+            hour: Number(m[4]) || 0,
+            minute: Number(m[5]) || 0,
+            second: Number(m[6]) || 0,
+        };
+        if (!this.isDateTimeObjectValid(o))
+            return;
+        return this.createDateFromDateTimeObject(o);
+    }
+    parseLooselyOrUndefined(s) {
+        if (!s || typeof s !== 'string')
+            return;
+        const m = DATE_TIME_REGEX_LOOSE.exec(s);
+        if (!m) {
+            if (s.length < 8)
+                return;
+            // Attempt to parse with Date constructor
+            const d = new Date(s);
+            return isNaN(d.getDate()) ? undefined : d;
+        }
+        const o = {
+            year: Number(m[1]),
+            month: Number(m[2]),
+            day: Number(m[3]) || 1,
+            // [4] is skipped due to extra regex parentheses group
+            hour: Number(m[5]) || 0,
+            minute: Number(m[6]) || 0,
+            second: Number(m[7]) || 0,
+        };
+        if (!this.isDateTimeObjectValid(o))
+            return;
+        return this.createDateFromDateTimeObject(o);
+    }
+    /**
+     * Throws on invalid value.
+     */
+    validateDateTimeObject(o) {
+        _assert(this.isDateTimeObjectValid(o), `Cannot construct LocalTime from: ${o.year}-${o.month}-${o.day} ${o.hour}:${o.minute}:${o.second}`);
+    }
+    isDateTimeObjectValid(o) {
+        return localDate.isDateObjectValid(o) && this.isTimeObjectValid(o);
+    }
+    isTimeObjectValid({ hour, minute, second }) {
+        return hour >= 0 && hour <= 23 && minute >= 0 && minute <= 59 && second >= 0 && second <= 59;
+    }
+    fromDate(date) {
+        _assert(!isNaN(date.getDate()), `localTime.fromDate is called on Date object that is invalid`);
         return new LocalTime(date);
     }
-    parseStringToDateOrNull(s) {
-        // Slicing removes the "timezone component", and makes the date "local"
-        // e.g 2022-04-06T23:15:00+09:00
-        // becomes 2022-04-06T23:15:00
-        // date = new Date(d.slice(0, 19))
-        // Parsing is inspired by how Day.js does it
-        // Specifically, it ensures that `localTime('2023-03-03')` returns the expected Date, and not a day before
-        // Because `new Date('2023-03-03')` in NewYork gives you '2023-03-02 19:00:00 GMT-0500'
-        const m = s.match(DATE_TIME_REGEX);
-        // Validate in 3 ways:
-        // 1. Should match Regex.
-        // In some ways it's stricter than Date constructor, e.g it doesn't allow 2023/05/05
-        // In other ways it's looser, e.g it allows `2023-05-05T`, while Date constructor doesn't.
-        // 2. Date constructor (of Node/v8 implementation, which we know is different from e.g WebKit/Safari)
-        // should not return `Invalid Date`.
-        // 3. Year, month and day should be valid, e.g 2023-01-32 should not be allowed.
-        // UPD: Actually, 3 can be skipped, because 2 is catching it already
-        // UPD: 2 is skipped, 1 and 3 are kept
-        // if (!m || isNaN(new Date(s).getDate())) return null
-        if (!m)
-            return null;
-        const year = Number(m[1]);
-        const month = Number(m[2]);
-        const day = Number(m[3]);
-        const hour = Number(m[5]);
-        const minute = Number(m[6]);
-        const second = Number(m[7]);
-        // Validation for just the Date part
-        if (!year ||
-            !month ||
-            month < 1 ||
-            month > 12 ||
-            !day ||
-            day < 1 ||
-            day > localDate.getMonthLength(year, month)) {
-            return null;
-        }
-        // Validation for Date+Time string, since the string is longer than YYYY-MM-DD
-        if (s.length > 10 &&
-            (isNaN(hour) ||
-                isNaN(minute) ||
-                isNaN(second) ||
-                hour < 0 ||
-                hour > 23 ||
-                minute < 0 ||
-                minute > 59 ||
-                second < 0 ||
-                second > 59)) {
-            return null;
-        }
-        return new Date(year, month - 1, day, hour || 0, minute || 0, second || 0, 0);
-    }
-    isValid(d) {
-        return this.parseOrNull(d) !== null;
+    fromUnix(ts) {
+        return new LocalTime(new Date(ts * 1000));
     }
+    /**
+     * Create LocalTime from unixTimestamp in milliseconds (not in seconds).
+     */
+    fromMillis(millis) {
+        return new LocalTime(new Date(millis));
+    }
+    fromDateTimeObject(o) {
+        // todo: validate?
+        return new LocalTime(this.createDateFromDateTimeObject(o));
+    }
+    createDateFromDateTimeObject(o) {
+        return new Date(o.year, o.month - 1, o.day || 1, o.hour || 0, o.minute || 0, o.second || 0);
+    }
+    // private assertNotNull(
+    //   lt: LocalTime | null,
+    //   input: LocalTimeInputNullable,
+    // ): asserts lt is LocalTime {
+    //   _assert(lt !== null, `Cannot parse "${input}" into LocalTime`, {
+    //     input,
+    //   })
+    // }
     /**
      * Returns the IANA timezone e.g `Europe/Stockholm`.
      * https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -696,26 +825,6 @@ class LocalTimeFactory {
     isTimezoneValid(tz) {
         return Intl.supportedValuesOf('timeZone').includes(tz);
     }
-    now() {
-        return new LocalTime(new Date());
-    }
-    /**
-     * Creates a LocalTime from the input, unless it's falsy - then returns undefined.
-     *
-     * `localTime` function will instead return LocalTime of `now` for falsy input.
-     */
-    orUndefined(d) {
-        return d ? this.of(d) : undefined;
-    }
-    /**
-     * Creates a LocalTime from the input, unless it's falsy - then returns LocalTime.now
-     */
-    orNow(d) {
-        return d ? this.of(d) : this.now();
-    }
-    fromComponents(c) {
-        return new LocalTime(new Date(c.year, c.month - 1, c.day || 1, c.hour || 0, c.minute || 0, c.second || 0));
-    }
     sort(items, dir = 'asc', mutate = false) {
         const mod = dir === 'desc' ? -1 : 1;
         return (mutate ? items : [...items]).sort((a, b) => {
@@ -733,7 +842,7 @@ class LocalTimeFactory {
         const items2 = items.filter(_isTruthy);
         _assert(items2.length, 'localTime.min called on empty array');
         return items2
-            .map(i => this.of(i))
+            .map(i => this.fromInput(i))
             .reduce((min, item) => (min.$date.valueOf() <= item.$date.valueOf() ? min : item));
     }
     maxOrUndefined(items) {
@@ -743,7 +852,7 @@ class LocalTimeFactory {
         const items2 = items.filter(_isTruthy);
         _assert(items2.length, 'localTime.max called on empty array');
         return items2
-            .map(i => this.of(i))
+            .map(i => this.fromInput(i))
             .reduce((max, item) => (max.$date.valueOf() >= item.$date.valueOf() ? max : item));
     }
 }
@@ -836,14 +945,7 @@ function differenceInMonths(a, b) {
     return -(wholeMonthDiff + ((b.getTime() - anchor) / (anchor2 - anchor)) * sign);
 }
 const localTimeFactory = new LocalTimeFactory();
-export const localTime = localTimeFactory.of.bind(localTimeFactory);
+export const localTime = localTimeFactory.fromInput.bind(localTimeFactory);
 // The line below is the blackest of black magic I have ever written in 2024.
 // And probably 2023 as well.
 Object.setPrototypeOf(localTime, localTimeFactory);
-/**
- Convenience function to return current Unix timestamp in seconds.
- Like Date.now(), but in seconds.
- */
-export function nowUnix() {
-    return Math.floor(Date.now() / 1000);
-}

package/dist-esm/datetime/timeInterval.js

@@ -11,7 +11,7 @@ export class TimeInterval {
         this.$end = $end;
     }
     static of(start, end) {
-        return new TimeInterval(localTime.of(start).unix(), localTime.of(end).unix());
+        return new TimeInterval(localTime.fromInput(start).unix, localTime.fromInput(end).unix);
     }
     get start() {
         return this.$start;
@@ -55,7 +55,7 @@ export class TimeInterval {
         return this.cmp(d) >= 0;
     }
     includes(d, incl = '[)') {
-        d = localTime.of(d).unix();
+        d = localTime.fromInput(d).unix;
         // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
         if (d < this.$start || (d === this.$start && incl[0] === '('))
             return false;

package/dist-esm/decorators/logMethod.decorator.js

@@ -1,4 +1,4 @@
-import { SimpleMovingAverage, _stringify, _assert } from '..';
+import { _assert, _stringify, SimpleMovingAverage } from '..';
 import { _ms } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature } from './decorator.util';
 /**