Skip to content

Commit 27d16be

Browse files
6tail6tail
authored
Merge pull request #22 from 6tail/v1.2.0
v1.2.1 新增灶马头；修复月九星计算错误的问题；修复九星错别字。
2 parents 3ad1c1b + c6c6bb9 commit 27d16be

File tree

8 files changed

+249
-120
lines changed

8 files changed

+249
-120
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,8 @@
6262

6363
## [1.2.0] - 2025-01-16
6464
1. 优化：解决arkts警告。
65+
66+
## [1.2.1] - 2025-01-29
67+
1. 新增：灶马头 KitchenGodSteed。
68+
2. 修复：月九星计算错误的问题。
69+
3. 修复：九星错别字。

‎build.config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {defineBuildConfig} from 'unbuild'
1+
import {defineBuildConfig} from "unbuild";
22

33
export default defineBuildConfig({
44
entries: [
5-
'lib/index',
5+
"lib/index",
66
],
77
clean: true,
88
declaration: true,
99
rollup: {
1010
emitCJS: true,
1111
},
12-
})
12+
});

‎eslint.config.mjs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import globals from "globals";
2+
import ts from "typescript-eslint";
3+
4+
export default [
5+
{
6+
files: ["lib/*.ts"]
7+
},
8+
{
9+
ignores: ["test/*.ts"],
10+
},
11+
{
12+
languageOptions: {
13+
globals: globals.browser
14+
}
15+
},
16+
...ts.configs.recommended,
17+
];

‎lib/index.ts‎

Lines changed: 149 additions & 60 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tyme4ts",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"description": "Tyme是一个非常强大的日历工具库，可以看作 Lunar 的升级版，拥有更优的设计和扩展性，支持公历和农历、星座、干支、生肖、节气、法定假日等。",
55
"main": "./dist/lib/index.cjs",
66
"module": "./dist/lib/index.mjs",
@@ -13,6 +13,7 @@
1313
}
1414
},
1515
"scripts": {
16+
"lint": "eslint",
1617
"build": "unbuild",
1718
"test": "mocha -r ts-node/register --config=.mocharc.json",
1819
"release": "npm run test && npm publish"
@@ -35,12 +36,16 @@
3536
},
3637
"devDependencies": {
3738
"@testdeck/mocha": "^0.3.3",
38-
"@types/mocha": "^10.0.6",
39-
"@types/node": "^20.10.5",
40-
"mocha": "^10.2.0",
39+
"@types/mocha": "^10.0.10",
40+
"@types/node": "^22.10.10",
41+
"@typescript-eslint/eslint-plugin": "^8.21.0",
42+
"@typescript-eslint/parser": "^8.21.0",
43+
"typescript-eslint": "^8.21.0",
44+
"eslint": "^9.19.0",
45+
"mocha": "^11.1.0",
4146
"ts-node": "^10.9.2",
42-
"tslint": "^6.1.3",
43-
"typescript": "^5.3.3",
44-
"unbuild": "^2.0.0"
47+
"typescript": "^5.7.3",
48+
"unbuild": "^3.3.1",
49+
"globals": "^15.14.0"
4550
}
4651
}

‎test/KitchenGodSteedTest.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import {suite, test} from '@testdeck/mocha';
2+
import {KitchenGodSteed} from '../lib';
3+
import {equal} from 'assert';
4+
5+
@suite
6+
class KitchenGodSteedTest {
7+
@test
8+
test0(): void {
9+
equal(KitchenGodSteed.fromLunarYear(2017).getDragon(), '二龙治水');
10+
equal(KitchenGodSteed.fromLunarYear(2018).getDragon(), '二龙治水');
11+
equal(KitchenGodSteed.fromLunarYear(2019).getDragon(), '八龙治水');
12+
equal(KitchenGodSteed.fromLunarYear(5).getDragon(), '三龙治水');
13+
}
14+
15+
@test
16+
test1(): void {
17+
equal(KitchenGodSteed.fromLunarYear(2017).getCake(), '二人分饼');
18+
equal(KitchenGodSteed.fromLunarYear(2018).getCake(), '八人分饼');
19+
equal(KitchenGodSteed.fromLunarYear(5).getCake(), '一人分饼');
20+
}
21+
22+
@test
23+
test2(): void {
24+
equal(KitchenGodSteed.fromLunarYear(2021).getCattle(), '十一牛耕田');
25+
}
26+
27+
@test
28+
test3(): void {
29+
equal(KitchenGodSteed.fromLunarYear(2018).getGold(), '三日得金');
30+
}
31+
}

‎test/NineStarTest.ts‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,96 @@
11
import {suite, test} from '@testdeck/mocha';
2-
import {LunarDay, LunarHour, LunarMonth, LunarYear, SolarDay} from '../lib';
2+
import {LunarDay, LunarHour, LunarMonth, LunarYear, NineStar, SolarDay} from '../lib';
33
import {equal} from 'assert';
44

55
@suite
66
class NineStarTest {
77
@test
8-
test0() {
9-
const nineStar = LunarYear.fromYear(1985).getNineStar();
8+
test0(): void {
9+
const nineStar: NineStar = LunarYear.fromYear(1985).getNineStar();
1010
equal(nineStar.getName(), '六');
1111
equal(nineStar.toString(), '六白金');
1212
}
1313

1414
@test
15-
test1() {
16-
const nineStar = LunarYear.fromYear(2022).getNineStar();
15+
test1(): void {
16+
const nineStar: NineStar = LunarYear.fromYear(2022).getNineStar();
1717
equal(nineStar.toString(), '五黄土');
1818
equal(nineStar.getDipper().toString(), '玉衡');
1919
}
2020

2121
@test
22-
test2() {
23-
const nineStar = LunarYear.fromYear(2033).getNineStar();
22+
test2(): void {
23+
const nineStar: NineStar = LunarYear.fromYear(2033).getNineStar();
2424
equal(nineStar.toString(), '三碧木');
2525
equal(nineStar.getDipper().toString(), '天玑');
2626
}
2727

2828
@test
29-
test3() {
30-
const nineStar = LunarMonth.fromYm(1985, 2).getNineStar();
29+
test3(): void {
30+
const nineStar: NineStar = LunarMonth.fromYm(1985, 2).getNineStar();
3131
equal(nineStar.toString(), '四绿木');
3232
equal(nineStar.getDipper().toString(), '天权');
3333
}
3434

3535
@test
36-
test4() {
37-
const nineStar = LunarMonth.fromYm(1985, 2).getNineStar();
36+
test4(): void {
37+
const nineStar: NineStar = LunarMonth.fromYm(1985, 2).getNineStar();
3838
equal( nineStar.toString(), '四绿木');
3939
equal(nineStar.getDipper().toString(), '天权');
4040
}
4141

4242
@test
43-
test5() {
44-
const nineStar = LunarMonth.fromYm(2022, 1).getNineStar();
45-
equal(nineStar.toString(), '二黒土');
43+
test5(): void {
44+
const nineStar: NineStar = LunarMonth.fromYm(2022, 1).getNineStar();
45+
equal(nineStar.toString(), '二黑土');
4646
equal(nineStar.getDipper().toString(), '天璇');
4747
}
4848

4949
@test
50-
test6() {
51-
const nineStar = LunarMonth.fromYm(2033, 1).getNineStar();
50+
test6(): void {
51+
const nineStar: NineStar = LunarMonth.fromYm(2033, 1).getNineStar();
5252
equal(nineStar.toString(), '五黄土');
5353
equal(nineStar.getDipper().toString(), '玉衡');
5454
}
5555

5656
@test
57-
test7() {
58-
const nineStar = SolarDay.fromYmd(1985, 2, 19).getLunarDay().getNineStar();
57+
test7(): void {
58+
const nineStar: NineStar = SolarDay.fromYmd(1985, 2, 19).getLunarDay().getNineStar();
5959
equal(nineStar.toString(), '五黄土');
6060
equal(nineStar.getDipper().toString(), '玉衡');
6161
}
6262

6363
@test
64-
test8() {
65-
const nineStar = LunarDay.fromYmd(2022, 1, 1).getNineStar();
64+
test8(): void {
65+
const nineStar: NineStar = LunarDay.fromYmd(2022, 1, 1).getNineStar();
6666
equal(nineStar.toString(), '四绿木');
6767
equal(nineStar.getDipper().toString(), '天权');
6868
}
6969

7070
@test
71-
test9() {
72-
const nineStar = LunarDay.fromYmd(2033, 1, 1).getNineStar();
71+
test9(): void {
72+
const nineStar: NineStar = LunarDay.fromYmd(2033, 1, 1).getNineStar();
7373
equal(nineStar.toString(), '一白水');
7474
equal(nineStar.getDipper().toString(), '天枢');
7575
}
7676

7777
@test
78-
test10() {
79-
const nineStar = LunarHour.fromYmdHms(2033, 1, 1, 12, 0, 0).getNineStar();
78+
test10(): void {
79+
const nineStar: NineStar = LunarHour.fromYmdHms(2033, 1, 1, 12, 0, 0).getNineStar();
8080
equal(nineStar.toString(), '七赤金');
8181
equal(nineStar.getDipper().toString(), '摇光');
8282
}
8383

8484
@test
85-
test11() {
86-
const nineStar = LunarHour.fromYmdHms(2011, 5, 3, 23, 0, 0).getNineStar();
85+
test11(): void {
86+
const nineStar: NineStar = LunarHour.fromYmdHms(2011, 5, 3, 23, 0, 0).getNineStar();
8787
equal(nineStar.toString(), '七赤金');
8888
equal(nineStar.getDipper().toString(), '摇光');
8989
}
90+
91+
@test
92+
test12(): void {
93+
const m: LunarMonth = LunarMonth.fromYm(2024, 11);
94+
equal(m.getNineStar().toString(), '四绿木');
95+
}
9096
}

‎tslint.json‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)