mingpan 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +64 -0
- package/README.ja.md +64 -0
- package/README.md +80 -11
- package/dist/core/bazi/BaziCore.d.ts +7 -1
- package/dist/core/bazi/BaziCore.d.ts.map +1 -1
- package/dist/core/bazi/BaziCore.js +41 -15
- package/dist/core/bazi/BaziCore.js.map +1 -1
- package/dist/core/bazi/TrueSolarTime.js +8 -8
- package/dist/core/bazi/TrueSolarTime.js.map +1 -1
- package/dist/core/bazi/types.d.ts +4 -0
- package/dist/core/bazi/types.d.ts.map +1 -1
- package/dist/core/calendar/SolarTermsCalculator.js +2 -2
- package/dist/core/calendar/SolarTermsCalculator.js.map +1 -1
- package/dist/core/calendar/astronomicalCalendar.d.ts +0 -13
- package/dist/core/calendar/astronomicalCalendar.d.ts.map +1 -1
- package/dist/core/calendar/astronomicalCalendar.js +0 -56
- package/dist/core/calendar/astronomicalCalendar.js.map +1 -1
- package/dist/core/calendar/calendar.d.ts.map +1 -1
- package/dist/core/calendar/calendar.js +11 -11
- package/dist/core/calendar/calendar.js.map +1 -1
- package/dist/core/calendar/lunarCalendar.js +1 -1
- package/dist/core/calendar/lunarCalendar.js.map +1 -1
- package/dist/core/calendar/solarTerms.js +10 -10
- package/dist/core/calendar/solarTerms.js.map +1 -1
- package/dist/core/ziwei/IztroAdapter.d.ts.map +1 -1
- package/dist/core/ziwei/IztroAdapter.js +11 -4
- package/dist/core/ziwei/IztroAdapter.js.map +1 -1
- package/dist/index.d.ts +10 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +13 -1582
- package/dist/index.js.map +1 -1
- package/dist/output/fortuneTextRenderer.d.ts +8 -7
- package/dist/output/fortuneTextRenderer.d.ts.map +1 -1
- package/dist/output/fortuneTextRenderer.js +89 -25
- package/dist/output/fortuneTextRenderer.js.map +1 -1
- package/dist/output/listTextRenderer.js +7 -7
- package/dist/output/listTextRenderer.js.map +1 -1
- package/dist/output/qimenTextRenderer.d.ts +2 -6
- package/dist/output/qimenTextRenderer.d.ts.map +1 -1
- package/dist/output/qimenTextRenderer.js +12 -145
- package/dist/output/qimenTextRenderer.js.map +1 -1
- package/dist/server.d.ts +11 -0
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +35 -0
- package/dist/server.js.map +1 -0
- package/dist/services/bazi/BaziService.d.ts +1 -17
- package/dist/services/bazi/BaziService.d.ts.map +1 -1
- package/dist/services/bazi/BaziService.js +11 -195
- package/dist/services/bazi/BaziService.js.map +1 -1
- package/dist/services/bazi/analyzers/StrengthAnalyzer.js +1 -1
- package/dist/services/bazi/analyzers/StrengthAnalyzer.js.map +1 -1
- package/dist/services/bazi/analyzers/TenGodsAnalyzer.js +12 -12
- package/dist/services/bazi/analyzers/TenGodsAnalyzer.js.map +1 -1
- package/dist/services/bazi/calculators/DaYunCalculator.js +1 -1
- package/dist/services/bazi/calculators/DaYunCalculator.js.map +1 -1
- package/dist/services/bazi/calculators/LiuRiCalculator.js +2 -2
- package/dist/services/bazi/calculators/LiuRiCalculator.js.map +1 -1
- package/dist/services/bazi/calculators/LiuYueCalculator.js +2 -2
- package/dist/services/bazi/calculators/LiuYueCalculator.js.map +1 -1
- package/dist/services/bazi/calculators/LuckCycleCalculator.d.ts.map +1 -1
- package/dist/services/bazi/calculators/LuckCycleCalculator.js +55 -43
- package/dist/services/bazi/calculators/LuckCycleCalculator.js.map +1 -1
- package/dist/services/bazi/index.d.ts +0 -2
- package/dist/services/bazi/index.d.ts.map +1 -1
- package/dist/services/bazi/index.js +1 -5
- package/dist/services/bazi/index.js.map +1 -1
- package/dist/services/bazi/types.d.ts +4 -112
- package/dist/services/bazi/types.d.ts.map +1 -1
- package/dist/services/bazi/types.js +3 -102
- package/dist/services/bazi/types.js.map +1 -1
- package/dist/services/daliuren/DaliurenService.d.ts +11 -1
- package/dist/services/daliuren/DaliurenService.d.ts.map +1 -1
- package/dist/services/daliuren/DaliurenService.js +30 -0
- package/dist/services/daliuren/DaliurenService.js.map +1 -1
- package/dist/services/daliuren/calculators/TianDiPanCalculator.d.ts.map +1 -1
- package/dist/services/daliuren/calculators/TianDiPanCalculator.js +3 -4
- package/dist/services/daliuren/calculators/TianDiPanCalculator.js.map +1 -1
- package/dist/services/daliuren/data/constants.d.ts +7 -0
- package/dist/services/daliuren/data/constants.d.ts.map +1 -1
- package/dist/services/daliuren/data/constants.js +17 -1
- package/dist/services/daliuren/data/constants.js.map +1 -1
- package/dist/services/daliuren/types.d.ts +11 -2
- package/dist/services/daliuren/types.d.ts.map +1 -1
- package/dist/services/liuyao/LiuyaoService.d.ts.map +1 -1
- package/dist/services/liuyao/LiuyaoService.js +1 -0
- package/dist/services/liuyao/LiuyaoService.js.map +1 -1
- package/dist/services/meihua/MeihuaService.d.ts.map +1 -1
- package/dist/services/meihua/MeihuaService.js +4 -3
- package/dist/services/meihua/MeihuaService.js.map +1 -1
- package/dist/services/meihua/calculators/TiyongCalculator.d.ts.map +1 -1
- package/dist/services/meihua/calculators/TiyongCalculator.js +6 -5
- package/dist/services/meihua/calculators/TiyongCalculator.js.map +1 -1
- package/dist/services/qimen/QimenService.d.ts +1 -18
- package/dist/services/qimen/QimenService.d.ts.map +1 -1
- package/dist/services/qimen/QimenService.js +13 -45
- package/dist/services/qimen/QimenService.js.map +1 -1
- package/dist/services/qimen/calculators/BaMenCalculator.d.ts +14 -22
- package/dist/services/qimen/calculators/BaMenCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/BaMenCalculator.js +41 -59
- package/dist/services/qimen/calculators/BaMenCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/JiuGongCalculator.d.ts +6 -13
- package/dist/services/qimen/calculators/JiuGongCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/JiuGongCalculator.js +11 -41
- package/dist/services/qimen/calculators/JiuGongCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/JiuXingCalculator.d.ts +13 -23
- package/dist/services/qimen/calculators/JiuXingCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/JiuXingCalculator.js +23 -68
- package/dist/services/qimen/calculators/JiuXingCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/JuShuCalculator.d.ts +8 -5
- package/dist/services/qimen/calculators/JuShuCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/JuShuCalculator.js +16 -21
- package/dist/services/qimen/calculators/JuShuCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/PanTypeCalculator.d.ts +19 -14
- package/dist/services/qimen/calculators/PanTypeCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/PanTypeCalculator.js +34 -36
- package/dist/services/qimen/calculators/PanTypeCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/SanQiLiuYiCalculator.d.ts +11 -20
- package/dist/services/qimen/calculators/SanQiLiuYiCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/SanQiLiuYiCalculator.js +29 -42
- package/dist/services/qimen/calculators/SanQiLiuYiCalculator.js.map +1 -1
- package/dist/services/qimen/calculators/ZhuanPanCalculator.d.ts +34 -41
- package/dist/services/qimen/calculators/ZhuanPanCalculator.d.ts.map +1 -1
- package/dist/services/qimen/calculators/ZhuanPanCalculator.js +102 -130
- package/dist/services/qimen/calculators/ZhuanPanCalculator.js.map +1 -1
- package/dist/services/qimen/types.d.ts +3 -77
- package/dist/services/qimen/types.d.ts.map +1 -1
- package/dist/services/qimen/types.js +3 -2
- package/dist/services/qimen/types.js.map +1 -1
- package/dist/services/ziwei/ZiweiService.d.ts.map +1 -1
- package/dist/services/ziwei/ZiweiService.js +4 -3
- package/dist/services/ziwei/ZiweiService.js.map +1 -1
- package/dist/services/ziwei/calculators/DecadeCalculator.d.ts.map +1 -1
- package/dist/services/ziwei/calculators/DecadeCalculator.js +2 -1
- package/dist/services/ziwei/calculators/DecadeCalculator.js.map +1 -1
- package/dist/shared/logger.d.ts +5 -0
- package/dist/shared/logger.d.ts.map +1 -1
- package/dist/shared/logger.js +16 -4
- package/dist/shared/logger.js.map +1 -1
- package/dist/tools/baziTools.d.ts +13 -0
- package/dist/tools/baziTools.d.ts.map +1 -0
- package/dist/tools/baziTools.js +331 -0
- package/dist/tools/baziTools.js.map +1 -0
- package/dist/tools/calendarTools.d.ts +12 -0
- package/dist/tools/calendarTools.d.ts.map +1 -0
- package/dist/tools/calendarTools.js +121 -0
- package/dist/tools/calendarTools.js.map +1 -0
- package/dist/tools/divinationTools.d.ts +9 -0
- package/dist/tools/divinationTools.d.ts.map +1 -0
- package/dist/tools/divinationTools.js +205 -0
- package/dist/tools/divinationTools.js.map +1 -0
- package/dist/tools/qimenTools.d.ts +10 -0
- package/dist/tools/qimenTools.d.ts.map +1 -0
- package/dist/tools/qimenTools.js +132 -0
- package/dist/tools/qimenTools.js.map +1 -0
- package/dist/tools/schemas.d.ts +99 -0
- package/dist/tools/schemas.d.ts.map +1 -0
- package/dist/tools/schemas.js +163 -0
- package/dist/tools/schemas.js.map +1 -0
- package/dist/tools/ziweiTools.d.ts +14 -0
- package/dist/tools/ziweiTools.d.ts.map +1 -0
- package/dist/tools/ziweiTools.js +484 -0
- package/dist/tools/ziweiTools.js.map +1 -0
- package/dist/utils/ageCalculator.d.ts +1 -1
- package/dist/utils/ageCalculator.d.ts.map +1 -1
- package/dist/utils/ageCalculator.js +10 -6
- package/dist/utils/ageCalculator.js.map +1 -1
- package/dist/utils/timeNormalization.d.ts +42 -17
- package/dist/utils/timeNormalization.d.ts.map +1 -1
- package/dist/utils/timeNormalization.js +99 -41
- package/dist/utils/timeNormalization.js.map +1 -1
- package/dist/utils/wallTime.d.ts +25 -0
- package/dist/utils/wallTime.d.ts.map +1 -0
- package/dist/utils/wallTime.js +33 -0
- package/dist/utils/wallTime.js.map +1 -0
- package/dist/worker.d.ts +23 -0
- package/dist/worker.d.ts.map +1 -0
- package/dist/worker.js +47 -0
- package/dist/worker.js.map +1 -0
- package/package.json +21 -11
- package/dist/services/bazi/analyzers/HiddenStemsAnalyzer.d.ts +0 -16
- package/dist/services/bazi/analyzers/HiddenStemsAnalyzer.d.ts.map +0 -1
- package/dist/services/bazi/analyzers/HiddenStemsAnalyzer.js +0 -60
- package/dist/services/bazi/analyzers/HiddenStemsAnalyzer.js.map +0 -1
- package/dist/services/bazi/analyzers/NaYinAnalyzer.d.ts +0 -33
- package/dist/services/bazi/analyzers/NaYinAnalyzer.d.ts.map +0 -1
- package/dist/services/bazi/analyzers/NaYinAnalyzer.js +0 -209
- package/dist/services/bazi/analyzers/NaYinAnalyzer.js.map +0 -1
- package/dist/services/bazi/analyzers/ShenShaAnalyzer.d.ts +0 -236
- package/dist/services/bazi/analyzers/ShenShaAnalyzer.d.ts.map +0 -1
- package/dist/services/bazi/analyzers/ShenShaAnalyzer.js +0 -2079
- package/dist/services/bazi/analyzers/ShenShaAnalyzer.js.map +0 -1
- package/dist/services/bazi/analyzers/TraditionalAnalyzer.d.ts +0 -46
- package/dist/services/bazi/analyzers/TraditionalAnalyzer.d.ts.map +0 -1
- package/dist/services/bazi/analyzers/TraditionalAnalyzer.js +0 -260
- package/dist/services/bazi/analyzers/TraditionalAnalyzer.js.map +0 -1
- package/dist/services/qimen/calculators/ZeRiCalculator.d.ts +0 -78
- package/dist/services/qimen/calculators/ZeRiCalculator.d.ts.map +0 -1
- package/dist/services/qimen/calculators/ZeRiCalculator.js +0 -431
- package/dist/services/qimen/calculators/ZeRiCalculator.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrueSolarTime.js","sourceRoot":"","sources":["../../../src/core/bazi/TrueSolarTime.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,2EAK0C;AAE1C,MAAa,aAAa;IACxB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,CAAC,IAAU,EAAE,SAAiB;QACzC,sDAAsD;QACtD,MAAM,EAAE,GAAG,IAAA,2CAAoB,EAC7B,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"TrueSolarTime.js","sourceRoot":"","sources":["../../../src/core/bazi/TrueSolarTime.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,10 @@ export interface BaziCoreResult {
|
|
|
89
89
|
fiveElements: FiveElementsAnalysis;
|
|
90
90
|
voidBranches?: string[];
|
|
91
91
|
twelveGrowthStages?: TwelveGrowthStage[];
|
|
92
|
+
/** 命宫（《三命通会》子平法：子起正月逆数至生月，生时落月宫顺数至卯，五虎遁起干） */
|
|
93
|
+
mingGong?: string;
|
|
94
|
+
/** 胎元（《渊海子平》：月干进一位、月支进三位） */
|
|
95
|
+
taiYuan?: string;
|
|
92
96
|
}
|
|
93
97
|
export interface ElementStrength {
|
|
94
98
|
element: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/bazi/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/bazi/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ class SolarTermsCalculator {
|
|
|
68
68
|
const adjustedMinutes = baseMinutes + yearDiff * 365.2422 * 24 * 60 / 24;
|
|
69
69
|
// 轉換為日期
|
|
70
70
|
const termDate = new Date(2000, 0, 1);
|
|
71
|
-
termDate.setMinutes(termDate.
|
|
71
|
+
termDate.setMinutes(termDate.getUTCMinutes() + adjustedMinutes);
|
|
72
72
|
// 根據節氣索引調整日期（這是簡化版本）
|
|
73
73
|
const month = Math.floor(i / 2);
|
|
74
74
|
const isFirstHalf = i % 2 === 0;
|
|
@@ -96,7 +96,7 @@ class SolarTermsCalculator {
|
|
|
96
96
|
const terms = this.calculateYearSolarTerms(year);
|
|
97
97
|
const dateStr = `${year}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
|
|
98
98
|
return terms.some(term => {
|
|
99
|
-
const termDateStr = `${term.date.
|
|
99
|
+
const termDateStr = `${term.date.getUTCFullYear()}-${String(term.date.getUTCMonth() + 1).padStart(2, '0')}-${String(term.date.getUTCDate()).padStart(2, '0')}`;
|
|
100
100
|
return termDateStr === dateStr;
|
|
101
101
|
});
|
|
102
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolarTermsCalculator.js","sourceRoot":"","sources":["../../../src/core/calendar/SolarTermsCalculator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SolarTermsCalculator.js","sourceRoot":"","sources":["../../../src/core/calendar/SolarTermsCalculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,19 +41,6 @@ export declare function getSolarLongitude(jd: number): number;
|
|
|
41
41
|
* Find the exact moment of a solar term
|
|
42
42
|
* Uses Newton-Raphson iteration for precision
|
|
43
43
|
*/
|
|
44
|
-
export declare function findSolarTermTime(year: number, targetLongitude: number): Date;
|
|
45
|
-
/**
|
|
46
|
-
* Get all 24 solar terms for a given year
|
|
47
|
-
*/
|
|
48
|
-
export declare function getSolarTermsForYear(year: number): Array<{
|
|
49
|
-
name: string;
|
|
50
|
-
date: Date;
|
|
51
|
-
longitude: number;
|
|
52
|
-
}>;
|
|
53
|
-
/**
|
|
54
|
-
* Calculate the precise moment of new moon
|
|
55
|
-
* Used for lunar calendar calculations
|
|
56
|
-
*/
|
|
57
44
|
export declare function getNewMoonTime(k: number): number;
|
|
58
45
|
/**
|
|
59
46
|
* Constants for precise calculations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astronomicalCalendar.d.ts","sourceRoot":"","sources":["../../../src/core/calendar/astronomicalCalendar.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,MAAU,EAChB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAAU,GACjB,MAAM,CAoBR;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAgCA;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAsC9F;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAgBrD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CA+BpD;AAED;;;GAGG;AACH,wBAAgB,
|
|
1
|
+
{"version":3,"file":"astronomicalCalendar.d.ts","sourceRoot":"","sources":["../../../src/core/calendar/astronomicalCalendar.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,MAAU,EAChB,MAAM,GAAE,MAAU,EAClB,MAAM,GAAE,MAAU,GACjB,MAAM,CAoBR;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAgCA;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAsC9F;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAgBrD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CA+BpD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CA4ChD;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;CAQlC,CAAC;AAEF;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAc7E"}
|
|
@@ -11,8 +11,6 @@ exports.julianDayToGregorian = julianDayToGregorian;
|
|
|
11
11
|
exports.getEarthNutationParameter = getEarthNutationParameter;
|
|
12
12
|
exports.getLightAberration = getLightAberration;
|
|
13
13
|
exports.getSolarLongitude = getSolarLongitude;
|
|
14
|
-
exports.findSolarTermTime = findSolarTermTime;
|
|
15
|
-
exports.getSolarTermsForYear = getSolarTermsForYear;
|
|
16
14
|
exports.getNewMoonTime = getNewMoonTime;
|
|
17
15
|
exports.isValidDate = isValidDate;
|
|
18
16
|
/**
|
|
@@ -151,60 +149,6 @@ function getSolarLongitude(jd) {
|
|
|
151
149
|
* Find the exact moment of a solar term
|
|
152
150
|
* Uses Newton-Raphson iteration for precision
|
|
153
151
|
*/
|
|
154
|
-
function findSolarTermTime(year, targetLongitude) {
|
|
155
|
-
// Initial guess: approximate date based on mean solar motion
|
|
156
|
-
const meanDaysPerDegree = 365.2422 / 360;
|
|
157
|
-
const dayOfYear = targetLongitude * meanDaysPerDegree;
|
|
158
|
-
let jd = gregorianToJulianDay(year, 1, 1) + dayOfYear;
|
|
159
|
-
// Newton-Raphson iteration
|
|
160
|
-
const maxIterations = 10;
|
|
161
|
-
const tolerance = 0.00001; // About 0.86 seconds
|
|
162
|
-
for (let i = 0; i < maxIterations; i++) {
|
|
163
|
-
const currentLongitude = getSolarLongitude(jd);
|
|
164
|
-
let diff = targetLongitude - currentLongitude;
|
|
165
|
-
// Handle wraparound at 360/0 degrees
|
|
166
|
-
if (diff > 180)
|
|
167
|
-
diff -= 360;
|
|
168
|
-
if (diff < -180)
|
|
169
|
-
diff += 360;
|
|
170
|
-
if (Math.abs(diff) < tolerance)
|
|
171
|
-
break;
|
|
172
|
-
// Adjust JD based on difference
|
|
173
|
-
// Sun moves approximately 0.9856 degrees per day
|
|
174
|
-
jd += diff / 0.9856;
|
|
175
|
-
}
|
|
176
|
-
const date = julianDayToGregorian(jd);
|
|
177
|
-
return new Date(date.year, date.month - 1, date.day, date.hour, date.minute, date.second);
|
|
178
|
-
}
|
|
179
|
-
/**
|
|
180
|
-
* Get all 24 solar terms for a given year
|
|
181
|
-
*/
|
|
182
|
-
function getSolarTermsForYear(year) {
|
|
183
|
-
const solarTermNames = [
|
|
184
|
-
'立春', '雨水', '惊蛰', '春分', '清明', '谷雨',
|
|
185
|
-
'立夏', '小满', '芒种', '夏至', '小暑', '大暑',
|
|
186
|
-
'立秋', '处暑', '白露', '秋分', '寒露', '霜降',
|
|
187
|
-
'立冬', '小雪', '大雪', '冬至', '小寒', '大寒'
|
|
188
|
-
];
|
|
189
|
-
const terms = [];
|
|
190
|
-
for (let i = 0; i < 24; i++) {
|
|
191
|
-
const longitude = (315 + i * 15) % 360; // Start from 立春 at 315°
|
|
192
|
-
const date = findSolarTermTime(year, longitude);
|
|
193
|
-
// IMPORTANT: Adjust for Beijing time (UTC+8)
|
|
194
|
-
// The astronomical calculations return UTC time, but BaZi uses Beijing time
|
|
195
|
-
const beijingDate = new Date(date.getTime() + 8 * 60 * 60 * 1000);
|
|
196
|
-
terms.push({
|
|
197
|
-
name: solarTermNames[i],
|
|
198
|
-
date: beijingDate,
|
|
199
|
-
longitude
|
|
200
|
-
});
|
|
201
|
-
}
|
|
202
|
-
return terms;
|
|
203
|
-
}
|
|
204
|
-
/**
|
|
205
|
-
* Calculate the precise moment of new moon
|
|
206
|
-
* Used for lunar calendar calculations
|
|
207
|
-
*/
|
|
208
152
|
function getNewMoonTime(k) {
|
|
209
153
|
// k is the lunation number (0 = Jan 6, 2000)
|
|
210
154
|
const T = k / 1236.85;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astronomicalCalendar.js","sourceRoot":"","sources":["../../../src/core/calendar/astronomicalCalendar.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAMH,oDA2BC;AAKD,oDAuCC;AAMD,8DAsCC;AAMD,gDAgBC;AAMD,8CA+BC;AAMD,
|
|
1
|
+
{"version":3,"file":"astronomicalCalendar.js","sourceRoot":"","sources":["../../../src/core/calendar/astronomicalCalendar.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calendar.d.ts","sourceRoot":"","sources":["../../../src/core/calendar/calendar.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,iBAAiB,CAAC;IACzB,GAAG,EAAE,iBAAiB,CAAC;IACvB,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QACb,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;QAC7C,IAAI,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;QAC1C,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,qBAAa,eAAe;IAC1B;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CACzB,IAAI,EAAE,IAAI,EACV,IAAI,GAAE,
|
|
1
|
+
{"version":3,"file":"calendar.d.ts","sourceRoot":"","sources":["../../../src/core/calendar/calendar.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,iBAAiB,CAAC;IACzB,GAAG,EAAE,iBAAiB,CAAC;IACvB,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QACb,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;QAC7C,IAAI,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;QAC1C,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,qBAAa,eAAe;IAC1B;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CACzB,IAAI,EAAE,IAAI,EACV,IAAI,GAAE,MAA2B,EACjC,MAAM,GAAE,MAA6B,GACpC,gBAAgB;IAyDnB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IA2BlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA2CnC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAQjC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IA6BlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAiB3B;;OAEG;IACH,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG;QAC3C,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB;IAyBD;;OAEG;IACH,MAAM,CAAC,mBAAmB,CACxB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gBAAgB,GACvB;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB;CAiCF"}
|
|
@@ -14,10 +14,10 @@ class PreciseCalendar {
|
|
|
14
14
|
* @param minute 分钟 (0-59)
|
|
15
15
|
* @returns 精确的八字信息
|
|
16
16
|
*/
|
|
17
|
-
static calculatePreciseBazi(date, hour = date.
|
|
18
|
-
const year = date.
|
|
19
|
-
const month = date.
|
|
20
|
-
const day = date.
|
|
17
|
+
static calculatePreciseBazi(date, hour = date.getUTCHours(), minute = date.getUTCMinutes()) {
|
|
18
|
+
const year = date.getUTCFullYear();
|
|
19
|
+
const month = date.getUTCMonth() + 1;
|
|
20
|
+
const day = date.getUTCDate();
|
|
21
21
|
// 计算儒略日
|
|
22
22
|
const jd = (0, julian_1.gregorianToJulianDay)(year, month, day, hour, minute);
|
|
23
23
|
// 获取节气信息
|
|
@@ -29,9 +29,9 @@ class PreciseCalendar {
|
|
|
29
29
|
catch (error) {
|
|
30
30
|
// 如果无法获取节气月份，使用备用方法
|
|
31
31
|
solarMonth = {
|
|
32
|
-
monthIndex: date.
|
|
32
|
+
monthIndex: date.getUTCMonth(),
|
|
33
33
|
monthName: ['正月', '二月', '三月', '四月', '五月', '六月',
|
|
34
|
-
'七月', '八月', '九月', '十月', '十一月', '十二月'][date.
|
|
34
|
+
'七月', '八月', '九月', '十月', '十一月', '十二月'][date.getUTCMonth()],
|
|
35
35
|
startTerm: '未知',
|
|
36
36
|
endTerm: '未知'
|
|
37
37
|
};
|
|
@@ -68,7 +68,7 @@ class PreciseCalendar {
|
|
|
68
68
|
* 计算年柱（以立春为分界点）
|
|
69
69
|
*/
|
|
70
70
|
static calculateYearPillar(date, solarTermInfo) {
|
|
71
|
-
let year = date.
|
|
71
|
+
let year = date.getUTCFullYear();
|
|
72
72
|
// 获取该年立春时间
|
|
73
73
|
const solarTerms = (0, solarTerms_1.calculateSolarTerms)(year);
|
|
74
74
|
const lichun = solarTerms[2]; // 立春是第3个节气 (索引2)
|
|
@@ -88,9 +88,9 @@ class PreciseCalendar {
|
|
|
88
88
|
*/
|
|
89
89
|
static calculateMonthPillar(date, yearStem, solarTermInfo) {
|
|
90
90
|
// 获取当前月份的节气信息来确定农历月
|
|
91
|
-
const year = date.
|
|
92
|
-
const month = date.
|
|
93
|
-
const day = date.
|
|
91
|
+
const year = date.getUTCFullYear();
|
|
92
|
+
const month = date.getUTCMonth() + 1; // JavaScript月份从0开始
|
|
93
|
+
const day = date.getUTCDate();
|
|
94
94
|
// 计算当前月的节气月份（以节气为准）
|
|
95
95
|
let lunarMonth;
|
|
96
96
|
try {
|
|
@@ -205,7 +205,7 @@ class PreciseCalendar {
|
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
207
|
// 检查是否在年份边界
|
|
208
|
-
const year = date.
|
|
208
|
+
const year = date.getUTCFullYear();
|
|
209
209
|
const lichun = (0, solarTerms_1.calculateSolarTerms)(year)[2];
|
|
210
210
|
const daysDiff = Math.abs((date.getTime() - lichun.getTime()) / (1000 * 60 * 60 * 24));
|
|
211
211
|
if (daysDiff <= 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/core/calendar/calendar.ts"],"names":[],"mappings":";AAAA,UAAU;;;AAEV,qCAIkB;AAClB,6CAKsB;AACtB,oDAImC;AACnC,2CAIqB;AA8BrB,MAAa,eAAe;IAC1B;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CACzB,IAAU,EACV,OAAe,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/core/calendar/calendar.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ class LunarCalendarService {
|
|
|
43
43
|
// For leap months, the month should be negative in the library's convention
|
|
44
44
|
const lunar = lunar_javascript_1.Lunar.fromYmd(year, month, day);
|
|
45
45
|
const solar = lunar.getSolar();
|
|
46
|
-
return new Date(solar.getYear(), solar.getMonth() - 1, solar.getDay());
|
|
46
|
+
return new Date(Date.UTC(solar.getYear(), solar.getMonth() - 1, solar.getDay()));
|
|
47
47
|
}
|
|
48
48
|
catch (error) {
|
|
49
49
|
console.error('公历转换错误:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lunarCalendar.js","sourceRoot":"","sources":["../../../src/core/calendar/lunarCalendar.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uDAAgD;AAyChD,MAAa,oBAAoB;IAC/B;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;QAC1D,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,wBAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE/B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAClC,OAAO;gBACL,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE;gBACrB,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE;gBACnB,MAAM,EAAE,QAAQ,GAAG,CAAC;gBACpB,SAAS,EAAE,KAAK,CAAC,iBAAiB,EAAE;gBACpC,OAAO,EAAE,KAAK,CAAC,eAAe,EAAE;gBAChC,MAAM,EAAE;oBACN,IAAI,EAAE,KAAK,CAAC,eAAe,EAAE;oBAC7B,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE;oBAC/B,GAAG,EAAE,KAAK,CAAC,cAAc,EAAE;oBAC3B,IAAI,EAAE,EAAE,CAAC,WAAW;iBACrB;gBACD,MAAM,EAAE,KAAK,CAAC,gBAAgB,EAAE;gBAChC,UAAU,EAAE,EAAE,CAAE,sCAAsC;aACvD,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,YAAY,CACjB,IAAY,EACZ,KAAa,EACb,GAAW,EACX,UAAmB,KAAK;QAExB,IAAI,CAAC;YACH,0EAA0E;YAC1E,4EAA4E;YAC5E,MAAM,KAAK,GAAG,wBAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE/B,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lunarCalendar.js","sourceRoot":"","sources":["../../../src/core/calendar/lunarCalendar.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ class PreciseSolarTermCalculator {
|
|
|
63
63
|
* 获取指定日期的节气信息
|
|
64
64
|
*/
|
|
65
65
|
static getSolarTermInfo(date) {
|
|
66
|
-
const year = date.
|
|
66
|
+
const year = date.getUTCFullYear();
|
|
67
67
|
const solarTerms = this.calculateYearSolarTerms(year);
|
|
68
68
|
let currentIndex = -1;
|
|
69
69
|
for (let i = 23; i >= 0; i--) {
|
|
@@ -175,7 +175,7 @@ class PreciseSolarTermCalculator {
|
|
|
175
175
|
// 忽略其他非中文名称
|
|
176
176
|
continue;
|
|
177
177
|
}
|
|
178
|
-
const date = new Date(p.year, p.month - 1, p.day, p.hour || 0, p.minute || 0, p.second || 0);
|
|
178
|
+
const date = new Date(Date.UTC(p.year, p.month - 1, p.day, p.hour || 0, p.minute || 0, p.second || 0));
|
|
179
179
|
const key = `${chineseName}_${p.year}`;
|
|
180
180
|
if (!termsByYear.has(chineseName)) {
|
|
181
181
|
termsByYear.set(chineseName, []);
|
|
@@ -231,7 +231,7 @@ class PreciseSolarTermCalculator {
|
|
|
231
231
|
const currentDate = new Date(startDate);
|
|
232
232
|
while (currentDate <= endDate) {
|
|
233
233
|
try {
|
|
234
|
-
const solar = lunar_javascript_1.Solar.fromYmd(currentDate.
|
|
234
|
+
const solar = lunar_javascript_1.Solar.fromYmd(currentDate.getUTCFullYear(), currentDate.getUTCMonth() + 1, currentDate.getUTCDate());
|
|
235
235
|
const lunar = solar.getLunar();
|
|
236
236
|
const monthGanZhi = lunar.getMonthInGanZhi();
|
|
237
237
|
if (prevMonthGanZhi && monthGanZhi !== prevMonthGanZhi) {
|
|
@@ -241,15 +241,15 @@ class PreciseSolarTermCalculator {
|
|
|
241
241
|
for (const [jieName, branch] of Object.entries(jieToMonthBranch)) {
|
|
242
242
|
if (branch === newBranch) {
|
|
243
243
|
// 检查年份是否匹配（小寒和大雪可能跨年）
|
|
244
|
-
const isCurrentYear = currentDate.
|
|
245
|
-
const isJanNextYear = currentDate.
|
|
246
|
-
const isDecCurrentYear = currentDate.
|
|
244
|
+
const isCurrentYear = currentDate.getUTCFullYear() === year;
|
|
245
|
+
const isJanNextYear = currentDate.getUTCFullYear() === year + 1 && currentDate.getUTCMonth() === 0;
|
|
246
|
+
const isDecCurrentYear = currentDate.getUTCFullYear() === year && currentDate.getUTCMonth() === 11;
|
|
247
247
|
if ((jieName === '小寒' && isJanNextYear) ||
|
|
248
248
|
(jieName === '大雪' && isDecCurrentYear) ||
|
|
249
249
|
(jieName !== '小寒' && jieName !== '大雪' && isCurrentYear)) {
|
|
250
250
|
result.set(jieName, new Date(currentDate));
|
|
251
251
|
}
|
|
252
|
-
else if (jieName === '小寒' && currentDate.
|
|
252
|
+
else if (jieName === '小寒' && currentDate.getUTCFullYear() === year && currentDate.getUTCMonth() === 0) {
|
|
253
253
|
// 当年1月的小寒
|
|
254
254
|
result.set(jieName, new Date(currentDate));
|
|
255
255
|
}
|
|
@@ -262,7 +262,7 @@ class PreciseSolarTermCalculator {
|
|
|
262
262
|
catch (e) {
|
|
263
263
|
// 忽略无效日期
|
|
264
264
|
}
|
|
265
|
-
currentDate.setDate(currentDate.
|
|
265
|
+
currentDate.setDate(currentDate.getUTCDate() + 1);
|
|
266
266
|
}
|
|
267
267
|
return result;
|
|
268
268
|
}
|
|
@@ -394,7 +394,7 @@ function normalizeLongitude(longitude) {
|
|
|
394
394
|
* 获取某月的天数
|
|
395
395
|
*/
|
|
396
396
|
function getDaysInMonth(year, month) {
|
|
397
|
-
return new Date(year, month, 0).
|
|
397
|
+
return new Date(year, month, 0).getUTCDate();
|
|
398
398
|
}
|
|
399
399
|
/**
|
|
400
400
|
* 查找某日期对应的节气
|
|
@@ -402,7 +402,7 @@ function getDaysInMonth(year, month) {
|
|
|
402
402
|
* @returns 节气信息
|
|
403
403
|
*/
|
|
404
404
|
function findSolarTerm(date) {
|
|
405
|
-
const year = date.
|
|
405
|
+
const year = date.getUTCFullYear();
|
|
406
406
|
const terms = calculateSolarTerms(year);
|
|
407
407
|
// 添加前一年最后一个节气和后一年第一个节气
|
|
408
408
|
const prevYearTerms = calculateSolarTerms(year - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solarTerms.js","sourceRoot":"","sources":["../../../src/core/calendar/solarTerms.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"solarTerms.js","sourceRoot":"","sources":["../../../src/core/calendar/solarTerms.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IztroAdapter.d.ts","sourceRoot":"","sources":["../../../src/core/ziwei/IztroAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"IztroAdapter.d.ts","sourceRoot":"","sources":["../../../src/core/ziwei/IztroAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACL,UAAU,EACV,SAAS,EACT,MAAM,EACN,WAAW,EAEX,WAAW,EAGZ,MAAM,4BAA4B,CAAC;AAEpC,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAmB;IAEnC;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAyC7B;;OAEG;IACH,YAAY,IAAI,SAAS;IAezB;;OAEG;IACH,cAAc,IAAI,WAAW;IAiC7B;;OAEG;IACH,UAAU,IAAI,MAAM,EAAE;IAqCtB;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,GAAG;IAenD;;OAEG;IACH,SAAS,IAAI,MAAM;IAInB;;OAEG;IACH,WAAW,IAAI,MAAM;IAIrB;;OAEG;IACH,YAAY,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE;IAUlF;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAwB3C;;OAEG;IACH,WAAW,IAAI,MAAM;IAOrB;;OAEG;IACH,OAAO,CAAC,OAAO;IA6Bf;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;OAEG;IACH,OAAO,CAAC,SAAS;IAiBjB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAsCxB;;OAEG;IACH,YAAY,IAAI,GAAG;CAapB"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.IztroAdapter = void 0;
|
|
8
8
|
const iztro_1 = require("iztro");
|
|
9
|
+
const lunar_javascript_1 = require("lunar-javascript");
|
|
9
10
|
const types_1 = require("../../services/ziwei/types");
|
|
10
11
|
class IztroAdapter {
|
|
11
12
|
astrolabe = null;
|
|
@@ -19,7 +20,12 @@ class IztroAdapter {
|
|
|
19
20
|
init(input) {
|
|
20
21
|
try {
|
|
21
22
|
// 格式化日期
|
|
22
|
-
|
|
23
|
+
// 口径（2026-08-30 裁定）：子初换日——23:00 起即属次日（与八字/六爻/大六壬/奇门统一，
|
|
24
|
+
// 不采用明末清初以后的「早晚子时」区分说）
|
|
25
|
+
const birthSolar = input.hour === 23
|
|
26
|
+
? lunar_javascript_1.Solar.fromYmd(input.year, input.month, input.day).next(1)
|
|
27
|
+
: lunar_javascript_1.Solar.fromYmd(input.year, input.month, input.day);
|
|
28
|
+
const dateStr = `${birthSolar.getYear()}-${birthSolar.getMonth().toString().padStart(2, '0')}-${birthSolar.getDay().toString().padStart(2, '0')}`;
|
|
23
29
|
const hourIndex = types_1.HOUR_TO_INDEX[input.hour] || 0;
|
|
24
30
|
// 保存基本信息
|
|
25
31
|
this.birthDate = dateStr;
|
|
@@ -260,9 +266,10 @@ class IztroAdapter {
|
|
|
260
266
|
* 获取星座
|
|
261
267
|
*/
|
|
262
268
|
getConstellation() {
|
|
263
|
-
|
|
264
|
-
const
|
|
265
|
-
const
|
|
269
|
+
// 直接从 'YYYY-MM-DD' 字符串取分量，绕开 Date 的时区解释
|
|
270
|
+
const parts = String(this.birthDate).split('-').map(Number);
|
|
271
|
+
const month = parts[1];
|
|
272
|
+
const day = parts[2];
|
|
266
273
|
const constellations = [
|
|
267
274
|
{ name: '水瓶座', start: [1, 20], end: [2, 18] },
|
|
268
275
|
{ name: '双鱼座', start: [2, 19], end: [3, 20] },
|