v1.2.26 修复SolarWeek获取当月第几周的错误。

__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__/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);
+});

lunar.js

@@ -770,9 +770,9 @@
         getTimePositionCaiDesc:function(){
           return LunarUtil.POSITION_DESC[this.getTimePositionCai()];
         },
-        getDayPositionTaiSui:function(){
+        _getDayPositionTaiSui:function(dayInGanZhi, yearZhiIndex){
           var p = '';
-          switch (this.getDayInGanZhi()) {
+          switch (dayInGanZhi) {
             case '甲子':
             case '乙丑':
             case '丙寅':
@@ -814,12 +814,91 @@
               p = '坎';
               break;
             default:
-              p = LunarYear.fromYear(this.getYear()).getPositionTaiSui();
+              p = LunarUtil.POSITION_TAI_SUI_YEAR[yearZhiIndex];
           }
           return p;
         },
-        getDayPositionTaiSuiDesc:function(){
-          return LunarUtil.POSITION_DESC[this.getDayPositionTaiSui()];
+        getDayPositionTaiSui:function(sect){
+          var dayInGanZhi;
+          var yearZhiIndex;
+          switch (sect) {
+            case 1:
+              dayInGanZhi = this.getDayInGanZhi();
+              yearZhiIndex = this._p.yearZhiIndex;
+              break;
+            case 3:
+              dayInGanZhi = this.getDayInGanZhi();
+              yearZhiIndex = this._p.yearZhiIndexExact;
+              break;
+            default:
+              dayInGanZhi = this.getDayInGanZhiExact2();
+              yearZhiIndex = this._p.yearZhiIndexByLiChun;
+          }
+          return this._getDayPositionTaiSui(dayInGanZhi, yearZhiIndex);
+        },
+        getDayPositionTaiSuiDesc:function(sect){
+          return LunarUtil.POSITION_DESC[this.getDayPositionTaiSui(sect)];
+        },
+        _getMonthPositionTaiSui:function(monthZhiIndex, monthGanIndex){
+          var p = '';
+          var m = monthZhiIndex - LunarUtil.BASE_MONTH_ZHI_INDEX;
+          if (m < 0) {
+            m += 12;
+          }
+          switch(m) {
+            case 0:
+            case 4:
+            case 8:
+              p = '艮';
+              break;
+            case 2:
+            case 6:
+            case 10:
+              p = '坤';
+              break;
+            case 3:
+            case 7:
+            case 11:
+              p = '巽';
+              break;
+            default:
+              p = LunarUtil.POSITION_GAN[monthGanIndex];
+          }
+          return p;
+        },
+        getMonthPositionTaiSui:function(sect){
+          var monthZhiIndex;
+          var monthGanIndex;
+          switch (sect) {
+            case 3:
+              monthZhiIndex = this._p.monthZhiIndexExact;
+              monthGanIndex = this._p.monthGanIndexExact;
+              break;
+            default:
+              monthZhiIndex = this._p.monthZhiIndex;
+              monthGanIndex = this._p.monthGanIndex;
+          }
+          return this._getMonthPositionTaiSui(monthZhiIndex, monthGanIndex);
+        },
+        getMonthPositionTaiSuiDesc:function(sect){
+          return LunarUtil.POSITION_DESC[this.getMonthPositionTaiSui(sect)];
+        },
+        getYearPositionTaiSui:function(sect){
+          var yearZhiIndex;
+          switch (sect) {
+            case 1:
+              yearZhiIndex = this._p.yearZhiIndex;
+              break;
+            case 3:
+              yearZhiIndex = this._p.yearZhiIndexExact;
+              break;
+            default:
+              yearZhiIndex = this._p.yearZhiIndexByLiChun;
+          }
+          return LunarUtil.POSITION_TAI_SUI_YEAR[yearZhiIndex];
+        },
+        getYearPositionTaiSuiDesc:function(sect){
+          return LunarUtil.POSITION_DESC[this.getYearPositionTaiSui(sect)];
         },
         getChong:function(){
           return this.getDayChong();
@@ -904,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;
@@ -1124,26 +1195,59 @@
         getYueXiang:function(){
           return LunarUtil.YUE_XIANG[this._p.day];
         },
-        getYearNineStar:function(){
-          return LunarYear.fromYear(this._p.year).getNineStar();
+        _getYearNineStar:function(yearInGanZhi){
+          var index = LunarUtil.getJiaZiIndex(yearInGanZhi) + 1;
+          var yearOffset = 0;
+          if (index != LunarUtil.getJiaZiIndex(this.getYearInGanZhi()) + 1) {
+            yearOffset = -1;
+          }
+          var yuan = Math.floor((this._p.year + yearOffset + 2696) / 60) % 3;
+          var offset = (62 + yuan * 3 - index) % 9;
+          if(0 === offset){
+            offset = 9;
+          }
+          return NineStar.fromIndex(offset - 1);
         },
-        getMonthNineStar:function(){
-          var n = 12;
-          var yearZhi = this.getYearZhi();
-          if ('子午卯酉'.indexOf(yearZhi)>-1) {
-            n = 18;
-          } else if ('辰戌丑未'.indexOf(yearZhi)>-1) {
-            n = 15;
+        getYearNineStar:function(sect){
+          var yearInGanZhi;
+          switch (sect) {
+            case 1:
+              yearInGanZhi = this.getYearInGanZhi();
+              break;
+            case 3:
+              yearInGanZhi = this.getYearInGanZhiExact();
+              break;
+            default:
+              yearInGanZhi = this.getYearInGanZhiByLiChun();
           }
-          var m = this._p.month;
-          if(m<0){
-            m = -m;
+          return this._getYearNineStar(yearInGanZhi);
+        },
+        _getMonthNineStar:function(yearZhiIndex, monthZhiIndex){
+          var index = yearZhiIndex % 3;
+          var n = 27 - (index * 3);
+          if (monthZhiIndex < LunarUtil.BASE_MONTH_ZHI_INDEX) {
+            n -= 3;
           }
-          var offset = (n-m)%9;
-          if(0===offset){
-            offset=9;
+          var offset = (n - monthZhiIndex) % 9;
+          return NineStar.fromIndex(offset);
+        },
+        getMonthNineStar:function(sect){
+          var yearZhiIndex;
+          var monthZhiIndex;
+          switch (sect) {
+            case 1:
+              yearZhiIndex = this._p.yearZhiIndex;
+              monthZhiIndex = this._p.monthZhiIndex;
+              break;
+            case 3:
+              yearZhiIndex = this._p.yearZhiIndexExact;
+              monthZhiIndex = this._p.monthZhiIndexExact;
+              break;
+            default:
+              yearZhiIndex = this._p.yearZhiIndexByLiChun;
+              monthZhiIndex = this._p.monthZhiIndex;
           }
-          return NineStar.fromIndex(offset-1);
+          return this._getMonthNineStar(yearZhiIndex, monthZhiIndex);
         },
         getDayNineStar:function(){
           var solarYmd = this._p.solar.toYmd();
@@ -1317,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){
@@ -1538,10 +1659,8 @@
         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);
+          var days = days = ExactDate.getDaysBetweenYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay(), this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay());
           return name + ' ' + LunarUtil.HOU[(Math.floor(days/5)) % LunarUtil.HOU.length];
         },
         getDayLu:function(){
@@ -1605,10 +1724,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);
         },
         /**
          * 周推移
@@ -2008,6 +2128,8 @@
           jieQiJulianDays: []
         },
         getYear:function(){return this._p.year;},
+        getGanIndex:function(){return this._p.ganIndex;},
+        getZhiIndex:function(){return this._p.zhiIndex;},
         getGan:function(){return LunarUtil.GAN[this._p.ganIndex+1];},
         getZhi:function(){return LunarUtil.ZHI[this._p.zhiIndex+1];},
         getGanZhi:function(){return this.getGan()+this.getZhi();},
@@ -2094,22 +2216,13 @@
           return _YUN[Math.floor((this._p.year+2696)/20)%9]+'运';
         },
         getNineStar:function(){
-          var index = LunarUtil.getJiaZiIndex(this.getGanZhi())+1;
-          var n = 65;
-          switch(this.getYuan()){
-            case '中元':
-              n = 68;
-              break;
-            case '下元':
-              n = 62;
-              break;
-            default:
+          var index = LunarUtil.getJiaZiIndex(this.getGanZhi()) + 1;
+          var yuan = Math.floor((this._p.year + 2696) / 60) % 3;
+          var offset = (62 + yuan * 3 - index) % 9;
+          if(0 === offset){
+            offset = 9;
           }
-          var offset = (n-index)%9;
-          if(0===offset){
-            offset=9;
-          }
-          return NineStar.fromIndex(offset-1);
+          return NineStar.fromIndex(offset - 1);
         },
         getPositionXi:function(){
           return LunarUtil.POSITION_XI[this._p.ganIndex+1];
@@ -2293,6 +2406,20 @@
         getPositionTaiSuiDesc:function(){
           return LunarUtil.POSITION_DESC[this.getPositionTaiSui()];
         },
+        getNineStar:function(){
+          var index = LunarYear.fromYear(this._p.year).getZhiIndex() % 3;
+          var m = this._p.month;
+          if (m < 0) {
+            m = -m;
+          }
+          var monthZhiIndex = (13 + m) % 12;
+          var n = 27 - (index * 3);
+          if (monthZhiIndex < LunarUtil.BASE_MONTH_ZHI_INDEX) {
+            n -= 3;
+          }
+          var offset = (n - monthZhiIndex) % 9;
+          return NineStar.fromIndex(offset);
+        },
         toString:function(){return this.getYear()+'年'+(this.isLeap()?'闰':'')+LunarUtil.MONTH[Math.abs(this.getMonth())]+'月('+this.getDayCount()+')天';}
       };
     };
@@ -3341,10 +3468,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--;

package.json

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