v1.2.27 新增阴历年、阴历月的推移；修复三候错误；修复道历节日错别字。

__tests__/SolarWeek.test.js

@@ -19,3 +19,15 @@ 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);
+});

__tests__/WuHou.test.js

@@ -77,3 +77,9 @@ test('test13', () => {
   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('立夏 三候');
+});

lunar.js

@@ -983,59 +983,51 @@
         },
         _convertJieQi:function(name){
           var jq = name;
-          if('DONG_ZHI'===jq){
+          if('DONG_ZHI' === jq){
             jq = '冬至';
-          }else if('DA_HAN'===jq){
+          }else if('DA_HAN' === jq){
             jq = '大寒';
-          }else if('XIAO_HAN'===jq){
+          }else if('XIAO_HAN' === jq){
             jq = '小寒';
-          }else if('LI_CHUN'===jq){
+          }else if('LI_CHUN' === jq){
             jq = '立春';
-          }else if('DA_XUE'===jq){
+          }else if('DA_XUE' === jq){
             jq = '大雪';
-          }else if('YU_SHUI'===jq){
+          }else if('YU_SHUI' === jq){
             jq = '雨水';
-          }else if('JING_ZHE'===jq){
+          }else if('JING_ZHE' === jq){
             jq = '惊蛰';
           }
           return jq;
         },
         getJie:function(){
-          var d;
-          var jie='';
-          for(var i=0,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+          for(var i=0, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
             var key = Lunar.JIE_QI_IN_USE[i];
-            d = this._p.jieQi[key];
-            if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              jie=key;
-              break;
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(jie);
+          return '';
         },
         getQi:function(){
-          var d;
-          var qi='';
-          for(var i=1,j=Lunar.JIE_QI_IN_USE.length;i<j;i+=2){
+          for(var i=1, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
             var key = Lunar.JIE_QI_IN_USE[i];
-            d = this._p.jieQi[key];
-            if(d.getYear()===this._p.solar.getYear()&&d.getMonth()===this._p.solar.getMonth()&&d.getDay()===this._p.solar.getDay()){
-              qi=key;
-              break;
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(qi);
+          return '';
         },
         getJieQi:function(){
-          var name = '';
           for(var key in this._p.jieQi){
             var d = this._p.jieQi[key];
-            if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
-              name = key;
-              break;
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._convertJieQi(key);
             }
           }
-          return this._convertJieQi(name);
+          return '';
         },
         getWeek:function(){
           return this._p.weekIndex;
@@ -1429,16 +1421,33 @@
           return this._buildJieQi(name, near);
         },
         getCurrentJieQi:function(){
-          var name = this.getJieQi();
-          return name.length>0 ? this._buildJieQi(name,this.solar) : null;
+          for(var key in this._p.jieQi){
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getCurrentJie:function(){
-          var name = this.getJie();
-          return name.length>0 ? this._buildJieQi(name,this.solar) : null;
+          for(var i=0, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
+            var key = Lunar.JIE_QI_IN_USE[i];
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getCurrentQi:function(){
-          var name = this.getQi();
-          return name.length>0 ? this._buildJieQi(name,this.solar) : null;
+          for(var i=1, j=Lunar.JIE_QI_IN_USE.length; i<j; i+=2){
+            var key = Lunar.JIE_QI_IN_USE[i];
+            var d = this._p.jieQi[key];
+            if(d.getYear() === this._p.solar.getYear() && d.getMonth() === this._p.solar.getMonth() && d.getDay() === this._p.solar.getDay()){
+              return this._buildJieQi(this._convertJieQi(key), d);
+            }
+          }
+          return null;
         },
         getEightChar:function(){
           if(!this._p.eightChar){
@@ -1650,11 +1659,14 @@
         getHou:function(){
           var jieQi = this.getPrevJieQi(true);
           var name = jieQi.getName();
-          var currentCalendar = ExactDate.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
           var startSolar = jieQi.getSolar();
-          var startCalendar = ExactDate.fromYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay());
-          var days = days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
-          return name + ' ' + LunarUtil.HOU[(Math.floor(days/5)) % LunarUtil.HOU.length];
+          var days = ExactDate.getDaysBetweenYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay(), this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
+          var max = LunarUtil.HOU.length - 1;
+          var offset = Math.floor(days / 5);
+          if (offset > max) {
+            offset = max;
+          }
+          return name + ' ' + LunarUtil.HOU[offset];
         },
         getDayLu:function(){
           var gan = LunarUtil.LU[this.getDayGan()];
@@ -1717,10 +1729,11 @@
         getIndex:function(){
           var firstDate = ExactDate.fromYmd(this._p.year,this._p.month,1);
           var firstDayWeek = firstDate.getDay();
-          if(firstDayWeek===0){
-            firstDayWeek = 7;
+          var offset = firstDayWeek - this._p.start;
+          if(offset < 0) {
+            offset += 7;
           }
-          return Math.ceil((this._p.day+firstDayWeek-this._p.start)/7);
+          return Math.ceil((this._p.day + offset)/7);
         },
         /**
          * 周推移
@@ -2258,6 +2271,9 @@
         toFullString:function(){
           return this.getYear()+'年';
         },
+        next:function(n){
+          return LunarYear.fromYear(this._p.year + n);
+        },
         _compute:function(){
           this._p.months = [];
           this._p.jieQiJulianDays = [];
@@ -2412,6 +2428,65 @@
           var offset = (n - monthZhiIndex) % 9;
           return NineStar.fromIndex(offset);
         },
+        next:function(n){
+          if (0 == n) {
+            return LunarMonth.fromYm(this._p.year, this._p.month);
+          } else {
+            var rest = Math.abs(n);
+            var ny = this._p.year;
+            var iy = ny;
+            var im = this._p.month;
+            var index = 0;
+            var months = LunarYear.fromYear(ny).getMonths();
+            var i;
+            var m;
+            var size;
+            if (n > 0) {
+              while (true) {
+                size = months.length;
+                for (i = 0; i < size; i++) {
+                  m = months[i];
+                  if (m.getYear() === iy && m.getMonth() === im) {
+                    index = i;
+                    break;
+                  }
+                }
+                var more = size - index - 1;
+                if (rest < more) {
+                  break;
+                }
+                rest -= more;
+                var lastMonth = months[size - 1];
+                iy = lastMonth.getYear();
+                im = lastMonth.getMonth();
+                ny++;
+                months = LunarYear.fromYear(ny).getMonths();
+              }
+              return months[index + rest];
+            } else {
+              while (true) {
+                size = months.length;
+                for (i = 0; i < size; i++) {
+                  m = months[i];
+                  if (m.getYear() === iy && m.getMonth() === im) {
+                    index = i;
+                    break;
+                  }
+                }
+                if (rest <= index) {
+                  break;
+                }
+                rest -= index;
+                var firstMonth = months[0];
+                iy = firstMonth.getYear();
+                im = firstMonth.getMonth();
+                ny--;
+                months = LunarYear.fromYear(ny).getMonths();
+              }
+              return months[index - rest];
+            }
+          }
+        },
         toString:function(){return this.getYear()+'年'+(this.isLeap()?'闰':'')+LunarUtil.MONTH[Math.abs(this.getMonth())]+'月('+this.getDayCount()+')天';}
       };
     };
@@ -3460,10 +3535,8 @@
             const startTimeZhiIndex = (start.getHour() === 23) ? 11 : LunarUtil.getTimeZhiIndex(start.toYmdHms().substr(11, 5));
             // 时辰差
             var hourDiff = endTimeZhiIndex - startTimeZhiIndex;
-            var endCalendar = ExactDate.fromYmd(end.getYear(), end.getMonth(), end.getDay());
-            var startCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
             // 天数差
-            var dayDiff = Math.floor((endCalendar - startCalendar) / (1000 * 3600 * 24));
+            var dayDiff = ExactDate.getDaysBetweenYmd(start.getYear(), start.getMonth(), start.getDay(), end.getYear(), end.getMonth(), end.getDay());
             if (hourDiff < 0) {
               hourDiff += 12;
               dayDiff--;
@@ -4241,7 +4314,7 @@
         '冬至':'北方玄上玉宸天尊同黑帝五炁天君下降'
       },
       FESTIVAL: {
-        '1-1': [_f('天腊之辰', '天腊，此日五帝会于束方九炁青天')],
+        '1-1': [_f('天腊之辰', '天腊，此日五帝会于东方九炁青天')],
         '1-3': [_f('郝真人圣诞'), _f('孙真人圣诞')],
         '1-5': [_f('孙祖清静元君诞')],
         '1-7': [_f('举迁赏会', '此日上元赐福，天官同地水二官考校罪福')],
@@ -4276,7 +4349,7 @@
         '4-20': [_f('眼光圣母娘娘诞')],
         '4-28': [_f('神农先帝诞')],
         '5-1': [_f('南极长生大帝圣诞')],
-        '5-5': [_f('地腊之辰', '地腊，此日五帝会於南方三炁丹天'), _f('南方雷祖圣诞'), _f('地祗温元帅圣诞'), _f('雷霆邓天君圣诞')],
+        '5-5': [_f('地腊之辰', '地腊，此日五帝会于南方三炁丹天'), _f('南方雷祖圣诞'), _f('地祗温元帅圣诞'), _f('雷霆邓天君圣诞')],
         '5-11': [_f('城隍爷圣诞')],
         '5-13': [_f('关圣帝君降神'), _f('关平太子圣诞')],
         '5-18': [_f('张天师圣诞')],
@@ -4318,7 +4391,7 @@
         '9-22': [_f('增福财神诞')],
         '9-23': [_f('萨翁真君圣诞')],
         '9-28': [_f('五显灵官马元帅圣诞')],
-        '10-1': [_f('民岁腊之辰', '民岁腊，此日五帝会於北方五炁黑天'), _f('东皇大帝圣诞')],
+        '10-1': [_f('民岁腊之辰', '民岁腊，此日五帝会于北方五炁黑天'), _f('东皇大帝圣诞')],
         '10-3': [_f('三茅应化真君圣诞')],
         '10-6': [_f('天曹诸司五岳五帝圣诞')],
         '10-15': [_f('下元水官大帝圣诞'), _f('建生大会', '此日下元解厄，水官同天地二官考校罪福')],
@@ -4329,7 +4402,7 @@
         '11-9': [_f('湘子韩祖圣诞')],
         '11-11': [_f('太乙救苦天尊圣诞')],
         '11-26': [_f('北方五道圣诞')],
-        '12-8': [_f('王侯腊之辰', '王侯腊，此日五帝会於上方玄都玉京')],
+        '12-8': [_f('王侯腊之辰', '王侯腊，此日五帝会于上方玄都玉京')],
         '12-16': [_f('南岳大帝圣诞'), _f('福德正神诞')],
         '12-20': [_f('鲁班先师圣诞')],
         '12-21': [_f('天猷上帝圣诞')],

package.json

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