🛠️ 修复地盘、人盘一些星耀的错误

Author: SylarLong

CHANGELOG.md

@@ -7,6 +7,13 @@
 - 🛠️ 修复（fix）
 - 🧹 琐事（Chore）
 
+## v2.5.7
+
+- 🛠️ 修复（fix）
+
+  - v2.5.6版本修复天使星位置错误导致天使重复。
+  - 地盘、人盘中十二长生没有传入性别导致顺序错误。
+
 ## v2.5.6
 
 - 🛠️ 修复（fix）

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iztro",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "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

@@ -993,6 +993,36 @@ describe('Astrolabe', () => {
     expect(soulPalace?.decadal).toStrictEqual({ range: [6, 15], heavenlyStem: '丁', earthlyBranch: '卯' });
   });
 
+  test('withOptions() with earth type', () => {
+    astro.config({ algorithm: 'zhongzhou' });
+
+    const result = withOptions({
+      dateStr: '1999-05-03',
+      type: 'solar',
+      timeIndex: 8,
+      gender: 'female',
+      astroType: 'earth',
+    });
+
+    expect(result.palaces[0].changsheng12).toEqual('病');
+    expect(result.palaces[1].changsheng12).toEqual('死');
+  });
+
+  test('withOptions() with earth type', () => {
+    astro.config({ algorithm: 'zhongzhou' });
+
+    const result = withOptions({
+      dateStr: '1999-05-03',
+      type: 'solar',
+      timeIndex: 8,
+      gender: 'male',
+      astroType: 'earth',
+    });
+
+    expect(result.palaces[0].changsheng12).toEqual('病');
+    expect(result.palaces[1].changsheng12).toEqual('衰');
+  });
+
   test('withOptions() with human type', () => {
     astro.config({ algorithm: 'zhongzhou' });
 

src/__tests__/star/star.test.ts

@@ -242,6 +242,32 @@ describe('star/index', () => {
       '胎',
       '养',
     ]);
+    expect(
+      getchangsheng12({
+        solarDate: '1999-5-3',
+        timeIndex: 8,
+        gender: '女',
+        fixLeap: true,
+      }),
+    ).toStrictEqual(['绝', '胎', '养', '长生', '沐浴', '冠带', '临官', '帝旺', '衰', '病', '死', '墓']);
+    expect(
+      getchangsheng12({
+        solarDate: '1999-5-3',
+        timeIndex: 8,
+        gender: '男',
+        fixLeap: true,
+        from: { heavenlyStem: '丙', earthlyBranch: '子' },
+      }),
+    ).toStrictEqual(['病', '衰', '帝旺', '临官', '冠带', '沐浴', '长生', '养', '胎', '绝', '墓', '死']);
+    expect(
+      getchangsheng12({
+        solarDate: '1999-5-3',
+        timeIndex: 8,
+        gender: '女',
+        fixLeap: true,
+        from: { heavenlyStem: '丙', earthlyBranch: '子' },
+      }),
+    ).toStrictEqual(['病', '死', '墓', '绝', '胎', '养', '长生', '沐浴', '冠带', '临官', '帝旺', '衰']);
   });
 
   test('getchangsheng12() vi-VN', () => {

src/astro/astro.ts

@@ -355,7 +355,13 @@ export function rearrangeAstrolable<T extends FunctionalAstrolabe>({
   const fiveElementsClass = getFiveElementsClass(from.heavenlyStem, from.earthlyBranch);
   const palaceNames = getPalaceNames(soulIndex);
   const majorStars = getMajorStar({ solarDate: astrolable.solarDate, timeIndex, fixLeap, from });
-  const changsheng12 = getchangsheng12({ solarDate: astrolable.solarDate, timeIndex, fixLeap, from });
+  const changsheng12 = getchangsheng12({
+    solarDate: astrolable.solarDate,
+    gender: astrolable.gender as GenderName,
+    timeIndex,
+    fixLeap,
+    from,
+  });
   const { decadals, ages } = getHoroscope({
     solarDate: astrolable.solarDate,
     timeIndex,
@@ -414,11 +420,6 @@ export function rearrangeAstrolable<T extends FunctionalAstrolabe>({
       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];