🛠️ 修复星耀位置错误及获取主星方法逻辑错误 #269

Author: SylarLong

CHANGELOG.md

@@ -7,6 +7,13 @@
 - 🛠️ 修复（fix）
 - 🧹 琐事（Chore）
 
+## v2.5.6
+
+- 🛠️ 修复（fix）
+
+  - 天使、天伤、天才三颗杂耀在地盘和人盘中位置错误。
+  - 命宫主星计算错误。#269
+
 ## v2.5.5
 
 - 🛠️ 修复（fix）

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iztro",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "轻量级紫微斗数星盘生成库。可以通过出生年月日获取到紫微斗数星盘信息、生肖、星座等信息。This is a lightweight kit for generating astrolabes for Zi Wei Dou Shu (The Purple Star Astrology), an ancient Chinese astrology. It allows you to obtain your horoscope and personality analysis.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

src/__tests__/astro/astro.test.ts

@@ -908,6 +908,10 @@ describe('Astrolabe', () => {
     expect(getMajorStarBySolarDate('2023-4-7', 0, true, 'ko-KR')).toEqual('탐랑');
   });
 
+  test('getMajorStarBySolarDate()', () => {
+    expect(getMajorStarBySolarDate('1987-05-16', 7)).toEqual('天机,天梁');
+  });
+
   test('getMajorStarByLunarDate() leap month', () => {
     expect(getMajorStarByLunarDate('2023-2-17', 0)).toEqual('紫微,贪狼');
     expect(getMajorStarByLunarDate('2023-2-17', 0, true)).toEqual('贪狼');
@@ -1012,6 +1016,26 @@ describe('Astrolabe', () => {
     expect(soulPalace?.decadal).toStrictEqual({ range: [6, 15], heavenlyStem: '丙', earthlyBranch: '寅' });
   });
 
+  test('withOptions() with human type', () => {
+    astro.config({ algorithm: 'zhongzhou' });
+
+    const result = withOptions({
+      dateStr: '1999-05-03',
+      type: 'solar',
+      timeIndex: 8,
+      gender: 'male',
+      astroType: 'human',
+    });
+
+    const tiancaiIndex = result?.star('天才')?.palace()?.index;
+    const tianshangIndex = result?.star('天伤')?.palace()?.index;
+    const tianshiIndex = result?.star('天使')?.palace()?.index;
+
+    expect(tiancaiIndex).toEqual(11);
+    expect(tianshangIndex).toEqual(3);
+    expect(tianshiIndex).toEqual(1);
+  });
+
   test('withOptions() to fix GitHub#242&#244', () => {
     astro.config({ yearDivide: 'normal' });
 

src/astro/astro.ts

@@ -14,11 +14,20 @@ import {
   setLanguage,
   t,
 } from '../i18n';
-import { getAdjectiveStar, getBoShi12, getchangsheng12, getMajorStar, getMinorStar, getYearly12 } from '../star';
+import {
+  getAdjectiveStar,
+  getBoShi12,
+  getchangsheng12,
+  getMajorStar,
+  getMinorStar,
+  getTianshiTianshangIndex,
+  getYearly12,
+} from '../star';
 import { fixIndex, translateChineseDate } from '../utils';
 import FunctionalAstrolabe from './FunctionalAstrolabe';
 import FunctionalPalace, { IFunctionalPalace } from './FunctionalPalace';
 import { getPalaceNames, getSoulAndBody, getHoroscope, getFiveElementsClass } from './palace';
+import FunctionalStar from '../star/FunctionalStar';
 
 const _plugins = [] as Plugin[];
 const _mutagens: Partial<Record<HeavenlyStemKey, StarKey[]>> = {};
@@ -356,7 +365,60 @@ export function rearrangeAstrolable<T extends FunctionalAstrolabe>({
   });
 
   astrolable.fiveElementsClass = fiveElementsClass;
+
+  // 重新获取天使、天伤的索引
+  const { tianshiIndex, tianshangIndex } = getTianshiTianshangIndex(
+    astrolable.gender as GenderName,
+    kot(astrolable.rawDates.chineseDate.yearly[1]) as EarthlyBranchKey,
+    soulIndex,
+  );
+  // 重新获取天才星的位置
+  const tiancaiIndex = fixIndex(
+    soulIndex + EARTHLY_BRANCHES.indexOf(kot(astrolable.rawDates.chineseDate.yearly[1]) as EarthlyBranchKey),
+  );
+
   astrolable.palaces.forEach((palace, i) => {
+    const _tianshangIdx = palace.adjectiveStars.findIndex((item) => kot(item.name) === 'tianshang');
+
+    if (_tianshangIdx !== -1 && tianshangIndex !== i) {
+      // 当天伤不应该在该宫位时，删之
+      palace.adjectiveStars.splice(_tianshangIdx, 1);
+    }
+
+    if (_tianshangIdx === -1 && tianshangIndex === i) {
+      // 当天伤应该在该宫位却不在，加之
+      palace.adjectiveStars.push(new FunctionalStar({ name: t('tianshang'), type: 'adjective', scope: 'origin' }));
+    }
+
+    const _tianshiIdx = palace.adjectiveStars.findIndex((item) => kot(item.name) === 'tianshi');
+
+    if (_tianshiIdx !== -1 && tianshiIndex !== i) {
+      // 当天使不应该在该宫位时，删之
+      palace.adjectiveStars.splice(_tianshiIdx, 1);
+    }
+
+    if (_tianshiIdx === -1 && tianshiIndex === i) {
+      // 当天使应该在该宫位却不在，加之
+      palace.adjectiveStars.push(new FunctionalStar({ name: t('tianshi'), type: 'adjective', scope: 'origin' }));
+    }
+
+    const _tiancaiIndex = palace.adjectiveStars.findIndex((item) => kot(item.name) === 'tiancai');
+
+    if (_tiancaiIndex !== -1 && tiancaiIndex !== i) {
+      // 当天才不应该在该宫位时，删之
+      palace.adjectiveStars.splice(_tiancaiIndex, 1);
+    }
+
+    if (_tiancaiIndex === -1 && tiancaiIndex === i) {
+      // 当天才应该在该宫位却不在，加之
+      palace.adjectiveStars.push(new FunctionalStar({ name: t('tiancai'), type: 'adjective', scope: 'origin' }));
+    }
+
+    if (_tianshiIdx === -1 && tianshiIndex === i) {
+      // 当天使应该在该宫位却不在，加之
+      palace.adjectiveStars.push(new FunctionalStar({ name: t('tianshi'), type: 'adjective', scope: 'origin' }));
+    }
+
     palace.name = palaceNames[i];
     palace.majorStars = majorStars[i];
     palace.changsheng12 = changsheng12[i];
@@ -484,16 +546,16 @@ export const getMajorStarBySolarDate = (
 ) => {
   language && setLanguage(language);
 
-  const { bodyIndex } = getSoulAndBody({ solarDate: solarDateStr, timeIndex, fixLeap });
+  const { soulIndex } = getSoulAndBody({ solarDate: solarDateStr, timeIndex, fixLeap });
   const majorStars = getMajorStar({ solarDate: solarDateStr, timeIndex, fixLeap });
-  const stars = majorStars[bodyIndex].filter((star) => star.type === 'major');
+  const stars = majorStars[soulIndex].filter((star) => star.type === 'major');
 
   if (stars.length) {
     return stars.map((star) => t(star.name)).join(',');
   }
 
   // 如果命宫为空宫，则借对宫主星
-  return majorStars[fixIndex(bodyIndex + 6)]
+  return majorStars[fixIndex(soulIndex + 6)]
     .filter((star) => star.type === 'major')
     .map((star) => t(star.name))
     .join(',');

src/star/location.ts

@@ -5,6 +5,7 @@ import {
   EarthlyBranchKey,
   EarthlyBranchName,
   FiveElementsClassKey,
+  GenderName,
   HeavenlyStemKey,
   HeavenlyStemName,
   kot,
@@ -637,7 +638,7 @@ export const getDahaoIndex = (earthlyBranchKey: EarthlyBranchKey) => {
  */
 export const getYearlyStarIndex = (param: AstrolabeParam) => {
   const { solarDate, timeIndex, gender, fixLeap } = param;
-  const { horoscopeDivide, algorithm } = getConfig();
+  const { horoscopeDivide } = getConfig();
   const { yearly } = getHeavenlyStemAndEarthlyBranchBySolarDate(solarDate, timeIndex, {
     // 流耀应该用立春为界，但为了满足不同流派的需求允许配置
     year: horoscopeDivide,
@@ -718,18 +719,7 @@ export const getYearlyStarIndex = (param: AstrolabeParam) => {
   const nianjieIndex = getNianjieIndex(yearly[1]);
   const dahaoAdjIndex = getDahaoIndex(earthlyBranch);
 
-  const genderYinyang = ['male', 'female'];
-  const sameYinyang = yinyang === genderYinyang.indexOf(kot(gender!));
-
-  let tianshangIndex = fixIndex(PALACES.indexOf('friendsPalace') + soulIndex);
-  let tianshiIndex = fixIndex(PALACES.indexOf('healthPalace') + soulIndex);
-
-  if (algorithm === 'zhongzhou' && !sameYinyang) {
-    // 中州派的天使天伤与通行版本不一样
-    // 天伤奴仆、天使疾厄、夹迁移宫最易寻得
-    // 凡阳男阴女，皆依此诀，但若为阴男阳女，则改为天伤居疾厄、天使居奴仆。
-    [tianshiIndex, tianshangIndex] = [tianshangIndex, tianshiIndex];
-  }
+  const { tianshiIndex, tianshangIndex } = getTianshiTianshangIndex(gender!, earthlyBranch, soulIndex);
 
   return {
     xianchiIndex,
@@ -762,6 +752,27 @@ export const getYearlyStarIndex = (param: AstrolabeParam) => {
   };
 };
 
+export const getTianshiTianshangIndex = (gender: GenderName, earthlyBranch: EarthlyBranchKey, soulIndex: number) => {
+  // 判断命主出生年年支阴阳属性，如果结果为 0 则为阳，否则为阴
+  const yinyang = EARTHLY_BRANCHES.indexOf(earthlyBranch) % 2;
+
+  const { algorithm } = getConfig();
+
+  const genderYinyang = ['male', 'female'];
+  const sameYinyang = yinyang === genderYinyang.indexOf(kot(gender!));
+  let tianshangIndex = fixIndex(PALACES.indexOf('friendsPalace') + soulIndex);
+  let tianshiIndex = fixIndex(PALACES.indexOf('healthPalace') + soulIndex);
+
+  if (algorithm === 'zhongzhou' && !sameYinyang) {
+    // 中州派的天使天伤与通行版本不一样
+    // 天伤奴仆、天使疾厄、夹迁移宫最易寻得
+    // 凡阳男阴女，皆依此诀，但若为阴男阳女，则改为天伤居疾厄、天使居奴仆。
+    [tianshiIndex, tianshangIndex] = [tianshangIndex, tianshiIndex];
+  }
+
+  return { tianshangIndex, tianshiIndex };
+};
+
 /**
  * 获取年解的索引
  *