v1.2.5 修复闰冬月、闰腊月的问题；修复日历不准的问题；修复物候错误；大运、小运、流年支持自定义轮数；提升运行速度。

2026-04-19 06:48:41 +08:00 · 2021-09-14 00:38:06 +08:00
parent 657ccfbf55
commit c3e441ff22
6 changed files with 216 additions and 27 deletions
--- a/README.md
+++ b/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)

--- a/tests/Lunar.test.js
+++ b/tests/Lunar.test.js
@@ -382,3 +382,131 @@ test('test38', () => {
  const lunar = solar.getLunar();
  expect(lunar.getFestivals()[0]).toBe('除夕');
 });
+
+test('test39', () => {
+  const lunar = Lunar.fromYmd(2033, -11, 1);
+  expect(lunar.getSolar().toYmd()).toBe('2033-12-22');
+});
+
+test('test40', () => {
+  const solar = Solar.fromYmdHms(1, 1, 1, 12, 0, 0);
+  expect(solar.getLunar().toString()).toBe('〇年冬月十八');
+});
+
+test('test41', () => {
+  const solar = Solar.fromYmdHms(9999, 12, 31, 12, 0, 0);
+  expect(solar.getLunar().toString()).toBe('九九九九年腊月初二');
+});
+
+test('test42', () => {
+  const lunar = Lunar.fromYmdHms(0, 11, 18, 12, 0, 0);
+  expect(lunar.getSolar().toString()).toBe('0001-01-01');
+});
+
+test('test43', () => {
+  const lunar = Lunar.fromYmdHms(9999, 12, 2, 12, 0, 0);
+  expect(lunar.getSolar().toString()).toBe('9999-12-31');
+});
+
+test('test022', () => {
+  const lunar = Lunar.fromYmd(2033, -11, 1);
+  expect(lunar.getSolar().toString()).toBe('2033-12-22');
+});
+
+test('test023', () => {
+  const lunar = Lunar.fromYmd(2022, 1, 1);
+  expect(lunar.getYearNineStar().toString()).toBe('五黄土玉衡');
+});
+
+test('test024', () => {
+  const lunar = Lunar.fromYmd(2033, 1, 1);
+  expect(lunar.getYearNineStar().toString()).toBe('三碧木天玑');
+});
+
+test('test025', () => {
+  const solar = Solar.fromYmdHms(2021, 6, 7, 21, 18, 0);
+  expect(solar.getLunar().toString()).toBe('二〇二一年四月廿七');
+});
+
+test('test026', () => {
+  const lunar = Lunar.fromYmdHms(2021, 6, 7, 21, 18, 0);
+  expect(lunar.getSolar().toString()).toBe('2021-07-16');
+});
+
+test('test027', () => {
+  const solar = Solar.fromYmd(1989, 4, 28);
+  expect(solar.getLunar().getDay()).toBe(23);
+});
+
+test('test028', () => {
+  const solar = Solar.fromYmd(1990, 10, 8);
+  expect(solar.getLunar().getMonthInGanZhiExact()).toBe('乙酉');
+});
+
+test('test029', () => {
+  const solar = Solar.fromYmd(1990, 10, 9);
+  expect(solar.getLunar().getMonthInGanZhiExact()).toBe('丙戌');
+});
+
+test('test030', () => {
+  const solar = Solar.fromYmd(1990, 10, 8);
+  expect(solar.getLunar().getMonthInGanZhi()).toBe('丙戌');
+});
+
+test('test031', () => {
+  const solar = Solar.fromYmdHms(1987, 4, 17, 9, 0, 0);
+  expect(solar.getLunar().toString()).toBe('一九八七年三月二十');
+});
+
+test('test032', () => {
+  const lunar = Lunar.fromYmd(2034, 1, 1);
+  expect(lunar.getSolar().toString()).toBe('2034-02-19');
+});
+
+test('test033', () => {
+  const lunar = Lunar.fromYmd(2033, 12, 1);
+  expect(lunar.getSolar().toString()).toBe('2034-01-20');
+});
+
+test('test034', () => {
+  const lunar = Lunar.fromYmd(37, -12, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰腊');
+});
+
+test('test035', () => {
+  let lunar = Lunar.fromYmd(56, -12, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰腊');
+
+  lunar = Lunar.fromYmd(75, -11, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰冬');
+
+  lunar = Lunar.fromYmd(94, -11, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰冬');
+
+  lunar = Lunar.fromYmd(94, 12, 1);
+  expect(lunar.getMonthInChinese()).toBe('腊');
+
+  lunar = Lunar.fromYmd(113, 12, 1);
+  expect(lunar.getMonthInChinese()).toBe('腊');
+
+  lunar = Lunar.fromYmd(113, -12, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰腊');
+
+  lunar = Lunar.fromYmd(5552, -12, 1);
+  expect(lunar.getMonthInChinese()).toBe('闰腊');
+});
+
+test('test036', () => {
+  const solar = Solar.fromYmd(5553, 1, 22);
+  expect(solar.getLunar().toString()).toBe('五五五二年闰腊月初二');
+});
+
+test('test037', () => {
+  const solar = Solar.fromYmd(7013, 12, 24);
+  expect(solar.getLunar().toString()).toBe('七〇一三年闰冬月初四');
+});
+
+test('test038', () => {
+  const lunar = Lunar.fromYmd(7013, -11, 4);
+  expect(lunar.getSolar().toString()).toBe('7013-12-24');
+});
--- a/tests/Solar.test.js
+++ b/tests/Solar.test.js
@@ -1,4 +1,4 @@
-var {Solar} = require('../lunar');
+var {Solar, SolarUtil} = require('../lunar');

 test('test', () => {
  var solar = Solar.fromYmd(2019,5,1);
@@ -27,3 +27,7 @@ test('9', () => {
  var solar = Solar.fromYmd(26,4,13);
  expect(solar.getLunar().toString()).toBe('二六年三月初八');
 });
+
+test('10', () => {
+  expect(SolarUtil.isLeapYear(1500)).toBe(false);
+});
--- a/tests/WuHou.test.js
+++ b/tests/WuHou.test.js
@@ -47,3 +47,9 @@ test('test8()', () => {
  const lunar = solar.getLunar();
  expect(lunar.getWuHou()).toBe('鹖鴠不鸣');
 });
+
+test('test9()', () => {
+  const solar = Solar.fromYmd(1982,12,22);
+  const lunar = solar.getLunar();
+  expect(lunar.getWuHou()).toBe('蚯蚓结');
+});
--- a/lunar.js
+++ b/lunar.js
@@ -22,10 +22,10 @@
        return date;
      },
      fromYmd:function(y,m,d){
-        return this._(new Date(y+'/'+m+'/'+d+' 0:0:0'),y,m,d);
+        return this._(new Date(y+'/'+m+'/'+d+' 0:0:0 GMT+0800'),y,m,d);
      },
      fromYmdHms:function(y,m,d,hour,minute,second){
-        return this._(new Date(y+'/'+m+'/'+d+' '+hour+':'+minute+':'+second),y,m,d);
+        return this._(new Date(y+'/'+m+'/'+d+' '+hour+':'+minute+':'+second+' GMT+0800'),y,m,d);
      }
    };
  })();
@@ -179,7 +179,11 @@
              d += 10;
            }
          }
-          return [this._p.year,(this._p.month<10?'0':'')+this._p.month,(d<10?'0':'')+d].join('-');
+          var y = this._p.year + '';
+          while (y.length < 4) {
+            y = '0' + y;
+          }
+          return [y,(this._p.month<10?'0':'')+this._p.month,(d<10?'0':'')+d].join('-');
        },
        toYmdHms:function(){
          return this.toYmd()+' '+[(this._p.hour<10?'0':'')+this._p.hour,(this._p.minute<10?'0':'')+this._p.minute,(this._p.second<10?'0':'')+this._p.second].join(':');
@@ -1438,7 +1442,7 @@
          var startSolar = jieQi.getSolar();
          var startCalendar = ExactDate.fromYmd(startSolar.getYear(),startSolar.getMonth(),startSolar.getDay());
          var days = Math.floor((currentCalendar.getTime() - startCalendar.getTime()) / MS_PER_DAY);
-          return LunarUtil.WU_HOU[offset*3+Math.floor(days/5)];
+          return LunarUtil.WU_HOU[(offset*3+Math.floor(days/5)) % LunarUtil.WU_HOU.length];
        }
      };
    };
@@ -1843,6 +1847,20 @@
    };
  })();
  var LunarYear = (function(){
+    var _LEAP_11 = [75, 94, 170, 238, 265, 322, 389, 469, 553, 583, 610, 678, 735, 754, 773, 849, 887, 936, 1050, 1069, 1126, 1145, 1164, 1183, 1259, 1278, 1308, 1373, 1403, 1441, 1460, 1498, 1555, 1593, 1612, 1631, 1642, 2033, 2128, 2147, 2242, 2614, 2728, 2910, 3062, 3244, 3339, 3616, 3711, 3730, 3825, 4007, 4159, 4197, 4322, 4341, 4379, 4417, 4531, 4599, 4694, 4713, 4789, 4808, 4971, 5085, 5104, 5161, 5180, 5199, 5294, 5305, 5476, 5677, 5696, 5772, 5791, 5848, 5886, 6049, 6068, 6144, 6163, 6258, 6402, 6440, 6497, 6516, 6630, 6641, 6660, 6679, 6736, 6774, 6850, 6869, 6899, 6918, 6994, 7013, 7032, 7051, 7070, 7089, 7108, 7127, 7146, 7222, 7271, 7290, 7309, 7366, 7385, 7404, 7442, 7461, 7480, 7491, 7499, 7594, 7624, 7643, 7662, 7681, 7719, 7738, 7814, 7863, 7882, 7901, 7939, 7958, 7977, 7996, 8034, 8053, 8072, 8091, 8121, 8159, 8186, 8216, 8235, 8254, 8273, 8311, 8330, 8341, 8349, 8368, 8444, 8463, 8474, 8493, 8531, 8569, 8588, 8626, 8664, 8683, 8694, 8702, 8713, 8721, 8751, 8789, 8808, 8816, 8827, 8846, 8884, 8903, 8922, 8941, 8971, 9036, 9066, 9085, 9104, 9123, 9142, 9161, 9180, 9199, 9218, 9256, 9294, 9313, 9324, 9343, 9362, 9381, 9419, 9438, 9476, 9514, 9533, 9544, 9552, 9563, 9571, 9582, 9601, 9639, 9658, 9666, 9677, 9696, 9734, 9753, 9772, 9791, 9802, 9821, 9886, 9897, 9916, 9935, 9954, 9973, 9992];
+    var _LEAP_12 = [37, 56, 113, 132, 151, 189, 208, 227, 246, 284, 303, 341, 360, 379, 417, 436, 458, 477, 496, 515, 534, 572, 591, 629, 648, 667, 697, 716, 792, 811, 830, 868, 906, 925, 944, 963, 982, 1001, 1020, 1039, 1058, 1088, 1153, 1202, 1221, 1240, 1297, 1335, 1392, 1411, 1422, 1430, 1517, 1525, 1536, 1574, 3358, 3472, 3806, 3988, 4751, 4941, 5066, 5123, 5275, 5343, 5438, 5457, 5495, 5533, 5552, 5715, 5810, 5829, 5905, 5924, 6421, 6535, 6793, 6812, 6888, 6907, 7002, 7184, 7260, 7279, 7374, 7556, 7746, 7757, 7776, 7833, 7852, 7871, 7966, 8015, 8110, 8129, 8148, 8224, 8243, 8338, 8406, 8425, 8482, 8501, 8520, 8558, 8596, 8607, 8615, 8645, 8740, 8778, 8835, 8865, 8930, 8960, 8979, 8998, 9017, 9055, 9074, 9093, 9112, 9150, 9188, 9237, 9275, 9332, 9351, 9370, 9408, 9427, 9446, 9457, 9465, 9495, 9560, 9590, 9628, 9647, 9685, 9715, 9742, 9780, 9810, 9818, 9829, 9848, 9867, 9905, 9924, 9943, 9962, 10000];
+    var _LEAP = {};
+    var _CACHE = {};
+    var _initLeap = function() {
+      var i, j;
+      for (i = 0, j = _LEAP_11.length; i < j; i++) {
+        _LEAP['_' + _LEAP_11[i]] = 13;
+      }
+      for (i = 0, j = _LEAP_12.length; i < j; i++) {
+        _LEAP['_' + _LEAP_12[i]] = 14;
+      }
+    };
+    _initLeap();
    var _fromYear = function(lunarYear){
      return {
        _p:{
@@ -1887,7 +1905,8 @@
          // 每月天数，长度15
          var dayCounts = [];
          var i,j;
-          var year = this._p.year - 2000;
+          var currentYear = this._p.year;
+          var year = currentYear - 2000;
          // 从上年的大雪到下年的大寒
          for (i = 0, j = Lunar.JIE_QI_IN_USE.length; i < j; i++) {
            // 精确的节气
@@ -1914,25 +1933,41 @@
            dayCounts.push(Math.floor(hs[i + 1] - hs[i]));
          }

-          var leap = -1;
-          if (hs[13] <= jq[24]) {
-            i = 1;
-            while (hs[i + 1] > jq[2 * i] && i < 13) {
-              i++;
+          var currentYearLeap = _LEAP['_' + currentYear];
+          if (!currentYearLeap) {
+            currentYearLeap = -1;
+            if (hs[13] <= jq[24]) {
+              i = 1;
+              while (hs[i + 1] > jq[2 * i] && i < 13) {
+                i++;
+              }
+              currentYearLeap = i;
            }
-            leap = i;
          }

+          var prevYear = currentYear - 1;
+          var prevYearLeap = _LEAP['_' + prevYear];
+          prevYearLeap = prevYearLeap ? prevYearLeap - 12 : -1;
+
          var y = this._p.year - 1;
          var m = 11;
          for (i = 0, j = dayCounts.length; i < j; i++) {
-            var isLeap = false;
-            if (i == leap) {
-              isLeap = true;
-              m--;
+            var cm = m;
+            var isNextLeap = false;
+            if (y == currentYear && i == currentYearLeap) {
+              cm = -cm;
+            } else if (y == prevYear && i == prevYearLeap) {
+              cm = -cm;
+            }
+            if (y == currentYear && i + 1 == currentYearLeap) {
+              isNextLeap = true;
+            } else if (y == prevYear && i + 1 == prevYearLeap) {
+              isNextLeap = true;
+            }
+            this._p.months.push(LunarMonth._(y, cm, dayCounts[i], hs[i] + Solar.J2000));
+            if (!isNextLeap) {
+              m++;
            }
-            this._p.months.push(LunarMonth._(y, isLeap ? -m : m, dayCounts[i], hs[i] + Solar.J2000));
-            m++;
            if (m == 13) {
              m = 1;
              y++;
@@ -1942,8 +1977,17 @@
        }
      }._compute();
    };
+    var _fromCachedYear = function(lunarYear) {
+      var key = '_' + lunarYear;
+      var obj = _CACHE[key];
+      if (!obj) {
+        obj = _fromYear(lunarYear);
+        _CACHE[key] = obj;
+      }
+      return obj;
+    };
    return {
-      fromYear:function(lunarYear){return _fromYear(lunarYear);}
+      fromYear:function(lunarYear){return _fromCachedYear(lunarYear);}
    };
  })();
  var LunarMonth = (function(){
@@ -3131,8 +3175,10 @@
              },
              getXun:function(){return LunarUtil.getXun(this.getGanZhi());},
              getXunKong:function(){return LunarUtil.getXunKong(this.getGanZhi());},
-              getLiuNian: function(){
-                var n = 10;
+              getLiuNian: function(n){
+                if (!n) {
+                  n = 10;
+                }
                if (this._p.index < 1) {
                  n = this._p.endYear-this._p.startYear+1;
                }
@@ -3142,8 +3188,10 @@
                }
                return l;
              },
-              getXiaoYun: function(){
-                var n = 10;
+              getXiaoYun: function(n){
+                if (!n) {
+                  n = 10;
+                }
                if (this._p.index < 1) {
                  n = this._p.endYear-this._p.startYear+1;
                }
@@ -3178,9 +3226,12 @@
              c.setDate(birth.getDay() + this._p.startDay);
              return Solar.fromDate(c);
            },
-            getDaYun: function(){
+            getDaYun: function(n){
+              if (!n) {
+                n = 10;
+              }
              var l = [];
-              for (var i = 0; i < 10; i++) {
+              for (var i = 0; i < n; i++) {
                l.push(buildDaYun(this,i));
              }
              return l;
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lunar-javascript",
-  "version": "1.2.4",
+  "version": "1.2.5",
  "description": "lunar is a calendar library for Solar and Chinese Lunar.",
  "main": "index.js",
  "scripts": {