v1.6.4 中元节改为农历七月十五；修复Solar的nextMonth超期问题。

__tests__/EightChar.test.js

@@ -177,3 +177,15 @@ test('test11', () => {
   expect(eightChar.getDay()).toBe('庚子');
   expect(eightChar.getTime()).toBe('戊子');
 });
+
+test('test12', () => {
+  expect(Solar.fromYmdHms('1999', '06', '07', '09', '11', '00').getLunar().getEightChar().toString()).toBe('己卯 庚午 庚寅 辛巳');
+});
+
+test('流月', () => {
+  const solar = Solar.fromYmdHms(2023, 5, 3, 9, 0, 0);
+  const lunar = solar.getLunar();
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(1);
+  expect(yun.getDaYun()[0].getLiuNian()[0].getLiuYue()[0].getGanZhi()).toBe('甲寅');
+});

__tests__/Foto.test.js

@@ -13,3 +13,8 @@ test('test2()', () => {
   expect(foto.getGong()).toBe('东');
   expect(foto.getShou()).toBe('青龙');
 });
+
+test('test3()', () => {
+  const foto = Foto.fromLunar(Lunar.fromYmd(2021, 3, 16));
+  expect(foto.getOtherFestivals()).toStrictEqual(['准提菩萨圣诞']);
+});

__tests__/I18n.test.js

@@ -0,0 +1,12 @@
+const {Lunar, I18n} = require('../lunar');
+
+test('test1', () => {
+  const lunar = Lunar.fromYmd(2023,1,1);
+  console.log(lunar.toFullString());
+
+  I18n.setLanguage('en');
+  console.log(lunar.toFullString());
+
+  I18n.setLanguage('chs');
+});
+

__tests__/JieQi.test.js

@@ -88,12 +88,12 @@ test('test6', () => {
 
 test('test7', () => {
   const lunar = Lunar.fromYmd(2012, 9, 1);
-  expect(lunar.getJieQiTable()['白露'].toYmdHms()).toBe('2012-09-07 13:29:00');
+  expect(lunar.getJieQiTable()['白露'].toYmdHms()).toBe('2012-09-07 13:29:01');
 });
 
 test('test8', () => {
   const lunar = Lunar.fromYmd(2050, 12, 1);
-  expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:41:00');
+  expect(lunar.getJieQiTable()['DA_XUE'].toYmdHms()).toBe('2050-12-07 06:41:13');
 });
 
 test('test9', () => {
@@ -103,3 +103,8 @@ test('test9', () => {
   expect(lunar.getJie()).toBe('');
   expect(lunar.getQi()).toBe('冬至');
 });
+
+test('test10', () => {
+  const lunar = Lunar.fromYmd(2023, 6, 1);
+  expect(lunar.getJieQiTable()['冬至'].toYmdHms()).toBe('2022-12-22 05:48:11');
+});

__tests__/Lunar.test.js

@@ -590,3 +590,68 @@ test('test058', () => {
   const lunar = Lunar.fromYmd(1582, 9, 19);
   expect(lunar.getSolar().toString()).toBe('1582-10-15');
 });
+
+test('test059', () => {
+  const lunar = Lunar.fromYmd(1518, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('1518-02-10');
+});
+
+test('test060', () => {
+  const lunar = Lunar.fromYmd(793, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0793-02-15');
+});
+
+test('test061', () => {
+  const lunar = Lunar.fromYmd(2025, -6, 1);
+  expect(lunar.getSolar().toString()).toBe('2025-07-25');
+});
+
+test('test062', () => {
+  const lunar = Lunar.fromYmd(2025, 6, 1);
+  expect(lunar.getSolar().toString()).toBe('2025-06-25');
+});
+
+test('test063', () => {
+  const lunar = Lunar.fromYmd(193, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0193-02-19');
+});
+
+test('test064', () => {
+  const lunar = Lunar.fromYmd(288, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0288-02-19');
+});
+
+test('test065', () => {
+  const lunar = Lunar.fromYmd(755, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0755-02-16');
+});
+
+test('test066', () => {
+  const lunar = Lunar.fromYmd(41, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0041-02-20');
+});
+
+test('test067', () => {
+  const lunar = Lunar.fromYmd(57, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0057-02-23');
+});
+
+test('test068', () => {
+  const lunar = Lunar.fromYmd(345, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('0345-02-18');
+});
+
+test('test069', () => {
+  const solar = Solar.fromYmd(917, 12, 1);
+  expect(solar.getLunar().toString()).toBe('九一七年闰十月十四');
+});
+
+test('test070', () => {
+  const solar = Solar.fromYmd(917, 12, 31);
+  expect(solar.getLunar().toString()).toBe('九一七年冬月十五');
+});
+
+test('test071', () => {
+  const solar = Solar.fromYmd(918, 1, 1);
+  expect(solar.getLunar().toString()).toBe('九一七年冬月十六');
+});

__tests__/LunarMonth.test.js

@@ -0,0 +1,37 @@
+var {LunarMonth} = require('../lunar');
+
+test('test1', () => {
+  const month = LunarMonth.fromYm(2023, 1);
+  expect(month.getIndex()).toBe(1);
+  expect(month.getGanZhi()).toBe('甲寅');
+});
+
+test('test2', () => {
+  const month = LunarMonth.fromYm(2023, -2);
+  expect(month.getIndex()).toBe(3);
+  expect(month.getGanZhi()).toBe('丙辰');
+});
+
+test('test3', () => {
+  const month = LunarMonth.fromYm(2023, 3);
+  expect(month.getIndex()).toBe(4);
+  expect(month.getGanZhi()).toBe('丁巳');
+});
+
+test('test4', () => {
+  const month = LunarMonth.fromYm(2024, 1);
+  expect(month.getIndex()).toBe(1);
+  expect(month.getGanZhi()).toBe('丙寅');
+});
+
+test('test5', () => {
+  const month = LunarMonth.fromYm(2023, 12);
+  expect(month.getIndex()).toBe(13);
+  expect(month.getGanZhi()).toBe('丙寅');
+});
+
+test('test6', () => {
+  const month = LunarMonth.fromYm(2022, 1);
+  expect(month.getIndex()).toBe(1);
+  expect(month.getGanZhi()).toBe('壬寅');
+});

__tests__/LunarYear.test.js

@@ -88,7 +88,17 @@ test('test17', () => {
   expect(year.getYun()).toBe('八运');
 });
 
-test('test18', () => {
-  const year = LunarYear.fromYear(2022);
-  expect(year.getJieQiJulianDays()).toStrictEqual([2459555.7478605337, 2459570.499405936, 2459585.217980813, 2459599.9437018055, 2459614.7018054826, 2459629.5297495862, 2459644.446920318, 2459659.4814200983, 2459674.6389274267, 2459689.9334118855, 2459705.3512322665, 2459720.890569021, 2459736.517794922, 2459752.2178259823, 2459767.9429320656, 2459783.6713957503, 2459799.3534378354, 2459814.969435438, 2459830.480632029, 2459845.8774438635, 2459861.140466851, 2459876.2746654437, 2459891.281458942, 2459906.1807667296, 2459920.9903281447, 2459935.741672728, 2459950.461561025, 2459965.187040542, 2459979.9460747372, 2459994.7736723446, 2460009.6916930582]);
+test('test19', () => {
+  const year = LunarYear.fromYear(2021);
+  expect(year.getDayCount()).toBe(354);
+});
+
+test('test20', () => {
+  const year = LunarYear.fromYear(2023);
+  expect(year.getDayCount()).toBe(384);
+});
+
+test('test21', () => {
+  const year = LunarYear.fromYear(1517);
+  expect(year.getDayCount()).toBe(384);
 });

__tests__/Solar.test.js

@@ -29,7 +29,7 @@ test('9', () => {
 });
 
 test('10', () => {
-  expect(SolarUtil.isLeapYear(1500)).toBe(false);
+  expect(SolarUtil.isLeapYear(1500)).toBe(true);
 });
 
 test('11', () => {
@@ -92,3 +92,60 @@ test('19', () => {
   })
   expect(timeList).toStrictEqual(['2020-07-21 22:00:00', '1960-08-05 22:00:00']);
 });
+
+test('20', () => {
+  const solar = Solar.fromYmd(1582, 10, 4);
+  expect(solar.nextDay(1).toYmd()).toBe('1582-10-15');
+});
+
+test('21', () => {
+  const solar = Solar.fromYmd(1582, 10, 15);
+  expect(solar.nextDay(-1).toYmd()).toBe('1582-10-04');
+});
+
+test('22', () => {
+  const solar = Solar.fromYmd(1582, 10, 15);
+  expect(solar.nextDay(-5).toYmd()).toBe('1582-09-30');
+});
+
+test('23', () => {
+  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']);
+});
+
+test('24', () => {
+  const solarList = Solar.fromBaZi('己亥', '丁丑', '壬寅', '戊申');
+  const timeList = [];
+  solarList.forEach(solar => {
+    timeList.push(solar.toYmdHms());
+  })
+  expect(timeList).toStrictEqual(['1960-01-15 16:00:00', '1900-01-29 16:00:00']);
+});
+
+test('25', () => {
+  const solarList = Solar.fromBaZi('己亥', '丙子', '癸酉', '庚申');
+  const timeList = [];
+  solarList.forEach(solar => {
+    timeList.push(solar.toYmdHms());
+  })
+  expect(timeList).toStrictEqual(['1959-12-17 16:00:00']);
+});
+
+test('26', () => {
+  const solar = Solar.fromYmd(2023, 8, 31);
+  expect(solar.nextMonth(2).toYmd()).toBe('2023-10-31');
+});
+
+test('27', () => {
+  const solar = Solar.fromYmd(2023, 8, 31);
+  expect(solar.nextYear(2).toYmd()).toBe('2025-08-31');
+});
+
+test('28', () => {
+  const solar = Solar.fromYmd(2023, 8, 31);
+  expect(solar.nextMonth(6).toYmd()).toBe('2024-02-29');
+});

__tests__/SolarUtil.test.js

@@ -1,4 +1,4 @@
-var {SolarUtil} = require('../lunar');
+var {SolarUtil, Solar} = require('../lunar');
 
 test('isLeapYear()', () => {
   expect(SolarUtil.isLeapYear(2020)).toBe(true);
@@ -11,59 +11,59 @@ test('getDaysOfMonth()', () => {
 });
 
 test('addDays', () => {
-  var ymd = SolarUtil.addDays(2022,1,1, 1);
-  expect(ymd.year).toBe(2022);
-  expect(ymd.month).toBe(1);
-  expect(ymd.day).toBe(2);
+  var solar = Solar.fromYmd(2022,1,1).next(1);
+  expect(solar.getYear()).toBe(2022);
+  expect(solar.getMonth()).toBe(1);
+  expect(solar.getDay()).toBe(2);
 });
 
 test('addDays2', () => {
-  var ymd = SolarUtil.addDays(2022,1,31, 1);
-  expect(ymd.year).toBe(2022);
-  expect(ymd.month).toBe(2);
-  expect(ymd.day).toBe(1);
+  var solar = Solar.fromYmd(2022,1,31).next(1);
+  expect(solar.getYear()).toBe(2022);
+  expect(solar.getMonth()).toBe(2);
+  expect(solar.getDay()).toBe(1);
 });
 
 test('addDays3', () => {
-  var ymd = SolarUtil.addDays(2022,1,1, 365);
-  expect(ymd.year).toBe(2023);
-  expect(ymd.month).toBe(1);
-  expect(ymd.day).toBe(1);
+  var solar = Solar.fromYmd(2022,1,1).next(365);
+  expect(solar.getYear()).toBe(2023);
+  expect(solar.getMonth()).toBe(1);
+  expect(solar.getDay()).toBe(1);
 });
 
 test('addDays4', () => {
-  var ymd = SolarUtil.addDays(2023,1,1, -365);
-  expect(ymd.year).toBe(2022);
-  expect(ymd.month).toBe(1);
-  expect(ymd.day).toBe(1);
+  var solar = Solar.fromYmd(2023,1,1).next(-365);
+  expect(solar.getYear()).toBe(2022);
+  expect(solar.getMonth()).toBe(1);
+  expect(solar.getDay()).toBe(1);
 });
 
 test('addDays5', () => {
-  var ymd = SolarUtil.addDays(1582,10,4, 1);
-  expect(ymd.year).toBe(1582);
-  expect(ymd.month).toBe(10);
-  expect(ymd.day).toBe(15);
+  var solar = Solar.fromYmd(1582,10,4).next(1);
+  expect(solar.getYear()).toBe(1582);
+  expect(solar.getMonth()).toBe(10);
+  expect(solar.getDay()).toBe(15);
 });
 
 test('addDays6', () => {
-  var ymd = SolarUtil.addDays(1582,10,4, 18);
-  expect(ymd.year).toBe(1582);
-  expect(ymd.month).toBe(11);
-  expect(ymd.day).toBe(1);
+  var solar = Solar.fromYmd(1582,10,4).next(18);
+  expect(solar.getYear()).toBe(1582);
+  expect(solar.getMonth()).toBe(11);
+  expect(solar.getDay()).toBe(1);
 });
 
 test('addDays7', () => {
-  var ymd = SolarUtil.addDays(1582,11,1, -18);
-  expect(ymd.year).toBe(1582);
-  expect(ymd.month).toBe(10);
-  expect(ymd.day).toBe(4);
+  var solar = Solar.fromYmd(1582,11,1).next(-18);
+  expect(solar.getYear()).toBe(1582);
+  expect(solar.getMonth()).toBe(10);
+  expect(solar.getDay()).toBe(4);
 });
 
 test('addDays8', () => {
-  var ymd = SolarUtil.addDays(1582,11,1, -17);
-  expect(ymd.year).toBe(1582);
-  expect(ymd.month).toBe(10);
-  expect(ymd.day).toBe(15);
+  var solar = Solar.fromYmd(1582,11,1).next(-17);
+  expect(solar.getYear()).toBe(1582);
+  expect(solar.getMonth()).toBe(10);
+  expect(solar.getDay()).toBe(15);
 });
 
 test('getDaysBetween', () => {
@@ -82,11 +82,11 @@ test('getDaysBetween2', () => {
 });
 
 test('getWeek', () => {
-  var week = SolarUtil.getWeek(1582, 10, 1);
+  var week = Solar.fromYmd(1582, 10, 1).getWeek();
   expect(week).toBe(1);
 });
 
 test('getWeek1', () => {
-  var week = SolarUtil.getWeek(1582, 10, 15);
+  var week = Solar.fromYmd(1582, 10, 15).getWeek();
   expect(week).toBe(5);
 });

index.js

@@ -1,4 +1,4 @@
-const {Solar, Lunar, Foto, Tao, NineStar, EightChar, SolarWeek, SolarMonth, SolarSeason, SolarHalfYear, SolarYear, LunarMonth, LunarYear, LunarTime, ShouXingUtil, SolarUtil, LunarUtil, FotoUtil, TaoUtil, HolidayUtil} = require('./lunar.js')
+const {Solar, Lunar, Foto, Tao, NineStar, EightChar, SolarWeek, SolarMonth, SolarSeason, SolarHalfYear, SolarYear, LunarMonth, LunarYear, LunarTime, ShouXingUtil, SolarUtil, LunarUtil, FotoUtil, TaoUtil, HolidayUtil, NineStarUtil, I18n} = require('./lunar.js')
 
 module.exports = {
   Solar: Solar,
@@ -20,5 +20,7 @@ module.exports = {
   LunarUtil: LunarUtil,
   FotoUtil: FotoUtil,
   TaoUtil: TaoUtil,
-  HolidayUtil: HolidayUtil
+  HolidayUtil: HolidayUtil,
+  NineStarUtil: NineStarUtil,
+  I18n: I18n
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunar-javascript",
-  "version": "1.2.38",
+  "version": "1.6.4",
   "description": "lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {