@acorex/core 20.7.37 → 20.7.39

package/date-time/index.d.ts

@@ -1,5 +1,4 @@
-import * as rxjs from 'rxjs';
-import { Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import * as i1 from '@acorex/core/format';
 import { AXFormatOptions, AXFormatter } from '@acorex/core/format';
 import * as i0 from '@angular/core';
@@ -60,6 +59,10 @@ declare abstract class AXCalendar {
     constructor(config: AXCalendarConfig);
     get weekend(): number[];
     get weekdays(): number[];
+    /**
+     * Updates week layout settings (column order and weekend days).
+     */
+    applyWeekConfig(config: Partial<AXCalendarConfig>): void;
     /**
      * Returns the name of the calendar system.
      * @returns The calendar system name (e.g., 'gregorian', 'persian', 'islamic').
@@ -83,6 +86,10 @@ declare abstract class AXCalendar {
      * @returns The day of the week (1-7).
      */
     abstract dayOfWeek(date: Date): number;
+    /**
+     * Returns the 0-based weekday index used for week layout (0 = Sunday … 6 = Saturday).
+     */
+    weekdayIndex(date: Date): number;
     /**
      * Returns the month of the year for the given date.
      * @param date - The date to get the month from.
@@ -154,6 +161,7 @@ declare class AXDateTime {
     get dayOfMonth(): number;
     get dayOfYear(): number;
     get dayOfWeek(): number;
+    get weekdayIndex(): number;
     get hour(): number;
     get minute(): number;
     get second(): number;
@@ -278,17 +286,21 @@ declare class AXHolidaysLoaderDefault implements AXHolidaysLoader {
 declare const AX_DATETIME_HOLIDAYS_LOADER: InjectionToken<AXHolidaysLoader>;
 
 declare class AXCalendarService {
-    private config;
     private _holidaysLoader;
     private eventService;
     private formatService;
     private localeService;
+    private readonly calendars;
     get calendar(): AXCalendar;
     private activeCalendar;
-    calendarChanges$: rxjs.Observable<AXCalendar>;
+    calendarChanges$: Observable<AXCalendar>;
     getDefaultCalendar(): AXCalendar;
     getActiveCalendar(): AXCalendar;
     setActiveCalendar(name: string): void;
+    private notifyCalendarChanged;
+    private buildWeekConfig;
+    private registerCalendars;
+    private applyLocaleWeekSettings;
     onHolidaysChanged: Subject<AXHolidayDate[]>;
     private _holidays;
     get holidays(): AXHolidayDate[];
@@ -307,17 +319,6 @@ declare class AXCalendarService {
     static ɵprov: i0.ɵɵInjectableDeclaration<AXCalendarService>;
 }
 
-interface AXDateTimeConfig {
-    calendar: string;
-    calendars: {
-        [key: string]: AXCalendar;
-    };
-}
-declare const AX_DATETIME_CONFIG: InjectionToken<AXDateTimeConfig>;
-declare const AXDateTimeDefaultConfig: AXDateTimeConfig;
-type PartialDateTimeConfig = Partial<AXDateTimeConfig>;
-declare function dateTimeConfig(config?: PartialDateTimeConfig): AXDateTimeConfig;
-
 /**
  * @deprecated The pipe should not be used, use format instead
  */
@@ -402,6 +403,7 @@ declare class AXSolarHijriCalendar extends AXCalendar {
     dayOfMonth(date: Date): number;
     dayOfYear(date: Date): number;
     dayOfWeek(date: Date): number;
+    weekdayIndex(date: Date): number;
     weekOfYear(date: Date): number;
     year(date: Date): number;
     monthOfYear(date: Date): number;
@@ -431,5 +433,5 @@ declare class AXSolarHijriCalendar extends AXCalendar {
     private mod;
 }
 
-export { AXCalendar, AXCalendarMonth, AXCalendarService, AXDateTime, AXDateTimeDefaultConfig, AXDateTimeFormatter, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXGregorianCalendar, AXHolidaysLoaderDefault, AXSolarHijriCalendar, AXTimeDurationFormatter, AXTimeLeftFormatter, AX_DATETIME_CONFIG, AX_DATETIME_HOLIDAYS_LOADER, dateTimeConfig };
-export type { AXCalendarConfig, AXDateTimeConfig, AXDateTimeDisplayFormats, AXDateTimeFormatterOptions, AXDateTimePart, AXDateTimeParts, AXDateTimeUnitNames, AXDateValue, AXHolidayDate, AXHolidaysLoader, AXHolidaysLoaderOptions, AXTimeDurationFormatterOptions, AXTimeLeftFormatterOptions, AXTimeSpan, AXTimeSpanTotal, AXValidDateTimeValue, PartialDateTimeConfig, TimeUnit };
+export { AXCalendar, AXCalendarMonth, AXCalendarService, AXDateTime, AXDateTimeFormatter, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXGregorianCalendar, AXHolidaysLoaderDefault, AXSolarHijriCalendar, AXTimeDurationFormatter, AXTimeLeftFormatter, AX_DATETIME_HOLIDAYS_LOADER };
+export type { AXCalendarConfig, AXDateTimeDisplayFormats, AXDateTimeFormatterOptions, AXDateTimePart, AXDateTimeParts, AXDateTimeUnitNames, AXDateValue, AXHolidayDate, AXHolidaysLoader, AXHolidaysLoaderOptions, AXTimeDurationFormatterOptions, AXTimeLeftFormatterOptions, AXTimeSpan, AXTimeSpanTotal, AXValidDateTimeValue, TimeUnit };

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

@@ -4,11 +4,10 @@ import { AXFormatService, AXFormatModule } from '@acorex/core/format';
 import { AXLocaleService } from '@acorex/core/locale';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Pipe, NgModule } from '@angular/core';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { AX_GLOBAL_CONFIG } from '@acorex/core/config';
-import { defaults, orderBy, set, isNil, isDate } from 'lodash-es';
+import { Subject, BehaviorSubject } from 'rxjs';
 import { isBrowser } from '@acorex/core/platform';
 import { translateSync, AXTranslationService } from '@acorex/core/translation';
+import { defaults, orderBy, isNil, isDate } from 'lodash-es';
 
 class AXCalendar {
     /**
@@ -26,6 +25,18 @@ class AXCalendar {
     get weekdays() {
         return this._config.weekdays;
     }
+    /**
+     * Updates week layout settings (column order and weekend days).
+     */
+    applyWeekConfig(config) {
+        this._config = { ...this._config, ...config };
+    }
+    /**
+     * Returns the 0-based weekday index used for week layout (0 = Sunday … 6 = Saturday).
+     */
+    weekdayIndex(date) {
+        return this.dayOfWeek(date) - 1;
+    }
 }
 class AXDateTime {
     get date() {
@@ -44,10 +55,10 @@ class AXDateTime {
             // 0 1 ... 5 6 day of week ***
             d: () => (this.calendar.dayOfWeek(this.date) - 1).toString(),
             //  Su Mo ... Fr Sa ***
-            dd: () => translateSync(`@acorex:dateTime.weekdays.short.${this.calendar.weekdays[this.calendar.dayOfWeek(this.date) - 1]}`),
-            ddd: () => translateSync(`@acorex:dateTime.weekdays.short.${this.calendar.weekdays[this.calendar.dayOfWeek(this.date) - 1]}`),
+            dd: () => translateSync(`@acorex:dateTime.weekdays.short.${this.weekdayIndex}`),
+            ddd: () => translateSync(`@acorex:dateTime.weekdays.short.${this.weekdayIndex}`),
             // Sunday Monday ... Friday Saturday
-            dddd: () => translateSync(`@acorex:dateTime.weekdays.long.${this.calendar.weekdays[this.calendar.dayOfWeek(this.date) - 1]}`),
+            dddd: () => translateSync(`@acorex:dateTime.weekdays.long.${this.weekdayIndex}`),
             // 1 2 ... 30 31
             D: () => this.calendar.dayOfMonth(this.date).toString(),
             // 01 02 ... 30 31 day of month
@@ -73,9 +84,9 @@ class AXDateTime {
             // 01 02 ... 07
             EE: () => this.pad(this.calendar.dayOfWeek(this.date), 2),
             // Sun Mon ... Sat
-            EEE: () => translateSync(`@acorex:dateTime.weekdays.short.${this.calendar.weekdays[this.calendar.dayOfWeek(this.date) - 1]}`),
+            EEE: () => translateSync(`@acorex:dateTime.weekdays.short.${this.weekdayIndex}`),
             // Sunday Monday ... Saturday
-            EEEE: () => translateSync(`@acorex:dateTime.weekdays.long.${this.calendar.weekdays[this.calendar.dayOfWeek(this.date) - 1]}`),
+            EEEE: () => translateSync(`@acorex:dateTime.weekdays.long.${this.weekdayIndex}`),
             // 1 2 ... 2020 ...
             y: () => this.calendar.year(this.date).toString(),
             // 70 71 ... 29 30
@@ -131,6 +142,9 @@ class AXDateTime {
     get dayOfWeek() {
         return this._calendar.dayOfWeek(this.date);
     }
+    get weekdayIndex() {
+        return this._calendar.weekdayIndex(this.date);
+    }
     get hour() {
         return this._date.getHours();
     }
@@ -619,6 +633,18 @@ class AXGregorianCalendar extends AXCalendar {
     }
 }
 
+class AXHolidaysLoaderDefault {
+    getHolidays(options) {
+        return Promise.resolve([]);
+    }
+}
+const AX_DATETIME_HOLIDAYS_LOADER = new InjectionToken('AX_DATETIME_HOLIDAYS_LOADER', {
+    providedIn: 'root',
+    factory: () => {
+        return new AXHolidaysLoaderDefault();
+    },
+});
+
 class AXSolarHijriCalendar extends AXCalendar {
     /**
      * @ignore
@@ -649,6 +675,10 @@ class AXSolarHijriCalendar extends AXCalendar {
     dayOfWeek(date) {
         return date.getDay() == 6 ? 1 : date.getDay() + 2;
     }
+    weekdayIndex(date) {
+        const dow = this.dayOfWeek(date);
+        return dow === 1 ? 6 : dow - 2;
+    }
     weekOfYear(date) {
         //TODO : apply jalali
         const firstDay = new AXDateTime(date, this).startOf('year');
@@ -782,8 +812,12 @@ class AXSolarHijriCalendar extends AXCalendar {
             case 'day':
                 clone.setHours(0, 0, 0, 0);
                 return new AXDateTime(clone, this);
-            case 'week':
-                return new AXDateTime(clone, this).add('day', -this.dayOfWeek(clone) + 1).startOf('day');
+            case 'week': {
+                const currentDayOfWeek_0based = this.weekdayIndex(clone);
+                const firstDayOfWeek_0based = this.weekdays[0];
+                const daysToSubtract = (currentDayOfWeek_0based - firstDayOfWeek_0based + 7) % 7;
+                return new AXDateTime(clone, this).add('day', -daysToSubtract).startOf('day');
+            }
             case 'month': {
                 const jy = this.year(date);
                 const jm = this.monthOfYear(date);
@@ -1058,53 +1092,12 @@ class AXSolarHijriCalendar extends AXCalendar {
     }
 }
 
-const AX_DATETIME_CONFIG = new InjectionToken('AX_DATETIME_CONFIG', {
-    providedIn: 'root',
-    factory: () => {
-        const global = inject(AX_GLOBAL_CONFIG);
-        set(global, 'dateTime', AX_DATETIME_CONFIG);
-        return AXDateTimeDefaultConfig;
-    },
-});
-const AXDateTimeDefaultConfig = {
-    calendar: 'gregorian',
-    calendars: {
-        gregorian: new AXGregorianCalendar({
-            weekdays: [0, 1, 2, 3, 4, 5, 6],
-            weekend: [5, 6],
-        }),
-        'solar-hijri': new AXSolarHijriCalendar({
-            weekdays: [6, 0, 1, 2, 3, 4, 5],
-            weekend: [6],
-        }),
-    },
-};
-function dateTimeConfig(config = {}) {
-    const result = {
-        ...AXDateTimeDefaultConfig,
-        ...config,
-    };
-    return result;
-}
-
-class AXHolidaysLoaderDefault {
-    getHolidays(options) {
-        return Promise.resolve([]);
-    }
-}
-const AX_DATETIME_HOLIDAYS_LOADER = new InjectionToken('AX_DATETIME_HOLIDAYS_LOADER', {
-    providedIn: 'root',
-    factory: () => {
-        return new AXHolidaysLoaderDefault();
-    },
-});
-
 class AXCalendarService {
     get calendar() {
         return this.getActiveCalendar();
     }
     getDefaultCalendar() {
-        return this.config.calendars[this.config.calendar];
+        return this.resolveCalendar(this.localeService.activeProfile().calendar.system);
     }
     getActiveCalendar() {
         return this.activeCalendar.getValue();
@@ -1112,31 +1105,52 @@ class AXCalendarService {
     setActiveCalendar(name) {
         if (name != this.calendar?.name()) {
             const calendar = this.resolveCalendar(name);
-            this.activeCalendar.next(calendar);
-            this.eventService.emitEvent({
-                type: AXSystemEvents.AXCalendarChanged,
-                payload: this.getActiveCalendar(),
-            });
+            this.notifyCalendarChanged(calendar);
         }
     }
+    notifyCalendarChanged(calendar) {
+        this.activeCalendar.next(calendar);
+        this.eventService.emitEvent({
+            type: AXSystemEvents.AXCalendarChanged,
+            payload: calendar,
+        });
+    }
+    buildWeekConfig(profile) {
+        const weekdays = Array.from({ length: 7 }, (_, i) => (profile.calendar.week.startsOn + i) % 7);
+        return {
+            weekdays,
+            weekend: profile.calendar.week.weekends,
+        };
+    }
+    registerCalendars(profile) {
+        const weekConfig = this.buildWeekConfig(profile);
+        this.calendars.set('gregorian', new AXGregorianCalendar(weekConfig));
+        this.calendars.set('solar-hijri', new AXSolarHijriCalendar(weekConfig));
+    }
+    applyLocaleWeekSettings(locale) {
+        const weekConfig = this.buildWeekConfig(locale);
+        this.calendars.forEach((calendar) => calendar.applyWeekConfig(weekConfig));
+        this.notifyCalendarChanged(this.resolveCalendar(locale.calendar.system));
+    }
     get holidays() {
         return this._holidays;
     }
     constructor() {
-        this.config = inject(AX_DATETIME_CONFIG);
         this._holidaysLoader = inject(AX_DATETIME_HOLIDAYS_LOADER);
         this.eventService = inject(AXEventService);
         this.formatService = inject(AXFormatService);
         this.localeService = inject(AXLocaleService);
-        this.activeCalendar = new BehaviorSubject(this.getDefaultCalendar());
-        this.calendarChanges$ = this.activeCalendar.asObservable();
+        this.calendars = new Map();
         this.onHolidaysChanged = new Subject();
         this._holidays = [];
+        const profile = this.localeService.activeProfile();
+        this.registerCalendars(profile);
+        this.activeCalendar = new BehaviorSubject(this.resolveCalendar(profile.calendar.system));
+        this.calendarChanges$ = this.activeCalendar.asObservable();
         this.loadHolidays();
-        //
         this.localeService.profileChanged$.subscribe((locale) => {
             if (locale?.calendar?.system) {
-                this.setActiveCalendar(locale.calendar.system);
+                this.applyLocaleWeekSettings(locale);
             }
         });
     }
@@ -1208,11 +1222,11 @@ class AXCalendarService {
         return new AXDateTime(new Date(), calendar);
     }
     resolveCalendar(name) {
-        const c = this.config.calendars[name];
-        if (!c) {
+        const calendar = this.calendars.get(name);
+        if (!calendar) {
             return this.calendar;
         }
-        return c;
+        return calendar;
     }
     convert(value, calendarName) {
         const isISOString = (str) => {
@@ -1700,5 +1714,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AXCalendar, AXCalendarMonth, AXCalendarService, AXDateTime, AXDateTimeDefaultConfig, AXDateTimeFormatter, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXGregorianCalendar, AXHolidaysLoaderDefault, AXSolarHijriCalendar, AXTimeDurationFormatter, AXTimeLeftFormatter, AX_DATETIME_CONFIG, AX_DATETIME_HOLIDAYS_LOADER, dateTimeConfig };
+export { AXCalendar, AXCalendarMonth, AXCalendarService, AXDateTime, AXDateTimeFormatter, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXGregorianCalendar, AXHolidaysLoaderDefault, AXSolarHijriCalendar, AXTimeDurationFormatter, AXTimeLeftFormatter, AX_DATETIME_HOLIDAYS_LOADER };
 //# sourceMappingURL=acorex-core-date-time.mjs.map