@naturalcycles/js-lib 14.96.1 → 14.97.0

package/dist/datetime/localDate.d.ts

@@ -1,5 +1,5 @@
 import { Sequence } from '../seq/seq';
-import { IsoDate, UnixTimestamp } from '../types';
+import { IsoDateString, UnixTimestampNumber } from '../types';
 import { LocalTime } from './localTime';
 export declare type LocalDateUnit = 'year' | 'month' | 'day';
 export declare type Inclusiveness = '()' | '[]' | '[)' | '(]';
@@ -8,9 +8,9 @@ export declare type LocalDateConfig = LocalDate | string;
  * @experimental
  */
 export declare class LocalDate {
-    year: number;
-    month: number;
-    day: number;
+    private $year;
+    private $month;
+    private $day;
     private constructor();
     static create(year: number, month: number, day: number): LocalDate;
     /**
@@ -35,9 +35,17 @@ export declare class LocalDate {
     static latest(items: LocalDate[]): LocalDate;
     static range(minIncl: LocalDateConfig, maxExcl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
     static rangeSeq(minIncl: LocalDateConfig, maxExcl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): Sequence<LocalDate>;
-    static rangeString(minIncl: LocalDateConfig, maxExcl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): IsoDate[];
+    static rangeString(minIncl: LocalDateConfig, maxExcl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): IsoDateString[];
     static rangeIncl(minIncl: LocalDateConfig, maxIncl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
-    static rangeInclString(minIncl: LocalDateConfig, maxIncl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): IsoDate[];
+    static rangeInclString(minIncl: LocalDateConfig, maxIncl: LocalDateConfig, step?: number, stepUnit?: LocalDateUnit): IsoDateString[];
+    get(unit: LocalDateUnit): number;
+    set(unit: LocalDateUnit, v: number, mutate?: boolean): LocalDate;
+    year(): number;
+    year(v: number): LocalDate;
+    month(): number;
+    month(v: number): LocalDate;
+    day(): number;
+    day(v: number): LocalDate;
     isSame(d: LocalDateConfig): boolean;
     isBefore(d: LocalDateConfig): boolean;
     isSameOrBefore(d: LocalDateConfig): boolean;
@@ -76,12 +84,12 @@ export declare class LocalDate {
      */
     toDate(): Date;
     toLocalTime(): LocalTime;
-    toISODate(): IsoDate;
-    toString(): IsoDate;
+    toISODate(): IsoDateString;
+    toString(): IsoDateString;
     toStringCompact(): string;
-    unix(): UnixTimestamp;
+    unix(): UnixTimestampNumber;
     unixMillis(): number;
-    toJSON(): IsoDate;
+    toJSON(): IsoDateString;
 }
 /**
  * Shortcut wrapper around `LocalDate.parse` / `LocalDate.today`

package/dist/datetime/localDate.js

@@ -6,14 +6,15 @@ const seq_1 = require("../seq/seq");
 const types_1 = require("../types");
 const localTime_1 = require("./localTime");
 const m31 = new Set([1, 3, 5, 7, 8, 10, 12]);
+/* eslint-disable no-dupe-class-members */
 /**
  * @experimental
  */
 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);
@@ -117,9 +118,34 @@ class LocalDate {
     static rangeInclString(minIncl, maxIncl, step = 1, stepUnit = 'day') {
         return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit).map(ld => ld.toString());
     }
+    get(unit) {
+        return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
+    }
+    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;
+    }
+    year(v) {
+        return v === undefined ? this.$year : this.set('year', v);
+    }
+    month(v) {
+        return v === undefined ? this.$month : this.set('month', v);
+    }
+    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;
@@ -149,17 +175,17 @@ 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;
     }
@@ -177,82 +203,82 @@ 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;
+        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);
         }
-        while (day < 1) {
-            day += monLen;
-            month -= 1;
-            if (month < 1) {
-                year -= 1;
-                month += 12;
+        while ($day < 1) {
+            $day += monLen;
+            $month -= 1;
+            if ($month < 1) {
+                $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);
@@ -261,17 +287,17 @@ 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;
@@ -289,7 +315,7 @@ class LocalDate {
         return 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.
@@ -298,7 +324,7 @@ 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_1.LocalTime.of(this.toDate());
@@ -308,16 +334,16 @@ 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/datetime/localTime.d.ts

@@ -1,7 +1,7 @@
-import { IsoDate, IsoDateTime, UnixTimestamp } from '../types';
+import { IsoDateString, IsoDateTimeString, UnixTimestampNumber } from '../types';
 import { Inclusiveness, LocalDate } from './localDate';
 export declare type LocalTimeUnit = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
-export declare type LocalTimeConfig = LocalTime | Date | IsoDateTime | UnixTimestamp;
+export declare type LocalTimeConfig = LocalTime | Date | IsoDateTimeString | UnixTimestampNumber;
 export interface LocalTimeComponents {
     year: number;
     month: number;
@@ -40,8 +40,8 @@ export declare class LocalTime {
     year(v: number): LocalTime;
     month(): number;
     month(v: number): LocalTime;
-    date(): number;
-    date(v: number): LocalTime;
+    day(): number;
+    day(v: number): LocalTime;
     hour(): number;
     hour(v: number): LocalTime;
     minute(): number;
@@ -75,19 +75,19 @@ export declare class LocalTime {
     fromNow(now?: LocalTimeConfig): string;
     getDate(): Date;
     clone(): LocalTime;
-    unix(): UnixTimestamp;
+    unix(): UnixTimestampNumber;
     unixMillis(): number;
-    valueOf(): UnixTimestamp;
+    valueOf(): UnixTimestampNumber;
     toLocalDate(): LocalDate;
-    toPretty(seconds?: boolean): IsoDateTime;
+    toPretty(seconds?: boolean): IsoDateTimeString;
     /**
      * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
      */
-    toISODateTime(): IsoDateTime;
+    toISODateTime(): IsoDateTimeString;
     /**
      * Returns e.g: `1984-06-21`, only the date part of DateTime
      */
-    toISODate(): IsoDate;
+    toISODate(): IsoDateString;
     /**
      * Returns e.g: `17:03:15` (or `17:03` with seconds=false)
      */
@@ -97,7 +97,7 @@ export declare class LocalTime {
      */
     toStringCompact(seconds?: boolean): string;
     toString(): string;
-    toJSON(): UnixTimestamp;
+    toJSON(): UnixTimestampNumber;
 }
 /**
  * Shortcut wrapper around `LocalDate.parse` / `LocalDate.today`

package/dist/datetime/localTime.js

@@ -118,7 +118,7 @@ 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) {

package/dist/index.d.ts

@@ -51,7 +51,7 @@ export * from './string/string.util';
 import { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny';
 export * from './time/time.util';
 import { Class, ConditionalExcept, ConditionalPick, Merge, Promisable, ReadonlyDeep, Simplify } from './typeFest';
-import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, BatchResult, InstanceId, IsoDate, IsoDateTime, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
+import { AsyncMapper, AsyncPredicate, BaseDBEntity, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, Saved, Unsaved, BatchResult, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, KeyValueTuple, Mapper, ObjectMapper, ObjectPredicate, Predicate, PromiseMap, AnyObject, AnyFunction, Reviver, SavedDBEntity, StringMap, UnixTimestampNumber, UnixTimestamp, Integer, ValueOf, ValuesOf, AbortableMapper, AbortableAsyncPredicate, AbortableAsyncMapper, AbortablePredicate, END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues } from './types';
 export * from './unit/size.util';
 import { is } from './vendor/is';
 import { CommonLogLevel, CommonLogFunction, CommonLogger, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, CommonLogWithLevelFunction, commonLoggerCreate } from './log/commonLogger';
@@ -66,5 +66,5 @@ export * from './datetime/dateInterval';
 import { LocalDateConfig, LocalDateUnit, Inclusiveness } from './datetime/localDate';
 import { LocalTimeConfig, LocalTimeUnit, LocalTimeComponents } from './datetime/localTime';
 import { DateIntervalConfig, DateIntervalString } from './datetime/dateInterval';
-export type { DateIntervalConfig, DateIntervalString, LocalDateConfig, LocalDateUnit, Inclusiveness, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateTime, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
+export type { DateIntervalConfig, DateIntervalString, LocalDateConfig, LocalDateUnit, Inclusiveness, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateString, IsoDateTimeString, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestampNumber, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
 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/types.d.ts

@@ -111,18 +111,26 @@ export interface InstanceId {
  *
  * @example '2019-06-21'
  */
+export declare type IsoDateString = string;
+/**
+ * @deprecated use IsoDateString
+ */
 export declare type IsoDate = string;
 /**
  * Interface explicitly states that the value is an ISO DateTime string (with time).
  *
  * @example '2019-06-21T05:21:73Z'
  */
-export declare type IsoDateTime = string;
+export declare type IsoDateTimeString = string;
 /**
  * Interface explicitly states that the value is a Unix timestamp (in seconds).
  *
  * @example 1628945450
  */
+export declare type UnixTimestampNumber = number;
+/**
+ * @deprecated use UnixTimestampNumber
+ */
 export declare type UnixTimestamp = number;
 /**
  * Same as `number`, but with semantic meaning that it's an Integer.
@@ -136,11 +144,11 @@ export interface SavedDBEntity<ID = string> {
     /**
      * unixTimestamp of when the entity was first created (in the DB).
      */
-    created: UnixTimestamp;
+    created: UnixTimestampNumber;
     /**
      * unixTimestamp of when the entity was last updated (in the DB).
      */
-    updated: UnixTimestamp;
+    updated: UnixTimestampNumber;
 }
 /**
  * Base interface for any Entity that can be saved to DB.

package/dist-esm/datetime/localDate.js

@@ -3,14 +3,15 @@ import { Sequence } from '../seq/seq';
 import { END } from '../types';
 import { LocalTime } from './localTime';
 const m31 = new Set([1, 3, 5, 7, 8, 10, 12]);
+/* 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);
@@ -114,9 +115,34 @@ export class LocalDate {
     static rangeInclString(minIncl, maxIncl, step = 1, stepUnit = 'day') {
         return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit).map(ld => ld.toString());
     }
+    get(unit) {
+        return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
+    }
+    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;
+    }
+    year(v) {
+        return v === undefined ? this.$year : this.set('year', v);
+    }
+    month(v) {
+        return v === undefined ? this.$month : this.set('month', v);
+    }
+    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;
@@ -146,17 +172,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 +200,82 @@ 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;
+        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);
         }
-        while (day < 1) {
-            day += monLen;
-            month -= 1;
-            if (month < 1) {
-                year -= 1;
-                month += 12;
+        while ($day < 1) {
+            $day += monLen;
+            $month -= 1;
+            if ($month < 1) {
+                $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 +284,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;
@@ -286,7 +312,7 @@ export class LocalDate {
         return 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 +321,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 +331,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

@@ -115,7 +115,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) {

package/package.json

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

package/src/datetime/localDate.ts

@@ -1,6 +1,6 @@
 import { _assert } from '../error/assert'
 import { Sequence } from '../seq/seq'
-import { END, IsoDate, UnixTimestamp } from '../types'
+import { END, IsoDateString, UnixTimestampNumber } from '../types'
 import { LocalTime } from './localTime'
 
 export type LocalDateUnit = 'year' | 'month' | 'day'
@@ -10,11 +10,13 @@ const m31 = new Set<number>([1, 3, 5, 7, 8, 10, 12])
 
 export type LocalDateConfig = LocalDate | string
 
+/* eslint-disable no-dupe-class-members */
+
 /**
  * @experimental
  */
 export class LocalDate {
-  private constructor(public year: number, public month: number, public day: number) {}
+  private constructor(private $year: number, private $month: number, private $day: number) {}
 
   static create(year: number, month: number, day: number): LocalDate {
     return new LocalDate(year, month, day)
@@ -151,7 +153,7 @@ export class LocalDate {
     maxExcl: LocalDateConfig,
     step = 1,
     stepUnit: LocalDateUnit = 'day',
-  ): IsoDate[] {
+  ): IsoDateString[] {
     return LocalDate.range(minIncl, maxExcl, step, stepUnit).map(ld => ld.toString())
   }
 
@@ -169,15 +171,49 @@ export class LocalDate {
     maxIncl: LocalDateConfig,
     step = 1,
     stepUnit: LocalDateUnit = 'day',
-  ): IsoDate[] {
+  ): IsoDateString[] {
     return LocalDate.range(minIncl, LocalDate.of(maxIncl).add(1, stepUnit), step, stepUnit).map(
       ld => ld.toString(),
     )
   }
 
+  get(unit: LocalDateUnit): number {
+    return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day
+  }
+
+  set(unit: LocalDateUnit, v: number, mutate = false): LocalDate {
+    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
+  }
+
+  year(): number
+  year(v: number): LocalDate
+  year(v?: number): number | LocalDate {
+    return v === undefined ? this.$year : this.set('year', v)
+  }
+  month(): number
+  month(v: number): LocalDate
+  month(v?: number): number | LocalDate {
+    return v === undefined ? this.$month : this.set('month', v)
+  }
+  day(): number
+  day(v: number): LocalDate
+  day(v?: number): number | LocalDate {
+    return v === undefined ? this.$day : this.set('day', v)
+  }
+
   isSame(d: LocalDateConfig): boolean {
     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: LocalDateConfig): boolean {
@@ -211,12 +247,12 @@ export class LocalDate {
    */
   cmp(d: LocalDateConfig): -1 | 0 | 1 {
     d = LocalDate.of(d)
-    if (this.year < d.year) return -1
-    if (this.year > d.year) return 1
-    if (this.month < d.month) return -1
-    if (this.month > d.month) return 1
-    if (this.day < d.day) return -1
-    if (this.day > d.day) return 1
+    if (this.$year < d.$year) return -1
+    if (this.$year > d.$year) return 1
+    if (this.$month < d.$month) return -1
+    if (this.$month > d.$month) return 1
+    if (this.$day < d.$day) return -1
+    if (this.$day > d.$day) return 1
     return 0
   }
 
@@ -236,33 +272,33 @@ export class LocalDate {
     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
+    let days = this.$day - d.$day
 
-    if (d.year < this.year) {
-      for (let year = d.year; year < this.year; year++) {
+    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)
       }
     }
 
@@ -270,57 +306,57 @@ export class LocalDate {
   }
 
   add(num: number, unit: LocalDateUnit, mutate = false): LocalDate {
-    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
+    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)
     }
-    while (day < 1) {
-      day += monLen
-      month -= 1
-      if (month < 1) {
-        year -= 1
-        month += 12
+    while ($day < 1) {
+      $day += monLen
+      $month -= 1
+      if ($month < 1) {
+        $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: number, unit: LocalDateUnit, mutate = false): LocalDate {
@@ -329,21 +365,21 @@ export class LocalDate {
 
   startOf(unit: LocalDateUnit): LocalDate {
     if (unit === 'day') return this
-    if (unit === 'month') return LocalDate.create(this.year, this.month, 1)
+    if (unit === 'month') 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: LocalDateUnit): LocalDate {
     if (unit === 'day') return this
     if (unit === 'month')
       return LocalDate.create(
-        this.year,
-        this.month,
-        LocalDate.getMonthLength(this.year, this.month),
+        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: number): number {
@@ -362,7 +398,7 @@ export class LocalDate {
   }
 
   clone(): LocalDate {
-    return new LocalDate(this.year, this.month, this.day)
+    return new LocalDate(this.$year, this.$month, this.$day)
   }
 
   /**
@@ -372,35 +408,35 @@ export class LocalDate {
    * Timezone will match local timezone.
    */
   toDate(): Date {
-    return new Date(this.year, this.month - 1, this.day)
+    return new Date(this.$year, this.$month - 1, this.$day)
   }
 
   toLocalTime(): LocalTime {
     return LocalTime.of(this.toDate())
   }
 
-  toISODate(): IsoDate {
+  toISODate(): IsoDateString {
     return this.toString()
   }
 
-  toString(): IsoDate {
+  toString(): IsoDateString {
     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(): string {
     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
-  unix(): UnixTimestamp {
+  unix(): UnixTimestampNumber {
     return Math.floor(this.toDate().valueOf() / 1000)
   }
 
@@ -408,7 +444,7 @@ export class LocalDate {
     return this.toDate().valueOf()
   }
 
-  toJSON(): IsoDate {
+  toJSON(): IsoDateString {
     return this.toString()
   }
 }

package/src/datetime/localTime.ts

@@ -1,11 +1,11 @@
 import { _assert } from '../error/assert'
 import { _ms } from '../time/time.util'
-import { IsoDate, IsoDateTime, UnixTimestamp } from '../types'
+import { IsoDateString, IsoDateTimeString, UnixTimestampNumber } from '../types'
 import { Inclusiveness, LocalDate } from './localDate'
 
 export type LocalTimeUnit = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second'
 
-export type LocalTimeConfig = LocalTime | Date | IsoDateTime | UnixTimestamp
+export type LocalTimeConfig = LocalTime | Date | IsoDateTimeString | UnixTimestampNumber
 
 export interface LocalTimeComponents {
   year: number
@@ -144,9 +144,9 @@ export class LocalTime {
   month(v?: number): number | LocalTime {
     return v === undefined ? this.get('month') : this.set('month', v)
   }
-  date(): number
-  date(v: number): LocalTime
-  date(v?: number): number | LocalTime {
+  day(): number
+  day(v: number): LocalTime
+  day(v?: number): number | LocalTime {
     return v === undefined ? this.get('day') : this.set('day', v)
   }
   hour(): number
@@ -375,7 +375,7 @@ export class LocalTime {
     return new LocalTime(new Date(this.$date), this.utcMode)
   }
 
-  unix(): UnixTimestamp {
+  unix(): UnixTimestampNumber {
     return Math.floor(this.$date.valueOf() / 1000)
   }
 
@@ -383,7 +383,7 @@ export class LocalTime {
     return this.$date.valueOf()
   }
 
-  valueOf(): UnixTimestamp {
+  valueOf(): UnixTimestampNumber {
     return Math.floor(this.$date.valueOf() / 1000)
   }
 
@@ -403,7 +403,7 @@ export class LocalTime {
     )
   }
 
-  toPretty(seconds = true): IsoDateTime {
+  toPretty(seconds = true): IsoDateTimeString {
     const { year, month, day, hour, minute, second } = this.components()
 
     return (
@@ -432,14 +432,14 @@ export class LocalTime {
   /**
    * Returns e.g: `1984-06-21T17:56:21`, only the date part of DateTime
    */
-  toISODateTime(): IsoDateTime {
+  toISODateTime(): IsoDateTimeString {
     return this.$date.toISOString().slice(0, 19)
   }
 
   /**
    * Returns e.g: `1984-06-21`, only the date part of DateTime
    */
-  toISODate(): IsoDate {
+  toISODate(): IsoDateString {
     const { year, month, day } = this.components()
 
     return [
@@ -488,7 +488,7 @@ export class LocalTime {
     return String(this.unix())
   }
 
-  toJSON(): UnixTimestamp {
+  toJSON(): UnixTimestampNumber {
     return this.unix()
   }
 }

package/src/index.ts

@@ -105,7 +105,8 @@ import {
   BatchResult,
   InstanceId,
   IsoDate,
-  IsoDateTime,
+  IsoDateString,
+  IsoDateTimeString,
   KeyValueTuple,
   Mapper,
   ObjectMapper,
@@ -117,6 +118,7 @@ import {
   Reviver,
   SavedDBEntity,
   StringMap,
+  UnixTimestampNumber,
   UnixTimestamp,
   Integer,
   ValueOf,
@@ -197,7 +199,8 @@ export type {
   ObjectPredicate,
   InstanceId,
   IsoDate,
-  IsoDateTime,
+  IsoDateString,
+  IsoDateTimeString,
   Reviver,
   PMapOptions,
   Mapper,
@@ -218,6 +221,7 @@ export type {
   ConditionalPick,
   ConditionalExcept,
   Class,
+  UnixTimestampNumber,
   UnixTimestamp,
   Integer,
   BaseDBEntity,

package/src/types.ts

@@ -150,6 +150,11 @@ export interface InstanceId {
  *
  * @example '2019-06-21'
  */
+export type IsoDateString = string
+
+/**
+ * @deprecated use IsoDateString
+ */
 export type IsoDate = string
 
 /**
@@ -157,13 +162,18 @@ export type IsoDate = string
  *
  * @example '2019-06-21T05:21:73Z'
  */
-export type IsoDateTime = string
+export type IsoDateTimeString = string
 
 /**
  * Interface explicitly states that the value is a Unix timestamp (in seconds).
  *
  * @example 1628945450
  */
+export type UnixTimestampNumber = number
+
+/**
+ * @deprecated use UnixTimestampNumber
+ */
 export type UnixTimestamp = number
 
 /**
@@ -180,12 +190,12 @@ export interface SavedDBEntity<ID = string> {
   /**
    * unixTimestamp of when the entity was first created (in the DB).
    */
-  created: UnixTimestamp
+  created: UnixTimestampNumber
 
   /**
    * unixTimestamp of when the entity was last updated (in the DB).
    */
-  updated: UnixTimestamp
+  updated: UnixTimestampNumber
 }
 
 /**