@gracefullight/saju 1.2.0 → 1.3.1

package/README.ko.md

@@ -151,16 +151,20 @@ import { getFourPillars, STANDARD_PRESET } from "@gracefullight/saju";
 
 const adapter = await createDateFnsAdapter();
 
-const dt = {
-  date: new Date(1985, 4, 15, 14, 30), // 주의: 월은 0부터 시작
-  timeZone: "Asia/Seoul",
-};
+// 일반 Date를 바로 사용할 수 있습니다
+const dt = new Date(1985, 4, 15, 14, 30); // 주의: 월은 0부터 시작
 
 const result = getFourPillars(dt, {
   adapter,
   longitudeDeg: 126.9778,
   preset: STANDARD_PRESET,
 });
+
+// 명시적인 타임존 메타데이터가 필요하면 래퍼 객체도 계속 사용할 수 있습니다
+const zonedDt = {
+  date: new Date(1985, 4, 15, 14, 30),
+  timeZone: "Asia/Seoul",
+};
 ```
 
 ### 커스텀 날짜 어댑터

package/README.md

@@ -151,16 +151,20 @@ import { getFourPillars, STANDARD_PRESET } from "@gracefullight/saju";
 
 const adapter = await createDateFnsAdapter();
 
-const dt = {
-  date: new Date(1985, 4, 15, 14, 30), // Note: month is 0-indexed
-  timeZone: "Asia/Seoul",
-};
+// Plain Date works directly
+const dt = new Date(1985, 4, 15, 14, 30); // Note: month is 0-indexed
 
 const result = getFourPillars(dt, {
   adapter,
   longitudeDeg: 126.9778,
   preset: STANDARD_PRESET,
 });
+
+// If you need explicit timezone metadata, you can still pass a wrapper object
+const zonedDt = {
+  date: new Date(1985, 4, 15, 14, 30),
+  timeZone: "Asia/Seoul",
+};
 ```
 
 ### Custom Date Adapter

package/dist/__tests__/date-fns-adapter.test.js

@@ -6,6 +6,13 @@ describe("date-fns Adapter", () => {
         adapter = await createDateFnsAdapter();
     });
     describe("Basic date getters", () => {
+        it("should accept plain Date values", () => {
+            const dt = new Date(2000, 0, 1, 18, 0);
+            expect(adapter.getYear(dt)).toBe(2000);
+            expect(adapter.getMonth(dt)).toBe(1);
+            expect(adapter.getDay(dt)).toBe(1);
+            expect(adapter.getHour(dt)).toBe(18);
+        });
         it("should get year correctly", () => {
             const dt = { date: new Date(2000, 0, 1), timeZone: "Asia/Seoul" };
             expect(adapter.getYear(dt)).toBe(2000);
@@ -34,6 +41,10 @@ describe("date-fns Adapter", () => {
             const dt = { date: new Date(2000, 0, 1), timeZone: "Asia/Seoul" };
             expect(adapter.getZoneName(dt)).toBe("Asia/Seoul");
         });
+        it("should fall back to system timezone for plain Date values", () => {
+            const dt = new Date(2000, 0, 1);
+            expect(adapter.getZoneName(dt)).toBe(Intl.DateTimeFormat().resolvedOptions().timeZone);
+        });
     });
     describe("Date arithmetic", () => {
         it("should add minutes correctly", () => {

package/dist/__tests__/relations.test.js

@@ -81,6 +81,7 @@ describe("relations", () => {
         it("aggregates all relations", () => {
             const result = analyzeRelations("甲子", "庚午", "丙寅", "壬申");
             expect(result.all.length).toBe(result.combinations.length +
+                result.stemClashes.length +
                 result.clashes.length +
                 result.harms.length +
                 result.punishments.length +

package/dist/__tests__/saju.test.js

@@ -1,5 +1,6 @@
 import { DateTime } from "luxon";
 import { describe, expect, it } from "vitest";
+import { createDateFnsAdapter } from "../adapters/date-fns";
 import { createLuxonAdapter } from "../adapters/luxon";
 import { getSaju, STANDARD_PRESET } from "../index";
 describe("getSaju integration", () => {
@@ -140,4 +141,25 @@ describe("getSaju integration", () => {
         expect(result.solarTerms.prevJieDate).toBeDefined();
         expect(result.solarTerms.nextJieDate).toBeDefined();
     });
+    it("accepts plain Date with the date-fns adapter (Issue #64 regression)", async () => {
+        const adapter = await createDateFnsAdapter();
+        const dt = new Date(1990, 1, 1, 12, 10);
+        expect(() => getSaju(dt, {
+            adapter,
+            longitudeDeg: 126.9778,
+            gender: "male",
+            preset: STANDARD_PRESET,
+        })).not.toThrow();
+        const result = getSaju(dt, {
+            adapter,
+            longitudeDeg: 126.9778,
+            gender: "male",
+            preset: STANDARD_PRESET,
+        });
+        expect(result.pillars.year).toBeDefined();
+        expect(result.pillars.month).toBeDefined();
+        expect(result.pillars.day).toBeDefined();
+        expect(result.pillars.hour).toBeDefined();
+        expect(result.lunar.lunarYear).toBeGreaterThan(0);
+    });
 });

package/dist/__tests__/yongshen.test.js

@@ -14,17 +14,21 @@ describe("yongshen", () => {
             expect(result.allElements[result.primary.key].isYongShen).toBe(true);
         });
         it("identifies kishen elements correctly", () => {
-            const result = analyzeYongShen("甲子", "丙寅", "甲辰", "乙亥");
-            const hasKiShen = Object.values(result.allElements).some((e) => e.isKiShen);
-            expect(hasKiShen).toBe(true);
+            // Use a balanced chart where 억부 method is used (not formation)
+            const result = analyzeYongShen("甲子", "丙寅", "庚申", "丁亥");
+            if (result.method.key !== "formation") {
+                const hasKiShen = Object.values(result.allElements).some((e) => e.isKiShen);
+                expect(hasKiShen).toBe(true);
+            }
         });
         it("uses 억부 method for 중화 strength (조후 is adjustment, not primary)", () => {
             const result = analyzeYongShen("甲子", "丙寅", "庚申", "丁亥");
             expect(["balance", "formation"]).toContain(result.method.key);
         });
-        it("uses 억부 method for extreme strength", () => {
+        it("uses formation method for extreme strength with 종강격", () => {
+            // All wood: extremely strong with no controller (metal) → 종강격
             const result = analyzeYongShen("甲寅", "甲寅", "甲寅", "甲寅");
-            expect(result.method.key).toBe("balance");
+            expect(result.method.key).toBe("formation");
         });
         it("includes johuAdjustment field in result", () => {
             const result = analyzeYongShen("甲子", "丙寅", "甲辰", "乙亥");

package/dist/adapters/date-fns.d.ts

@@ -1,8 +1,8 @@
 import type { DateAdapter } from "../adapters/date-adapter";
-interface DateFnsDate {
+export interface ZonedDateFnsDate {
     date: Date;
     timeZone: string;
 }
+export type DateFnsDate = Date | ZonedDateFnsDate;
 export declare function createDateFnsAdapter(): Promise<DateAdapter<DateFnsDate>>;
-export {};
 //# sourceMappingURL=date-fns.d.ts.map

package/dist/adapters/date-fns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date-fns.d.ts","sourceRoot":"","sources":["../../src/adapters/date-fns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,UAAU,WAAW;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CA4E9E"}
+{"version":3,"file":"date-fns.d.ts","sourceRoot":"","sources":["../../src/adapters/date-fns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,gBAAgB,CAAC;AAgClD,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CA4D9E"}

package/dist/adapters/date-fns.js

@@ -1,3 +1,25 @@
+function isZonedDate(date) {
+    return (typeof date === "object" &&
+        date !== null &&
+        "date" in date &&
+        date.date instanceof Date &&
+        typeof date.timeZone === "string");
+}
+function getNativeDate(date) {
+    return isZonedDate(date) ? date.date : date;
+}
+function getSystemTimeZone() {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
+}
+function getTimeZone(date) {
+    return isZonedDate(date) ? date.timeZone : getSystemTimeZone();
+}
+function cloneWithTimeZone(date, timeZone) {
+    return { date, timeZone };
+}
+function preserveInputShape(input, date) {
+    return isZonedDate(input) ? cloneWithTimeZone(date, input.timeZone) : date;
+}
 export async function createDateFnsAdapter() {
     let addMinutes;
     let addDays;
@@ -31,43 +53,22 @@ export async function createDateFnsAdapter() {
         throw new Error("date-fns or date-fns-tz is not installed. Install with: npm install date-fns date-fns-tz");
     }
     return {
-        getYear: (dateFns) => getYear(dateFns.date),
-        getMonth: (dateFns) => getMonth(dateFns.date) + 1,
-        getDay: (dateFns) => getDate(dateFns.date),
-        getHour: (dateFns) => getHours(dateFns.date),
-        getMinute: (dateFns) => getMinutes(dateFns.date),
-        getSecond: (dateFns) => getSeconds(dateFns.date),
-        getZoneName: (dateFns) => dateFns.timeZone,
-        plusMinutes: (dateFns, minutes) => ({
-            date: addMinutes(dateFns.date, minutes),
-            timeZone: dateFns.timeZone,
-        }),
-        plusDays: (dateFns, days) => ({
-            date: addDays(dateFns.date, days),
-            timeZone: dateFns.timeZone,
-        }),
-        minusDays: (dateFns, days) => ({
-            date: subDays(dateFns.date, days),
-            timeZone: dateFns.timeZone,
-        }),
-        toUTC: (dateFns) => ({
-            date: fromZonedTime(dateFns.date, dateFns.timeZone),
-            timeZone: "UTC",
-        }),
-        toISO: (dateFns) => formatISO(dateFns.date),
-        toMillis: (dateFns) => dateFns.date.getTime(),
-        fromMillis: (millis, zone) => ({
-            date: new Date(millis),
-            timeZone: zone,
-        }),
-        createUTC: (year, month, day, hour, minute, second) => ({
-            date: new Date(Date.UTC(year, month - 1, day, hour, minute, second)),
-            timeZone: "UTC",
-        }),
-        setZone: (dateFns, zoneName) => ({
-            date: toZonedTime(dateFns.date, zoneName),
-            timeZone: zoneName,
-        }),
-        isGreaterThanOrEqual: (date1, date2) => date1.date >= date2.date,
+        getYear: (dateFns) => getYear(getNativeDate(dateFns)),
+        getMonth: (dateFns) => getMonth(getNativeDate(dateFns)) + 1,
+        getDay: (dateFns) => getDate(getNativeDate(dateFns)),
+        getHour: (dateFns) => getHours(getNativeDate(dateFns)),
+        getMinute: (dateFns) => getMinutes(getNativeDate(dateFns)),
+        getSecond: (dateFns) => getSeconds(getNativeDate(dateFns)),
+        getZoneName: (dateFns) => getTimeZone(dateFns),
+        plusMinutes: (dateFns, minutes) => preserveInputShape(dateFns, addMinutes(getNativeDate(dateFns), minutes)),
+        plusDays: (dateFns, days) => preserveInputShape(dateFns, addDays(getNativeDate(dateFns), days)),
+        minusDays: (dateFns, days) => preserveInputShape(dateFns, subDays(getNativeDate(dateFns), days)),
+        toUTC: (dateFns) => cloneWithTimeZone(fromZonedTime(getNativeDate(dateFns), getTimeZone(dateFns)), "UTC"),
+        toISO: (dateFns) => formatISO(getNativeDate(dateFns)),
+        toMillis: (dateFns) => getNativeDate(dateFns).getTime(),
+        fromMillis: (millis, zone) => cloneWithTimeZone(new Date(millis), zone),
+        createUTC: (year, month, day, hour, minute, second) => cloneWithTimeZone(new Date(Date.UTC(year, month - 1, day, hour, minute, second)), "UTC"),
+        setZone: (dateFns, zoneName) => cloneWithTimeZone(toZonedTime(getNativeDate(dateFns), zoneName), zoneName),
+        isGreaterThanOrEqual: (date1, date2) => getNativeDate(date1) >= getNativeDate(date2),
     };
 }

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":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAgC,KAAK,EAAE,MAAM,SAAS,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAE3B,eAAO,MAAM,eAAe;;;;CAI3B,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;CAI9B,CAAC;AAEF,eAAO,MAAM,OAAO;;;;CAAkB,CAAC;AACvC,eAAO,MAAM,OAAO;;;;CAAqB,CAAC;AAsD1C,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,KAAK,EACL,GAAG,GACJ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,GAAG;IACF,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAIA;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,CAAC,EACV,YAAY,EAAE,MAAM,EACpB,aAAa,SAAI,GAChB,CAAC,CAGH;AAoFD,wBAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,CAAC,EACV,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAAE,GACvC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAOA;AAsBD,wBAAgB,WAAW,CAAC,CAAC,EAC3B,OAAO,EAAE,CAAC,EACV,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAAE,GACvC;IACD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAWA;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,OAAO,EAAE,CAAC,EACV,EACE,OAAO,EACP,WAAwB,EACxB,YAAY,EACZ,aAAiB,EACjB,2BAAmC,GACpC,EAAE;IACD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACxB,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GACA;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAgB9C;AAWD,wBAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,CAAC,EACV,EACE,OAAO,EACP,YAAY,EACZ,aAAiB,EACjB,uBAA+B,EAC/B,WAAwB,EACxB,2BAAmC,GACpC,EAAE;IACD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAClC,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GACA;IACD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,CAAC,CAAC;IACd,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7D,CAuBA;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,CAAC,EACV,EACE,OAAO,EACP,YAAY,EACZ,aAAiB,EACjB,MAAgB,GACjB,EAAE;IACD,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,OAAO,GAAG,OAAO,OAAO,CAAC;CAC1C,GACA;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE;QACJ,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/D,iBAAiB,EAAE,MAAM,CAAC;QAC1B,MAAM,EAAE,OAAO,MAAM,CAAC;KACvB,CAAC;CACH,CA8CA"}

package/dist/core/four-pillars.js

@@ -13,6 +13,45 @@ export const TRADITIONAL_PRESET = {
 };
 export const presetA = STANDARD_PRESET;
 export const presetB = TRADITIONAL_PRESET;
+/**
+ * Korea DST period: 1987-05-10 02:00 ~ 1988-10-08 03:00 (UTC+10)
+ * Returns the effective timezone offset in hours for a Korean datetime.
+ */
+function getEffectiveKSTOffset(adapter, dtLocal) {
+    const y = adapter.getYear(dtLocal);
+    const m = adapter.getMonth(dtLocal);
+    const d = adapter.getDay(dtLocal);
+    const h = adapter.getHour(dtLocal);
+    // KDT start: 1987-05-10 02:00 KST (becomes 03:00 KDT)
+    // KDT end: 1988-10-08 03:00 KDT (becomes 02:00 KST)
+    const afterStart = y > 1987 || (y === 1987 && (m > 5 || (m === 5 && (d > 10 || (d === 10 && h >= 2)))));
+    const beforeEnd = y < 1988 || (y === 1988 && (m < 10 || (m === 10 && (d < 8 || (d === 8 && h < 3)))));
+    return afterStart && beforeEnd ? 10 : 9;
+}
+/**
+ * Approximate ΔT (TT - UT) in seconds.
+ * Based on polynomial expressions from Meeus / USNO.
+ */
+function deltaT(year) {
+    if (year >= 2005 && year < 2050) {
+        const t = year - 2000;
+        return 62.92 + 0.32217 * t + 0.005589 * t * t;
+    }
+    if (year >= 1986 && year < 2005) {
+        const t = year - 2000;
+        return (63.86 +
+            0.3345 * t -
+            0.060374 * t * t +
+            0.0017275 * t * t * t +
+            0.000651814 * t * t * t * t +
+            0.00002373599 * t * t * t * t * t);
+    }
+    if (year >= 1900 && year < 1986) {
+        const t = year - 1900;
+        return -0.02 + 0.000297 * t * t;
+    }
+    return 0;
+}
 function normDeg(x) {
     x %= 360;
     return x < 0 ? x + 360 : x;
@@ -38,7 +77,10 @@ function sunApparentLongitude(adapter, dtUtc) {
     const A = Math.floor(y / 100);
     const B = 2 - A + Math.floor(A / 4);
     const JD = Math.floor(365.25 * (y + 4716)) + Math.floor(30.6001 * (m + 1)) + d + B - 1524.5;
-    const T = (JD - 2451545.0) / 36525.0;
+    // Apply ΔT correction for TT
+    const dtSeconds = deltaT(y);
+    const JD_TT = JD + dtSeconds / 86400.0;
+    const T = (JD_TT - 2451545.0) / 36525.0;
     const L0 = normDeg(280.46646 + 36000.76983 * T + 0.0003032 * T * T);
     const M = normDeg(357.52911 + 35999.05029 * T - 0.0001537 * T * T);
     const deg2rad = (deg) => (deg * Math.PI) / 180;
@@ -171,7 +213,8 @@ export function hourPillar(dtLocal, { adapter, longitudeDeg, tzOffsetHours = 9,
     return { pillar: STEMS[hs] + BRANCHES[hb], adjustedDt: dtUsed, effectiveDate: effDate };
 }
 export function getFourPillars(dtLocal, { adapter, longitudeDeg, tzOffsetHours = 9, preset = presetA, }) {
-    const effectiveLongitude = longitudeDeg ?? tzOffsetHours * 15;
+    const effectiveTzOffset = tzOffsetHours === 9 ? getEffectiveKSTOffset(adapter, dtLocal) : tzOffsetHours;
+    const effectiveLongitude = longitudeDeg ?? effectiveTzOffset * 15;
     const dayBoundary = preset.dayBoundary ?? "midnight";
     const useMeanSolarTimeForHour = preset.useMeanSolarTimeForHour ?? false;
     const useMeanSolarTimeForBoundary = preset.useMeanSolarTimeForBoundary ?? false;
@@ -181,14 +224,14 @@ export function getFourPillars(dtLocal, { adapter, longitudeDeg, tzOffsetHours =
         adapter,
         dayBoundary,
         longitudeDeg: effectiveLongitude,
-        tzOffsetHours,
+        tzOffsetHours: effectiveTzOffset,
         useMeanSolarTimeForBoundary,
     });
     const d = dayPillarFromDate(effDate);
     const h = hourPillar(dtLocal, {
         adapter,
         longitudeDeg: effectiveLongitude,
-        tzOffsetHours,
+        tzOffsetHours: effectiveTzOffset,
         useMeanSolarTimeForHour,
         dayBoundary,
         useMeanSolarTimeForBoundary,

package/dist/core/luck.d.ts

@@ -1,4 +1,5 @@
 import type { DateAdapter } from "../adapters/date-adapter";
+import { type SolarTermKey } from "../core/solar-terms";
 import type { Gender, Polarity } from "../types";
 export type { Gender };
 export interface LuckPillar {
@@ -45,6 +46,11 @@ export interface MonthlyLuckResult {
     stem: string;
     branch: string;
     pillar: string;
+    solarTerm: {
+        key: SolarTermKey;
+        korean: string;
+        hanja: string;
+    };
 }
 export declare function calculateMonthlyLuck(year: number, fromMonth: number, toMonth: number): MonthlyLuckResult[];
 export interface DailyLuckResult {

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

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

package/dist/core/luck.js

@@ -1,3 +1,4 @@
+import { getSolarTermLabel } from "../core/solar-terms";
 import { getStemPolarity } from "../core/ten-gods";
 import { BRANCHES, getPillarIndex, jdnFromDate, pillarFromIndex, STEMS } from "../utils";
 export function calculateMajorLuck(birthDateTime, gender, yearPillar, monthPillar, options) {
@@ -79,6 +80,20 @@ export function getCurrentMajorLuck(majorLuck, age) {
     }
     return null;
 }
+const MONTH_JIE_KEYS = [
+    "springBegins",
+    "awakeningInsects",
+    "pureBrightness",
+    "summerBegins",
+    "grainInEar",
+    "minorHeat",
+    "autumnBegins",
+    "whiteDew",
+    "coldDew",
+    "winterBegins",
+    "majorSnow",
+    "minorCold",
+];
 export function calculateMonthlyLuck(year, fromMonth, toMonth) {
     const results = [];
     const yearIdx60 = (((year - 1984) % 60) + 60) % 60;
@@ -92,12 +107,19 @@ export function calculateMonthlyLuck(year, fromMonth, toMonth) {
         const stem = STEMS[stemIdx];
         const branch = BRANCHES[branchIdx];
         const pillar = stem + branch;
+        const jieKey = MONTH_JIE_KEYS[monthOffset % 12];
+        const jieLabel = getSolarTermLabel(jieKey);
         results.push({
             year,
             month,
             stem,
             branch,
             pillar,
+            solarTerm: {
+                key: jieLabel.key,
+                korean: jieLabel.korean,
+                hanja: jieLabel.hanja,
+            },
         });
     }
     return results;
@@ -106,7 +128,7 @@ export function calculateDailyLuck(year, month, fromDay, toDay) {
     const results = [];
     for (let day = fromDay; day <= toDay; day++) {
         const jdn = jdnFromDate(year, month, day);
-        const idx60 = (((jdn + 49) % 60) + 60) % 60;
+        const idx60 = (((jdn - 11) % 60) + 60) % 60;
         const stem = STEMS[idx60 % 10];
         const branch = BRANCHES[idx60 % 12];
         const pillar = stem + branch;
@@ -123,7 +145,7 @@ export function calculateDailyLuck(year, month, fromDay, toDay) {
 }
 export function getDayPillar(year, month, day) {
     const jdn = jdnFromDate(year, month, day);
-    const idx60 = (((jdn + 49) % 60) + 60) % 60;
+    const idx60 = (((jdn - 11) % 60) + 60) % 60;
     return STEMS[idx60 % 10] + BRANCHES[idx60 % 12];
 }
 export function getMonthPillar(year, month) {

package/dist/core/nayin.d.ts

@@ -0,0 +1,16 @@
+import type { Element } from "../types";
+export interface NayinResult {
+    element: Element;
+    korean: string;
+    hanja: string;
+}
+export declare function getNayin(pillarIdx60: number): NayinResult;
+export declare function getNayinFromPillar(pillar: string): NayinResult;
+export interface FourPillarsNayin {
+    year: NayinResult;
+    month: NayinResult;
+    day: NayinResult;
+    hour: NayinResult;
+}
+export declare function analyzeFourPillarsNayin(yearPillar: string, monthPillar: string, dayPillar: string, hourPillar: string): FourPillarsNayin;
+//# sourceMappingURL=nayin.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nayin.d.ts","sourceRoot":"","sources":["../../src/core/nayin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAkEvC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,CAMzD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAG9D;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,WAAW,CAAC;IACnB,GAAG,EAAE,WAAW,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,gBAAgB,CAOlB"}

package/dist/core/nayin.js

@@ -0,0 +1,83 @@
+import { getPillarIndex } from "../utils";
+const NAYIN_TABLE = {
+    0: { element: "metal", korean: "해중금", hanja: "海中金" },
+    1: { element: "metal", korean: "해중금", hanja: "海中金" },
+    2: { element: "fire", korean: "노중화", hanja: "爐中火" },
+    3: { element: "fire", korean: "노중화", hanja: "爐中火" },
+    4: { element: "wood", korean: "대림목", hanja: "大林木" },
+    5: { element: "wood", korean: "대림목", hanja: "大林木" },
+    6: { element: "earth", korean: "노방토", hanja: "路傍土" },
+    7: { element: "earth", korean: "노방토", hanja: "路傍土" },
+    8: { element: "metal", korean: "검봉금", hanja: "劍鋒金" },
+    9: { element: "metal", korean: "검봉금", hanja: "劍鋒金" },
+    10: { element: "fire", korean: "산두화", hanja: "山頭火" },
+    11: { element: "fire", korean: "산두화", hanja: "山頭火" },
+    12: { element: "water", korean: "간하수", hanja: "澗下水" },
+    13: { element: "water", korean: "간하수", hanja: "澗下水" },
+    14: { element: "earth", korean: "성두토", hanja: "城頭土" },
+    15: { element: "earth", korean: "성두토", hanja: "城頭土" },
+    16: { element: "metal", korean: "백랍금", hanja: "白蠟金" },
+    17: { element: "metal", korean: "백랍금", hanja: "白蠟金" },
+    18: { element: "wood", korean: "양류목", hanja: "楊柳木" },
+    19: { element: "wood", korean: "양류목", hanja: "楊柳木" },
+    20: { element: "water", korean: "천천수", hanja: "泉中水" },
+    21: { element: "water", korean: "천천수", hanja: "泉中水" },
+    22: { element: "earth", korean: "옥상토", hanja: "屋上土" },
+    23: { element: "earth", korean: "옥상토", hanja: "屋上土" },
+    24: { element: "fire", korean: "벽력화", hanja: "霹靂火" },
+    25: { element: "fire", korean: "벽력화", hanja: "霹靂火" },
+    26: { element: "wood", korean: "송백목", hanja: "松柏木" },
+    27: { element: "wood", korean: "송백목", hanja: "松柏木" },
+    28: { element: "water", korean: "장류수", hanja: "長流水" },
+    29: { element: "water", korean: "장류수", hanja: "長流水" },
+    30: { element: "metal", korean: "사중금", hanja: "砂中金" },
+    31: { element: "metal", korean: "사중금", hanja: "砂中金" },
+    32: { element: "fire", korean: "산하화", hanja: "山下火" },
+    33: { element: "fire", korean: "산하화", hanja: "山下火" },
+    34: { element: "wood", korean: "평지목", hanja: "平地木" },
+    35: { element: "wood", korean: "평지목", hanja: "平地木" },
+    36: { element: "earth", korean: "벽상토", hanja: "壁上土" },
+    37: { element: "earth", korean: "벽상토", hanja: "壁上土" },
+    38: { element: "metal", korean: "금박금", hanja: "金箔金" },
+    39: { element: "metal", korean: "금박금", hanja: "金箔金" },
+    40: { element: "fire", korean: "복등화", hanja: "覆燈火" },
+    41: { element: "fire", korean: "복등화", hanja: "覆燈火" },
+    42: { element: "water", korean: "천하수", hanja: "天河水" },
+    43: { element: "water", korean: "천하수", hanja: "天河水" },
+    44: { element: "earth", korean: "대역토", hanja: "大驛土" },
+    45: { element: "earth", korean: "대역토", hanja: "大驛土" },
+    46: { element: "metal", korean: "채광금", hanja: "釵釧金" },
+    47: { element: "metal", korean: "채광금", hanja: "釵釧金" },
+    48: { element: "wood", korean: "상자목", hanja: "桑柘木" },
+    49: { element: "wood", korean: "상자목", hanja: "桑柘木" },
+    50: { element: "water", korean: "대계수", hanja: "大溪水" },
+    51: { element: "water", korean: "대계수", hanja: "大溪水" },
+    52: { element: "earth", korean: "사중토", hanja: "砂中土" },
+    53: { element: "earth", korean: "사중토", hanja: "砂中土" },
+    54: { element: "fire", korean: "천상화", hanja: "天上火" },
+    55: { element: "fire", korean: "천상화", hanja: "天上火" },
+    56: { element: "wood", korean: "석류목", hanja: "石榴木" },
+    57: { element: "wood", korean: "석류목", hanja: "石榴木" },
+    58: { element: "water", korean: "대해수", hanja: "大海水" },
+    59: { element: "water", korean: "대해수", hanja: "大海水" },
+};
+export function getNayin(pillarIdx60) {
+    const normalized = ((pillarIdx60 % 60) + 60) % 60;
+    const pairIdx = Math.floor(normalized / 2) * 2;
+    const entry = NAYIN_TABLE[pairIdx];
+    if (!entry)
+        throw new Error(`Invalid pillar index: ${pillarIdx60}`);
+    return { element: entry.element, korean: entry.korean, hanja: entry.hanja };
+}
+export function getNayinFromPillar(pillar) {
+    const idx = getPillarIndex(pillar);
+    return getNayin(idx);
+}
+export function analyzeFourPillarsNayin(yearPillar, monthPillar, dayPillar, hourPillar) {
+    return {
+        year: getNayin(getPillarIndex(yearPillar)),
+        month: getNayin(getPillarIndex(monthPillar)),
+        day: getNayin(getPillarIndex(dayPillar)),
+        hour: getNayin(getPillarIndex(hourPillar)),
+    };
+}

package/dist/core/relations.d.ts

@@ -1,6 +1,6 @@
 import type { Element, ElementLabel } from "../core/ten-gods";
 import type { Label } from "../types";
-export declare const RELATION_TYPE_KEYS: readonly ["stemCombination", "sixCombination", "tripleCombination", "directionalCombination", "clash", "harm", "punishment", "destruction"];
+export declare const RELATION_TYPE_KEYS: readonly ["stemCombination", "stemClash", "sixCombination", "halfCombination", "tripleCombination", "directionalCombination", "clash", "harm", "punishment", "destruction"];
 export type RelationTypeKey = (typeof RELATION_TYPE_KEYS)[number];
 export interface RelationTypeLabel extends Label<RelationTypeKey> {
 }
@@ -20,11 +20,17 @@ export type StemCombinationResult = {
     resultElement: Element;
 };
 export declare const STEM_COMBINATIONS: StemCombinationResult[];
+export declare const STEM_CLASHES: [string, string][];
 export type BranchCombinationResult = {
     branches: [string, string];
     resultElement: Element;
 };
 export declare const BRANCH_SIX_COMBINATIONS: BranchCombinationResult[];
+export type HalfCombinationResult = {
+    branches: [string, string];
+    resultElement: Element;
+};
+export declare const BRANCH_HALF_COMBINATIONS: HalfCombinationResult[];
 export type TripleCombinationResult = {
     branches: [string, string, string];
     resultElement: Element;
@@ -46,6 +52,11 @@ export interface StemCombination {
     transformStatus: TransformationStatusLabel;
     transformReason: string;
 }
+export interface StemClash {
+    type: RelationTypeLabel;
+    pair: [string, string];
+    positions: [string, string];
+}
 export interface BranchSixCombination {
     type: RelationTypeLabel;
     pair: [string, string];
@@ -54,6 +65,12 @@ export interface BranchSixCombination {
     transformStatus: TransformationStatusLabel;
     transformReason: string;
 }
+export interface BranchHalfCombination {
+    type: RelationTypeLabel;
+    pair: [string, string];
+    positions: [string, string];
+    resultElement: ElementLabel;
+}
 export interface BranchTripleCombination {
     type: RelationTypeLabel;
     branches: string[];
@@ -93,9 +110,10 @@ export interface BranchDestruction {
     pair: [string, string];
     positions: [string, string];
 }
-export type Relation = StemCombination | BranchSixCombination | BranchTripleCombination | BranchDirectionalCombination | BranchClash | BranchHarm | BranchPunishment | BranchDestruction;
+export type Relation = StemCombination | StemClash | BranchSixCombination | BranchHalfCombination | BranchTripleCombination | BranchDirectionalCombination | BranchClash | BranchHarm | BranchPunishment | BranchDestruction;
 export interface RelationsResult {
-    combinations: (StemCombination | BranchSixCombination | BranchTripleCombination | BranchDirectionalCombination)[];
+    combinations: (StemCombination | BranchSixCombination | BranchHalfCombination | BranchTripleCombination | BranchDirectionalCombination)[];
+    stemClashes: StemClash[];
     clashes: BranchClash[];
     harms: BranchHarm[];
     punishments: BranchPunishment[];

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

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