@gracefullight/saju 1.3.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__/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/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/yongshen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yongshen.d.ts","sourceRoot":"","sources":["../../src/core/yongshen.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,YAAY,EAIlB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE3F,MAAM,WAAW,mBAAoB,SAAQ,KAAK,CAAC,iBAAiB,CAAC;CAAG;AAUxE,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,iBAAiB,GAAG,mBAAmB,CAGlF;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACzE,cAAc,EAAE,YAAY,GAAG,IAAI,CAAC;IACpC,8BAA8B;IAC9B,kBAAkB,CAAC,EAAE;QACnB,OAAO,EAAE,YAAY,CAAC;QACtB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;KAChC,CAAC;CACH;AAED,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAoLrC,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,cAAc,CA2FhB;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,cAAc,GAAG;IACnE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CA0BA"}
+{"version":3,"file":"yongshen.d.ts","sourceRoot":"","sources":["../../src/core/yongshen.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,YAAY,EAIlB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE3F,MAAM,WAAW,mBAAoB,SAAQ,KAAK,CAAC,iBAAiB,CAAC;CAAG;AAUxE,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,iBAAiB,GAAG,mBAAmB,CAGlF;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACzE,cAAc,EAAE,YAAY,GAAG,IAAI,CAAC;IACpC,8BAA8B;IAC9B,kBAAkB,CAAC,EAAE;QACnB,OAAO,EAAE,YAAY,CAAC;QACtB,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;KAChC,CAAC;CACH;AAED,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAwNrC,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,cAAc,CA2FhB;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,cAAc,GAAG;IACnE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CA0BA"}

package/dist/core/yongshen.js

@@ -102,7 +102,7 @@ function getYokbuYongShen(dayMasterElement, level) {
     const secondary = dayMasterElement;
     return { primary, secondary };
 }
-function hasSpecialFormation(dayMasterElement, level, allElements) {
+function countElements(elements) {
     const elementCounts = {
         wood: 0,
         fire: 0,
@@ -110,44 +110,56 @@ function hasSpecialFormation(dayMasterElement, level, allElements) {
         metal: 0,
         water: 0,
     };
-    for (const elem of allElements) {
+    for (const elem of elements) {
         elementCounts[elem]++;
     }
-    if (level.key === "extremelyWeak") {
-        // Find dominant non-daymaster element
-        let dominantElement = null;
-        let maxCount = 0;
-        for (const [elem, count] of Object.entries(elementCounts)) {
-            if (count > maxCount && elem !== dayMasterElement) {
-                maxCount = count;
-                dominantElement = elem;
-            }
-        }
-        if (dominantElement && maxCount >= 3) {
-            // Determine specific 종격 type
-            const dmControls = CONTROLS[dayMasterElement];
-            const dmControlledBy = CONTROLLED_BY[dayMasterElement];
-            const dmGenerates = GENERATES[dayMasterElement];
-            let type = "종격";
-            if (dominantElement === dmControls) {
-                type = "종재격"; // Follow Wealth
-            }
-            else if (dominantElement === dmControlledBy) {
-                type = "종살격"; // Follow Killings
-            }
-            else if (dominantElement === dmGenerates) {
-                type = "종아격"; // Follow Children/Output
-            }
-            return { isSpecial: true, type, followElement: dominantElement };
+    return elementCounts;
+}
+function getDominantNonDayMasterElement(dayMasterElement, elementCounts) {
+    let dominantElement = null;
+    let maxCount = 0;
+    for (const [elem, count] of Object.entries(elementCounts)) {
+        if (count > maxCount && elem !== dayMasterElement) {
+            maxCount = count;
+            dominantElement = elem;
         }
     }
+    return { dominantElement, maxCount };
+}
+function getFollowFormationType(dayMasterElement, dominantElement) {
+    const followTypeByElement = {
+        [CONTROLS[dayMasterElement]]: "종재격",
+        [CONTROLLED_BY[dayMasterElement]]: "종살격",
+        [GENERATES[dayMasterElement]]: "종아격",
+    };
+    return followTypeByElement[dominantElement] ?? "종격";
+}
+function getExtremelyWeakSpecialFormation(dayMasterElement, elementCounts) {
+    const { dominantElement, maxCount } = getDominantNonDayMasterElement(dayMasterElement, elementCounts);
+    if (!dominantElement || maxCount < 3) {
+        return { isSpecial: false, type: null, followElement: null };
+    }
+    return {
+        isSpecial: true,
+        type: getFollowFormationType(dayMasterElement, dominantElement),
+        followElement: dominantElement,
+    };
+}
+function getExtremelyStrongSpecialFormation(dayMasterElement, elementCounts) {
+    const controllerElement = CONTROLLED_BY[dayMasterElement];
+    const hasController = elementCounts[controllerElement] > 0;
+    if (hasController) {
+        return { isSpecial: false, type: null, followElement: null };
+    }
+    return { isSpecial: true, type: "종강격", followElement: dayMasterElement };
+}
+function hasSpecialFormation(dayMasterElement, level, allElements) {
+    const elementCounts = countElements(allElements);
+    if (level.key === "extremelyWeak") {
+        return getExtremelyWeakSpecialFormation(dayMasterElement, elementCounts);
+    }
     if (level.key === "extremelyStrong") {
-        // 종강격: extremely strong with no controllers present
-        const controllerElement = CONTROLLED_BY[dayMasterElement];
-        const hasController = elementCounts[controllerElement] > 0;
-        if (!hasController) {
-            return { isSpecial: true, type: "종강격", followElement: dayMasterElement };
-        }
+        return getExtremelyStrongSpecialFormation(dayMasterElement, elementCounts);
     }
     return { isSpecial: false, type: null, followElement: null };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gracefullight/saju",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Four Pillars (四柱) calculator with flexible date adapter support",
   "type": "module",
   "main": "./dist/index.js",