@gracefullight/saju 0.1.1 → 0.2.0

package/README.en.md

@@ -77,13 +77,19 @@ console.log(result);
 // {
 //   year: "己卯",    // Year Pillar (Heavenly Stem + Earthly Branch)
 //   month: "丙子",   // Month Pillar
-//   day: "庚辰",     // Day Pillar
-//   hour: "辛酉",    // Hour Pillar
+//   day: "辛巳",     // Day Pillar
+//   hour: "戊戌",    // Hour Pillar
+//   lunar: {
+//     lunarYear: 1999,
+//     lunarMonth: 11,
+//     lunarDay: 25,
+//     isLeapMonth: false
+//   },
 //   meta: {
-//     solarYear: 1999,
+//     solarYearUsed: 1999,
 //     sunLonDeg: 280.9,
 //     effectiveDayDate: { year: 2000, month: 1, day: 1 },
-//     adjustedHour: 18
+//     adjustedDtForHour: "2000-01-01T18:00:00.000+09:00"
 //   }
 // }
 ```
@@ -126,7 +132,7 @@ import { getFourPillars, STANDARD_PRESET } from "@gracefullight/saju";
 const adapter = await createDateFnsAdapter();
 
 const dt = {
-  date: new Date(1992, 9, 12, 19, 16), // Note: month is 0-indexed
+  date: new Date(1985, 4, 15, 14, 30), // Note: month is 0-indexed
   timeZone: "Asia/Seoul",
 };
 
@@ -228,11 +234,17 @@ function getFourPillars<T>(
   month: string;
   day: string;
   hour: string;
+  lunar: {
+    lunarYear: number;
+    lunarMonth: number;
+    lunarDay: number;
+    isLeapMonth: boolean;
+  };
   meta: {
-    solarYear: number;
+    solarYearUsed: number;
     sunLonDeg: number;
     effectiveDayDate: { year: number; month: number; day: number };
-    adjustedHour: number;
+    adjustedDtForHour: string;
   };
 }
 ```
@@ -245,7 +257,7 @@ function getFourPillars<T>(
   - `preset`: Configuration preset (use `STANDARD_PRESET` or `TRADITIONAL_PRESET`)
   - `tzOffsetHours`: Optional timezone offset in hours (default: 9 for KST)
 
-**Returns:** Object with year, month, day, hour pillars and metadata
+**Returns:** Object with year, month, day, hour pillars, lunar date, and metadata
 
 #### `yearPillar(adapter, datetime)`
 
@@ -291,6 +303,58 @@ function dayPillarFromDate(date: {
 }
 ```
 
+### Lunar Conversion Functions
+
+#### `getLunarDate(year, month, day)`
+
+Convert a solar (Gregorian) date to a lunar date.
+
+```typescript
+function getLunarDate(
+  year: number,
+  month: number,
+  day: number
+): {
+  lunarYear: number;
+  lunarMonth: number;
+  lunarDay: number;
+  isLeapMonth: boolean;
+}
+```
+
+**Example:**
+```typescript
+import { getLunarDate } from "@gracefullight/saju";
+
+const lunar = getLunarDate(2000, 1, 1);
+// { lunarYear: 1999, lunarMonth: 11, lunarDay: 25, isLeapMonth: false }
+```
+
+#### `getSolarDate(lunarYear, lunarMonth, lunarDay, isLeapMonth)`
+
+Convert a lunar date to a solar (Gregorian) date.
+
+```typescript
+function getSolarDate(
+  lunarYear: number,
+  lunarMonth: number,
+  lunarDay: number,
+  isLeapMonth?: boolean
+): {
+  year: number;
+  month: number;
+  day: number;
+}
+```
+
+**Example:**
+```typescript
+import { getSolarDate } from "@gracefullight/saju";
+
+const solar = getSolarDate(1999, 11, 25, false);
+// { year: 2000, month: 1, day: 1 }
+```
+
 #### `hourPillar(adapter, datetime, options)`
 
 Calculate only the hour pillar with optional solar time correction.
@@ -445,7 +509,7 @@ const adapter = await createLuxonAdapter();
 
 // New York birth time
 const nyTime = DateTime.fromObject(
-  { year: 1992, month: 10, day: 12, hour: 6, minute: 16 },
+  { year: 1985, month: 5, day: 15, hour: 6, minute: 30 },
   { zone: "America/New_York" }
 );
 
@@ -470,7 +534,7 @@ const month = monthPillar(adapter, dt);
 console.log(month.pillar, month.sunLonDeg);
 
 // Day pillar (no adapter needed)
-const day = dayPillarFromDate({ year: 1992, month: 10, day: 12 });
+const day = dayPillarFromDate({ year: 1985, month: 5, day: 15 });
 console.log(day.pillar);
 
 // Hour pillar with solar time

package/README.md

@@ -77,13 +77,19 @@ console.log(result);
 // {
 //   year: "己卯",    // 연주 (천간 + 지지)
 //   month: "丙子",   // 월주
-//   day: "庚辰",     // 일주
-//   hour: "辛酉",    // 시주
+//   day: "辛巳",     // 일주
+//   hour: "戊戌",    // 시주
+//   lunar: {
+//     lunarYear: 1999,
+//     lunarMonth: 11,
+//     lunarDay: 25,
+//     isLeapMonth: false
+//   },
 //   meta: {
-//     solarYear: 1999,
+//     solarYearUsed: 1999,
 //     sunLonDeg: 280.9,
 //     effectiveDayDate: { year: 2000, month: 1, day: 1 },
-//     adjustedHour: 18
+//     adjustedDtForHour: "2000-01-01T18:00:00.000+09:00"
 //   }
 // }
 ```
@@ -126,7 +132,7 @@ import { getFourPillars, STANDARD_PRESET } from "@gracefullight/saju";
 const adapter = await createDateFnsAdapter();
 
 const dt = {
-  date: new Date(1992, 9, 12, 19, 16), // 주의: 월은 0부터 시작
+  date: new Date(1985, 4, 15, 14, 30), // 주의: 월은 0부터 시작
   timeZone: "Asia/Seoul",
 };
 
@@ -228,11 +234,17 @@ function getFourPillars<T>(
   month: string;
   day: string;
   hour: string;
+  lunar: {
+    lunarYear: number;
+    lunarMonth: number;
+    lunarDay: number;
+    isLeapMonth: boolean;
+  };
   meta: {
-    solarYear: number;
+    solarYearUsed: number;
     sunLonDeg: number;
     effectiveDayDate: { year: number; month: number; day: number };
-    adjustedHour: number;
+    adjustedDtForHour: string;
   };
 }
 ```
@@ -245,7 +257,7 @@ function getFourPillars<T>(
   - `preset`: 설정 프리셋 (`STANDARD_PRESET` 또는 `TRADITIONAL_PRESET` 사용)
   - `tzOffsetHours`: 타임존 오프셋(시간 단위), 선택사항 (기본값: 9, KST)
 
-**반환값:** 연월일시 기둥과 메타데이터를 포함한 객체
+**반환값:** 연월일시 기둥, 음력 날짜, 메타데이터를 포함한 객체
 
 #### `yearPillar(adapter, datetime)`
 
@@ -291,6 +303,58 @@ function dayPillarFromDate(date: {
 }
 ```
 
+### 음력 변환 함수
+
+#### `getLunarDate(year, month, day)`
+
+양력(그레고리력) 날짜를 음력 날짜로 변환
+
+```typescript
+function getLunarDate(
+  year: number,
+  month: number,
+  day: number
+): {
+  lunarYear: number;
+  lunarMonth: number;
+  lunarDay: number;
+  isLeapMonth: boolean;
+}
+```
+
+**예시:**
+```typescript
+import { getLunarDate } from "@gracefullight/saju";
+
+const lunar = getLunarDate(2000, 1, 1);
+// { lunarYear: 1999, lunarMonth: 11, lunarDay: 25, isLeapMonth: false }
+```
+
+#### `getSolarDate(lunarYear, lunarMonth, lunarDay, isLeapMonth)`
+
+음력 날짜를 양력(그레고리력) 날짜로 변환
+
+```typescript
+function getSolarDate(
+  lunarYear: number,
+  lunarMonth: number,
+  lunarDay: number,
+  isLeapMonth?: boolean
+): {
+  year: number;
+  month: number;
+  day: number;
+}
+```
+
+**예시:**
+```typescript
+import { getSolarDate } from "@gracefullight/saju";
+
+const solar = getSolarDate(1999, 11, 25, false);
+// { year: 2000, month: 1, day: 1 }
+```
+
 #### `hourPillar(adapter, datetime, options)`
 
 태양시 보정 옵션과 함께 시주만 계산
@@ -445,7 +509,7 @@ const adapter = await createLuxonAdapter();
 
 // 뉴욕 출생 시간
 const nyTime = DateTime.fromObject(
-  { year: 1992, month: 10, day: 12, hour: 6, minute: 16 },
+  { year: 1985, month: 5, day: 15, hour: 6, minute: 30 },
   { zone: "America/New_York" }
 );
 
@@ -470,7 +534,7 @@ const month = monthPillar(adapter, dt);
 console.log(month.pillar, month.sunLonDeg);
 
 // 일주 (어댑터 불필요)
-const day = dayPillarFromDate({ year: 1992, month: 10, day: 12 });
+const day = dayPillarFromDate({ year: 1985, month: 5, day: 15 });
 console.log(day.pillar);
 
 // 태양시를 사용한 시주

package/dist/__tests__/four-pillars.test.js

@@ -20,14 +20,14 @@ describe("Four Pillars Core", () => {
         });
     });
     describe("dayPillarFromDate", () => {
-        it("should calculate day pillar for test case (1992-10-12 = 甲申)", () => {
-            const result = dayPillarFromDate({ year: 1992, month: 10, day: 12 });
-            expect(result.pillar).toBe("甲申");
-            expect(result.idx60).toBe(20);
+        it("should calculate day pillar for test case (1985-05-15 = 甲寅)", () => {
+            const result = dayPillarFromDate({ year: 1985, month: 5, day: 15 });
+            expect(result.pillar).toBe("甲寅");
+            expect(result.idx60).toBe(50);
         });
         it("should handle 60-day cycle correctly", () => {
-            const start = dayPillarFromDate({ year: 1992, month: 10, day: 12 });
-            const after60 = dayPillarFromDate({ year: 1992, month: 12, day: 11 });
+            const start = dayPillarFromDate({ year: 1985, month: 5, day: 15 });
+            const after60 = dayPillarFromDate({ year: 1985, month: 7, day: 14 });
             expect(start.idx60).toBe(after60.idx60);
         });
         it("should calculate day pillar for leap year date", () => {
@@ -47,21 +47,21 @@ describe("Four Pillars Core", () => {
             expect(result.pillar).toBe("甲子");
             expect(result.solarYear).toBe(1984);
         });
-        it("should calculate year pillar for 1992 (壬申)", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12 }, { zone: "Asia/Seoul" });
+        it("should calculate year pillar for 1985 (乙丑)", () => {
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15 }, { zone: "Asia/Seoul" });
             const result = yearPillar(adapter, dt);
-            expect(result.pillar).toBe("壬申");
-            expect(result.solarYear).toBe(1992);
+            expect(result.pillar).toBe("乙丑");
+            expect(result.solarYear).toBe(1985);
         });
         it("should handle date before Lichun (立春)", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 1, day: 15 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 1, day: 15 }, { zone: "Asia/Seoul" });
             const result = yearPillar(adapter, dt);
-            expect(result.solarYear).toBe(1991);
+            expect(result.solarYear).toBe(1984);
         });
         it("should handle date after Lichun", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 3, day: 1 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 3, day: 1 }, { zone: "Asia/Seoul" });
             const result = yearPillar(adapter, dt);
-            expect(result.solarYear).toBe(1992);
+            expect(result.solarYear).toBe(1985);
         });
         it("should follow 60-year cycle", () => {
             const dt1 = DateTime.fromObject({ year: 1984, month: 3, day: 1 }, { zone: "Asia/Seoul" });
@@ -72,25 +72,25 @@ describe("Four Pillars Core", () => {
         });
     });
     describe("monthPillar", () => {
-        it("should calculate month pillar for test case (1992-10-12)", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12 }, { zone: "Asia/Seoul" });
+        it("should calculate month pillar for test case (1985-05-15)", () => {
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15 }, { zone: "Asia/Seoul" });
             const result = monthPillar(adapter, dt);
-            expect(result.pillar).toBe("庚戌");
+            expect(result.pillar).toBe("辛巳");
         });
         it("should return valid stem-branch combination", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15 }, { zone: "Asia/Seoul" });
             const result = monthPillar(adapter, dt);
             expect(result.pillar).toMatch(/^[甲乙丙丁戊己庚辛壬癸][子丑寅卯辰巳午未申酉戌亥]$/);
         });
         it("should include sun longitude in result", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15 }, { zone: "Asia/Seoul" });
             const result = monthPillar(adapter, dt);
             expect(result.sunLonDeg).toBeGreaterThanOrEqual(0);
             expect(result.sunLonDeg).toBeLessThan(360);
         });
         it("should calculate different months correctly", () => {
-            const jan = DateTime.fromObject({ year: 1992, month: 1, day: 15 }, { zone: "Asia/Seoul" });
-            const jul = DateTime.fromObject({ year: 1992, month: 7, day: 15 }, { zone: "Asia/Seoul" });
+            const jan = DateTime.fromObject({ year: 1985, month: 1, day: 15 }, { zone: "Asia/Seoul" });
+            const jul = DateTime.fromObject({ year: 1985, month: 7, day: 15 }, { zone: "Asia/Seoul" });
             const result1 = monthPillar(adapter, jan);
             const result2 = monthPillar(adapter, jul);
             expect(result1.pillar).not.toBe(result2.pillar);
@@ -98,41 +98,41 @@ describe("Four Pillars Core", () => {
     });
     describe("effectiveDayDate", () => {
         it("should return same date for midnight boundary before 23:00", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12, hour: 22, minute: 30 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15, hour: 22, minute: 30 }, { zone: "Asia/Seoul" });
             const result = effectiveDayDate(adapter, dt, { dayBoundary: "midnight" });
-            expect(result.year).toBe(1992);
-            expect(result.month).toBe(10);
-            expect(result.day).toBe(12);
+            expect(result.year).toBe(1985);
+            expect(result.month).toBe(5);
+            expect(result.day).toBe(15);
         });
         it("should advance date for zi23 boundary after 23:00", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12, hour: 23, minute: 30 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15, hour: 23, minute: 30 }, { zone: "Asia/Seoul" });
             const result = effectiveDayDate(adapter, dt, { dayBoundary: "zi23" });
-            expect(result.year).toBe(1992);
-            expect(result.month).toBe(10);
-            expect(result.day).toBe(13);
+            expect(result.year).toBe(1985);
+            expect(result.month).toBe(5);
+            expect(result.day).toBe(16);
         });
         it("should not advance date for zi23 boundary before 23:00", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12, hour: 22, minute: 59 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15, hour: 22, minute: 59 }, { zone: "Asia/Seoul" });
             const result = effectiveDayDate(adapter, dt, { dayBoundary: "zi23" });
-            expect(result.year).toBe(1992);
-            expect(result.month).toBe(10);
-            expect(result.day).toBe(12);
+            expect(result.year).toBe(1985);
+            expect(result.month).toBe(5);
+            expect(result.day).toBe(15);
         });
         it("should handle month boundary with zi23", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 31, hour: 23, minute: 30 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 31, hour: 23, minute: 30 }, { zone: "Asia/Seoul" });
             const result = effectiveDayDate(adapter, dt, { dayBoundary: "zi23" });
-            expect(result.year).toBe(1992);
-            expect(result.month).toBe(11);
+            expect(result.year).toBe(1985);
+            expect(result.month).toBe(6);
             expect(result.day).toBe(1);
         });
         it("should apply mean solar time correction when enabled", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12, hour: 23, minute: 50 }, { zone: "Asia/Seoul" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15, hour: 23, minute: 50 }, { zone: "Asia/Seoul" });
             const result = effectiveDayDate(adapter, dt, {
                 dayBoundary: "zi23",
                 longitudeDeg: 126.9,
                 useMeanSolarTimeForBoundary: true,
             });
-            expect(result.day).toBe(13);
+            expect(result.day).toBe(16);
         });
     });
     describe("hourPillar", () => {
@@ -175,7 +175,7 @@ describe("Four Pillars Core", () => {
             });
             expect(result.year).toBe("己卯");
             expect(result.month).toBe("丙子");
-            expect(result.day).toBe("庚辰");
+            expect(result.day).toBe("戊午");
             expect(result.hour).toBe("辛酉");
         });
         it("should include metadata", () => {
@@ -189,6 +189,18 @@ describe("Four Pillars Core", () => {
             expect(result.meta.effectiveDayDate).toEqual({ year: 2000, month: 1, day: 1 });
             expect(result.meta.preset).toEqual(presetA);
         });
+        it("should include lunar date information", () => {
+            const dt = DateTime.fromObject({ year: 2000, month: 1, day: 1, hour: 18, minute: 0 }, { zone: "Asia/Seoul" });
+            const result = getFourPillars(adapter, dt, {
+                longitudeDeg: 126.9,
+                preset: presetA,
+            });
+            expect(result.lunar).toBeDefined();
+            expect(result.lunar.lunarYear).toBe(1999);
+            expect(result.lunar.lunarMonth).toBe(11);
+            expect(result.lunar.lunarDay).toBe(25);
+            expect(result.lunar.isLeapMonth).toBe(false);
+        });
     });
     describe("getFourPillars - Preset B", () => {
         it("should calculate four pillars with preset B", () => {
@@ -274,7 +286,7 @@ describe("Four Pillars Core", () => {
             expect(resultSeoul.day).toBe(resultTokyo.day);
         });
         it("should handle different longitudes affecting hour pillar", () => {
-            const dt = DateTime.fromObject({ year: 1992, month: 10, day: 12, hour: 0, minute: 30 }, { zone: "UTC" });
+            const dt = DateTime.fromObject({ year: 1985, month: 5, day: 15, hour: 0, minute: 30 }, { zone: "UTC" });
             const westLong = getFourPillars(adapter, dt, {
                 longitudeDeg: -120,
                 preset: presetB,

package/dist/__tests__/lunar.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=lunar.test.d.ts.map

package/dist/__tests__/lunar.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lunar.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/lunar.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/lunar.test.js

@@ -0,0 +1,83 @@
+import { describe, expect, it } from "vitest";
+import { getLunarDate, getSolarDate } from "@/core/lunar";
+describe("Lunar Calendar", () => {
+    describe("getLunarDate", () => {
+        it("should convert solar date to lunar date (2000-01-01)", () => {
+            const result = getLunarDate(2000, 1, 1);
+            expect(result.lunarYear).toBe(1999);
+            expect(result.lunarMonth).toBe(11);
+            expect(result.lunarDay).toBe(25);
+            expect(result.isLeapMonth).toBe(false);
+        });
+        it("should convert solar date to lunar date (1985-05-15)", () => {
+            const result = getLunarDate(1985, 5, 15);
+            expect(result.lunarYear).toBe(1985);
+            expect(result.lunarMonth).toBe(3);
+            expect(result.lunarDay).toBe(26);
+            expect(result.isLeapMonth).toBe(false);
+        });
+        it("should handle leap month correctly (2023-03-22 is in leap 2nd month)", () => {
+            const result = getLunarDate(2023, 3, 22);
+            expect(result.lunarYear).toBe(2023);
+            expect(result.lunarMonth).toBe(2);
+            expect(result.isLeapMonth).toBe(true);
+        });
+        it("should convert first day of lunar year", () => {
+            const result = getLunarDate(2024, 2, 10);
+            expect(result.lunarYear).toBe(2024);
+            expect(result.lunarMonth).toBe(1);
+            expect(result.lunarDay).toBe(1);
+            expect(result.isLeapMonth).toBe(false);
+        });
+    });
+    describe("getSolarDate", () => {
+        it("should convert lunar date to solar date", () => {
+            const result = getSolarDate(1999, 11, 25, false);
+            expect(result.year).toBe(2000);
+            expect(result.month).toBe(1);
+            expect(result.day).toBe(1);
+        });
+        it("should convert lunar date (1985-03-26) to solar date", () => {
+            const result = getSolarDate(1985, 3, 26, false);
+            expect(result.year).toBe(1985);
+            expect(result.month).toBe(5);
+            expect(result.day).toBe(15);
+        });
+        it("should handle leap month in reverse conversion", () => {
+            const result = getSolarDate(2023, 2, 1, true);
+            expect(result.year).toBe(2023);
+            expect(result.month).toBe(3);
+            expect(result.day).toBe(22);
+        });
+        it("should convert first day of lunar year 2024", () => {
+            const result = getSolarDate(2024, 1, 1, false);
+            expect(result.year).toBe(2024);
+            expect(result.month).toBe(2);
+            expect(result.day).toBe(10);
+        });
+    });
+    describe("round-trip conversion", () => {
+        it("should convert solar -> lunar -> solar correctly", () => {
+            const original = { year: 2000, month: 6, day: 15 };
+            const lunar = getLunarDate(original.year, original.month, original.day);
+            const backToSolar = getSolarDate(lunar.lunarYear, lunar.lunarMonth, lunar.lunarDay, lunar.isLeapMonth);
+            expect(backToSolar.year).toBe(original.year);
+            expect(backToSolar.month).toBe(original.month);
+            expect(backToSolar.day).toBe(original.day);
+        });
+        it("should handle various dates in round-trip", () => {
+            const testDates = [
+                { year: 1990, month: 3, day: 20 },
+                { year: 2010, month: 8, day: 1 },
+                { year: 2020, month: 12, day: 31 },
+            ];
+            for (const date of testDates) {
+                const lunar = getLunarDate(date.year, date.month, date.day);
+                const backToSolar = getSolarDate(lunar.lunarYear, lunar.lunarMonth, lunar.lunarDay, lunar.isLeapMonth);
+                expect(backToSolar.year).toBe(date.year);
+                expect(backToSolar.month).toBe(date.month);
+                expect(backToSolar.day).toBe(date.day);
+            }
+        });
+    });
+});

package/dist/core/four-pillars.d.ts

@@ -1,4 +1,5 @@
 import type { DateAdapter } from "@/adapters/date-adapter";
+import { type LunarDate } from "@/core/lunar";
 export declare const STEMS: string[];
 export declare const BRANCHES: string[];
 export declare const STANDARD_PRESET: {
@@ -73,6 +74,7 @@ export declare function getFourPillars<T>(adapter: DateAdapter<T>, dtLocal: T, {
     month: string;
     day: string;
     hour: string;
+    lunar: LunarDate;
     meta: {
         solarYearUsed: number;
         sunLonDeg: number;

package/dist/core/four-pillars.d.ts.map

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

package/dist/core/four-pillars.js

@@ -1,3 +1,4 @@
+import { getLunarDate } from "@/core/lunar";
 export const STEMS = ["甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸"];
 export const BRANCHES = ["子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"];
 export const STANDARD_PRESET = {
@@ -33,7 +34,7 @@ function jdnFromDate(y, m, d) {
 }
 export function dayPillarFromDate({ year, month, day, }) {
     const jdn = jdnFromDate(year, month, day);
-    const idx60 = (jdn + 12) % 60;
+    const idx60 = (((jdn - 11) % 60) + 60) % 60;
     return { idx60, pillar: pillarFrom60(idx60) };
 }
 export function applyMeanSolarTime(adapter, dtLocal, longitudeDeg, tzOffsetHours = 9) {
@@ -160,9 +161,9 @@ function hourBranchIndexFromHour(h) {
     // Traditional Chinese hours (時辰) mapping:
     // Each branch represents a 2-hour period, starting from 子時 at 23:00
     // 子時 (0): 23:00-01:00, 丑時 (1): 01:00-03:00, ..., 亥時 (11): 21:00-23:00
-    // Formula: (hour + 1) / 2 gives the branch index, but we need +1 offset
-    // because 23:00 (hour 23) should map to index 0 (子), wrapping around
-    return Math.floor((h + 1) / 2 + 1) % 12;
+    // Formula: floor((hour + 1) / 2) % 12
+    // Examples: 0->0(子), 1->1(丑), 3->2(寅), 23->0(子)
+    return Math.floor((h + 1) / 2) % 12;
 }
 export function hourPillar(adapter, dtLocal, { longitudeDeg, tzOffsetHours = 9, useMeanSolarTimeForHour = false, dayBoundary = "midnight", useMeanSolarTimeForBoundary = false, } = {}) {
     let dtUsed = dtLocal;
@@ -205,11 +206,13 @@ export function getFourPillars(adapter, dtLocal, { longitudeDeg, tzOffsetHours =
         dayBoundary,
         useMeanSolarTimeForBoundary,
     });
+    const lunar = getLunarDate(effDate.year, effDate.month, effDate.day);
     return {
         year: y.pillar,
         month: m.pillar,
         day: d.pillar,
         hour: h.pillar,
+        lunar,
         meta: {
             solarYearUsed: y.solarYear,
             sunLonDeg: m.sunLonDeg,

package/dist/core/lunar.d.ts

@@ -0,0 +1,13 @@
+export interface LunarDate {
+    lunarYear: number;
+    lunarMonth: number;
+    lunarDay: number;
+    isLeapMonth: boolean;
+}
+export declare function getLunarDate(year: number, month: number, day: number): LunarDate;
+export declare function getSolarDate(lunarYear: number, lunarMonth: number, lunarDay: number, isLeapMonth?: boolean): {
+    year: number;
+    month: number;
+    day: number;
+};
+//# sourceMappingURL=lunar.d.ts.map

package/dist/core/lunar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lunar.d.ts","sourceRoot":"","sources":["../../src/core/lunar.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAYhF;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,UAAQ,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAW9C"}

package/dist/core/lunar.js

@@ -0,0 +1,24 @@
+import { Lunar, Solar } from "lunar-javascript";
+export function getLunarDate(year, month, day) {
+    const solar = Solar.fromYmd(year, month, day);
+    const lunar = solar.getLunar();
+    const rawMonth = lunar.getMonth();
+    const isLeapMonth = rawMonth < 0;
+    return {
+        lunarYear: lunar.getYear(),
+        lunarMonth: isLeapMonth ? Math.abs(rawMonth) : rawMonth,
+        lunarDay: lunar.getDay(),
+        isLeapMonth,
+    };
+}
+export function getSolarDate(lunarYear, lunarMonth, lunarDay, isLeapMonth = false) {
+    // lunar-javascript uses negative month for leap months
+    const month = isLeapMonth ? -lunarMonth : lunarMonth;
+    const lunar = Lunar.fromYmd(lunarYear, month, lunarDay);
+    const solar = lunar.getSolar();
+    return {
+        year: solar.getYear(),
+        month: solar.getMonth(),
+        day: solar.getDay(),
+    };
+}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export type { DateAdapter } from "@/adapters/date-adapter";
+export { getLunarDate, getSolarDate, type LunarDate } from "@/core/lunar";
 export { applyMeanSolarTime, BRANCHES, dayPillarFromDate, effectiveDayDate, getFourPillars, hourPillar, monthPillar, presetA, presetB, STANDARD_PRESET, STEMS, TRADITIONAL_PRESET, yearPillar, } from "@/core/four-pillars";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,WAAW,EACX,OAAO,EACP,OAAO,EACP,eAAe,EACf,KAAK,EACL,kBAAkB,EAClB,UAAU,GACX,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1E,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,WAAW,EACX,OAAO,EACP,OAAO,EACP,eAAe,EACf,KAAK,EACL,kBAAkB,EAClB,UAAU,GACX,MAAM,qBAAqB,CAAC"}

package/dist/index.js

@@ -1 +1,2 @@
+export { getLunarDate, getSolarDate } from "@/core/lunar";
 export { applyMeanSolarTime, BRANCHES, dayPillarFromDate, effectiveDayDate, getFourPillars, hourPillar, monthPillar, presetA, presetB, STANDARD_PRESET, STEMS, TRADITIONAL_PRESET, yearPillar, } from "@/core/four-pillars";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gracefullight/saju",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Four Pillars (四柱) calculator with flexible date adapter support",
   "type": "module",
   "main": "./dist/index.js",
@@ -66,5 +66,8 @@
     "date-fns-tz": "^3.2.0",
     "luxon": "^3.5.0",
     "vitest": "^2.1.8"
+  },
+  "dependencies": {
+    "lunar-javascript": "^1.7.7"
   }
 }