@gracefullight/saju 1.2.0 → 1.3.1

package/dist/core/relations.js

@@ -1,7 +1,9 @@
 import { getBranchElement, getElementLabel, getStemElement } from "../core/ten-gods";
 export const RELATION_TYPE_KEYS = [
     "stemCombination",
+    "stemClash",
     "sixCombination",
+    "halfCombination",
     "tripleCombination",
     "directionalCombination",
     "clash",
@@ -11,7 +13,9 @@ export const RELATION_TYPE_KEYS = [
 ];
 const RELATION_TYPE_DATA = {
     stemCombination: { korean: "천간합", hanja: "天干合" },
+    stemClash: { korean: "천간충", hanja: "天干沖" },
     sixCombination: { korean: "육합", hanja: "六合" },
+    halfCombination: { korean: "반합", hanja: "半合" },
     tripleCombination: { korean: "삼합", hanja: "三合" },
     directionalCombination: { korean: "방합", hanja: "方合" },
     clash: { korean: "충", hanja: "沖" },
@@ -57,6 +61,12 @@ export const STEM_COMBINATIONS = [
     { stems: ["丁", "壬"], resultElement: "wood" },
     { stems: ["戊", "癸"], resultElement: "fire" },
 ];
+export const STEM_CLASHES = [
+    ["甲", "庚"],
+    ["乙", "辛"],
+    ["丙", "壬"],
+    ["丁", "癸"],
+];
 export const BRANCH_SIX_COMBINATIONS = [
     { branches: ["子", "丑"], resultElement: "earth" },
     { branches: ["寅", "亥"], resultElement: "wood" },
@@ -65,6 +75,16 @@ export const BRANCH_SIX_COMBINATIONS = [
     { branches: ["巳", "申"], resultElement: "water" },
     { branches: ["午", "未"], resultElement: "earth" },
 ];
+export const BRANCH_HALF_COMBINATIONS = [
+    { branches: ["寅", "午"], resultElement: "fire" },
+    { branches: ["午", "戌"], resultElement: "fire" },
+    { branches: ["巳", "酉"], resultElement: "metal" },
+    { branches: ["酉", "丑"], resultElement: "metal" },
+    { branches: ["申", "子"], resultElement: "water" },
+    { branches: ["子", "辰"], resultElement: "water" },
+    { branches: ["亥", "卯"], resultElement: "wood" },
+    { branches: ["卯", "未"], resultElement: "wood" },
+];
 export const BRANCH_TRIPLE_COMBINATIONS = [
     { branches: ["寅", "午", "戌"], resultElement: "fire" },
     { branches: ["申", "子", "辰"], resultElement: "water" },
@@ -194,6 +214,7 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
     const allStemChars = stems.map((s) => s.char);
     const allBranchChars = branches.map((b) => b.char);
     const combinations = [];
+    const stemClashes = [];
     const clashes = [];
     const harms = [];
     const punishments = [];
@@ -216,6 +237,16 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
                     });
                 }
             }
+            for (const clash of STEM_CLASHES) {
+                if ((s1.char === clash[0] && s2.char === clash[1]) ||
+                    (s1.char === clash[1] && s2.char === clash[0])) {
+                    stemClashes.push({
+                        type: getRelationTypeLabel("stemClash"),
+                        pair: [s1.char, s2.char],
+                        positions: [s1.position, s2.position],
+                    });
+                }
+            }
         }
     }
     for (let i = 0; i < branches.length; i++) {
@@ -236,6 +267,17 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
                     });
                 }
             }
+            for (const halfCombo of BRANCH_HALF_COMBINATIONS) {
+                if ((b1.char === halfCombo.branches[0] && b2.char === halfCombo.branches[1]) ||
+                    (b1.char === halfCombo.branches[1] && b2.char === halfCombo.branches[0])) {
+                    combinations.push({
+                        type: getRelationTypeLabel("halfCombination"),
+                        pair: [b1.char, b2.char],
+                        positions: [b1.position, b2.position],
+                        resultElement: getElementLabel(halfCombo.resultElement),
+                    });
+                }
+            }
             for (const clash of BRANCH_CLASHES) {
                 if ((b1.char === clash[0] && b2.char === clash[1]) ||
                     (b1.char === clash[1] && b2.char === clash[0])) {
@@ -268,17 +310,23 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
             }
         }
     }
-    const branchChars = branches.map((b) => b.char);
     for (const combo of BRANCH_TRIPLE_COMBINATIONS) {
-        const matched = combo.branches.filter((b) => branchChars.includes(b));
+        const matched = [];
+        const usedIndices = new Set();
+        for (const target of combo.branches) {
+            const idx = branches.findIndex((b, i) => b.char === target && !usedIndices.has(i));
+            if (idx !== -1) {
+                usedIndices.add(idx);
+                matched.push({ char: target, position: branches[idx].position });
+            }
+        }
         if (matched.length >= 2) {
-            // biome-ignore lint/style/noNonNullAssertion: matched is filtered from branchChars, find is guaranteed
-            const positions = matched.map((m) => branches.find((b) => b.char === m).position);
+            const positions = matched.map((m) => m.position);
             const isComplete = matched.length === 3;
             const transform = checkTransformationCondition(combo.resultElement, monthBranch, allBranchChars, isComplete);
             combinations.push({
                 type: getRelationTypeLabel("tripleCombination"),
-                branches: matched,
+                branches: matched.map((m) => m.char),
                 positions,
                 resultElement: getElementLabel(combo.resultElement),
                 isComplete,
@@ -288,15 +336,22 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
         }
     }
     for (const combo of BRANCH_DIRECTIONAL_COMBINATIONS) {
-        const matched = combo.branches.filter((b) => branchChars.includes(b));
+        const matched = [];
+        const usedIndices = new Set();
+        for (const target of combo.branches) {
+            const idx = branches.findIndex((b, i) => b.char === target && !usedIndices.has(i));
+            if (idx !== -1) {
+                usedIndices.add(idx);
+                matched.push({ char: target, position: branches[idx].position });
+            }
+        }
         if (matched.length >= 2) {
-            // biome-ignore lint/style/noNonNullAssertion: matched is filtered from branchChars, find is guaranteed
-            const positions = matched.map((m) => branches.find((b) => b.char === m).position);
+            const positions = matched.map((m) => m.position);
             const isComplete = matched.length === 3;
             const transform = checkTransformationCondition(combo.resultElement, monthBranch, allBranchChars, isComplete);
             combinations.push({
                 type: getRelationTypeLabel("directionalCombination"),
-                branches: matched,
+                branches: matched.map((m) => m.char),
                 positions,
                 resultElement: getElementLabel(combo.resultElement),
                 isComplete,
@@ -305,6 +360,7 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
             });
         }
     }
+    const branchChars = branches.map((b) => b.char);
     for (const punishment of BRANCH_PUNISHMENTS) {
         const matched = punishment.branches.filter((b) => branchChars.includes(b));
         const isTriple = punishment.branches.length === 3;
@@ -343,9 +399,17 @@ export function analyzeRelations(yearPillar, monthPillar, dayPillar, hourPillar)
             });
         }
     }
-    const all = [...combinations, ...clashes, ...harms, ...punishments, ...destructions];
+    const all = [
+        ...combinations,
+        ...stemClashes,
+        ...clashes,
+        ...harms,
+        ...punishments,
+        ...destructions,
+    ];
     return {
         combinations,
+        stemClashes,
         clashes,
         harms,
         punishments,

package/dist/core/sinsals.d.ts

@@ -1,5 +1,5 @@
 import type { Label, PillarPosition } from "../types";
-export declare const SINSALS: readonly ["peachBlossom", "skyHorse", "floweryCanopy", "ghostGate", "solitaryStar", "widowStar", "heavenlyVirtue", "monthlyVirtue", "skyNoble", "moonNoble", "literaryNoble", "academicHall", "bloodKnife", "sixHarms", "whiteCloth", "heavenlyDoctor", "suspendedNeedle", "kuiGang", "sheepBlade", "redFlame", "taijiNoble", "goldenCarriage", "officialStar", "hiddenWealth", "officialAcademicHall", "whiteTiger", "heavenlyGate", "heavenlyKitchen", "literaryCurve", "imperialPardon", "lostSpirit", "robbery", "disaster", "generalStar", "saddleMount", "redPhoenix", "heavenlyJoy", "gongmang", "wonjin"];
+export declare const SINSALS: readonly ["peachBlossom", "skyHorse", "floweryCanopy", "ghostGate", "solitaryStar", "widowStar", "heavenlyVirtue", "monthlyVirtue", "skyNoble", "moonNoble", "literaryNoble", "academicHall", "bloodKnife", "sixHarms", "whiteCloth", "heavenlyDoctor", "suspendedNeedle", "kuiGang", "sheepBlade", "redFlame", "taijiNoble", "goldenCarriage", "officialStar", "hiddenWealth", "officialAcademicHall", "whiteTiger", "heavenlyGate", "heavenlyKitchen", "literaryCurve", "imperialPardon", "lostSpirit", "robbery", "disaster", "heavenlyKiller", "earthlyKiller", "yearKiller", "monthKiller", "generalStar", "saddleMount", "redPhoenix", "heavenlyJoy", "gongmang", "wonjin"];
 export type SinsalKey = (typeof SINSALS)[number];
 export type SinsalType = "auspicious" | "inauspicious" | "neutral";
 export interface SinsalLabel extends Label<SinsalKey> {

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

@@ -1 +1 @@
-{"version":3,"file":"sinsals.d.ts","sourceRoot":"","sources":["../../src/core/sinsals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAErD,eAAO,MAAM,OAAO,mlBAwCV,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;AAEnE,MAAM,WAAW,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;CAClB;AA+dD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;CACvD;AA6CD,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,YAAY,CA+Sd;AAED,eAAO,MAAM,WAAW,EAAE,MAAM,CAC9B,SAAS,EACT;IACE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;CAClB,CA6NF,CAAC;AAEF,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,WAAW,CAS1D"}
+{"version":3,"file":"sinsals.d.ts","sourceRoot":"","sources":["../../src/core/sinsals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAErD,eAAO,MAAM,OAAO,mpBA4CV,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,cAAc,GAAG,SAAS,CAAC;AAEnE,MAAM,WAAW,WAAY,SAAQ,KAAK,CAAC,SAAS,CAAC;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;CAClB;AA+hBD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;CACvD;AA6CD,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,YAAY,CAuWd;AAED,eAAO,MAAM,WAAW,EAAE,MAAM,CAC9B,SAAS,EACT;IACE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;CAClB,CAqPF,CAAC;AAEF,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,WAAW,CAS1D"}

package/dist/core/sinsals.js

@@ -32,6 +32,10 @@ export const SINSALS = [
     "lostSpirit",
     "robbery",
     "disaster",
+    "heavenlyKiller",
+    "earthlyKiller",
+    "yearKiller",
+    "monthKiller",
     "generalStar",
     "saddleMount",
     "redPhoenix",
@@ -420,6 +424,66 @@ const DISASTER_MAP = {
     卯: "酉",
     未: "酉",
 };
+// 천살 (년지/일지 기준 삼합 → 지지에서 체크)
+const HEAVENLY_KILLER_MAP = {
+    寅: "丑",
+    午: "丑",
+    戌: "丑",
+    巳: "辰",
+    酉: "辰",
+    丑: "辰",
+    申: "未",
+    子: "未",
+    辰: "未",
+    亥: "戌",
+    卯: "戌",
+    未: "戌",
+};
+// 지살 (년지/일지 기준 삼합 → 지지에서 체크)
+const EARTHLY_KILLER_MAP = {
+    寅: "寅",
+    午: "寅",
+    戌: "寅",
+    巳: "巳",
+    酉: "巳",
+    丑: "巳",
+    申: "申",
+    子: "申",
+    辰: "申",
+    亥: "亥",
+    卯: "亥",
+    未: "亥",
+};
+// 연살 (년지/일지 기준 삼합 → 지지에서 체크)
+const YEAR_KILLER_MAP = {
+    寅: "卯",
+    午: "卯",
+    戌: "卯",
+    巳: "午",
+    酉: "午",
+    丑: "午",
+    申: "酉",
+    子: "酉",
+    辰: "酉",
+    亥: "子",
+    卯: "子",
+    未: "子",
+};
+// 월살 (년지/일지 기준 삼합 → 지지에서 체크)
+const MONTH_KILLER_MAP = {
+    寅: "辰",
+    午: "辰",
+    戌: "辰",
+    巳: "未",
+    酉: "未",
+    丑: "未",
+    申: "戌",
+    子: "戌",
+    辰: "戌",
+    亥: "丑",
+    卯: "丑",
+    未: "丑",
+};
 // 장성 (년지/일지 기준 삼합의 왕지)
 const GENERAL_STAR_MAP = {
     寅: "午",
@@ -582,6 +646,18 @@ export function analyzeSinsals(yearPillar, monthPillar, dayPillar, hourPillar) {
     // 재살 (년지/일지 기준)
     matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, DISASTER_MAP, "disaster"));
     matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, DISASTER_MAP, "disaster"));
+    // 천살 (년지/일지 기준)
+    matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, HEAVENLY_KILLER_MAP, "heavenlyKiller"));
+    matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, HEAVENLY_KILLER_MAP, "heavenlyKiller"));
+    // 지살 (년지/일지 기준)
+    matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, EARTHLY_KILLER_MAP, "earthlyKiller"));
+    matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, EARTHLY_KILLER_MAP, "earthlyKiller"));
+    // 연살 (년지/일지 기준)
+    matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, YEAR_KILLER_MAP, "yearKiller"));
+    matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, YEAR_KILLER_MAP, "yearKiller"));
+    // 월살 (년지/일지 기준)
+    matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, MONTH_KILLER_MAP, "monthKiller"));
+    matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, MONTH_KILLER_MAP, "monthKiller"));
     // 장성살 (년지/일지 기준)
     matches.push(...checkBranchBasedSinsal(yearBranch, allBranches, positions, GENERAL_STAR_MAP, "generalStar"));
     matches.push(...checkBranchBasedSinsal(dayBranch, allBranches, positions, GENERAL_STAR_MAP, "generalStar"));
@@ -804,6 +880,30 @@ export const SINSAL_INFO = {
         meaning: "재난, 감금, 소송",
         type: "inauspicious",
     },
+    heavenlyKiller: {
+        korean: "천살",
+        hanja: "天煞",
+        meaning: "천재지변, 불의의 사고",
+        type: "inauspicious",
+    },
+    earthlyKiller: {
+        korean: "지살",
+        hanja: "地煞",
+        meaning: "이동 중 사고, 지진, 함몰",
+        type: "inauspicious",
+    },
+    yearKiller: {
+        korean: "연살",
+        hanja: "年煞",
+        meaning: "질병, 관재, 구설",
+        type: "inauspicious",
+    },
+    monthKiller: {
+        korean: "월살",
+        hanja: "月煞",
+        meaning: "가정불화, 부부갈등",
+        type: "inauspicious",
+    },
     generalStar: {
         korean: "장성살",
         hanja: "將星煞",

package/dist/core/solar-terms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solar-terms.d.ts","sourceRoot":"","sources":["../../src/core/solar-terms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,eAAe,iXAyBlB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,YAAY,CAAC;IACzD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7F,CAAC;AAEJ,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,GAAG,cAAc,CAGnE;AAED,eAAO,MAAM,WAAW,kBAAuD,CAAC;AAEhF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC;AAC7E,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC;AAE7E,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,YAAY,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,OAAO,EAAE,SAAS,CAAC;IACnB,+CAA+C;IAC/C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,sEAAsE;IACtE,aAAa,EAAE,MAAM,CAAC;IACtB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,iCAAiC;IACjC,IAAI,EAAE,SAAS,CAAC;IAChB,+CAA+C;IAC/C,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,OAAO,EAAE,SAAS,CAAC;IACnB,2BAA2B;IAC3B,WAAW,EAAE,iBAAiB,CAAC;IAC/B,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,6FAA6F;IAC7F,OAAO,EAAE,SAAS,CAAC;IACnB,uBAAuB;IACvB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;CACvB;AAuMD,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,OAAO,EAAE,CAAC,EACV,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAAE,GACvC,aAAa,CA0Ef;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,IAAI,EAAE,MAAM,EACZ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnE,KAAK,CAAC;IACP,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC,CAuBD"}
+{"version":3,"file":"solar-terms.d.ts","sourceRoot":"","sources":["../../src/core/solar-terms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,eAAe,iXAyBlB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,YAAY,CAAC;IACzD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7F,CAAC;AAEJ,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,GAAG,cAAc,CAGnE;AAED,eAAO,MAAM,WAAW,kBAAuD,CAAC;AAEhF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC;AAC7E,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC;AAE7E,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,YAAY,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,OAAO,EAAE,SAAS,CAAC;IACnB,+CAA+C;IAC/C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,sEAAsE;IACtE,aAAa,EAAE,MAAM,CAAC;IACtB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,iCAAiC;IACjC,IAAI,EAAE,SAAS,CAAC;IAChB,+CAA+C;IAC/C,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,OAAO,EAAE,SAAS,CAAC;IACnB,2BAA2B;IAC3B,WAAW,EAAE,iBAAiB,CAAC;IAC/B,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,6FAA6F;IAC7F,OAAO,EAAE,SAAS,CAAC;IACnB,uBAAuB;IACvB,WAAW,EAAE,iBAAiB,CAAC;IAC/B,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;CACvB;AAqOD,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,OAAO,EAAE,CAAC,EACV,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAAE,GACvC,aAAa,CA0Ef;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,IAAI,EAAE,MAAM,EACZ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnE,KAAK,CAAC;IACP,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC,CAuBD"}

package/dist/core/solar-terms.js

@@ -55,6 +55,30 @@ export function getSolarTermLabel(key) {
     return { key, ...data };
 }
 export const SOLAR_TERMS = SOLAR_TERM_KEYS.map((key) => getSolarTermLabel(key));
+/**
+ * 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;
@@ -71,7 +95,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;

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

@@ -1 +1 @@
-{"version":3,"file":"strength.d.ts","sourceRoot":"","sources":["../../src/core/strength.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,mBAAmB,sIAUtB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,MAAM,WAAW,kBAAmB,SAAQ,KAAK,CAAC,gBAAgB,CAAC;CAAG;AActE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,kBAAkB,CAG/E;AAgLD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB;AAGD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,cAAc,CAsGhB"}
+{"version":3,"file":"strength.d.ts","sourceRoot":"","sources":["../../src/core/strength.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,mBAAmB,sIAUtB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,MAAM,WAAW,kBAAmB,SAAQ,KAAK,CAAC,gBAAgB,CAAC;CAAG;AActE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,GAAG,kBAAkB,CAG/E;AAgLD,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB;AAGD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,cAAc,CA6HhB"}

package/dist/core/strength.js

@@ -1,3 +1,4 @@
+import { findBranchClash, findStemCombination } from "../core/relations";
 import { getStemElement, getStemPolarity, getTenGodKey, } from "../core/ten-gods";
 export const STRENGTH_LEVEL_KEYS = [
     "extremelyWeak",
@@ -188,7 +189,29 @@ export function analyzeStrength(yearPillar, monthPillar, dayPillar, hourPillar)
     for (const branch of allBranches) {
         tonggeun += calculateRootStrength(dayMaster, branch);
     }
+    // Clash reduction: if day branch is clashed, reduce root strength
+    let clashReduction = 0;
+    for (const branch of allBranches) {
+        if (branch !== dayPillar[1] && findBranchClash(dayPillar[1], branch)) {
+            clashReduction += 0.3;
+        }
+    }
+    tonggeun = Math.max(0, tonggeun - clashReduction);
     const allStems = [yearPillar[0], monthPillar[0], dayPillar[0], hourPillar[0]];
+    // Stem combination: check if daymaster is in a stem combination
+    let stemComboBonus = 0;
+    const otherStems = [yearPillar[0], monthPillar[0], hourPillar[0]];
+    for (const stem of otherStems) {
+        const combo = findStemCombination(dayMaster, stem);
+        if (combo) {
+            if (combo.resultElement === dayMasterElement) {
+                stemComboBonus += 0.2; // Combination strengthens day master element
+            }
+            else {
+                stemComboBonus -= 0.1; // Combination transforms away from day master
+            }
+        }
+    }
     const monthHiddenStems = HIDDEN_STEM_WEIGHTS[monthBranch] || [];
     let transparentBonus = 0;
     for (const hs of monthHiddenStems) {
@@ -205,7 +228,6 @@ export function analyzeStrength(yearPillar, monthPillar, dayPillar, hourPillar)
         deukji += calculateRootStrength(dayMaster, branch);
     }
     let deukse = 0;
-    const otherStems = [yearPillar[0], monthPillar[0], hourPillar[0]];
     for (const stem of otherStems) {
         const tenGod = getTenGodKey(dayMaster, stem);
         if (isHelpfulTenGod(tenGod)) {
@@ -239,6 +261,7 @@ export function analyzeStrength(yearPillar, monthPillar, dayPillar, hourPillar)
     score += deukse * 8;
     score += helpCount * 5;
     score -= weakenCount * 6;
+    score += stemComboBonus * 10;
     score = Math.round(score * 10) / 10;
     let levelKey;
     if (score <= 10)

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;AA2JrC,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,29 +102,64 @@ function getYokbuYongShen(dayMasterElement, level) {
     const secondary = dayMasterElement;
     return { primary, secondary };
 }
+function countElements(elements) {
+    const elementCounts = {
+        wood: 0,
+        fire: 0,
+        earth: 0,
+        metal: 0,
+        water: 0,
+    };
+    for (const elem of elements) {
+        elementCounts[elem]++;
+    }
+    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") {
-        const elementCounts = {
-            wood: 0,
-            fire: 0,
-            earth: 0,
-            metal: 0,
-            water: 0,
-        };
-        for (const elem of allElements) {
-            elementCounts[elem]++;
-        }
-        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) {
-            return { isSpecial: true, type: "종격", followElement: dominantElement };
-        }
+        return getExtremelyWeakSpecialFormation(dayMasterElement, elementCounts);
+    }
+    if (level.key === "extremelyStrong") {
+        return getExtremelyStrongSpecialFormation(dayMasterElement, elementCounts);
     }
     return { isSpecial: false, type: null, followElement: null };
 }
@@ -156,7 +191,7 @@ export function analyzeYongShen(yearPillar, monthPillar, dayPillar, hourPillar)
         primaryKey = specialFormation.followElement;
         secondaryKey = GENERATES[specialFormation.followElement];
         methodKey = "formation";
-        reasoning = `종격 성립. ${getElementLabel(specialFormation.followElement).korean} 세력을 따름`;
+        reasoning = `${specialFormation.type} 성립. ${getElementLabel(specialFormation.followElement).korean} 세력을 따름`;
         const yokbu = getYokbuYongShen(dayMasterElement, strength.level);
         alternativeBalance = { primary: yokbu.primary, secondary: yokbu.secondary };
     }

package/dist/index.d.ts

@@ -2,7 +2,8 @@ export type { DateAdapter } from "./adapters/date-adapter";
 export { applyMeanSolarTime, BRANCHES, dayPillarFromDate, effectiveDayDate, getFourPillars, hourPillar, monthPillar, presetA, presetB, STANDARD_PRESET, STEMS, TRADITIONAL_PRESET, yearPillar, } from "./core/four-pillars";
 export { calculateDailyLuck, calculateMajorLuck, calculateMonthlyLuck, calculateYearlyLuck, type DailyLuckResult, type Gender, getCurrentMajorLuck, getDayPillar, getMonthPillar, getYearPillar, type LuckPillar, type MajorLuckResult, type MonthlyLuckResult, type StartAgeDetail, type YearlyLuckResult, } from "./core/luck";
 export { getLunarDate, getSolarDate, type LunarDate } from "./core/lunar";
-export { analyzeRelations, BRANCH_CLASHES, BRANCH_DESTRUCTIONS, BRANCH_DIRECTIONAL_COMBINATIONS, BRANCH_HARMS, BRANCH_PUNISHMENTS, BRANCH_SIX_COMBINATIONS, BRANCH_TRIPLE_COMBINATIONS, type BranchClash, type BranchDestruction, type BranchDirectionalCombination, type BranchHarm, type BranchPunishment, type BranchSixCombination, type BranchTripleCombination, findBranchClash, findBranchSixCombination, findStemCombination, type Relation, type RelationsResult, STEM_COMBINATIONS, type StemCombination, } from "./core/relations";
+export { analyzeFourPillarsNayin, type FourPillarsNayin, getNayin, getNayinFromPillar, type NayinResult, } from "./core/nayin";
+export { analyzeRelations, BRANCH_CLASHES, BRANCH_DESTRUCTIONS, BRANCH_DIRECTIONAL_COMBINATIONS, BRANCH_HALF_COMBINATIONS, BRANCH_HARMS, BRANCH_PUNISHMENTS, BRANCH_SIX_COMBINATIONS, BRANCH_TRIPLE_COMBINATIONS, type BranchClash, type BranchDestruction, type BranchDirectionalCombination, type BranchHalfCombination, type BranchHarm, type BranchPunishment, type BranchSixCombination, type BranchTripleCombination, findBranchClash, findBranchSixCombination, findStemCombination, type Relation, type RelationsResult, STEM_CLASHES, STEM_COMBINATIONS, type StemClash, type StemCombination, } from "./core/relations";
 export { analyzeSinsals, getSinsalLabel, SINSAL_INFO, SINSALS, type SinsalKey, type SinsalLabel, type SinsalMatch, type SinsalResult, type SinsalType, } from "./core/sinsals";
 export { analyzeSolarTerms, getSolarTermLabel, getSolarTermsForYear, SOLAR_TERM_KEYS, SOLAR_TERMS, type SolarTerm, type SolarTermDateInfo, type SolarTermHanja, type SolarTermInfo, type SolarTermKey, type SolarTermLabel, type SolarTermName, } from "./core/solar-terms";
 export { analyzeStrength, getStrengthLevelLabel, STRENGTH_LEVEL_KEYS, type StrengthFactors, type StrengthLevelKey, type StrengthLevelLabel, type StrengthResult, } from "./core/strength";
@@ -14,6 +15,7 @@ import type { DateAdapter } from "./adapters/date-adapter";
 import { type presetA } from "./core/four-pillars";
 import { type Gender, type MajorLuckResult, type YearlyLuckResult } from "./core/luck";
 import type { LunarDate } from "./core/lunar";
+import { type FourPillarsNayin } from "./core/nayin";
 import { type RelationsResult } from "./core/relations";
 import { type SinsalResult } from "./core/sinsals";
 import { type SolarTermInfo } from "./core/solar-terms";
@@ -33,6 +35,7 @@ export interface SajuResult {
     strength: StrengthResult;
     relations: RelationsResult;
     yongShen: YongShenResult;
+    nayin: FourPillarsNayin;
     solarTerms: SolarTermInfo;
     majorLuck: MajorLuckResult;
     yearlyLuck: YearlyLuckResult[];

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -1,7 +1,8 @@
 export { applyMeanSolarTime, BRANCHES, dayPillarFromDate, effectiveDayDate, getFourPillars, hourPillar, monthPillar, presetA, presetB, STANDARD_PRESET, STEMS, TRADITIONAL_PRESET, yearPillar, } from "./core/four-pillars";
 export { calculateDailyLuck, calculateMajorLuck, calculateMonthlyLuck, calculateYearlyLuck, getCurrentMajorLuck, getDayPillar, getMonthPillar, getYearPillar, } from "./core/luck";
 export { getLunarDate, getSolarDate } from "./core/lunar";
-export { analyzeRelations, BRANCH_CLASHES, BRANCH_DESTRUCTIONS, BRANCH_DIRECTIONAL_COMBINATIONS, BRANCH_HARMS, BRANCH_PUNISHMENTS, BRANCH_SIX_COMBINATIONS, BRANCH_TRIPLE_COMBINATIONS, findBranchClash, findBranchSixCombination, findStemCombination, STEM_COMBINATIONS, } from "./core/relations";
+export { analyzeFourPillarsNayin, getNayin, getNayinFromPillar, } from "./core/nayin";
+export { analyzeRelations, BRANCH_CLASHES, BRANCH_DESTRUCTIONS, BRANCH_DIRECTIONAL_COMBINATIONS, BRANCH_HALF_COMBINATIONS, BRANCH_HARMS, BRANCH_PUNISHMENTS, BRANCH_SIX_COMBINATIONS, BRANCH_TRIPLE_COMBINATIONS, findBranchClash, findBranchSixCombination, findStemCombination, STEM_CLASHES, STEM_COMBINATIONS, } from "./core/relations";
 export { analyzeSinsals, getSinsalLabel, SINSAL_INFO, SINSALS, } from "./core/sinsals";
 export { analyzeSolarTerms, getSolarTermLabel, getSolarTermsForYear, SOLAR_TERM_KEYS, SOLAR_TERMS, } from "./core/solar-terms";
 export { analyzeStrength, getStrengthLevelLabel, STRENGTH_LEVEL_KEYS, } from "./core/strength";
@@ -10,6 +11,7 @@ export { analyzeTwelveStages, getTwelveStageLabel, TWELVE_STAGES, } from "./core
 export { analyzeYongShen, getElementRecommendations, getYongShenMethodLabel, } from "./core/yongshen";
 import { getFourPillars } from "./core/four-pillars";
 import { calculateMajorLuck, calculateYearlyLuck, } from "./core/luck";
+import { analyzeFourPillarsNayin } from "./core/nayin";
 import { analyzeRelations } from "./core/relations";
 import { analyzeSinsals } from "./core/sinsals";
 import { analyzeSolarTerms } from "./core/solar-terms";
@@ -30,6 +32,7 @@ export function getSaju(dtLocal, options) {
     const strength = analyzeStrength(year, month, day, hour);
     const relations = analyzeRelations(year, month, day, hour);
     const yongShen = analyzeYongShen(year, month, day, hour);
+    const nayin = analyzeFourPillarsNayin(year, month, day, hour);
     const solarTerms = analyzeSolarTerms(dtLocal, { adapter });
     const twelveStages = analyzeTwelveStages(year, month, day, hour);
     const sinsals = analyzeSinsals(year, month, day, hour);
@@ -40,6 +43,7 @@ export function getSaju(dtLocal, options) {
         strength,
         relations,
         yongShen,
+        nayin,
         solarTerms,
         majorLuck: calculateMajorLuck(dtLocal, options.gender, year, month, {
             adapter,

package/dist/utils/constants.js

@@ -49,7 +49,7 @@ export function jdnFromDate(year, month, day) {
         32045);
 }
 export function dayPillarIndexFromJdn(jdn) {
-    return (((jdn + 49) % 60) + 60) % 60;
+    return (((jdn - 11) % 60) + 60) % 60;
 }
 export function isYangStem(stem) {
     return ["甲", "丙", "戊", "庚", "壬"].includes(stem);

package/package.json

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