v1.7.7 新增2026年法定假日。

bugfix getDayXiongSha

CHANGELOG.md

@@ -0,0 +1,46 @@
+# Changelog
+
+
+## [1.6.10] - 2024-02-06
+1. 八字转阳历结果按时间先后排序，转换速度大幅提升。
+
+## [1.6.11] - 2024-02-29
+1. 修复节气当天获取下一节气仍为当前节气的问题。
+2. 完善package.json中author信息。
+3. 修复每日宜忌存在重复项的问题。
+4. 修复八字转阳历存在遗漏的问题。
+
+## [1.6.12] - 2024-03-17
+1. 修复八字转阳历存在遗漏的问题。
+
+## [1.6.13] - 2024-11-12
+1. 新增2025年法定假日数据。
+
+## [1.7.0] - 2025-02-12
+1. 修复每日宜忌错别字。
+2. 去除每日宜忌的重复项。
+
+## [1.7.1] - 2025-03-05
+1. 调整每日宜忌的默认流派。
+2. 更新2018之后的△T参数。
+
+## [1.7.2] - 2025-04-07
+1. 修复八字身宫计算错误的问题。
+
+## [1.7.3] - 2025-04-29
+1. 修复身宫报错的问题。
+
+## [1.7.4] - 2025-09-07
+1. 修复极端情况下八字转公历时刻出现遗漏的问题。
+
+## [1.7.5] - 2025-10-01
+1. 修复：候的错别字。
+2. 优化：更新△T参数。
+3. 优化：吉神宜驱、凶神宜忌。
+
+## [1.7.6] - 2025-10-21
+1. 修复：吉神宜驱、凶神宜忌的错误。
+2. 修复：农历闰月及后续月份的干支错误。
+
+## [1.7.7] - 2025-11-05
+1. 新增：2026年法定假日。

__tests__/EightChar.test.js

@@ -189,3 +189,72 @@ test('流月', () => {
   const yun = eightChar.getYun(1);
   expect(yun.getDaYun()[0].getLiuNian()[0].getLiuYue()[0].getGanZhi()).toBe('甲寅');
 });
+
+test('test19', () => {
+  const solarList = Solar.fromBaZi('丁丑','癸卯','癸丑','辛酉', 2, 1900);
+  const timeList = [];
+  solarList.forEach(solar => {
+    timeList.push(solar.toYmdHms());
+  })
+  expect(timeList).toStrictEqual(['1937-03-27 18:00:00', '1997-03-12 18:00:00']);
+});
+
+test('test20', () => {
+  const lunar = Solar.fromYmdHms(2024, 1, 29, 9, 30, 0).getLunar();
+  const eightChar = lunar.getEightChar();
+  expect(eightChar.getMingGong()).toBe('癸亥');
+  expect(eightChar.getShenGong()).toBe('己未');
+});
+
+
+test('test21', () => {
+  expect(Solar.fromYmdHms(1990, 1, 27, 0, 0, 0).getLunar().getEightChar().getShenGong()).toBe('丙寅');
+});
+
+
+test('test23', () => {
+  expect(Solar.fromYmdHms(2019, 3, 7, 8, 0, 0).getLunar().getEightChar().getMingGong()).toBe('甲戌');
+});
+
+
+test('test24', () => {
+  expect(Solar.fromYmdHms(2019, 3, 27, 2, 0, 0).getLunar().getEightChar().getMingGong()).toBe('丁丑');
+});
+
+
+test('test25', () => {
+  expect(Lunar.fromYmdHms(1994, 5, 20, 18, 0 ,0).getEightChar().getMingGong()).toBe('丙寅');
+});
+
+
+test('test26', () => {
+  const lunar = Solar.fromYmdHms(1986, 2, 16, 8, 0, 0).getLunar();
+  const eightChar = lunar.getEightChar();
+  expect(eightChar.getMingGong()).toBe('己亥');
+  expect(eightChar.getShenGong()).toBe('乙未');
+});
+
+
+test('test27', () => {
+  const lunar = Solar.fromYmdHms(1972, 11, 27, 10, 0, 0).getLunar();
+  const eightChar = lunar.getEightChar();
+  expect(eightChar.getShenGong()).toBe('乙巳');
+});
+
+test('test28', () => {
+  const solarList = Solar.fromBaZi('丁卯','丁未','甲申','乙丑', 1, 1900);
+  const timeList = [];
+  solarList.forEach(solar => {
+    timeList.push(solar.toYmdHms());
+  })
+  expect(timeList).toStrictEqual(['1987-08-03 02:00:00']);
+});
+
+test('test29', () => {
+  const solarList = Solar.fromBaZi('壬申','壬寅','庚辰','甲申', 1, 1801);
+  const timeList = [];
+  solarList.forEach(solar => {
+    timeList.push(solar.toYmdHms());
+  })
+  expect(timeList).toStrictEqual(['1812-02-18 16:00:00', '1992-03-05 15:00:00']);
+});

__tests__/Holiday.test.js

@@ -51,3 +51,12 @@ test('testRemove', () => {
   holiday = HolidayUtil.getHoliday('2010-01-01');
   expect(holiday).toBe(null);
 });
+
+test('test2025', () => {
+  let names =   HolidayUtil.NAMES;
+  names[0] = '元旦节';
+
+  HolidayUtil.fix(names, '');
+  const holiday = HolidayUtil.getHoliday(2025, 1, 1);
+  expect(holiday.getName()).toBe('元旦节');
+});

__tests__/JieQi.test.js

@@ -93,7 +93,7 @@ test('test7', () => {
 
 test('test8', () => {
   const lunar = Lunar.fromYmd(2050, 12, 1);
-  expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:41:13');
+  expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:41:54');
 });
 
 test('test9', () => {
@@ -106,5 +106,11 @@ test('test9', () => {
 
 test('test10', () => {
   const lunar = Lunar.fromYmd(2023, 6, 1);
-  expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:11');
+  expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:12');
+});
+
+test('test11', () => {
+  const lunar = Solar.fromYmd(2024, 2, 4).getLunar();
+  expect(lunar.getPrevJie(true).getName()).toBe('立春');
+  expect(lunar.getNextJie(true).getName()).toBe('惊蛰');
 });

__tests__/Lunar.test.js

@@ -655,3 +655,30 @@ test('test071', () => {
   const solar = Solar.fromYmd(918, 1, 1);
   expect(solar.getLunar().toString()).toBe('九一七年冬月十六');
 });
+
+test('test072', () => {
+  const solar = Solar.fromYmd(1991, 2, 15);
+  const lunar = solar.getLunar();
+  expect(lunar.toString()).toBe('一九九一年正月初一');
+  expect(lunar.getYearInGanZhi()).toBe('辛未');
+  expect(lunar.getYearShengXiao()).toBe('羊');
+});
+
+test('test073', () => {
+  const solar = Lunar.fromYmd(2024, 10, 10).getSolar();
+  expect(solar.toString()).toBe('2024-11-10');
+});
+
+test('test100', () => {
+  const lunar = Solar.fromYmd(2025, 9, 16).getLunar();
+  expect(lunar.getDayJiShen().toString()).toBe('时德,阳德,民日,玉宇,司命');
+  expect(lunar.getDayXiongSha().toString()).toBe('河魁,死神,天吏,致死,往亡');
+});
+
+test('test101', () => {
+  const lunar = Solar.fromYmd(2025, 12, 15).getLunar();
+  expect(lunar.getMonthZhiIndex()).toBe(0);
+  expect(lunar.getDayInGanZhi().toString()).toBe('戊午');
+  expect(lunar.getDayJiShen().toString()).toBe('阳德,六仪,续世,解神,司命');
+  expect(lunar.getDayXiongSha().toString()).toBe('月破,大耗,灾煞,天火,厌对,招摇,五虚,血忌');
+});

__tests__/LunarMonth.test.js

@@ -9,13 +9,13 @@ test('test1', () => {
 test('test2', () => {
   const month = LunarMonth.fromYm(2023, -2);
   expect(month.getIndex()).toBe(3);
-  expect(month.getGanZhi()).toBe('丙辰');
+  expect(month.getGanZhi()).toBe('乙卯');
 });
 
 test('test3', () => {
   const month = LunarMonth.fromYm(2023, 3);
   expect(month.getIndex()).toBe(4);
-  expect(month.getGanZhi()).toBe('丁巳');
+  expect(month.getGanZhi()).toBe('丙辰');
 });
 
 test('test4', () => {
@@ -27,7 +27,7 @@ test('test4', () => {
 test('test5', () => {
   const month = LunarMonth.fromYm(2023, 12);
   expect(month.getIndex()).toBe(13);
-  expect(month.getGanZhi()).toBe('丙寅');
+  expect(month.getGanZhi()).toBe('乙丑');
 });
 
 test('test6', () => {

__tests__/Solar.test.js

@@ -63,7 +63,7 @@ test('16', () => {
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['1976-09-21 12:00:00', '1916-10-06 12:00:00']);
+  expect(timeList).toStrictEqual(['1916-10-06 12:00:00', '1976-09-21 12:00:00']);
 });
 
 test('17', () => {
@@ -72,7 +72,7 @@ test('17', () => {
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['1999-07-21 16:00:00', '1939-08-05 16:00:00']);
+  expect(timeList).toStrictEqual(['1939-08-05 16:00:00', '1999-07-21 16:00:00']);
 });
 
 test('18', () => {
@@ -81,7 +81,7 @@ test('18', () => {
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['1960-12-17 12:00:00', '1901-01-01 12:00:00']);
+  expect(timeList).toStrictEqual(['1901-01-01 12:00:00', '1960-12-17 12:00:00']);
 });
 
 test('19', () => {
@@ -90,7 +90,7 @@ test('19', () => {
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['2020-07-21 22:00:00', '1960-08-05 22:00:00']);
+  expect(timeList).toStrictEqual(['1960-08-05 22:00:00', '2020-07-21 22:00:00']);
 });
 
 test('20', () => {
@@ -109,12 +109,12 @@ test('22', () => {
 });
 
 test('23', () => {
-  const solarList = Solar.fromBaZi('癸卯', '甲寅', '癸丑', '甲子', 2, 1843);
+  const solarList = Solar.fromBaZi('癸卯', '甲寅', '甲寅', '甲子', 2, 1843);
   const timeList = [];
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['2023-02-24 23:00:00', '1843-02-08 23:00:00']);
+  expect(timeList).toStrictEqual(['1843-02-09 00:00:00', '2023-02-25 00:00:00']);
 });
 
 test('24', () => {
@@ -123,7 +123,7 @@ test('24', () => {
   solarList.forEach(solar => {
     timeList.push(solar.toYmdHms());
   })
-  expect(timeList).toStrictEqual(['1960-01-15 16:00:00', '1900-01-29 16:00:00']);
+  expect(timeList).toStrictEqual(['1900-01-29 16:00:00', '1960-01-15 16:00:00']);
 });
 
 test('25', () => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lunar-javascript",
-  "version": "1.6.7",
-  "description": "lunar is a calendar library for Solar and Chinese Lunar.",
+  "version": "1.7.7",
+  "description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {
     "test": "jest"
@@ -42,7 +42,7 @@
     "青龙名堂等十二神",
     "黄道黑道日"
   ],
-  "author": "6tail",
+  "author": "6tail <6tail@6tail.cn> (https://6tail.cn)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/6tail/lunar-javascript/issues"