@naturalcycles/js-lib 14.139.2 → 14.140.0

package/dist/datetime/localDate.d.ts

@@ -3,7 +3,7 @@ import { LocalTime } from './localTime';
 export type LocalDateUnit = LocalDateUnitStrict | 'week';
 export type LocalDateUnitStrict = 'year' | 'month' | 'day';
 export type Inclusiveness = '()' | '[]' | '[)' | '(]';
-export type LocalDateConfig = LocalDate | IsoDateString;
+export type LocalDateConfig = LocalDate | Date | IsoDateString;
 export type LocalDateFormatter = (ld: LocalDate) => string;
 /**
  * @experimental

package/dist/datetime/localDate.js

@@ -50,8 +50,11 @@ class LocalDate {
             return null;
         if (d instanceof LocalDate)
             return d;
+        if (d instanceof Date) {
+            return this.fromDate(d);
+        }
         // const [year, month, day] = d.slice(0, 10).split('-').map(Number)
-        const matches = DATE_REGEX.exec(d.slice(0, 10));
+        const matches = typeof d === 'string' && DATE_REGEX.exec(d.slice(0, 10));
         if (!matches)
             return null;
         const year = Number(matches[1]);

package/dist/datetime/localTime.js

@@ -60,6 +60,10 @@ class LocalTime {
         else if (typeof d === 'number') {
             date = new Date(d * 1000);
         }
+        else if (typeof d !== 'string') {
+            // unexpected type, e.g Function or something
+            return null;
+        }
         else {
             date = new Date(d.slice(0, 19));
         }
@@ -402,7 +406,7 @@ class LocalTime {
         return Math.floor(this.$date.valueOf() / 1000);
     }
     toLocalDate() {
-        return localDate_1.LocalDate.create(this.$date.getFullYear(), this.$date.getMonth() + 1, this.$date.getDate());
+        return localDate_1.LocalDate.fromDate(this.$date);
     }
     toPretty(seconds = true) {
         const { year, month, day, hour, minute, second } = this.components();

package/dist-esm/datetime/localDate.js

@@ -47,8 +47,11 @@ export class LocalDate {
             return null;
         if (d instanceof LocalDate)
             return d;
+        if (d instanceof Date) {
+            return this.fromDate(d);
+        }
         // const [year, month, day] = d.slice(0, 10).split('-').map(Number)
-        const matches = DATE_REGEX.exec(d.slice(0, 10));
+        const matches = typeof d === 'string' && DATE_REGEX.exec(d.slice(0, 10));
         if (!matches)
             return null;
         const year = Number(matches[1]);

package/dist-esm/datetime/localTime.js

@@ -57,6 +57,10 @@ export class LocalTime {
         else if (typeof d === 'number') {
             date = new Date(d * 1000);
         }
+        else if (typeof d !== 'string') {
+            // unexpected type, e.g Function or something
+            return null;
+        }
         else {
             date = new Date(d.slice(0, 19));
         }
@@ -400,7 +404,7 @@ export class LocalTime {
         return Math.floor(this.$date.valueOf() / 1000);
     }
     toLocalDate() {
-        return LocalDate.create(this.$date.getFullYear(), this.$date.getMonth() + 1, this.$date.getDate());
+        return LocalDate.fromDate(this.$date);
     }
     toPretty(seconds = true) {
         const { year, month, day, hour, minute, second } = this.components();

package/package.json

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

package/src/datetime/localDate.ts

@@ -14,7 +14,7 @@ export type Inclusiveness = '()' | '[]' | '[)' | '(]'
 const MDAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 const DATE_REGEX = /^(\d\d\d\d)-(\d\d)-(\d\d)$/
 
-export type LocalDateConfig = LocalDate | IsoDateString
+export type LocalDateConfig = LocalDate | Date | IsoDateString
 export type LocalDateFormatter = (ld: LocalDate) => string
 
 /* eslint-disable no-dupe-class-members */
@@ -67,9 +67,12 @@ export class LocalDate {
   static parseOrNull(d: LocalDateConfig | undefined | null): LocalDate | null {
     if (!d) return null
     if (d instanceof LocalDate) return d
+    if (d instanceof Date) {
+      return this.fromDate(d)
+    }
 
     // const [year, month, day] = d.slice(0, 10).split('-').map(Number)
-    const matches = DATE_REGEX.exec(d.slice(0, 10))
+    const matches = typeof (d as any) === 'string' && DATE_REGEX.exec(d.slice(0, 10))
     if (!matches) return null
 
     const year = Number(matches[1])

package/src/datetime/localTime.ts

@@ -82,6 +82,9 @@ export class LocalTime {
       date = d
     } else if (typeof d === 'number') {
       date = new Date(d * 1000)
+    } else if (typeof (d as any) !== 'string') {
+      // unexpected type, e.g Function or something
+      return null
     } else {
       date = new Date(d.slice(0, 19))
     }
@@ -494,11 +497,7 @@ export class LocalTime {
   }
 
   toLocalDate(): LocalDate {
-    return LocalDate.create(
-      this.$date.getFullYear(),
-      this.$date.getMonth() + 1,
-      this.$date.getDate(),
-    )
+    return LocalDate.fromDate(this.$date)
   }
 
   toPretty(seconds = true): IsoDateTimeString {