@acorex/core 22.1.0-next.31 → 22.1.0-next.33

package/fesm2022/acorex-core-date-time.mjs

@@ -76,9 +76,9 @@ class AXDateTime {
             // 01 02 ... 11 12
             MM: () => this.pad(this.calendar.monthOfYear(this.date), 2),
             // Jan Feb ... Nov Dec
-            MMM: () => translateSync(`@acorex:dateTime.months.${this.calendar.name()}.short.${this.calendar.monthOfYear(this.date) - 1}`),
+            MMM: () => translateSync(`dateTime.months.${this.calendar.name()}.short.${this.calendar.monthOfYear(this.date) - 1}`),
             // January February ... November December
-            MMMM: () => translateSync(`@acorex:dateTime.months.${this.calendar.name()}.long.${this.calendar.monthOfYear(this.date) - 1}`),
+            MMMM: () => translateSync(`dateTime.months.${this.calendar.name()}.long.${this.calendar.monthOfYear(this.date) - 1}`),
             // 1 2 ... 7
             E: () => this.calendar.dayOfWeek(this.date).toString(),
             // 01 02 ... 07
@@ -554,12 +554,24 @@ class AXGregorianCalendar extends AXCalendar {
                 break;
             case 'week':
                 break;
-            case 'month':
-                clone.setMonth(Math.max(0, value - 1));
+            case 'month': {
+                const newMonth = Math.max(0, value - 1);
+                const lastDayOfMonth = new Date(clone.getFullYear(), newMonth + 1, 0).getDate();
+                const day = Math.min(clone.getDate(), lastDayOfMonth);
+                // Set to the 1st first so native Date does not overflow (e.g. Jan 31 → Feb).
+                clone.setDate(1);
+                clone.setMonth(newMonth);
+                clone.setDate(day);
                 break;
-            case 'year':
+            }
+            case 'year': {
+                const isFeb29 = clone.getMonth() === 1 && clone.getDate() === 29;
                 clone.setFullYear(value);
+                if (isFeb29 && clone.getMonth() !== 1) {
+                    clone.setMonth(1, 28);
+                }
                 break;
+            }
         }
         return new AXDateTime(clone, this);
     }
@@ -778,10 +790,7 @@ class AXSolarHijriCalendar extends AXCalendar {
             default:
             case 'day': {
                 const gDate = this.toGregorian(jDate.year, jDate.month, value);
-                clone.setFullYear(gDate.getFullYear());
-                clone.setMonth(gDate.getMonth());
-                clone.setDate(gDate.getDate());
-                break;
+                return this.withCivilDate(clone, gDate);
             }
             case 'week':
                 break;
@@ -789,19 +798,24 @@ class AXSolarHijriCalendar extends AXCalendar {
                 const lastDay = this.SolarHijriMonthLength(jDate.year, value);
                 const day = Math.min(jDate.day, lastDay);
                 const gDate2 = this.toGregorian(jDate.year, value, day);
-                clone.setFullYear(gDate2.getFullYear());
-                clone.setMonth(gDate2.getMonth());
-                clone.setDate(gDate2.getDate());
-                break;
+                return this.withCivilDate(clone, gDate2);
             }
             case 'year': {
-                const gDate3 = this.toGregorian(value, jDate.month, jDate.day);
-                clone.setFullYear(gDate3.getFullYear());
-                break;
+                const lastDay = this.SolarHijriMonthLength(value, jDate.month);
+                const day = Math.min(jDate.day, lastDay);
+                const gDate3 = this.toGregorian(value, jDate.month, day);
+                return this.withCivilDate(clone, gDate3);
             }
         }
         return new AXDateTime(clone, this);
     }
+    /**
+     * Builds a Date from converted civil Y/M/D while keeping the original time.
+     * Assigning year/month/day on an existing Date sequentially overflows (e.g. Aug 31 → Feb).
+     */
+    withCivilDate(source, civil) {
+        return new AXDateTime(new Date(civil.getFullYear(), civil.getMonth(), civil.getDate(), source.getHours(), source.getMinutes(), source.getSeconds(), source.getMilliseconds()), this);
+    }
     startOf(date, unit) {
         const clone = new Date(date.valueOf());
         switch (unit) {
@@ -1259,10 +1273,10 @@ class AXCalendarService {
             calendar: calendar.name(),
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXCalendarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXCalendarService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXCalendarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXCalendarService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXCalendarService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXCalendarService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [] });
@@ -1286,10 +1300,10 @@ class AXDateTimePipe {
         const val = this._calendarService.convert(value, calendar.name());
         return this.formatService.format(val, 'datetime', format);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimePipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe }); }
-    static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimePipe, isStandalone: true, name: "axDate" }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimePipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe }); }
+    static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimePipe, isStandalone: true, name: "axDate" }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimePipe, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimePipe, decorators: [{
             type: Pipe,
             args: [{ name: 'axDate' }]
         }] });
@@ -1334,10 +1348,10 @@ class AXDateFormatter {
             .convert(value, effectiveOptions.calendar)
             .format(format, { locale: effectiveOptions.locale });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateFormatter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateFormatter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateFormatter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateFormatter, decorators: [{
             type: Injectable
         }] });
 
@@ -1391,10 +1405,10 @@ class AXDateTimeFormatter {
             .convert(value, effectiveOptions.calendar)
             .format(format, { locale: effectiveOptions.locale });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeFormatter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeFormatter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeFormatter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeFormatter, decorators: [{
             type: Injectable
         }] });
 
@@ -1517,10 +1531,10 @@ class AXTimeDurationFormatter {
             return result.join(separator);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeDurationFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeDurationFormatter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeDurationFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeDurationFormatter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeDurationFormatter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeDurationFormatter, decorators: [{
             type: Injectable
         }] });
 
@@ -1564,10 +1578,10 @@ class AXTimeFormatter {
             .convert(value, effectiveOptions.calendar)
             .format(format, { locale: effectiveOptions.locale });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeFormatter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeFormatter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeFormatter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeFormatter, decorators: [{
             type: Injectable
         }] });
 
@@ -1689,21 +1703,21 @@ class AXTimeLeftFormatter {
                 return 'Invalid format';
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeLeftFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeLeftFormatter }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeLeftFormatter, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeLeftFormatter }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXTimeLeftFormatter, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXTimeLeftFormatter, decorators: [{
             type: Injectable
         }] });
 
 class AXDateTimeModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeModule, imports: [i1.AXFormatModule, AXDateTimePipe], exports: [AXDateTimePipe] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeModule, imports: [AXFormatModule.forChild({
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeModule, imports: [i1.AXFormatModule, AXDateTimePipe], exports: [AXDateTimePipe] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeModule, imports: [AXFormatModule.forChild({
                 formatters: [AXDateTimeFormatter, AXDateFormatter, AXTimeFormatter, AXTimeLeftFormatter, AXTimeDurationFormatter],
             })] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXDateTimeModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.6", ngImport: i0, type: AXDateTimeModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [