iching-shifa 1.0.0 → 1.0.1

package/dist/index.cjs

@@ -145,9 +145,9 @@ function timeQiGua(year, month, day, hour, lunarMonth, lunarDay, yearZhi, hourZh
   const hzCode = diZhiArr.indexOf(hourZhi) + 1;
   const cm = lunarMonth;
   const cd = lunarDay;
-  let upperNum = (yzCode + cm + cd) % 8;
+  let upperNum = (yzCode + cm + cd + hzCode) % 8;
   if (upperNum === 0) upperNum = 8;
-  let lowerNum = (yzCode + cm + cd + hzCode) % 8;
+  let lowerNum = (yzCode + cm + cd) % 8;
   if (lowerNum === 0) lowerNum = 8;
   let dongYao = (yzCode + cm + cd + hzCode) % 6;
   if (dongYao === 0) dongYao = 6;
@@ -208,16 +208,6 @@ function getMovingYaoPositions(yaoString) {
   }
   return positions;
 }
-const TRIGRAM_TO_BAGUA = {
-  "797999997779797979979777979779977777977777777799799799997999997997979799999779799979779997997977977777797777997977797999779779977797997799779797779979999799977999777799999979777999797979977797": "乾",
-  "776796976778778978976978798976976998998796776976776998996998998796778978798798978776998996796778776978996996798776976798996778796978798796798778978776996996998776798998996778976778978976796796": "兑",
-  "967987769989987767787767967767969789967967969789789969987789767787987969989787967769767769989769767787989767787969787787987769767969987967989967789787967769987989789769989789969987769789989969": "离",
-  "766966788788786786786966966766988986788986986988768986966786766988968986968788968786768988988786966768788786986988968986988788768968768786968966766766966766766968766788988968966768788768986768": "震",
-  "877877699697699879697899699677879679879897679877879877677677877699879897679699899897897899677877897677699697877897899677897899897677679679679679697899699879879697697877679697677699899697899879": "巽",
-  "878696678696876678876878696896876896676676698898698878876898878898878878676676696678696878698698876898676698678676896878698876696696898678898698678678896678898876896696876676896698676898896896": "坎",
-  "867689687667867689669867867867667687869689889689689869669667669869887867689687887669687669889669889869687867889669869887887667667667889889687889887869669687887667869887689889869887687867667689": "艮",
-  "886688666686688666866668668888886868686886688868666686688888668686886866666668888686666868668886888666866866688868686868868868668666886866688686866866866668668886888888686886666688888868888688": "坤"
-};
 const BAGUA_XIANG = {
   "1": "天",
   "2": "澤",
@@ -228,6 +218,16 @@ const BAGUA_XIANG = {
   "7": "山",
   "8": "地"
 };
+const CODE_TO_BAGUA = {
+  "777": "乾",
+  "778": "兑",
+  "787": "离",
+  "788": "震",
+  "877": "巽",
+  "878": "坎",
+  "887": "艮",
+  "888": "坤"
+};
 const GUA64_ORDER = [
   "乾",
   "姤",
@@ -5417,12 +5417,12 @@ function ganZhiToWuXing(ganOrZhi) {
   }
   return wx;
 }
-function getWuXingRelation(a, b) {
-  if (a === b) return "比和";
-  if (SHENG[b] === a) return "生我";
-  if (SHENG[a] === b) return "我生";
-  if (KE[b] === a) return "尅我";
-  if (KE[a] === b) return "我尅";
+function getWuXingRelation(yaoWx, gongWx) {
+  if (yaoWx === gongWx) return "比和";
+  if (SHENG[yaoWx] === gongWx) return "生我";
+  if (SHENG[gongWx] === yaoWx) return "我生";
+  if (KE[yaoWx] === gongWx) return "尅我";
+  if (KE[gongWx] === yaoWx) return "我尅";
   return "比和";
 }
 function wuXingToLiuQin(yaoWuXing, gongWuXing) {
@@ -5548,8 +5548,8 @@ function getGuaName(yaoString) {
   }
   const lower = staticYao.slice(0, 3);
   const upper = staticYao.slice(3, 6);
-  const lowerGua = TRIGRAM_TO_BAGUA[lower];
-  const upperGua = TRIGRAM_TO_BAGUA[upper];
+  const lowerGua = CODE_TO_BAGUA[lower];
+  const upperGua = CODE_TO_BAGUA[upper];
   if (lowerGua && upperGua) {
     return findGuaByTrigrams(lowerGua, upperGua) || `${lowerGua}${upperGua}`;
   }
@@ -5588,8 +5588,8 @@ function decodeGua(yaoString, dayGanZhi, isZhiGua = false) {
   const palaceLevel = GUA_PALACE_LEVEL[guaName] || "本宮";
   const palaceWuXing = PALACE_WUXING[palace] || "金";
   const staticYao = yaoString.replace(/9/g, "7").replace(/6/g, "8");
-  const lowerTrigram = TRIGRAM_TO_BAGUA[staticYao.slice(0, 3)] || "乾";
-  const upperTrigram = TRIGRAM_TO_BAGUA[staticYao.slice(3, 6)] || "乾";
+  const lowerTrigram = CODE_TO_BAGUA[staticYao.slice(0, 3)] || "乾";
+  const upperTrigram = CODE_TO_BAGUA[staticYao.slice(3, 6)] || "乾";
   const lowerNajiaRaw = NAJIA_LOWER[lowerTrigram] || [];
   const upperNajiaRaw = NAJIA_UPPER[upperTrigram] || [];
   const parseNajia = (item) => {
@@ -5675,8 +5675,8 @@ function findFuShen(yaoList, palace, palaceWuXing) {
     return void 0;
   }
   const pureCode = PALACE_PURE_CODE[palace] || "777777";
-  const pureLowerTrigram = TRIGRAM_TO_BAGUA[pureCode.slice(0, 3)] || "乾";
-  const pureUpperTrigram = TRIGRAM_TO_BAGUA[pureCode.slice(3, 6)] || "乾";
+  const pureLowerTrigram = CODE_TO_BAGUA[pureCode.slice(0, 3)] || "乾";
+  const pureUpperTrigram = CODE_TO_BAGUA[pureCode.slice(3, 6)] || "乾";
   const pureLowerNajiaRaw = NAJIA_LOWER[pureLowerTrigram] || [];
   const pureUpperNajiaRaw = NAJIA_UPPER[pureUpperTrigram] || [];
   const parseNajia = (item) => {