@thyrith/momentkh 3.0.0 → 3.0.2

package/dist/momentkh.d.ts

@@ -16,20 +16,20 @@ export declare enum MoonPhase {
     Waning = 1
 }
 export declare enum MonthIndex {
-    Mikasar = 0,// មិគសិរ
-    Bos = 1,// បុស្ស
+    Migasir = 0,// មិគសិរ
+    Boss = 1,// បុស្ស
     Meak = 2,// មាឃ
-    Phalgun = 3,// ផល្គុន
-    Chetr = 4,// ចេត្រ
-    Visakh = 5,// ពិសាខ
+    Phalkun = 3,// ផល្គុន
+    Cheit = 4,// ចេត្រ
+    Pisakh = 5,// ពិសាខ
     Jesth = 6,// ជេស្ឋ
-    Asath = 7,// អាសាឍ
+    Asadh = 7,// អាសាឍ
     Srap = 8,// ស្រាពណ៍
-    Photrobot = 9,// ភទ្របទ
+    Phatrabot = 9,// ភទ្របទ
     Assoch = 10,// អស្សុជ
-    Kadek = 11,// កត្ដិក
-    BothmakAsath = 12,// បឋមាសាឍ
-    TutiyakAsath = 13
+    Kadeuk = 11,// កត្ដិក
+    Pathamasadh = 12,// បឋមាសាឍ
+    Tutiyasadh = 13
 }
 export declare enum AnimalYear {
     Chhut = 0,// ជូត - Rat
@@ -45,17 +45,17 @@ export declare enum AnimalYear {
     Cho = 10,// ច - Dog
     Kor = 11
 }
-export declare enum EraYear {
-    Samridhisak = 0,// សំរឹទ្ធិស័ក
-    Ekasak = 1,// ឯកស័ក
-    Tosak = 2,// ទោស័ក
-    Tresak = 3,// ត្រីស័ក
-    Chatvasak = 4,// ចត្វាស័ក
-    Panchasak = 5,// បញ្ចស័ក
-    Chhasak = 6,// ឆស័ក
-    Saptasak = 7,// សប្តស័ក
-    Atthasak = 8,// អដ្ឋស័ក
-    Novvasak = 9
+export declare enum Sak {
+    SamridhiSak = 0,// សំរឹទ្ធិស័ក
+    AekSak = 1,// ឯកស័ក
+    ToSak = 2,// ទោស័ក
+    TreiSak = 3,// ត្រីស័ក
+    ChattvaSak = 4,// ចត្វាស័ក
+    PanchaSak = 5,// បញ្ចស័ក
+    ChhaSak = 6,// ឆស័ក
+    SappaSak = 7,// សប្តស័ក
+    AtthaSak = 8,// អដ្ឋស័ក
+    NappaSak = 9
 }
 export declare enum DayOfWeek {
     Sunday = 0,// អាទិត្យ
@@ -85,8 +85,8 @@ export interface KhmerDateInfo {
     jsYear: number;
     animalYear: AnimalYear;
     animalYearName: string;
-    eraYear: EraYear;
-    eraYearName: string;
+    sak: Sak;
+    sakName: string;
     dayOfWeek: DayOfWeek;
     dayOfWeekName: string;
 }
@@ -138,10 +138,18 @@ export interface Constants {
     LunarMonths: Record<string, number>;
     LunarMonthNames: string[];
     SolarMonthNames: string[];
+    SolarMonthAbbreviationNames: string[];
+    LunarMonthAbbreviationNames: string[];
     AnimalYearNames: string[];
-    EraYearNames: string[];
+    AnimalYearEmojis: string[];
+    SakNames: string[];
     WeekdayNames: string[];
-    MoonStatusNames: string[];
+    WeekdayNamesShort: string[];
+    MoonPhaseNames: string[];
+    MoonPhaseShort: string[];
+    MoonDaySymbols: string[];
+    KhmerNumerals: Record<string, string>;
+    khNewYearMoments: Record<string, string>;
 }
 declare class KhmerDate {
     day: number;
@@ -155,27 +163,48 @@ declare class KhmerDate {
     subtractDays(count: number): KhmerDate;
     toString(): string;
 }
-export declare const momentkh: {
-    fromGregorian(year: number, month: number, day: number, hour?: number, minute?: number, second?: number): KhmerConversionResult;
-    fromKhmer(day: number, moonPhase: MoonPhase | number, monthIndex: MonthIndex | number, beYear: number): GregorianDate;
-    getNewYear(ceYear: number): NewYearInfo;
-    format(khmerData: KhmerConversionResult, formatString?: string): string;
-    fromDate(date: Date): KhmerConversionResult;
-    toDate(day: number, moonPhase: MoonPhase | number, monthIndex: MonthIndex | number, beYear: number): Date;
+export declare function fromGregorian(year: number, month: number, day: number, hour?: number, minute?: number, second?: number): KhmerConversionResult;
+export declare function fromKhmer(day: number, moonPhase: MoonPhase | number, monthIndex: MonthIndex | number, beYear: number): GregorianDate;
+export declare function getNewYear(ceYear: number): NewYearInfo;
+export declare function format(khmerData: KhmerConversionResult, formatString?: string): string;
+export declare function fromDate(date: Date): KhmerConversionResult;
+export declare function toDate(day: number, moonPhase: MoonPhase | number, monthIndex: MonthIndex | number, beYear: number): Date;
+export declare const constants: {
+    LunarMonths: Record<string, number>;
+    LunarMonthNames: string[];
+    SolarMonthNames: string[];
+    SolarMonthAbbreviationNames: string[];
+    LunarMonthAbbreviationNames: string[];
+    AnimalYearNames: string[];
+    AnimalYearEmojis: string[];
+    SakNames: string[];
+    WeekdayNames: string[];
+    MoonPhaseNames: string[];
+};
+declare const _default: {
+    fromGregorian: typeof fromGregorian;
+    fromKhmer: typeof fromKhmer;
+    getNewYear: typeof getNewYear;
+    format: typeof format;
+    fromDate: typeof fromDate;
+    toDate: typeof toDate;
     constants: {
         LunarMonths: Record<string, number>;
         LunarMonthNames: string[];
         SolarMonthNames: string[];
+        SolarMonthAbbreviationNames: string[];
+        LunarMonthAbbreviationNames: string[];
         AnimalYearNames: string[];
-        EraYearNames: string[];
+        AnimalYearEmojis: string[];
+        SakNames: string[];
         WeekdayNames: string[];
-        MoonStatusNames: string[];
+        MoonPhaseNames: string[];
     };
     MoonPhase: typeof MoonPhase;
     MonthIndex: typeof MonthIndex;
     AnimalYear: typeof AnimalYear;
-    EraYear: typeof EraYear;
+    Sak: typeof Sak;
     DayOfWeek: typeof DayOfWeek;
 };
-export default momentkh;
+export default _default;
 //# sourceMappingURL=momentkh.d.ts.map

package/dist/momentkh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"momentkh.d.ts","sourceRoot":"","sources":["../momentkh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"momentkh.d.ts","sourceRoot":"","sources":["../momentkh.ts"],"names":[],"mappings":"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"}

package/dist/momentkh.js

@@ -13,7 +13,13 @@
  * @license MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.momentkh = exports.DayOfWeek = exports.EraYear = exports.AnimalYear = exports.MonthIndex = exports.MoonPhase = void 0;
+exports.constants = exports.DayOfWeek = exports.Sak = exports.AnimalYear = exports.MonthIndex = exports.MoonPhase = void 0;
+exports.fromGregorian = fromGregorian;
+exports.fromKhmer = fromKhmer;
+exports.getNewYear = getNewYear;
+exports.format = format;
+exports.fromDate = fromDate;
+exports.toDate = toDate;
 // ============================================================================
 // Type Definitions
 // ============================================================================
@@ -25,20 +31,20 @@ var MoonPhase;
 })(MoonPhase || (exports.MoonPhase = MoonPhase = {}));
 var MonthIndex;
 (function (MonthIndex) {
-    MonthIndex[MonthIndex["Mikasar"] = 0] = "Mikasar";
-    MonthIndex[MonthIndex["Bos"] = 1] = "Bos";
+    MonthIndex[MonthIndex["Migasir"] = 0] = "Migasir";
+    MonthIndex[MonthIndex["Boss"] = 1] = "Boss";
     MonthIndex[MonthIndex["Meak"] = 2] = "Meak";
-    MonthIndex[MonthIndex["Phalgun"] = 3] = "Phalgun";
-    MonthIndex[MonthIndex["Chetr"] = 4] = "Chetr";
-    MonthIndex[MonthIndex["Visakh"] = 5] = "Visakh";
+    MonthIndex[MonthIndex["Phalkun"] = 3] = "Phalkun";
+    MonthIndex[MonthIndex["Cheit"] = 4] = "Cheit";
+    MonthIndex[MonthIndex["Pisakh"] = 5] = "Pisakh";
     MonthIndex[MonthIndex["Jesth"] = 6] = "Jesth";
-    MonthIndex[MonthIndex["Asath"] = 7] = "Asath";
+    MonthIndex[MonthIndex["Asadh"] = 7] = "Asadh";
     MonthIndex[MonthIndex["Srap"] = 8] = "Srap";
-    MonthIndex[MonthIndex["Photrobot"] = 9] = "Photrobot";
+    MonthIndex[MonthIndex["Phatrabot"] = 9] = "Phatrabot";
     MonthIndex[MonthIndex["Assoch"] = 10] = "Assoch";
-    MonthIndex[MonthIndex["Kadek"] = 11] = "Kadek";
-    MonthIndex[MonthIndex["BothmakAsath"] = 12] = "BothmakAsath";
-    MonthIndex[MonthIndex["TutiyakAsath"] = 13] = "TutiyakAsath"; // ទុតិយាសាឍ
+    MonthIndex[MonthIndex["Kadeuk"] = 11] = "Kadeuk";
+    MonthIndex[MonthIndex["Pathamasadh"] = 12] = "Pathamasadh";
+    MonthIndex[MonthIndex["Tutiyasadh"] = 13] = "Tutiyasadh"; // ទុតិយាសាឍ
 })(MonthIndex || (exports.MonthIndex = MonthIndex = {}));
 var AnimalYear;
 (function (AnimalYear) {
@@ -55,19 +61,19 @@ var AnimalYear;
     AnimalYear[AnimalYear["Cho"] = 10] = "Cho";
     AnimalYear[AnimalYear["Kor"] = 11] = "Kor"; // កុរ - Pig
 })(AnimalYear || (exports.AnimalYear = AnimalYear = {}));
-var EraYear;
-(function (EraYear) {
-    EraYear[EraYear["Samridhisak"] = 0] = "Samridhisak";
-    EraYear[EraYear["Ekasak"] = 1] = "Ekasak";
-    EraYear[EraYear["Tosak"] = 2] = "Tosak";
-    EraYear[EraYear["Tresak"] = 3] = "Tresak";
-    EraYear[EraYear["Chatvasak"] = 4] = "Chatvasak";
-    EraYear[EraYear["Panchasak"] = 5] = "Panchasak";
-    EraYear[EraYear["Chhasak"] = 6] = "Chhasak";
-    EraYear[EraYear["Saptasak"] = 7] = "Saptasak";
-    EraYear[EraYear["Atthasak"] = 8] = "Atthasak";
-    EraYear[EraYear["Novvasak"] = 9] = "Novvasak"; // នព្វស័ក
-})(EraYear || (exports.EraYear = EraYear = {}));
+var Sak;
+(function (Sak) {
+    Sak[Sak["SamridhiSak"] = 0] = "SamridhiSak";
+    Sak[Sak["AekSak"] = 1] = "AekSak";
+    Sak[Sak["ToSak"] = 2] = "ToSak";
+    Sak[Sak["TreiSak"] = 3] = "TreiSak";
+    Sak[Sak["ChattvaSak"] = 4] = "ChattvaSak";
+    Sak[Sak["PanchaSak"] = 5] = "PanchaSak";
+    Sak[Sak["ChhaSak"] = 6] = "ChhaSak";
+    Sak[Sak["SappaSak"] = 7] = "SappaSak";
+    Sak[Sak["AtthaSak"] = 8] = "AtthaSak";
+    Sak[Sak["NappaSak"] = 9] = "NappaSak"; // នព្វស័ក
+})(Sak || (exports.Sak = Sak = {}));
 var DayOfWeek;
 (function (DayOfWeek) {
     DayOfWeek[DayOfWeek["Sunday"] = 0] = "Sunday";
@@ -96,11 +102,24 @@ const SolarMonthNames = [
     'មករា', 'កុម្ភៈ', 'មីនា', 'មេសា', 'ឧសភា', 'មិថុនា',
     'កក្កដា', 'សីហា', 'កញ្ញា', 'តុលា', 'វិច្ឆិកា', 'ធ្នូ'
 ];
+const SolarMonthAbbreviationNames = [
+    'មក', 'កម', 'មន', 'មស', 'ឧស', 'មថ',
+    'កដ', 'សហ', 'កញ', 'តល', 'វក', 'ធន'
+];
+const LunarMonthAbbreviationNames = [
+    'មិ', 'បុ', 'មា', 'ផល', 'ចេ', 'ពិ',
+    'ជេ', 'អា', 'ស្រ', 'ភ', 'អ', 'ក',
+    'បឋ', 'ទុតិ'
+];
 const AnimalYearNames = [
     'ជូត', 'ឆ្លូវ', 'ខាល', 'ថោះ', 'រោង', 'ម្សាញ់',
     'មមី', 'មមែ', 'វក', 'រកា', 'ច', 'កុរ'
 ];
-const EraYearNames = [
+const AnimalYearEmojis = [
+    '🐀', '🐂', '🐅', '🐇', '🐉', '🐍',
+    '🐎', '🐐', '🐒', '🐓', '🐕', '🐖'
+];
+const SakNames = [
     'សំរឹទ្ធិស័ក', 'ឯកស័ក', 'ទោស័ក', 'ត្រីស័ក', 'ចត្វាស័ក',
     'បញ្ចស័ក', 'ឆស័ក', 'សប្តស័ក', 'អដ្ឋស័ក', 'នព្វស័ក'
 ];
@@ -108,8 +127,8 @@ const WeekdayNames = [
     'អាទិត្យ', 'ចន្ទ', 'អង្គារ', 'ពុធ', 'ព្រហស្បតិ៍', 'សុក្រ', 'សៅរ៍'
 ];
 const WeekdayNamesShort = ['អា', 'ច', 'អ', 'ព', 'ព្រ', 'សុ', 'ស'];
-const MoonStatusNames = ['កើត', 'រោច'];
-const MoonStatusShort = ['ក', 'រ'];
+const MoonPhaseNames = ['កើត', 'រោច'];
+const MoonPhaseShort = ['ក', 'រ'];
 const MoonDaySymbols = [
     '᧡', '᧢', '᧣', '᧤', '᧥', '᧦', '᧧', '᧨', '᧩', '᧪',
     '᧫', '᧬', '᧭', '᧮', '᧯', '᧱', '᧲', '᧳', '᧴', '᧵',
@@ -372,7 +391,7 @@ function getNumberOfDaysInKhmerMonth(monthIndex, beYear) {
     if (idx === MonthIndex.Jesth && leapType === 2) { // ជេស្ឋ with leap day
         return 30;
     }
-    if (idx === MonthIndex.BothmakAsath || idx === MonthIndex.TutiyakAsath) { // បឋមាសាឍ, ទុតិយាសាឍ
+    if (idx === MonthIndex.Pathamasadh || idx === MonthIndex.Tutiyasadh) { // បឋមាសាឍ, ទុតិយាសាឍ
         return leapType === 1 ? 30 : 0;
     }
     // Alternating pattern: even months = 29 days, odd months = 30 days
@@ -391,26 +410,26 @@ function nextMonthOf(monthIndex, beYear) {
     const leapType = getLeapType(beYear);
     const idx = typeof monthIndex === 'number' ? monthIndex : monthIndex;
     if (idx === MonthIndex.Jesth && leapType === 1) { // ជេស្ឋ in leap month year
-        return MonthIndex.BothmakAsath; // បឋមាសាឍ
+        return MonthIndex.Pathamasadh; // បឋមាសាឍ
     }
-    if (idx === MonthIndex.Kadek)
-        return MonthIndex.Mikasar; // កត្ដិក -> មិគសិរ
-    if (idx === MonthIndex.BothmakAsath)
-        return MonthIndex.TutiyakAsath; // បឋមាសាឍ -> ទុតិយាសាឍ
-    if (idx === MonthIndex.TutiyakAsath)
+    if (idx === MonthIndex.Kadeuk)
+        return MonthIndex.Migasir; // កត្ដិក -> មិគសិរ
+    if (idx === MonthIndex.Pathamasadh)
+        return MonthIndex.Tutiyasadh; // បឋមាសាឍ -> ទុតិយាសាឍ
+    if (idx === MonthIndex.Tutiyasadh)
         return MonthIndex.Srap; // ទុតិយាសាឍ -> ស្រាពណ៍
     return (idx + 1);
 }
 function previousMonthOf(monthIndex, beYear) {
     const leapType = getLeapType(beYear);
     const idx = typeof monthIndex === 'number' ? monthIndex : monthIndex;
-    if (idx === MonthIndex.Mikasar)
-        return MonthIndex.Kadek; // មិគសិរ -> កត្ដិក
+    if (idx === MonthIndex.Migasir)
+        return MonthIndex.Kadeuk; // មិគសិរ -> កត្ដិក
     if (idx === MonthIndex.Srap && leapType === 1)
-        return MonthIndex.TutiyakAsath; // ស្រាពណ៍ -> ទុតិយាសាឍ (leap)
-    if (idx === MonthIndex.TutiyakAsath)
-        return MonthIndex.BothmakAsath; // ទុតិយាសាឍ -> បឋមាសាឍ
-    if (idx === MonthIndex.BothmakAsath)
+        return MonthIndex.Tutiyasadh; // ស្រាពណ៍ -> ទុតិយាសាឍ (leap)
+    if (idx === MonthIndex.Tutiyasadh)
+        return MonthIndex.Pathamasadh; // ទុតិយាសាឍ -> បឋមាសាឍ
+    if (idx === MonthIndex.Pathamasadh)
         return MonthIndex.Jesth; // បឋមាសាឍ -> ជេស្ឋ
     return (idx - 1);
 }
@@ -601,7 +620,7 @@ class KhmerDate {
                 const newDayNum = currentDayNum + remaining;
                 const newDay = KhmerDate.fromDayNumber(newDayNum);
                 let newBeYear = result.beYear;
-                if (result.monthIndex === MonthIndex.Visakh) { // ពិសាខ
+                if (result.monthIndex === MonthIndex.Pisakh) { // ពិសាខ
                     if (result.moonPhase === MoonPhase.Waxing && newDay.moonPhase === MoonPhase.Waning) {
                         newBeYear++;
                     }
@@ -612,7 +631,7 @@ class KhmerDate {
             else {
                 remaining -= (daysLeftInMonth + 1);
                 const nextMonth = nextMonthOf(result.monthIndex, result.beYear);
-                const newBeYear = (result.monthIndex === MonthIndex.Chetr) ? result.beYear + 1 : result.beYear;
+                const newBeYear = (result.monthIndex === MonthIndex.Cheit) ? result.beYear + 1 : result.beYear;
                 result = new KhmerDate(1, MoonPhase.Waxing, nextMonth, newBeYear); // Start at 1កើត
             }
         }
@@ -629,7 +648,7 @@ class KhmerDate {
                 const newDayNum = currentDayNum - remaining;
                 const newDay = KhmerDate.fromDayNumber(newDayNum);
                 let newBeYear = result.beYear;
-                if (result.monthIndex === MonthIndex.Visakh) { // ពិសាខ
+                if (result.monthIndex === MonthIndex.Pisakh) { // ពិសាខ
                     if (result.moonPhase === MoonPhase.Waning && newDay.moonPhase === MoonPhase.Waxing) {
                         newBeYear--;
                     }
@@ -640,7 +659,7 @@ class KhmerDate {
             else {
                 remaining -= (currentDayNum + 1);
                 const prevMonth = previousMonthOf(result.monthIndex, result.beYear);
-                const newBeYear = (result.monthIndex === MonthIndex.Visakh) ? result.beYear - 1 : result.beYear;
+                const newBeYear = (result.monthIndex === MonthIndex.Pisakh) ? result.beYear - 1 : result.beYear;
                 const daysInPrevMonth = getNumberOfDaysInKhmerMonth(prevMonth, newBeYear);
                 const newDay = KhmerDate.fromDayNumber(daysInPrevMonth - 1);
                 result = new KhmerDate(newDay.day, newDay.moonPhase, prevMonth, newBeYear);
@@ -649,7 +668,7 @@ class KhmerDate {
         return result;
     }
     toString() {
-        return `${this.day}${MoonStatusNames[this.moonPhase]} ខែ${LunarMonthNames[this.monthIndex]} ព.ស.${this.beYear}`;
+        return `${this.day}${MoonPhaseNames[this.moonPhase]} ខែ${LunarMonthNames[this.monthIndex]} ព.ស.${this.beYear}`;
     }
 }
 // ============================================================================
@@ -665,7 +684,7 @@ function getMaybeBEYear(year, month) {
         return year + 544;
     }
 }
-// Cache for Visakha Bochea dates by year
+// Cache for Pisakha Bochea dates by year
 const visakhaBocheaCache = {};
 // Cache for New Year Full Info
 const newYearInfoCache = {};
@@ -674,7 +693,7 @@ const newYearInfoCache = {};
  * BE year increases on ១រោច ខែពិសាខ (1st waning day of Pisakh = dayNumber 15 of month 5)
  * Returns timestamp in milliseconds at midnight of that day
  */
-function getVisakhaBochea(year, isSearching = false) {
+function getPisakhaBochea(year, isSearching = false) {
     if (visakhaBocheaCache[year]) {
         return visakhaBocheaCache[year];
     }
@@ -684,7 +703,7 @@ function getVisakhaBochea(year, isSearching = false) {
         for (let searchDay = 1; searchDay <= daysInMonth; searchDay++) {
             // Avoid infinite recursion by using simplified BE year during search
             const result = gregorianToKhmerInternal(year, searchMonth, searchDay, 12, 0, 0, true);
-            if (result.khmer.monthIndex === MonthIndex.Visakh && result._khmerDateObj.getDayNumber() === 15) {
+            if (result.khmer.monthIndex === MonthIndex.Pisakh && result._khmerDateObj.getDayNumber() === 15) {
                 // Found 1រោច Pisakh - return timestamp at midnight (start of BE year change day)
                 // BE year changes at 00:00 on this day
                 const timestamp = new Date(year, searchMonth - 1, searchDay, 0, 0, 0, 0).getTime();
@@ -770,7 +789,7 @@ function gregorianToKhmerInternal(year, month, day, hour = 0, minute = 0, second
     else {
         // Normal mode: compare against exact BE year transition datetime (1រោច Pisakh at 00:00)
         const inputTimestamp = new Date(year, month - 1, day, hour, minute, second).getTime();
-        const beYearTransitionTimestamp = getVisakhaBochea(year);
+        const beYearTransitionTimestamp = getPisakhaBochea(year);
         if (inputTimestamp >= beYearTransitionTimestamp) {
             // On or after 1រោច Pisakh (new BE year)
             beYear = year + 544;
@@ -784,14 +803,14 @@ function gregorianToKhmerInternal(year, month, day, hour = 0, minute = 0, second
     let jsYear = beToJs(beYear);
     let animalYearIndex = ((beYear + 4) % 12 + 12) % 12;
     // Adjust Era and Animal Year based on Khmer New Year logic
-    // They should change at New Year, not wait for Visakha Bochea (which changes BE)
+    // They should change at New Year, not wait for Pisakha Bochea (which changes BE)
     if (!isSearching) {
         const newYearInfo = getNewYearFullInfo(year);
         const inputTimestamp = new Date(year, month - 1, day, hour, minute, second).getTime();
-        const visakhaBocheaTimestamp = getVisakhaBochea(year);
+        const visakhaBocheaTimestamp = getPisakhaBochea(year);
         // Animal Year changes at Moha Songkran (exact New Year time)
-        // Only apply manual increment if we are in the gap between New Year and Visakha Bochea
-        // (After Visakha Bochea, the BE year increments, so the formula based on BE automatically gives the new Animal Year)
+        // Only apply manual increment if we are in the gap between New Year and Pisakha Bochea
+        // (After Pisakha Bochea, the BE year increments, so the formula based on BE automatically gives the new Animal Year)
         if (inputTimestamp >= newYearInfo.newYearMoment.getTime() && inputTimestamp <= visakhaBocheaTimestamp) {
             animalYearIndex = (animalYearIndex + 1) % 12;
         }
@@ -800,7 +819,7 @@ function gregorianToKhmerInternal(year, month, day, hour = 0, minute = 0, second
             jsYear++;
         }
     }
-    const eraYearIndex = ((jsYear % 10) + 10) % 10;
+    const sakIndex = ((jsYear % 10) + 10) % 10;
     const dayOfWeek = getDayOfWeek(year, month, day);
     const khmerDate = new KhmerDate(khmerDayInfo.day, khmerDayInfo.moonPhase, khmerMonth, beYear);
     return {
@@ -808,15 +827,15 @@ function gregorianToKhmerInternal(year, month, day, hour = 0, minute = 0, second
         khmer: {
             day: khmerDayInfo.day,
             moonPhase: khmerDayInfo.moonPhase,
-            moonPhaseName: MoonStatusNames[khmerDayInfo.moonPhase],
+            moonPhaseName: MoonPhaseNames[khmerDayInfo.moonPhase],
             monthIndex: khmerMonth,
             monthName: LunarMonthNames[khmerMonth],
             beYear: beYear,
             jsYear: jsYear,
             animalYear: animalYearIndex,
             animalYearName: AnimalYearNames[animalYearIndex],
-            eraYear: eraYearIndex,
-            eraYearName: EraYearNames[eraYearIndex],
+            sak: sakIndex,
+            sakName: SakNames[sakIndex],
             dayOfWeek: dayOfWeek,
             dayOfWeekName: WeekdayNames[dayOfWeek]
         },
@@ -843,7 +862,7 @@ function khmerToGregorian(day, moonPhase, monthIndex, beYear) {
             for (let gDay = 1; gDay <= daysInMonth; gDay++) {
                 // For BE year transition day (1រោច Pisakh) and the day before (15កើត Pisakh),
                 // check multiple times during the day because BE year can change during this period
-                const isAroundBEYearChange = monthIndexNum === MonthIndex.Visakh &&
+                const isAroundBEYearChange = monthIndexNum === MonthIndex.Pisakh &&
                     ((day === 15 && moonPhaseNum === MoonPhase.Waxing) || (day === 1 && moonPhaseNum === MoonPhase.Waning));
                 const timesToCheck = isAroundBEYearChange
                     ? [0, 6, 12, 18, 23] // Check at different hours
@@ -963,34 +982,47 @@ function getKhmerNewYear(ceYear) {
 // ============================================================================
 // Formatting Functions
 // ============================================================================
-function format(khmerData, formatString) {
+function formatKhmer(khmerData, formatString) {
     if (!formatString) {
         // Default format
         const { khmer } = khmerData;
         const moonDay = `${khmer.day}${khmer.moonPhaseName}`;
-        return toKhmerNumeral(`ថ្ងៃ${khmer.dayOfWeekName} ${moonDay} ខែ${khmer.monthName} ឆ្នាំ${khmer.animalYearName} ${khmer.eraYearName} ពុទ្ធសករាជ ${khmer.beYear}`);
+        return toKhmerNumeral(`ថ្ងៃ${khmer.dayOfWeekName} ${moonDay} ខែ${khmer.monthName} ឆ្នាំ${khmer.animalYearName} ${khmer.sakName} ពុទ្ធសករាជ ${khmer.beYear}`);
     }
     // Custom format
     const formatRules = {
         'W': () => khmerData.khmer.dayOfWeekName,
         'w': () => WeekdayNamesShort[khmerData.gregorian.dayOfWeek],
-        'd': () => khmerData.khmer.day,
-        'D': () => (khmerData.khmer.day < 10 ? '0' : '') + khmerData.khmer.day,
-        'n': () => MoonStatusShort[khmerData.khmer.moonPhase],
+        'd': () => toKhmerNumeral(khmerData.khmer.day),
+        'D': () => toKhmerNumeral((khmerData.khmer.day < 10 ? '0' : '') + khmerData.khmer.day),
+        'dr': () => khmerData.khmer.day,
+        'Dr': () => (khmerData.khmer.day < 10 ? '0' : '') + khmerData.khmer.day,
+        'n': () => MoonPhaseShort[khmerData.khmer.moonPhase],
         'N': () => khmerData.khmer.moonPhaseName,
         'o': () => MoonDaySymbols[khmerData._khmerDateObj.getDayNumber()],
         'm': () => khmerData.khmer.monthName,
         'M': () => SolarMonthNames[khmerData.gregorian.month - 1],
         'a': () => khmerData.khmer.animalYearName,
-        'e': () => khmerData.khmer.eraYearName,
-        'b': () => khmerData.khmer.beYear,
-        'c': () => khmerData.gregorian.year,
-        'j': () => khmerData.khmer.jsYear
+        'as': () => AnimalYearEmojis[khmerData.khmer.animalYear],
+        'e': () => khmerData.khmer.sakName,
+        'b': () => toKhmerNumeral(khmerData.khmer.beYear),
+        'br': () => khmerData.khmer.beYear,
+        'c': () => toKhmerNumeral(khmerData.gregorian.year),
+        'cr': () => khmerData.gregorian.year,
+        'j': () => toKhmerNumeral(khmerData.khmer.jsYear),
+        'jr': () => khmerData.khmer.jsYear,
+        'Ms': () => SolarMonthAbbreviationNames[khmerData.gregorian.month - 1],
+        'ms': () => LunarMonthAbbreviationNames[khmerData.khmer.monthIndex]
     };
-    const regex = new RegExp(Object.keys(formatRules).join('|'), 'g');
-    const result = formatString.replace(regex, match => {
-        const value = formatRules[match]();
-        return toKhmerNumeral(String(value));
+    // Sort keys by length descending to ensure longer tokens (like 'Ms', 'ms') are matched before shorter ones (like 'M', 'm')
+    const sortedKeys = Object.keys(formatRules).sort((a, b) => b.length - a.length);
+    const regex = new RegExp(`\\[([^\\]]+)\\]|(${sortedKeys.join('|')})`, 'g');
+    const result = formatString.replace(regex, (match, escaped, token) => {
+        if (escaped) {
+            return escaped;
+        }
+        const value = formatRules[token]();
+        return String(value);
     });
     return result;
 }
@@ -1004,49 +1036,57 @@ function gregorianToKhmer(year, month, day, hour = 0, minute = 0, second = 0) {
 // ============================================================================
 // Public API
 // ============================================================================
-exports.momentkh = {
-    // Conversion functions
-    fromGregorian(year, month, day, hour = 0, minute = 0, second = 0) {
-        return gregorianToKhmer(year, month, day, hour, minute, second);
-    },
-    fromKhmer(day, moonPhase, monthIndex, beYear) {
-        return khmerToGregorian(day, moonPhase, monthIndex, beYear);
-    },
-    // New Year function
-    getNewYear(ceYear) {
-        return getKhmerNewYear(ceYear);
-    },
-    // Format function
-    format(khmerData, formatString) {
-        return format(khmerData, formatString);
-    },
-    // Utility for creating date from Date object
-    fromDate(date) {
-        // Validate Date object
-        validateDateObject(date);
-        return gregorianToKhmer(date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
-    },
-    // Convert Khmer to Date object
-    toDate(day, moonPhase, monthIndex, beYear) {
-        const greg = khmerToGregorian(day, moonPhase, monthIndex, beYear);
-        return new Date(greg.year, greg.month - 1, greg.day);
-    },
-    // Constants export
-    constants: {
-        LunarMonths,
-        LunarMonthNames,
-        SolarMonthNames,
-        AnimalYearNames,
-        EraYearNames,
-        WeekdayNames,
-        MoonStatusNames
-    },
-    // Enums export for easier usage
+// Conversion functions
+function fromGregorian(year, month, day, hour = 0, minute = 0, second = 0) {
+    return gregorianToKhmer(year, month, day, hour, minute, second);
+}
+function fromKhmer(day, moonPhase, monthIndex, beYear) {
+    return khmerToGregorian(day, moonPhase, monthIndex, beYear);
+}
+// New Year function
+function getNewYear(ceYear) {
+    return getKhmerNewYear(ceYear);
+}
+// Format function
+function format(khmerData, formatString) {
+    return formatKhmer(khmerData, formatString);
+}
+// Utility for creating date from Date object
+function fromDate(date) {
+    // Validate Date object
+    validateDateObject(date);
+    return gregorianToKhmer(date.getFullYear(), date.getMonth() + 1, date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+}
+// Convert Khmer to Date object
+function toDate(day, moonPhase, monthIndex, beYear) {
+    const greg = khmerToGregorian(day, moonPhase, monthIndex, beYear);
+    return new Date(greg.year, greg.month - 1, greg.day);
+}
+// Constants export
+exports.constants = {
+    LunarMonths,
+    LunarMonthNames,
+    SolarMonthNames,
+    SolarMonthAbbreviationNames,
+    LunarMonthAbbreviationNames,
+    AnimalYearNames,
+    AnimalYearEmojis,
+    SakNames,
+    WeekdayNames,
+    MoonPhaseNames
+};
+// Default export - aggregate all exports for convenience
+exports.default = {
+    fromGregorian,
+    fromKhmer,
+    getNewYear,
+    format,
+    fromDate,
+    toDate,
+    constants: exports.constants,
     MoonPhase,
     MonthIndex,
     AnimalYear,
-    EraYear,
+    Sak,
     DayOfWeek
 };
-// Default export
-exports.default = exports.momentkh;