@naturalcycles/js-lib 14.90.0 → 14.91.0

package/dist/datetime/localDate.d.ts

@@ -18,6 +18,11 @@ export declare class LocalDate {
     static of(d: LocalDateConfig): LocalDate;
     static parseCompact(d: string): LocalDate;
     static fromDate(d: Date): LocalDate;
+    /**
+     * Returns null if invalid.
+     */
+    static parseOrNull(d: LocalDateConfig): LocalDate | null;
+    static isValid(iso: string): boolean;
     static today(): LocalDate;
     static sort(items: LocalDate[], mutate?: boolean, descending?: boolean): LocalDate[];
     static earliestOrUndefined(items: LocalDate[]): LocalDate | undefined;
@@ -54,9 +59,9 @@ export declare class LocalDate {
     subtract(num: number, unit: LocalDateUnit, mutate?: boolean): LocalDate;
     startOf(unit: LocalDateUnit): LocalDate;
     endOf(unit: LocalDateUnit): LocalDate;
-    private getYearDays;
-    private getMonthLen;
-    private isLeapYear;
+    static getYearLength(year: number): number;
+    static getMonthLength(year: number, month: number): number;
+    static isLeapYear(year: number): boolean;
     clone(): LocalDate;
     /**
      * Converts LocalDate into instance of Date.

package/dist/datetime/localDate.js

@@ -22,17 +22,15 @@ class LocalDate {
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
     static of(d) {
-        if (d instanceof LocalDate)
-            return d;
-        const [year, month, day] = d.slice(0, 10).split('-').map(Number);
-        if (!day || !month || (!year && year !== 0)) {
+        const t = this.parseOrNull(d);
+        if (t === null) {
             throw new Error(`Cannot parse "${d}" into LocalDate`);
         }
-        return new LocalDate(year, month, day);
+        return t;
     }
     static parseCompact(d) {
         const [year, month, day] = [d.slice(0, 4), d.slice(4, 2), d.slice(6, 2)].map(Number);
-        if (!day || !month || (!year && year !== 0)) {
+        if (!day || !month || !year) {
             throw new Error(`Cannot parse "${d}" into LocalDate`);
         }
         return new LocalDate(year, month, day);
@@ -40,6 +38,28 @@ class LocalDate {
     static fromDate(d) {
         return new LocalDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
     }
+    /**
+     * Returns null if invalid.
+     */
+    static parseOrNull(d) {
+        if (d instanceof LocalDate)
+            return d;
+        // todo: explore more performant options
+        const [year, month, day] = d.slice(0, 10).split('-').map(Number);
+        if (!year ||
+            !month ||
+            month < 1 ||
+            month > 12 ||
+            !day ||
+            day < 1 ||
+            day > this.getMonthLength(year, month)) {
+            return null;
+        }
+        return new LocalDate(year, month, day);
+    }
+    static isValid(iso) {
+        return this.parseOrNull(iso) !== null;
+    }
     static today() {
         return this.fromDate(new Date());
     }
@@ -148,22 +168,22 @@ class LocalDate {
         let days = this.day - d.day;
         if (d.year < this.year) {
             for (let year = d.year; year < this.year; year++) {
-                days += this.getYearDays(year);
+                days += LocalDate.getYearLength(year);
             }
         }
         else if (this.year < d.year) {
             for (let year = this.year; year < d.year; year++) {
-                days -= this.getYearDays(year);
+                days -= LocalDate.getYearLength(year);
             }
         }
         if (d.month < this.month) {
             for (let month = d.month; month < this.month; month++) {
-                days += this.getMonthLen(this.year, month);
+                days += LocalDate.getMonthLength(this.year, month);
             }
         }
         else if (this.month < d.month) {
             for (let month = this.month; month < d.month; month++) {
-                days -= this.getMonthLen(d.year, month);
+                days -= LocalDate.getMonthLength(d.year, month);
             }
         }
         return days;
@@ -180,7 +200,7 @@ class LocalDate {
             year += num;
         }
         // check day overflow
-        let monLen = this.getMonthLen(year, month);
+        let monLen = LocalDate.getMonthLength(year, month);
         while (day > monLen) {
             day -= monLen;
             month += 1;
@@ -188,7 +208,7 @@ class LocalDate {
                 year += 1;
                 month -= 12;
             }
-            monLen = this.getMonthLen(year, month);
+            monLen = LocalDate.getMonthLength(year, month);
         }
         while (day < 1) {
             day += monLen;
@@ -197,7 +217,7 @@ class LocalDate {
                 year -= 1;
                 month += 12;
             }
-            monLen = this.getMonthLen(year, month);
+            monLen = LocalDate.getMonthLength(year, month);
         }
         // check month overflow
         while (month > 12) {
@@ -231,19 +251,19 @@ class LocalDate {
         if (unit === 'day')
             return this;
         if (unit === 'month')
-            return LocalDate.create(this.year, this.month, this.getMonthLen(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);
     }
-    getYearDays(year) {
+    static getYearLength(year) {
         return this.isLeapYear(year) ? 366 : 365;
     }
-    getMonthLen(year, month) {
+    static getMonthLength(year, month) {
         if (month === 2)
             return this.isLeapYear(year) ? 29 : 28;
         return m31.has(month) ? 31 : 30;
     }
-    isLeapYear(year) {
+    static isLeapYear(year) {
         if (year % 4 !== 0)
             return false;
         if (year % 100 !== 0)

package/dist/datetime/localTime.d.ts

@@ -20,6 +20,11 @@ export declare class LocalTime {
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
     static of(d: LocalTimeConfig): LocalTime;
+    /**
+     * Returns null if invalid
+     */
+    static parseOrNull(d: LocalTimeConfig): LocalTime | null;
+    static isValid(d: LocalTimeConfig): boolean;
     static unix(ts: UnixTimestamp): LocalTime;
     static now(): LocalTime;
     static fromComponents(c: {
@@ -68,7 +73,7 @@ export declare class LocalTime {
     unix(): UnixTimestamp;
     valueOf(): UnixTimestamp;
     toISO8601(): IsoDateTime;
-    toPretty(): IsoDateTime;
+    toPretty(seconds?: boolean): IsoDateTime;
     /**
      * Returns e.g: `19840621_1705`
      */

package/dist/datetime/localTime.js

@@ -24,21 +24,38 @@ class LocalTime {
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
     static of(d) {
+        const t = this.parseOrNull(d);
+        if (t === null) {
+            throw new TypeError(`Cannot parse "${d}" into LocalTime`);
+        }
+        return t;
+    }
+    /**
+     * Returns null if invalid
+     */
+    static parseOrNull(d) {
         if (d instanceof LocalTime)
             return d;
-        if (d instanceof Date)
-            return new LocalTime(d);
-        if (typeof d === 'number') {
-            // unix timestamp
-            return new LocalTime(new Date(d * 1000));
+        let date;
+        if (d instanceof Date) {
+            date = d;
+        }
+        else if (typeof d === 'number') {
+            date = new Date(d * 1000);
+        }
+        else {
+            date = new Date(d);
         }
-        const date = new Date(d);
         // validation
         if (isNaN(date.getDate())) {
-            throw new TypeError(`Cannot parse "${d}" into LocalTime`);
+            // throw new TypeError(`Cannot parse "${d}" into LocalTime`)
+            return null;
         }
         return new LocalTime(date);
     }
+    static isValid(d) {
+        return this.parseOrNull(d) !== null;
+    }
     static unix(ts) {
         return new LocalTime(new Date(ts * 1000));
     }
@@ -283,8 +300,12 @@ class LocalTime {
     toISO8601() {
         return this.$date.toISOString().slice(0, 19);
     }
-    toPretty() {
-        return this.$date.toISOString().slice(0, 19).split('T').join(' ');
+    toPretty(seconds = true) {
+        return this.$date
+            .toISOString()
+            .slice(0, seconds ? 19 : 16)
+            .split('T')
+            .join(' ');
     }
     /**
      * Returns e.g: `19840621_1705`

package/dist-esm/datetime/localDate.js

@@ -19,17 +19,15 @@ export class LocalDate {
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
     static of(d) {
-        if (d instanceof LocalDate)
-            return d;
-        const [year, month, day] = d.slice(0, 10).split('-').map(Number);
-        if (!day || !month || (!year && year !== 0)) {
+        const t = this.parseOrNull(d);
+        if (t === null) {
             throw new Error(`Cannot parse "${d}" into LocalDate`);
         }
-        return new LocalDate(year, month, day);
+        return t;
     }
     static parseCompact(d) {
         const [year, month, day] = [d.slice(0, 4), d.slice(4, 2), d.slice(6, 2)].map(Number);
-        if (!day || !month || (!year && year !== 0)) {
+        if (!day || !month || !year) {
             throw new Error(`Cannot parse "${d}" into LocalDate`);
         }
         return new LocalDate(year, month, day);
@@ -37,6 +35,28 @@ export class LocalDate {
     static fromDate(d) {
         return new LocalDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
     }
+    /**
+     * Returns null if invalid.
+     */
+    static parseOrNull(d) {
+        if (d instanceof LocalDate)
+            return d;
+        // todo: explore more performant options
+        const [year, month, day] = d.slice(0, 10).split('-').map(Number);
+        if (!year ||
+            !month ||
+            month < 1 ||
+            month > 12 ||
+            !day ||
+            day < 1 ||
+            day > this.getMonthLength(year, month)) {
+            return null;
+        }
+        return new LocalDate(year, month, day);
+    }
+    static isValid(iso) {
+        return this.parseOrNull(iso) !== null;
+    }
     static today() {
         return this.fromDate(new Date());
     }
@@ -145,22 +165,22 @@ export class LocalDate {
         let days = this.day - d.day;
         if (d.year < this.year) {
             for (let year = d.year; year < this.year; year++) {
-                days += this.getYearDays(year);
+                days += LocalDate.getYearLength(year);
             }
         }
         else if (this.year < d.year) {
             for (let year = this.year; year < d.year; year++) {
-                days -= this.getYearDays(year);
+                days -= LocalDate.getYearLength(year);
             }
         }
         if (d.month < this.month) {
             for (let month = d.month; month < this.month; month++) {
-                days += this.getMonthLen(this.year, month);
+                days += LocalDate.getMonthLength(this.year, month);
             }
         }
         else if (this.month < d.month) {
             for (let month = this.month; month < d.month; month++) {
-                days -= this.getMonthLen(d.year, month);
+                days -= LocalDate.getMonthLength(d.year, month);
             }
         }
         return days;
@@ -177,7 +197,7 @@ export class LocalDate {
             year += num;
         }
         // check day overflow
-        let monLen = this.getMonthLen(year, month);
+        let monLen = LocalDate.getMonthLength(year, month);
         while (day > monLen) {
             day -= monLen;
             month += 1;
@@ -185,7 +205,7 @@ export class LocalDate {
                 year += 1;
                 month -= 12;
             }
-            monLen = this.getMonthLen(year, month);
+            monLen = LocalDate.getMonthLength(year, month);
         }
         while (day < 1) {
             day += monLen;
@@ -194,7 +214,7 @@ export class LocalDate {
                 year -= 1;
                 month += 12;
             }
-            monLen = this.getMonthLen(year, month);
+            monLen = LocalDate.getMonthLength(year, month);
         }
         // check month overflow
         while (month > 12) {
@@ -228,19 +248,19 @@ export class LocalDate {
         if (unit === 'day')
             return this;
         if (unit === 'month')
-            return LocalDate.create(this.year, this.month, this.getMonthLen(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);
     }
-    getYearDays(year) {
+    static getYearLength(year) {
         return this.isLeapYear(year) ? 366 : 365;
     }
-    getMonthLen(year, month) {
+    static getMonthLength(year, month) {
         if (month === 2)
             return this.isLeapYear(year) ? 29 : 28;
         return m31.has(month) ? 31 : 30;
     }
-    isLeapYear(year) {
+    static isLeapYear(year) {
         if (year % 4 !== 0)
             return false;
         if (year % 100 !== 0)

package/dist-esm/datetime/localTime.js

@@ -21,21 +21,38 @@ export class LocalTime {
      * Input can already be a LocalDate - it is returned as-is in that case.
      */
     static of(d) {
+        const t = this.parseOrNull(d);
+        if (t === null) {
+            throw new TypeError(`Cannot parse "${d}" into LocalTime`);
+        }
+        return t;
+    }
+    /**
+     * Returns null if invalid
+     */
+    static parseOrNull(d) {
         if (d instanceof LocalTime)
             return d;
-        if (d instanceof Date)
-            return new LocalTime(d);
-        if (typeof d === 'number') {
-            // unix timestamp
-            return new LocalTime(new Date(d * 1000));
+        let date;
+        if (d instanceof Date) {
+            date = d;
+        }
+        else if (typeof d === 'number') {
+            date = new Date(d * 1000);
+        }
+        else {
+            date = new Date(d);
         }
-        const date = new Date(d);
         // validation
         if (isNaN(date.getDate())) {
-            throw new TypeError(`Cannot parse "${d}" into LocalTime`);
+            // throw new TypeError(`Cannot parse "${d}" into LocalTime`)
+            return null;
         }
         return new LocalTime(date);
     }
+    static isValid(d) {
+        return this.parseOrNull(d) !== null;
+    }
     static unix(ts) {
         return new LocalTime(new Date(ts * 1000));
     }
@@ -280,8 +297,12 @@ export class LocalTime {
     toISO8601() {
         return this.$date.toISOString().slice(0, 19);
     }
-    toPretty() {
-        return this.$date.toISOString().slice(0, 19).split('T').join(' ');
+    toPretty(seconds = true) {
+        return this.$date
+            .toISOString()
+            .slice(0, seconds ? 19 : 16)
+            .split('T')
+            .join(' ');
     }
     /**
      * Returns e.g: `19840621_1705`

package/package.json

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

package/src/datetime/localDate.ts

@@ -23,21 +23,19 @@ export class LocalDate {
    * Input can already be a LocalDate - it is returned as-is in that case.
    */
   static of(d: LocalDateConfig): LocalDate {
-    if (d instanceof LocalDate) return d
-
-    const [year, month, day] = d.slice(0, 10).split('-').map(Number)
+    const t = this.parseOrNull(d)
 
-    if (!day || !month || (!year && year !== 0)) {
+    if (t === null) {
       throw new Error(`Cannot parse "${d}" into LocalDate`)
     }
 
-    return new LocalDate(year, month, day)
+    return t
   }
 
   static parseCompact(d: string): LocalDate {
     const [year, month, day] = [d.slice(0, 4), d.slice(4, 2), d.slice(6, 2)].map(Number)
 
-    if (!day || !month || (!year && year !== 0)) {
+    if (!day || !month || !year) {
       throw new Error(`Cannot parse "${d}" into LocalDate`)
     }
 
@@ -48,6 +46,34 @@ export class LocalDate {
     return new LocalDate(d.getFullYear(), d.getMonth() + 1, d.getDate())
   }
 
+  /**
+   * Returns null if invalid.
+   */
+  static parseOrNull(d: LocalDateConfig): LocalDate | null {
+    if (d instanceof LocalDate) return d
+
+    // todo: explore more performant options
+    const [year, month, day] = d.slice(0, 10).split('-').map(Number)
+
+    if (
+      !year ||
+      !month ||
+      month < 1 ||
+      month > 12 ||
+      !day ||
+      day < 1 ||
+      day > this.getMonthLength(year, month)
+    ) {
+      return null
+    }
+
+    return new LocalDate(year, month, day)
+  }
+
+  static isValid(iso: string): boolean {
+    return this.parseOrNull(iso) !== null
+  }
+
   static today(): LocalDate {
     return this.fromDate(new Date())
   }
@@ -203,21 +229,21 @@ export class LocalDate {
 
     if (d.year < this.year) {
       for (let year = d.year; year < this.year; year++) {
-        days += this.getYearDays(year)
+        days += LocalDate.getYearLength(year)
       }
     } else if (this.year < d.year) {
       for (let year = this.year; year < d.year; year++) {
-        days -= this.getYearDays(year)
+        days -= LocalDate.getYearLength(year)
       }
     }
 
     if (d.month < this.month) {
       for (let month = d.month; month < this.month; month++) {
-        days += this.getMonthLen(this.year, month)
+        days += LocalDate.getMonthLength(this.year, month)
       }
     } else if (this.month < d.month) {
       for (let month = this.month; month < d.month; month++) {
-        days -= this.getMonthLen(d.year, month)
+        days -= LocalDate.getMonthLength(d.year, month)
       }
     }
 
@@ -236,7 +262,7 @@ export class LocalDate {
     }
 
     // check day overflow
-    let monLen = this.getMonthLen(year, month)
+    let monLen = LocalDate.getMonthLength(year, month)
     while (day > monLen) {
       day -= monLen
       month += 1
@@ -245,7 +271,7 @@ export class LocalDate {
         month -= 12
       }
 
-      monLen = this.getMonthLen(year, month)
+      monLen = LocalDate.getMonthLength(year, month)
     }
     while (day < 1) {
       day += monLen
@@ -255,7 +281,7 @@ export class LocalDate {
         month += 12
       }
 
-      monLen = this.getMonthLen(year, month)
+      monLen = LocalDate.getMonthLength(year, month)
     }
 
     // check month overflow
@@ -292,21 +318,25 @@ export class LocalDate {
   endOf(unit: LocalDateUnit): LocalDate {
     if (unit === 'day') return this
     if (unit === 'month')
-      return LocalDate.create(this.year, this.month, this.getMonthLen(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)
   }
 
-  private getYearDays(year: number): number {
+  static getYearLength(year: number): number {
     return this.isLeapYear(year) ? 366 : 365
   }
 
-  private getMonthLen(year: number, month: number): number {
+  static getMonthLength(year: number, month: number): number {
     if (month === 2) return this.isLeapYear(year) ? 29 : 28
     return m31.has(month) ? 31 : 30
   }
 
-  private isLeapYear(year: number): boolean {
+  static isLeapYear(year: number): boolean {
     if (year % 4 !== 0) return false
     if (year % 100 !== 0) return true
     return year % 400 === 0

package/src/datetime/localTime.ts

@@ -36,24 +36,44 @@ export class LocalTime {
    * Input can already be a LocalDate - it is returned as-is in that case.
    */
   static of(d: LocalTimeConfig): LocalTime {
-    if (d instanceof LocalTime) return d
-    if (d instanceof Date) return new LocalTime(d)
+    const t = this.parseOrNull(d)
 
-    if (typeof d === 'number') {
-      // unix timestamp
-      return new LocalTime(new Date(d * 1000))
+    if (t === null) {
+      throw new TypeError(`Cannot parse "${d}" into LocalTime`)
     }
 
-    const date = new Date(d)
+    return t
+  }
+
+  /**
+   * Returns null if invalid
+   */
+  static parseOrNull(d: LocalTimeConfig): LocalTime | null {
+    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 {
+      date = new Date(d)
+    }
 
     // validation
     if (isNaN(date.getDate())) {
-      throw new TypeError(`Cannot parse "${d}" into LocalTime`)
+      // throw new TypeError(`Cannot parse "${d}" into LocalTime`)
+      return null
     }
 
     return new LocalTime(date)
   }
 
+  static isValid(d: LocalTimeConfig): boolean {
+    return this.parseOrNull(d) !== null
+  }
+
   static unix(ts: UnixTimestamp): LocalTime {
     return new LocalTime(new Date(ts * 1000))
   }
@@ -339,8 +359,12 @@ export class LocalTime {
     return this.$date.toISOString().slice(0, 19)
   }
 
-  toPretty(): IsoDateTime {
-    return this.$date.toISOString().slice(0, 19).split('T').join(' ')
+  toPretty(seconds = true): IsoDateTime {
+    return this.$date
+      .toISOString()
+      .slice(0, seconds ? 19 : 16)
+      .split('T')
+      .join(' ')
   }
 
   /**