@naturalcycles/js-lib 14.95.1 → 14.97.0

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

@@ -2,18 +2,6 @@ import { _assert } from '../error/assert';
 import { _ms } from '../time/time.util';
 import { LocalDate } from './localDate';
 /* eslint-disable no-dupe-class-members */
-// Design choices:
-// No milliseconds
-// No timezone support, ISO8601 is parsed as LocalDateTime, discarding Timezone information
-// Formats as unix timestamp, ISO8601 or "pretty string"
-// toString and .toJSON formats as unix timestamp
-// No "unixMillis", just pure unixtimestamp
-// .valueOf returns unix timestamp (no millis)
-// Prevents dayjs(undefined) being dayjs.now()
-// Validates on parse, throws if invalid. Doesn't allow invalid objects
-// No arbitrary .format('') (which is slow to parse) vs well-defined (opinionated) formats
-// Separate LocalTime, powered by native js Date, and LocalDate - a smaller functionality class when
-// you only need "whole dates", no time, no timezone worry
 /**
  * @experimental
  */
@@ -127,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/dist-esm/error/try.js

@@ -4,11 +4,17 @@ import { AppError } from './app.error';
  * Allows to write shorter code that avoids `try/catch`.
  * Useful e.g. in unit tests.
  *
- * Similar to pTuple, but for sync functions.
+ * Similar to pTry, but for sync functions.
  *
  * 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

@@ -42,7 +42,6 @@ export * from './promise/pProps';
 import { pRetry, pRetryFn } from './promise/pRetry';
 export * from './promise/pState';
 import { pTimeout, pTimeoutFn } from './promise/pTimeout';
-export * from './promise/pTuple';
 export * from './string/case';
 export * from './string/json.util';
 export * from './string/string.util';

package/package.json

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