🛠️ 修改默认排盘月份按农历初一为分界。

Author: SylarLong

CHANGELOG.md

@@ -7,6 +7,12 @@
 - 🛠️ 修复（fix）
 - 🧹 琐事（Chore）
 
+## v2.5.5
+
+- 🛠️ 修复（fix）
+
+  - 修改默认排盘月份按农历初一为分界。
+
 ## v2.5.4
 
 - 🛠️ 修复（fix）

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iztro",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "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",
@@ -69,7 +69,7 @@
   "dependencies": {
     "dayjs": "^1.11.10",
     "i18next": "^23.5.1",
-    "lunar-lite": "^0.2.7",
+    "lunar-lite": "^0.2.8",
     "lunar-typescript": "^1.7.8"
   }
 }

src/__tests__/astro/astro.test.ts

@@ -619,7 +619,7 @@ describe('Astrolabe', () => {
 
     expect(result).toHaveProperty('solarDate', '2000-2-4');
     expect(result).toHaveProperty('lunarDate', '一九九九年腊月廿九');
-    expect(result).toHaveProperty('chineseDate', '庚辰 丁丑 壬辰 壬寅');
+    expect(result).toHaveProperty('chineseDate', '庚辰 己丑 壬辰 壬寅');
     expect(result).toHaveProperty('time', '寅时');
     expect(result).toHaveProperty('zodiac', '龙');
     expect(result).toHaveProperty('earthlyBranchOfSoulPalace', '亥');
@@ -647,13 +647,13 @@ describe('Astrolabe', () => {
   });
 
   test('bySolar() with `normal` year divider', () => {
-    astro.config({ yearDivide: 'normal' });
+    astro.config({ yearDivide: 'normal', horoscopeDivide: 'normal' });
 
     const result = astro.bySolar('1980-2-14', 0, 'male', true);
 
     expect(result).toHaveProperty('solarDate', '1980-2-14');
     expect(result).toHaveProperty('lunarDate', '一九七九年腊月廿八');
-    expect(result).toHaveProperty('chineseDate', '己未 戊寅 丁巳 庚子');
+    expect(result).toHaveProperty('chineseDate', '己未 丁丑 丁巳 庚子');
     expect(result).toHaveProperty('time', '早子时');
     expect(result).toHaveProperty('zodiac', '羊');
     expect(result).toHaveProperty('earthlyBranchOfSoulPalace', '丑');
@@ -665,8 +665,8 @@ describe('Astrolabe', () => {
     expect(result.palaces[0].decadal).toHaveProperty('range', [112, 121]);
     const horoscope = result.horoscope('1980-2-14');
 
-    expect(horoscope.yearly).toHaveProperty('earthlyBranch', '申');
-    expect(horoscope.yearly).toHaveProperty('heavenlyStem', '庚');
+    expect(horoscope.yearly).toHaveProperty('earthlyBranch', '未');
+    expect(horoscope.yearly).toHaveProperty('heavenlyStem', '己');
   });
 
   test('check special date `1995-3-30`', () => {
@@ -751,6 +751,7 @@ describe('Astrolabe', () => {
       language: 'zh-CN',
       config: {
         yearDivide: 'exact',
+        horoscopeDivide: 'exact',
       },
     });
 
@@ -783,7 +784,7 @@ describe('Astrolabe', () => {
 
     expect(result).toHaveProperty('solarDate', '1980-2-14');
     expect(result).toHaveProperty('lunarDate', '一九七九年腊月廿八');
-    expect(result).toHaveProperty('chineseDate', '己未 戊寅 丁巳 庚子');
+    expect(result).toHaveProperty('chineseDate', '己未 丁丑 丁巳 庚子');
     expect(result).toHaveProperty('time', '早子时');
     expect(result).toHaveProperty('zodiac', '羊');
     expect(result).toHaveProperty('earthlyBranchOfSoulPalace', '丑');

src/astro/FunctionalAstrolabe.ts

@@ -37,7 +37,7 @@ const _getHoroscopeBySolarDate = (
     targetDate,
     timeIndex || convertTimeIndex,
     {
-      // 运限是以立春为界，但为了满足部分流派允许配置
+      // 允许配置运限分割点
       year: getConfig().horoscopeDivide,
       month: getConfig().horoscopeDivide,
     },

src/astro/astro.ts

@@ -33,7 +33,7 @@ const _brightness: Partial<Record<StarKey, BrightnessKey[]>> = {};
  * exact：立春分界
  */
 let _yearDivide: 'normal' | 'exact' = 'normal';
-let _horoscopeDivide: 'normal' | 'exact' = 'exact';
+let _horoscopeDivide: 'normal' | 'exact' = 'normal';
 
 /**
  * 小限分割点，默认为生日。
@@ -181,6 +181,7 @@ export function bySolar<T extends FunctionalAstrolabe>(
 
   const { yearly } = getHeavenlyStemAndEarthlyBranchBySolarDate(solarDate, tIndex, {
     year: getConfig().yearDivide,
+    month: getConfig().horoscopeDivide,
   });
   const earthlyBranchOfYear = kot<EarthlyBranchKey>(yearly[1], 'Earthly');
   const heavenlyStemOfYear = kot<HeavenlyStemKey>(yearly[0], 'Heavenly');

yarn.lock

@@ -3845,23 +3845,23 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lunar-lite@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.npmjs.org/lunar-lite/-/lunar-lite-0.2.7.tgz#3b68df72870627158acfa31d26d0f5fe9b441bbd"
-  integrity sha512-ePsbfKBUhnHINckdb5svyjSiYItxR6BySSmZ5Wjc5yRwKX8nbIVRBB0hwrW/NpZP5SuSXz1TSvuM/TVP9brZmw==
+lunar-lite@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.npmjs.org/lunar-lite/-/lunar-lite-0.2.8.tgz#a0caad44ee65c75d28c9430c890c544f9c5572ee"
+  integrity sha512-Y4tba4RaIFI0ikImJhgoEsyqtDE64lJIM3yFwRX01dbmagCDq7rNmpDQFrSFFy4WXeuywdRVFpIBoT1GGCEizw==
   dependencies:
-    lunar-typescript "^1.7.5"
-
-lunar-typescript@^1.7.5:
-  version "1.7.5"
-  resolved "https://registry.npmjs.org/lunar-typescript/-/lunar-typescript-1.7.5.tgz#8a407f9db10aaf896f1477564dbfef741463e245"
-  integrity sha512-AlOwYrxHRCR9Plba5TlZY0NVv6aFobmR1gxfiAE1KxjDzBXoDtT2KrsBYCVaErGokiL8qLMS1FNwGPiPRX2a4g==
+    lunar-typescript "^1.8.6"
 
 lunar-typescript@^1.7.8:
   version "1.7.8"
   resolved "https://registry.npmjs.org/lunar-typescript/-/lunar-typescript-1.7.8.tgz#f051ea5a3a5f731581ed37fe4638df8b42ce3b52"
   integrity sha512-i1rjc1eDHUF4k8NfpYxar3ZKtxyVHOGnR+yVTMS8jMy74ugq7KeHI+8T1XIvB3uojpBq6asywe7z25PmI3VLPw==
 
+lunar-typescript@^1.8.6:
+  version "1.8.6"
+  resolved "https://registry.npmjs.org/lunar-typescript/-/lunar-typescript-1.8.6.tgz#9ecadd8610369f800bf46a517da7f6c598f6491d"
+  integrity sha512-5Eo4T/cnuXfrgO4k5LCpOGHIUOuz5hCF/IfNv0T29WY2shR36Hiz+ecN9WjnUuxUKhql9gbOkPaQoqLFKtPRNA==
+
 make-dir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz"