v1.2.29 每日宜忌支持2种流派。

bug修复：反推八字Solar_fromBaZi函数，在阳历元旦后、农历新年前，反推失败的bug

README.md

@@ -1,6 +1,6 @@
 # lunar [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/6tail/lunar-javascript/blob/master/LICENSE)
 
-lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。
+lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。
 
 [English](https://github.com/6tail/lunar-javascript/blob/master/README_EN.md)
 

__tests__/Foto.test.js

@@ -0,0 +1,15 @@
+var {Foto, Lunar} = require('../lunar');
+
+test('test1()', () => {
+  const foto = Foto.fromLunar(Lunar.fromYmd(2021, 10, 14));
+  expect(foto.toFullString()).toBe('二五六五年十月十四 (三元降) (四天王巡行)');
+});
+
+test('test2()', () => {
+  const foto = Foto.fromLunar(Lunar.fromYmd(2020, 4, 13));
+  expect(foto.getXiu()).toBe('氐');
+  expect(foto.getZheng()).toBe('土');
+  expect(foto.getAnimal()).toBe('貉');
+  expect(foto.getGong()).toBe('东');
+  expect(foto.getShou()).toBe('青龙');
+});

__tests__/JieQi.test.js

@@ -95,3 +95,11 @@ test('test8', () => {
   const lunar = Lunar.fromYmd(2050, 12, 1);
   expect(lunar.getJieQiTable()['大雪'].toYmdHms()).toBe('2050-12-07 06:41:00');
 });
+
+test('test9', () => {
+  const solar = Solar.fromYmd(2021, 12, 21);
+  const lunar = solar.getLunar();
+  expect(lunar.getJieQi()).toBe('冬至');
+  expect(lunar.getJie()).toBe('');
+  expect(lunar.getQi()).toBe('冬至');
+});

__tests__/Lunar.test.js

@@ -415,12 +415,12 @@ test('test022', () => {
 
 test('test023', () => {
   const lunar = Lunar.fromYmd(2022, 1, 1);
-  expect(lunar.getYearNineStar().toString()).toBe('五黄土玉衡');
+  expect(lunar.getYearNineStar().toString()).toBe('六白金开阳');
 });
 
 test('test024', () => {
   const lunar = Lunar.fromYmd(2033, 1, 1);
-  expect(lunar.getYearNineStar().toString()).toBe('三碧木天玑');
+  expect(lunar.getYearNineStar().toString()).toBe('四绿木天权');
 });
 
 test('test025', () => {

__tests__/LunarYear.test.js

@@ -22,3 +22,68 @@ test('test4', () => {
   const year = LunarYear.fromYear(2021);
   expect(year.getGengTian()).toBe('十一牛耕田');
 });
+
+test('test5', () => {
+  const year = LunarYear.fromYear(1864);
+  expect(year.getYuan()).toBe('上元');
+});
+
+test('test6', () => {
+  const year = LunarYear.fromYear(1923);
+  expect(year.getYuan()).toBe('上元');
+});
+
+test('test7', () => {
+  const year = LunarYear.fromYear(1924);
+  expect(year.getYuan()).toBe('中元');
+});
+
+test('test8', () => {
+  const year = LunarYear.fromYear(1983);
+  expect(year.getYuan()).toBe('中元');
+});
+
+test('test9', () => {
+  const year = LunarYear.fromYear(1984);
+  expect(year.getYuan()).toBe('下元');
+});
+
+test('test10', () => {
+  const year = LunarYear.fromYear(2043);
+  expect(year.getYuan()).toBe('下元');
+});
+
+test('test11', () => {
+  const year = LunarYear.fromYear(1864);
+  expect(year.getYun()).toBe('一运');
+});
+
+test('test12', () => {
+  const year = LunarYear.fromYear(1883);
+  expect(year.getYun()).toBe('一运');
+});
+
+test('test13', () => {
+  const year = LunarYear.fromYear(1884);
+  expect(year.getYun()).toBe('二运');
+});
+
+test('test14', () => {
+  const year = LunarYear.fromYear(1903);
+  expect(year.getYun()).toBe('二运');
+});
+
+test('test15', () => {
+  const year = LunarYear.fromYear(1904);
+  expect(year.getYun()).toBe('三运');
+});
+
+test('test16', () => {
+  const year = LunarYear.fromYear(1923);
+  expect(year.getYun()).toBe('三运');
+});
+
+test('test17', () => {
+  const year = LunarYear.fromYear(2004);
+  expect(year.getYun()).toBe('八运');
+});

__tests__/SolarWeek.test.js

@@ -19,3 +19,21 @@ test('testFromSunday', () => {
   expect(week.getFirstDay().toString()).toBe('2019-04-28');
   expect(week.getFirstDayInMonth().toString()).toBe('2019-05-01');
 });
+
+test('test1', () => {
+  const start = 0;
+  const week = SolarWeek.fromYmd(2022, 5, 1, start);
+  expect(week.getIndex()).toBe(1);
+});
+
+test('test2', () => {
+  const start = 2;
+  const week = SolarWeek.fromYmd(2021, 5, 4, start);
+  expect(week.getIndex()).toBe(2);
+});
+
+test('test3', () => {
+  const start = 0;
+  const week = SolarWeek.fromYmd(2022, 3, 6, start);
+  expect(week.getIndexInYear()).toBe(11);
+});

__tests__/WuHou.test.js

@@ -53,3 +53,33 @@ test('test9()', () => {
   const lunar = solar.getLunar();
   expect(lunar.getWuHou()).toBe('蚯蚓结');
 });
+
+test('test10', () => {
+  const solar = Solar.fromYmd(2021,12,21);
+  const lunar = solar.getLunar();
+  expect(lunar.getHou()).toBe('冬至 初候');
+});
+
+test('test11', () => {
+  const solar = Solar.fromYmd(2021,12,26);
+  const lunar = solar.getLunar();
+  expect(lunar.getHou()).toBe('冬至 二候');
+});
+
+test('test12', () => {
+  const solar = Solar.fromYmd(2021,12,31);
+  const lunar = solar.getLunar();
+  expect(lunar.getHou()).toBe('冬至 三候');
+});
+
+test('test13', () => {
+  const solar = Solar.fromYmd(2022,1,5);
+  const lunar = solar.getLunar();
+  expect(lunar.getHou()).toBe('小寒 初候');
+});
+
+test('test14', () => {
+  const solar = Solar.fromYmd(2022,5,20);
+  const lunar = solar.getLunar();
+  expect(lunar.getHou()).toBe('立夏 三候');
+});

__tests__/Yun.test.js

@@ -31,3 +31,30 @@ it('test3', () => {
   expect(yun.getStartDay()).toBe(0);
   expect(yun.getStartSolar().toYmd()).toBe('2020-02-06');
 });
+
+it('test4', () => {
+  const solar = Solar.fromYmdHms(2022, 3, 9, 20, 51, 0);
+  const lunar = solar.getLunar();
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(1);
+  expect(yun.getStartSolar().toYmd()).toBe('2030-12-19');
+});
+
+it('test5', () => {
+  const solar = Solar.fromYmdHms(2022, 3, 9, 20, 51, 0);
+  const lunar = solar.getLunar();
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(1, 2);
+  expect(yun.getStartYear()).toBe(8);
+  expect(yun.getStartMonth()).toBe(9);
+  expect(yun.getStartDay()).toBe(2);
+  expect(yun.getStartSolar().toYmd()).toBe('2030-12-12');
+});
+
+it('test6', () => {
+  const solar = Solar.fromYmdHms(2018, 6, 11, 9, 30, 0);
+  const lunar = solar.getLunar();
+  const eightChar = lunar.getEightChar();
+  const yun = eightChar.getYun(0, 2);
+  expect(yun.getStartSolar().toYmd()).toBe('2020-03-21');
+});

index.js

@@ -1,9 +1,10 @@
-const {Solar, Lunar, Foto, NineStar, EightChar, SolarWeek, SolarMonth, SolarSeason, SolarHalfYear, SolarYear, LunarMonth, LunarYear, LunarTime, ShouXingUtil, SolarUtil, LunarUtil, FotoUtil, 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} = require('./lunar.js')
 
 module.exports = {
   Solar: Solar,
   Lunar: Lunar,
   Foto: Foto,
+  Tao: Tao,
   NineStar: NineStar,
   EightChar: EightChar,
   SolarWeek: SolarWeek,
@@ -18,5 +19,6 @@ module.exports = {
   SolarUtil: SolarUtil,
   LunarUtil: LunarUtil,
   FotoUtil: FotoUtil,
+  TaoUtil: TaoUtil,
   HolidayUtil: HolidayUtil
 }

package.json

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