1
0
mirror of synced 2025-12-13 00:28:02 +08:00

v1.2.3 修正2016年国庆节数据;删除5月23日世界读书日;修复v1.2.0和v1.2.1的重大bug。

This commit is contained in:
6tail
2021-05-23 22:33:25 +08:00
parent aead9412ed
commit b83fbe8cc7
7 changed files with 345 additions and 172 deletions

2
.gitignore vendored
View File

@@ -1,2 +1,4 @@
.idea/
*.iml
node_modules/
package-lock.json

View File

@@ -1,4 +1,4 @@
var {Solar} = require('../lunar');
var {Solar, Lunar} = require('../lunar');
test('test1', () => {
const solar = Solar.fromYmdHms(2005, 12, 23, 8, 37, 0);
@@ -53,6 +53,15 @@ test('test4', () => {
expect(eightChar.getTime()).toBe('辛亥');
});
test('test5', () => {
const lunar = Lunar.fromYmdHms(2019,12,12,11,22,0);
const eightChar = lunar.getEightChar();
expect(eightChar.getYear()).toBe('己亥');
expect(eightChar.getMonth()).toBe('丁丑');
expect(eightChar.getDay()).toBe('戊申');
expect(eightChar.getTime()).toBe('戊午');
});
test('地支藏干', () => {
const solar = Solar.fromYmdHms(2005, 12, 23, 8, 37, 0);
const lunar = solar.getLunar();

View File

@@ -38,3 +38,7 @@ test('test1', () => {
expect(HolidayUtil.getHoliday('2021-11-11') + '').toBe('2021-11-11 结婚纪念日 2021-11-11');
expect(HolidayUtil.getHoliday('2021-12-01') + '').toBe('2021-12-01 她的生日 2021-12-01');
});
test('test2', () => {
expect(HolidayUtil.getHoliday('2016-10-04').getTarget()).toBe('2016-10-01');
});

View File

@@ -1,4 +1,4 @@
var {Solar} = require('../lunar');
var {Solar, Lunar} = require('../lunar');
test('干支', () => {
let solar = Solar.fromYmdHms(2020, 1, 1, 13, 22, 0);
@@ -182,3 +182,182 @@ expect(lunar.getYearInGanZhiExact()).toBe('丙寅');
expect(lunar.getMonthInGanZhi()).toBe('癸巳');
expect(lunar.getMonthInGanZhiExact()).toBe('癸巳');
});
test('test8', () => {
const lunar = Lunar.fromYmdHms(2020,12,10,13,0,0);
expect(lunar.toString()).toBe('二〇二〇年腊月初十');
expect(lunar.getSolar().toString()).toBe('2021-01-22');
});
test('test9', () => {
const lunar = Lunar.fromYmdHms(1500,1,1,12,0,0);
expect(lunar.getSolar().toString()).toBe('1500-01-31');
});
test('test10', () => {
const lunar = Lunar.fromYmdHms(1500,12,29,12,0,0);
expect(lunar.getSolar().toString()).toBe('1501-01-18');
});
test('test11', () => {
const solar = Solar.fromYmdHms(1500,1,1,12,0,0);
expect(solar.getLunar().toString()).toBe('一四九九年腊月初一');
});
test('test12', () => {
const solar = Solar.fromYmdHms(1500,12,31,12,0,0);
expect(solar.getLunar().toString()).toBe('一五〇〇年腊月十一');
});
test('test13', () => {
const solar = Solar.fromYmdHms(1582,10,4,12,0,0);
expect(solar.getLunar().toString()).toBe('一五八二年九月十八');
});
test('test14', () => {
const solar = Solar.fromYmdHms(1582,10,15,12,0,0);
expect(solar.getLunar().toString()).toBe('一五八二年九月十九');
});
test('test15', () => {
const lunar = Lunar.fromYmdHms(1582,9,18,12,0,0);
expect(lunar.getSolar().toString()).toBe('1582-10-04');
});
test('test16', () => {
const lunar = Lunar.fromYmdHms(1582,9,19,12,0,0);
expect(lunar.getSolar().toString()).toBe('1582-10-15');
});
test('test17', () => {
const lunar = Lunar.fromYmdHms(2019,12,12,11,22,0);
expect(lunar.getSolar().toString()).toBe('2020-01-06');
});
test('test18', () => {
const solar = Solar.fromYmdHms(2020,2,4,13,22,0);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('庚子');
expect(lunar.getYearInGanZhiByLiChun()).toBe('庚子');
expect(lunar.getYearInGanZhiExact()).toBe('己亥');
expect(lunar.getMonthInGanZhi()).toBe('戊寅');
expect(lunar.getMonthInGanZhiExact()).toBe('丁丑');
});
test('test19', () => {
const solar = Solar.fromYmdHms(2019, 2, 8, 13, 22, 0);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('己亥');
expect(lunar.getYearInGanZhiByLiChun()).toBe('己亥');
expect(lunar.getYearInGanZhiExact()).toBe('己亥');
expect(lunar.getMonthInGanZhi()).toBe('丙寅');
expect(lunar.getMonthInGanZhiExact()).toBe('丙寅');
});
test('test20', () => {
const solar = Solar.fromYmdHms(1988, 2, 15, 23, 30,0);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('丁卯');
expect(lunar.getYearInGanZhiByLiChun()).toBe('戊辰');
expect(lunar.getYearInGanZhiExact()).toBe('戊辰');
});
test('test21', () => {
const solar = Solar.fromYmd(1988, 2, 15);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('丁卯');
});
test('test22', () => {
const solar = Solar.fromYmd(2012, 12, 27);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('壬辰');
expect(lunar.getMonthInGanZhi()).toBe('壬子');
expect(lunar.getDayInGanZhi()).toBe('壬戌');
});
test('test23', () => {
const solar = Solar.fromYmd(2012, 12, 20);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('壬辰');
expect(lunar.getMonthInGanZhi()).toBe('壬子');
expect(lunar.getDayInGanZhi()).toBe('乙卯');
});
test('test24', () => {
const solar = Solar.fromYmd(2012, 11, 20);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('壬辰');
expect(lunar.getMonthInGanZhi()).toBe('辛亥');
expect(lunar.getDayInGanZhi()).toBe('乙酉');
});
test('test25', () => {
const solar = Solar.fromYmd(2012, 10, 20);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('壬辰');
expect(lunar.getMonthInGanZhi()).toBe('庚戌');
expect(lunar.getDayInGanZhi()).toBe('甲寅');
});
test('test26', () => {
const solar = Solar.fromYmd(2012, 9, 20);
const lunar = solar.getLunar();
expect(lunar.getYearInGanZhi()).toBe('壬辰');
expect(lunar.getMonthInGanZhi()).toBe('己酉');
expect(lunar.getDayInGanZhi()).toBe('甲申');
});
test('test26', () => {
const solar = Solar.fromYmd(2012, 8, 5);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('戊戌');
});
test('test27', () => {
const solar = Solar.fromYmd(2000, 2, 2);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('庚寅');
});
test('test28', () => {
const solar = Solar.fromYmd(1996, 1, 16);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('壬子');
});
test('test29', () => {
const solar = Solar.fromYmd(1997, 2, 16);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('己丑');
});
test('test30', () => {
const solar = Solar.fromYmd(1998, 3, 16);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('壬戌');
});
test('test31', () => {
const solar = Solar.fromYmd(1999, 4, 16);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('戊戌');
});
test('test32', () => {
const solar = Solar.fromYmd(2000, 7, 16);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('乙亥');
});
test('test33', () => {
const solar = Solar.fromYmd(2000, 1, 6);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('癸亥');
});
test('test34', () => {
const solar = Solar.fromYmd(2000, 1, 9);
const lunar = solar.getLunar();
expect(lunar.getDayInGanZhi()).toBe('丙寅');
});

View File

@@ -1,4 +1,4 @@
var {Solar} = require('../lunar');
var {Solar, Lunar} = require('../lunar');
it('起运', () => {
const solar = Solar.fromYmdHms(1981, 1, 29, 23, 37, 0);
@@ -10,3 +10,24 @@ it('起运', () => {
expect(yun.getStartDay()).toBe(20);
expect(yun.getStartSolar().toYmd()).toBe('1989-02-18');
});
it('test2', () => {
const lunar = Lunar.fromYmdHms(2019, 12, 12, 11, 22, 0);
const eightChar = lunar.getEightChar();
const yun = eightChar.getYun(1);
expect(yun.getStartYear()).toBe(0);
expect(yun.getStartMonth()).toBe(1);
expect(yun.getStartDay()).toBe(0);
expect(yun.getStartSolar().toYmd()).toBe('2020-02-06');
});
it('test3', () => {
const solar = Solar.fromYmdHms(2020, 1, 6, 11, 22, 0);
const lunar = solar.getLunar();
const eightChar = lunar.getEightChar();
const yun = eightChar.getYun(1);
expect(yun.getStartYear()).toBe(0);
expect(yun.getStartMonth()).toBe(1);
expect(yun.getStartDay()).toBe(0);
expect(yun.getStartSolar().toYmd()).toBe('2020-02-06');
});

294
lunar.js

File diff suppressed because one or more lines are too long

View File

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