iching-shifa 1.2.0 → 1.3.0

package/README.md

@@ -8,6 +8,8 @@
 - **时间起卦** - 按年月日时四柱起卦
 - **手动输入起卦** - 输入6位爻值字符串（6/7/8/9）
 - **纳甲排盘** - 完整的六爻排盘（本卦/之卦/互卦、六亲、六兽、世应、伏神等）
+- **神煞排盘** - 按日支/月令/季节/日干计算神煞，并输出独立 JSON 字段
+- **纳音信息** - 本卦和之卦六爻输出 60 甲子纳音
 
 ## 安装
 
@@ -82,6 +84,7 @@ interface PanResult {
   dayKong: string;      // 日空
   hourKong: string;     // 时空
   monthJian: string;    // 月建
+  shenSha: ShenShaMap;  // 神煞（独立 map）
   benGua: GuaPan;       // 本卦
   zhiGua: GuaPan;       // 之卦
   huGua: GuaPan;        // 互卦
@@ -90,6 +93,16 @@ interface PanResult {
   explanation: string;  // 断卦说明
 }
 
+type ShenShaMap = Record<string, {
+  targetDiZhi: string[];
+  matches: {
+    guaKey: 'benGua' | 'zhiGua' | 'huGua';
+    position: number;
+    diZhi: string;
+    naJia: string;
+  }[];
+}>;
+
 interface GuaPan {
   guaName: string;      // 卦名
   palace: string;       // 所属宫
@@ -101,6 +114,7 @@ interface GuaPan {
   tuanCi: string;       // 彖辞
   shenYao?: number;     // 身爻
   fuShen?: FuShenData[];// 伏神
+  pangFuShen?: FuShenData[];// 旁伏神
 }
 
 interface YaoData {
@@ -110,6 +124,7 @@ interface YaoData {
   tianGan: string;      // 天干
   diZhi: string;        // 地支
   naJia: string;        // 纳甲
+  naYin?: string;       // 纳音（本卦、之卦）
   wuXing: string;       // 五行
   liuQin: string;       // 六亲
   liuShou: string;      // 六兽
@@ -138,10 +153,10 @@ bun test --watch
 ```bash
 $ bun test
 
- 12 pass
+ 19 pass
  0 fail
- 67 expect() calls
-Ran 12 tests across 1 file. [33.00ms]
+ 127 expect() calls
+Ran 19 tests across 1 file. [28.00ms]
 ```
 
 ## 许可

package/dist/index.cjs

@@ -5407,6 +5407,71 @@ const WU_XING_STARS = [
   "岁星",
   "熒惑"
 ];
+const NAYIN_60 = {
+  "甲子": "海中金",
+  "乙丑": "海中金",
+  "丙寅": "炉中火",
+  "丁卯": "炉中火",
+  "戊辰": "大林木",
+  "己巳": "大林木",
+  "庚午": "路旁土",
+  "辛未": "路旁土",
+  "壬申": "剑锋金",
+  "癸酉": "剑锋金",
+  "甲戌": "山头火",
+  "乙亥": "山头火",
+  "丙子": "涧下水",
+  "丁丑": "涧下水",
+  "戊寅": "城头土",
+  "己卯": "城头土",
+  "庚辰": "白蜡金",
+  "辛巳": "白蜡金",
+  "壬午": "杨柳木",
+  "癸未": "杨柳木",
+  "甲申": "泉中水",
+  "乙酉": "泉中水",
+  "丙戌": "屋上土",
+  "丁亥": "屋上土",
+  "戊子": "霹雳火",
+  "己丑": "霹雳火",
+  "庚寅": "松柏木",
+  "辛卯": "松柏木",
+  "壬辰": "长流水",
+  "癸巳": "长流水",
+  "甲午": "沙中金",
+  "乙未": "沙中金",
+  "丙申": "山下火",
+  "丁酉": "山下火",
+  "戊戌": "平地木",
+  "己亥": "平地木",
+  "庚子": "壁上土",
+  "辛丑": "壁上土",
+  "壬寅": "金箔金",
+  "癸卯": "金箔金",
+  "甲辰": "覆灯火",
+  "乙巳": "覆灯火",
+  "丙午": "天河水",
+  "丁未": "天河水",
+  "戊申": "大驿土",
+  "己酉": "大驿土",
+  "庚戌": "钗钏金",
+  "辛亥": "钗钏金",
+  "壬子": "桑柘木",
+  "癸丑": "桑柘木",
+  "甲寅": "大溪水",
+  "乙卯": "大溪水",
+  "丙辰": "沙中土",
+  "丁巳": "沙中土",
+  "戊午": "天上火",
+  "己未": "天上火",
+  "庚申": "石榴木",
+  "辛酉": "石榴木",
+  "壬戌": "大海水",
+  "癸亥": "大海水"
+};
+function getNaYin(ganZhi) {
+  return NAYIN_60[ganZhi];
+}
 const GAN_ZHI_WUXING = {
   // 天干
   "甲": "木",
@@ -5594,6 +5659,146 @@ function getCurrentSolarTerm(year, month, day) {
     return "";
   }
 }
+const SHENSHA_ORDER = [
+  "驿马",
+  "桃花",
+  "华盖",
+  "天医",
+  "天喜",
+  "天马",
+  "天乙贵人",
+  "禄神",
+  "文昌"
+];
+function getDayBranchShenSha(dayZhi) {
+  if (["申", "子", "辰"].includes(dayZhi)) {
+    return { 驿马: ["寅"], 桃花: ["酉"], 华盖: ["辰"] };
+  }
+  if (["寅", "午", "戌"].includes(dayZhi)) {
+    return { 驿马: ["申"], 桃花: ["卯"], 华盖: ["戌"] };
+  }
+  if (["巳", "酉", "丑"].includes(dayZhi)) {
+    return { 驿马: ["亥"], 桃花: ["午"], 华盖: ["丑"] };
+  }
+  if (["亥", "卯", "未"].includes(dayZhi)) {
+    return { 驿马: ["巳"], 桃花: ["子"], 华盖: ["未"] };
+  }
+  return { 驿马: [], 桃花: [], 华盖: [] };
+}
+function getTianYi(monthZhi) {
+  const index = DI_ZHI.indexOf(monthZhi);
+  if (index === -1) {
+    return [];
+  }
+  return [DI_ZHI[(index + DI_ZHI.length - 1) % DI_ZHI.length]];
+}
+function getTianMa(monthZhi) {
+  if (["寅", "申"].includes(monthZhi)) return ["午"];
+  if (["卯", "酉"].includes(monthZhi)) return ["申"];
+  if (["辰", "戌"].includes(monthZhi)) return ["戌"];
+  if (["巳", "亥"].includes(monthZhi)) return ["子"];
+  if (["子", "午"].includes(monthZhi)) return ["寅"];
+  if (["丑", "未"].includes(monthZhi)) return ["辰"];
+  return [];
+}
+function getSeasonByMonthZhi(monthZhi) {
+  if (["寅", "卯", "辰"].includes(monthZhi)) return "春";
+  if (["巳", "午", "未"].includes(monthZhi)) return "夏";
+  if (["申", "酉", "戌"].includes(monthZhi)) return "秋";
+  if (["亥", "子", "丑"].includes(monthZhi)) return "冬";
+  return void 0;
+}
+function getTianXi(monthZhi) {
+  const season = getSeasonByMonthZhi(monthZhi);
+  if (season === "春") return ["戌"];
+  if (season === "夏") return ["丑"];
+  if (season === "秋") return ["辰"];
+  if (season === "冬") return ["未"];
+  return [];
+}
+function getTianYiGuiRen(dayGan) {
+  if (["甲", "戊"].includes(dayGan)) return ["丑", "未"];
+  if (["乙", "己"].includes(dayGan)) return ["子", "申"];
+  if (["丙", "丁"].includes(dayGan)) return ["亥", "酉"];
+  if (["庚", "辛"].includes(dayGan)) return ["午", "寅"];
+  if (["壬", "癸"].includes(dayGan)) return ["卯", "巳"];
+  return [];
+}
+function getLuShen(dayGan) {
+  if (dayGan === "甲") return ["寅"];
+  if (dayGan === "乙") return ["卯"];
+  if (dayGan === "丙") return ["巳"];
+  if (dayGan === "丁") return ["午"];
+  if (dayGan === "戊") return ["巳"];
+  if (dayGan === "己") return ["午"];
+  if (dayGan === "庚") return ["申"];
+  if (dayGan === "辛") return ["酉"];
+  if (dayGan === "壬") return ["亥"];
+  if (dayGan === "癸") return ["子"];
+  return [];
+}
+function getWenChang(dayGan) {
+  if (dayGan === "甲") return ["巳"];
+  if (dayGan === "乙") return ["午"];
+  if (dayGan === "丙") return ["申"];
+  if (dayGan === "丁") return ["酉"];
+  if (dayGan === "戊") return ["申"];
+  if (dayGan === "己") return ["酉"];
+  if (dayGan === "庚") return ["亥"];
+  if (dayGan === "辛") return ["子"];
+  if (dayGan === "壬") return ["寅"];
+  if (dayGan === "癸") return ["卯"];
+  return [];
+}
+function getShenShaTargets(dayGan, dayZhi, monthZhi) {
+  const dayBranchShenSha = getDayBranchShenSha(dayZhi);
+  return {
+    驿马: dayBranchShenSha.驿马,
+    桃花: dayBranchShenSha.桃花,
+    华盖: dayBranchShenSha.华盖,
+    天医: getTianYi(monthZhi),
+    天喜: getTianXi(monthZhi),
+    天马: getTianMa(monthZhi),
+    天乙贵人: getTianYiGuiRen(dayGan),
+    禄神: getLuShen(dayGan),
+    文昌: getWenChang(dayGan)
+  };
+}
+function buildShenShaMap(dayGan, dayZhi, monthZhi, guaList) {
+  const targets = getShenShaTargets(dayGan, dayZhi, monthZhi);
+  const result = {};
+  for (const name of SHENSHA_ORDER) {
+    const targetDiZhi = targets[name];
+    const matches = [];
+    for (const gua of guaList) {
+      for (const yao of gua.yaoList) {
+        if (targetDiZhi.includes(yao.diZhi)) {
+          matches.push({
+            guaKey: gua.guaKey,
+            position: yao.position,
+            diZhi: yao.diZhi,
+            naJia: yao.naJia
+          });
+        }
+      }
+    }
+    result[name] = {
+      targetDiZhi: [...targetDiZhi],
+      matches
+    };
+  }
+  return result;
+}
+const OPPOSITE_PALACE = {
+  "乾": "坤",
+  "坤": "乾",
+  "坎": "离",
+  "离": "坎",
+  "震": "巽",
+  "巽": "震",
+  "艮": "兑",
+  "兑": "艮"
+};
 function getGuaName(yaoString) {
   if (YAO_STRING_TO_GUA[yaoString]) {
     return YAO_STRING_TO_GUA[yaoString];
@@ -5638,7 +5843,7 @@ function getLiuShou(dayGan) {
   }
   return rotateList(shouList, startShou);
 }
-function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
+function decodeGua(yaoString, dayGanZhi, isZhiGua = false, includeNaYin = true) {
   const guaName = getGuaName(yaoString);
   const palace = GUA_PALACE[guaName] || "乾";
   const palaceLevel = GUA_PALACE_LEVEL[guaName] || "本宮";
@@ -5683,7 +5888,7 @@ function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
         shenYaoIndex = shenYaoZhi;
       }
     }
-    yaoList.push({
+    const yaoData = {
       position: i + 1,
       yaoValue,
       isMoving,
@@ -5694,7 +5899,11 @@ function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
       liuQin,
       liuShou,
       shiYing
-    });
+    };
+    if (includeNaYin) {
+      yaoData.naYin = getNaYin(naJia);
+    }
+    yaoList.push(yaoData);
   }
   const desc = GUA_DESCRIPTIONS[guaName] || {};
   const guaCi = desc[0] || "";
@@ -5706,8 +5915,10 @@ function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
   const wuXingStarIndex = Math.floor(Math.random() * 5);
   const wuXingStar = WU_XING_STARS[wuXingStarIndex] || "鎮星";
   let fuShen;
+  let pangFuShen;
   if (!isZhiGua) {
     fuShen = findFuShen(yaoList, palace, palaceWuXing);
+    pangFuShen = findPangFuShen(yaoList, palace);
   }
   return {
     guaName,
@@ -5720,17 +5931,20 @@ function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
     yaoCi,
     tuanCi,
     shenYao: shenYaoIndex,
-    fuShen
+    fuShen,
+    pangFuShen
   };
 }
 function findFuShen(yaoList, palace, palaceWuXing) {
-  const existingLiuQin = new Set(yaoList.map((y) => y.liuQin));
-  const allLiuQin = ["父母", "兄弟", "官鬼", "妻财", "子孙"];
-  const missingLiuQin = allLiuQin.filter((lq) => !existingLiuQin.has(lq));
-  if (missingLiuQin.length === 0) {
-    return void 0;
-  }
-  const pureCode = PALACE_PURE_CODE[palace] || "777777";
+  return buildFuShenFromPalace(yaoList, palace, palaceWuXing);
+}
+function findPangFuShen(yaoList, palace) {
+  const oppositePalace = OPPOSITE_PALACE[palace] || "坤";
+  const oppositeWuXing = PALACE_WUXING[oppositePalace] || "土";
+  return buildFuShenFromPalace(yaoList, oppositePalace, oppositeWuXing);
+}
+function buildFuShenFromPalace(yaoList, sourcePalace, sourcePalaceWuXing) {
+  const pureCode = PALACE_PURE_CODE[sourcePalace] || "777777";
   const pureLowerTrigram = CODE_TO_BAGUA[pureCode.slice(0, 3)] || "乾";
   const pureUpperTrigram = CODE_TO_BAGUA[pureCode.slice(3, 6)] || "乾";
   const pureLowerNajiaRaw = NAJIA_LOWER[pureLowerTrigram] || [];
@@ -5756,25 +5970,19 @@ function findFuShen(yaoList, palace, palaceWuXing) {
     const diZhi = DI_ZHI[najiaData[1]] || "子";
     const wuXing = WU_XING[najiaData[2]] || "金";
     const naJia = tianGan + diZhi;
-    const liuQin = wuXingToLiuQin(wuXing, palaceWuXing);
-    if (missingLiuQin.includes(liuQin)) {
-      const hostYao = yaoList[i];
-      fuShenList.push({
-        fuLiuQin: liuQin,
-        fuNaJia: naJia,
-        fuWuXing: wuXing,
-        hostYaoIndex: i,
-        hostNaJia: hostYao.naJia,
-        feiWuXing: hostYao.wuXing,
-        relation: getWuXingRelation(wuXing, hostYao.wuXing)
-      });
-      const idx = missingLiuQin.indexOf(liuQin);
-      if (idx > -1) {
-        missingLiuQin.splice(idx, 1);
-      }
-    }
+    const liuQin = wuXingToLiuQin(wuXing, sourcePalaceWuXing);
+    const hostYao = yaoList[i];
+    fuShenList.push({
+      fuLiuQin: liuQin,
+      fuNaJia: naJia,
+      fuWuXing: wuXing,
+      hostYaoIndex: i,
+      hostNaJia: hostYao.naJia,
+      feiWuXing: hostYao.wuXing,
+      relation: getWuXingRelation(wuXing, hostYao.wuXing)
+    });
   }
-  return fuShenList.length > 0 ? fuShenList : void 0;
+  return fuShenList;
 }
 function buildExplanation(yaoString, benGuaName, zhiGuaName, benGuaCi, zhiGuaCi, yaoCi) {
   const dongCount = countMovingYao(yaoString);
@@ -5821,7 +6029,17 @@ function decodePan(yaoString, options) {
   const zhiYaoString = getZhiGua(yaoString);
   const zhiGua = decodeGua(zhiYaoString, dayGZ, true);
   const huYaoString = getHuGua(yaoString);
-  const huGua = decodeGua(huYaoString, dayGZ, true);
+  const huGua = decodeGua(huYaoString, dayGZ, true, false);
+  const shenSha = buildShenShaMap(
+    lunar.dayGanZhi.tian,
+    lunar.dayGanZhi.di,
+    lunar.monthGanZhi.di,
+    [
+      { guaKey: "benGua", yaoList: benGua.yaoList },
+      { guaKey: "zhiGua", yaoList: zhiGua.yaoList },
+      { guaKey: "huGua", yaoList: huGua.yaoList }
+    ]
+  );
   const dongYaoCount = countMovingYao(yaoString);
   const explanation = buildExplanation(
     yaoString,
@@ -5847,6 +6065,7 @@ function decodePan(yaoString, options) {
     dayKong,
     hourKong,
     monthJian,
+    shenSha,
     benGua,
     zhiGua,
     huGua,
@@ -5896,6 +6115,7 @@ exports.JIAZI_60 = JIAZI_60;
 exports.JIEQI_NAMES = JIEQI_NAMES;
 exports.LIU_QIN = LIU_QIN;
 exports.LIU_SHOU = LIU_SHOU;
+exports.NAYIN_60 = NAYIN_60;
 exports.TIAN_GAN = TIAN_GAN;
 exports.WU_XING = WU_XING;
 exports.WU_XING_STARS = WU_XING_STARS;
@@ -5911,6 +6131,7 @@ exports.getGuaName = getGuaName;
 exports.getHourGanZhi = getHourGanZhi;
 exports.getHuGua = getHuGua;
 exports.getMovingYaoPositions = getMovingYaoPositions;
+exports.getNaYin = getNaYin;
 exports.getWuXingRelation = getWuXingRelation;
 exports.getZhiGua = getZhiGua;
 exports.isMovingYao = isMovingYao;