@acorex/core 5.0.45 → 5.0.48

package/fesm2020/acorex-core.mjs

@@ -164,14 +164,43 @@ AXConfig.dataChangeSubject = new Subject();
 // @dynamic
 class AXDateTime {
     constructor(value = new Date(), calendar = AXConfig.get(`dateTime.calendar`)) {
-        this._calendar =
-            typeof calendar == 'string'
-                ? AXConfig.get(`dateTime.calendars.${calendar}`)
-                : calendar;
+        this._formatKeys = {
+            ss: () => this.pad(this.date.getSeconds(), 2),
+            s: () => this.date.getSeconds().toString(),
+            //
+            dd: () => this.pad(this.calendar.dayOfMonth(this.date), 2),
+            d: () => this.calendar.dayOfMonth(this.date).toString(),
+            //
+            mm: () => this.pad(this.date.getMinutes(), 2),
+            m: () => this.date.getMinutes().toString(),
+            //
+            MMMM: () => this.calendar.monthNames[this.calendar.monthOfYear(this.date) - 1],
+            MMM: () => this.calendar.monthShortNames[this.calendar.monthOfYear(this.date) - 1],
+            MM: () => this.pad(this.calendar.monthOfYear(this.date), 2),
+            //
+            DDDD: () => this.calendar.dayNames[this.calendar.dayOfWeek(this.date) - 1],
+            DDD: () => this.calendar.dayShortNames[this.calendar.dayOfWeek(this.date) - 1],
+            //
+            yyyy: () => this.calendar.year(this.date).toString(),
+            YYYY: () => this.calendar.year(this.date).toString(),
+            yy: () => this.calendar.year(this.date).toString().substring(2),
+            YY: () => this.calendar.year(this.date).toString().substring(2),
+            //
+            HH: () => this.pad(this.date.getHours(), 2),
+            H: () => this.date.getHours().toString(),
+            //
+            hh: () => this.pad((this.date.getHours() % 12 || 12), 2),
+            h: () => (this.date.getHours() % 12 || 12).toString(),
+            //
+            A: () => (this.date.getHours() < 12) ? 'am' : 'pm',
+            a: () => (this.date.getHours() < 12) ? 'am' : 'pm',
+        };
+        this._calendar = AXDateTime.resolveCalendar(calendar);
         if (value instanceof Date) {
             this._date = value;
         }
         else {
+            //TODO: parse jalali
             this._date = new Date(value);
         }
     }
@@ -188,6 +217,31 @@ class AXDateTime {
         }
         return date;
     }
+    static from(value = {
+        calendar: AXConfig.get('dateTime.calendar'),
+        year: 1,
+        month: 1,
+        date: 1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        ms: 0
+    }) {
+        // let date: AXDateTime = new AXDateTime(new Date(), value.calendar);
+        // date.set('year', value.year);
+        // date.set('month', value.month);
+        // date.set('day', value.date);
+        // date.set('hour', value.hours);
+        // date.set('minute', value.minutes);
+        // date.set('second', value.seconds);
+        // date.set('ms', value.ms);
+        return AXDateTime.resolveCalendar(value.calendar).create(value);
+    }
+    static resolveCalendar(calendar) {
+        return typeof calendar == 'string'
+            ? AXConfig.get(`dateTime.calendars.${calendar}`)
+            : calendar;
+    }
     get date() {
         return this._date;
     }
@@ -195,7 +249,7 @@ class AXDateTime {
         return this._calendar;
     }
     clone() {
-        return new AXDateTime(this.date, this.calendar.name());
+        return new AXDateTime(this.date, this.calendar);
     }
     get dayOfMonth() {
         return this._calendar.dayOfMonth(this.date);
@@ -244,40 +298,9 @@ class AXDateTime {
         return this._calendar.endOf(this.date, unit);
     }
     format(format = AXConfig.get('dateTime.shortDateFormat')) {
-        const keys = {
-            ss: () => this.pad(this.date.getSeconds(), 2),
-            s: () => this.date.getSeconds().toString(),
-            //
-            dd: () => this.pad(this.calendar.dayOfMonth(this.date), 2),
-            d: () => this.calendar.dayOfMonth(this.date).toString(),
-            //
-            mm: () => this.pad(this.date.getMinutes(), 2),
-            m: () => this.date.getMinutes().toString(),
-            //
-            MMMM: () => this.calendar.monthNames[this.calendar.monthOfYear(this.date) - 1],
-            MMM: () => this.calendar.monthShortNames[this.calendar.monthOfYear(this.date) - 1],
-            MM: () => this.pad(this.calendar.monthOfYear(this.date), 2),
-            //
-            DDDD: () => this.calendar.dayNames[this.calendar.dayOfWeek(this.date) - 1],
-            DDD: () => this.calendar.dayShortNames[this.calendar.dayOfWeek(this.date) - 1],
-            //
-            yyyy: () => this.calendar.year(this.date).toString(),
-            YYYY: () => this.calendar.year(this.date).toString(),
-            yy: () => this.calendar.year(this.date).toString().substring(2),
-            YY: () => this.calendar.year(this.date).toString().substring(2),
-            //
-            HH: () => this.pad(this.date.getHours(), 2),
-            H: () => this.date.getHours().toString(),
-            //
-            hh: () => this.pad((this.date.getHours() % 12 || 12), 2),
-            h: () => (this.date.getHours() % 12 || 12).toString(),
-            //
-            A: () => (this.date.getHours() < 12) ? 'am' : 'pm',
-            a: () => (this.date.getHours() < 12) ? 'am' : 'pm',
-        };
-        const re = new RegExp(_.orderBy(Object.keys(keys), c => c.length, ['desc']).join("|"), "gi");
-        return format.replace(re, function (matched) {
-            return keys[matched]();
+        const re = new RegExp(_.orderBy(Object.keys(this._formatKeys), c => c.length, ['desc']).join("|"), "gi");
+        return format.replace(re, (matched) => {
+            return this._formatKeys[matched]();
         });
     }
     pad(n, width, z = '0') {
@@ -291,7 +314,7 @@ class AXDateTime {
         return this.compare(value, unit) == 0;
     }
     compare(value, unit = 'day') {
-        const val = AXDateTime.convert(value);
+        const val = AXDateTime.convert(value, this.calendar.name());
         const func = (v1, v2) => {
             if (v1 == v2) {
                 return 0;
@@ -476,6 +499,9 @@ class GeorgianCalendar {
             "Thu", "Fri", "Sat"
         ];
     }
+    create(value) {
+        return new AXDateTime(new Date(value.year, value.month - 1, value.date, value.hours || 0, value.minutes || 0, value.seconds || 0, value.ms || 0), this.name());
+    }
     name() {
         return 'gregorian';
     }
@@ -645,6 +671,10 @@ class JalaliCalendar {
         this.dayNames = ("شنبه_یکشنبه_دوشنبه_سه شنبه_چهارشنبه_پنج شنبه_جمعه").split("_");
         this.dayShortNames = "ش_ی_د_س_چ_پ_ج".split("_");
     }
+    create(value) {
+        const a = this.toGregorian(value.year, value.month, value.date);
+        return new AXDateTime(new Date(a.getFullYear(), a.getMonth(), a.getDate(), value.hours || 0, value.minutes || 0, value.seconds || 0, value.ms || 0), this.name());
+    }
     name() {
         return 'jalali';
     }
@@ -687,14 +717,10 @@ class JalaliCalendar {
                     let jd = this.dayOfMonth(date);
                     let jm = this.monthOfYear(date);
                     let jy = this.year(date);
-                    jm = (jm + amount) % 12;
-                    if (0 > jm) {
-                        jy += (this.monthOfYear(date) + amount - jm - 12) / 12;
-                        jm += 12;
-                    }
-                    else {
-                        jy += ((this.monthOfYear(date) + amount - jm) / 12);
-                    }
+                    const nm = (jm + amount);
+                    const ny = (nm % 12) ? Math.floor(nm / 12) : 0;
+                    jy += ny;
+                    jm = nm - (ny * 12);
                     const vv = this.toGregorian(jy, jm, jd);
                     v.setFullYear(vv.getFullYear());
                     v.setMonth(vv.getMonth());
@@ -707,6 +733,10 @@ class JalaliCalendar {
                 break;
             case 'year':
                 {
+                    // const v = new Date(value);
+                    // v.setFullYear(v.getFullYear() + amount);
+                    // value = v.valueOf();
+                    // break
                     const v = new Date(value);
                     let jd = this.dayOfMonth(date);
                     let jm = this.monthOfYear(date);
@@ -716,8 +746,8 @@ class JalaliCalendar {
                     v.setMonth(vv.getMonth());
                     v.setDate(vv.getDate());
                     value = v.valueOf();
+                    break;
                 }
-                break;
             case 'day':
             default:
                 value += 86400000 * amount;
@@ -725,7 +755,35 @@ class JalaliCalendar {
         return new AXDateTime(new Date(value), this.name());
     }
     set(date, unit, value) {
-        throw new Error("Method not implemented.");
+        const clone = new Date(date.valueOf());
+        const jDate = this.toJalali(clone);
+        switch (unit) {
+            case 'second':
+                clone.setHours(clone.getHours(), clone.getMinutes(), value, clone.getMilliseconds());
+                break;
+            case 'minute':
+                clone.setHours(clone.getHours(), value, clone.getSeconds(), clone.getMilliseconds());
+                break;
+            case 'hour':
+                clone.setHours(value, clone.getMinutes(), clone.getSeconds(), clone.getMilliseconds());
+                break;
+            default:
+            case 'day':
+                const gDate = this.toGregorian(jDate.year, jDate.month, value);
+                clone.setDate(gDate.getDate());
+                break;
+            case "week":
+                break;
+            case "month":
+                const gDate2 = this.toGregorian(jDate.year, value, jDate.day);
+                clone.setMonth(gDate2.getMonth());
+                break;
+            case "year":
+                const gDate3 = this.toGregorian(value, jDate.month, jDate.day);
+                clone.setFullYear(gDate3.getFullYear());
+                break;
+        }
+        return new AXDateTime(clone, this.name());
     }
     startOf(date, unit) {
         const clone = new Date(date.valueOf());
@@ -973,7 +1031,7 @@ class AXDateTimeModule {
                     gregorian: new GeorgianCalendar()
                 },
                 calendar: 'gregorian',
-                shortDateFormat: 'DDD, dd MMM yyyy'
+                shortDateFormat: 'DDDD, d MMM yyyy'
             }
         });
     }