mingyu-core 0.1.6 → 0.1.7
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.md +19 -1
- package/dist/bazi/baziAnalysisFormatter.d.ts.map +1 -1
- package/dist/bazi/baziAnalysisFormatter.js +3 -2
- package/dist/bazi/baziAnalysisFormatter.js.map +1 -1
- package/dist/bazi/baziCalculator.d.ts.map +1 -1
- package/dist/bazi/baziCalculator.js +6 -3
- package/dist/bazi/baziCalculator.js.map +1 -1
- package/dist/bazi/baziCalculatorHelpers.d.ts +2 -2
- package/dist/bazi/baziCalculatorHelpers.d.ts.map +1 -1
- package/dist/bazi/baziCalculatorHelpers.js +2 -19
- package/dist/bazi/baziCalculatorHelpers.js.map +1 -1
- package/dist/bazi/baziEnhancement/classicPatterns.d.ts +1 -0
- package/dist/bazi/baziEnhancement/classicPatterns.d.ts.map +1 -1
- package/dist/bazi/baziEnhancement/classicPatterns.js +41 -12
- package/dist/bazi/baziEnhancement/classicPatterns.js.map +1 -1
- package/dist/bazi/baziPromptEnhancement.d.ts +14 -0
- package/dist/bazi/baziPromptEnhancement.d.ts.map +1 -0
- package/dist/bazi/baziPromptEnhancement.js +414 -0
- package/dist/bazi/baziPromptEnhancement.js.map +1 -0
- package/dist/bazi/baziShenSha/helpers/dayRules.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/helpers/dayRules.js +3 -2
- package/dist/bazi/baziShenSha/helpers/dayRules.js.map +1 -1
- package/dist/bazi/baziShenSha/helpers/disasterRules.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/helpers/disasterRules.js +9 -16
- package/dist/bazi/baziShenSha/helpers/disasterRules.js.map +1 -1
- package/dist/bazi/baziShenSha/helpers/luRules.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/helpers/luRules.js +12 -28
- package/dist/bazi/baziShenSha/helpers/luRules.js.map +1 -1
- package/dist/bazi/baziShenSha/helpers/nobleRules.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/helpers/nobleRules.js +11 -13
- package/dist/bazi/baziShenSha/helpers/nobleRules.js.map +1 -1
- package/dist/bazi/baziShenSha/helpers/types.d.ts +2 -0
- package/dist/bazi/baziShenSha/helpers/types.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/index.d.ts +6 -2
- package/dist/bazi/baziShenSha/index.d.ts.map +1 -1
- package/dist/bazi/baziShenSha/index.js +7 -2
- package/dist/bazi/baziShenSha/index.js.map +1 -1
- package/dist/bazi/baziShenSha/variants.d.ts +17 -0
- package/dist/bazi/baziShenSha/variants.d.ts.map +1 -0
- package/dist/bazi/baziShenSha/variants.js +12 -0
- package/dist/bazi/baziShenSha/variants.js.map +1 -0
- package/dist/bazi/baziTypes.d.ts +2 -0
- package/dist/bazi/baziTypes.d.ts.map +1 -1
- package/dist/bazi/baziTypes.js.map +1 -1
- package/dist/bazi/fortuneModalSelection.d.ts +6 -0
- package/dist/bazi/fortuneModalSelection.d.ts.map +1 -0
- package/dist/bazi/fortuneModalSelection.js +22 -0
- package/dist/bazi/fortuneModalSelection.js.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/breakdown.d.ts +6 -0
- package/dist/bazi/fortuneSelection/helpers/breakdown.d.ts.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/breakdown.js +137 -0
- package/dist/bazi/fortuneSelection/helpers/breakdown.js.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/resolvers.d.ts +9 -0
- package/dist/bazi/fortuneSelection/helpers/resolvers.d.ts.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/resolvers.js +74 -0
- package/dist/bazi/fortuneSelection/helpers/resolvers.js.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/types.d.ts +71 -0
- package/dist/bazi/fortuneSelection/helpers/types.d.ts.map +1 -0
- package/dist/bazi/fortuneSelection/helpers/types.js +2 -0
- package/dist/bazi/fortuneSelection/helpers/types.js.map +1 -0
- package/dist/bazi/fortuneSelection/index.d.ts +6 -0
- package/dist/bazi/fortuneSelection/index.d.ts.map +1 -0
- package/dist/bazi/fortuneSelection/index.js +484 -0
- package/dist/bazi/fortuneSelection/index.js.map +1 -0
- package/dist/bazi/index.d.ts +18 -0
- package/dist/bazi/index.d.ts.map +1 -1
- package/dist/bazi/index.js +14 -0
- package/dist/bazi/index.js.map +1 -1
- package/dist/bazi/kongWang.d.ts +4 -0
- package/dist/bazi/kongWang.d.ts.map +1 -0
- package/dist/bazi/kongWang.js +21 -0
- package/dist/bazi/kongWang.js.map +1 -0
- package/dist/bazi/kongWangAnalysis.d.ts.map +1 -1
- package/dist/bazi/kongWangAnalysis.js +2 -13
- package/dist/bazi/kongWangAnalysis.js.map +1 -1
- package/dist/bazi/tombStorage.d.ts.map +1 -1
- package/dist/bazi/tombStorage.js +23 -10
- package/dist/bazi/tombStorage.js.map +1 -1
- package/dist/divination/algorithms/_shared/wuxing.d.ts +1 -1
- package/dist/divination/algorithms/_shared/wuxing.js +2 -2
- package/dist/divination/algorithms/liuyao.d.ts +5 -0
- package/dist/divination/algorithms/liuyao.d.ts.map +1 -1
- package/dist/divination/algorithms/liuyao.js +22 -18
- package/dist/divination/algorithms/liuyao.js.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/classic-patterns.d.ts.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/classic-patterns.js +58 -93
- package/dist/divination/algorithms/qimen/helpers/classic-patterns.js.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/layout.d.ts +6 -5
- package/dist/divination/algorithms/qimen/helpers/layout.d.ts.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/layout.js +84 -48
- package/dist/divination/algorithms/qimen/helpers/layout.js.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/patterns.d.ts.map +1 -1
- package/dist/divination/algorithms/qimen/helpers/patterns.js +1 -3
- package/dist/divination/algorithms/qimen/helpers/patterns.js.map +1 -1
- package/dist/divination/algorithms/qimen/index.d.ts +3 -2
- package/dist/divination/algorithms/qimen/index.d.ts.map +1 -1
- package/dist/divination/algorithms/qimen/index.js +3 -6
- package/dist/divination/algorithms/qimen/index.js.map +1 -1
- package/dist/divination/tarot.d.ts +1 -1
- package/dist/prompt-evidence/format.d.ts +5 -0
- package/dist/prompt-evidence/format.d.ts.map +1 -0
- package/dist/prompt-evidence/format.js +55 -0
- package/dist/prompt-evidence/format.js.map +1 -0
- package/dist/prompt-evidence/types.d.ts +15 -0
- package/dist/prompt-evidence/types.d.ts.map +1 -0
- package/dist/prompt-evidence/types.js +2 -0
- package/dist/prompt-evidence/types.js.map +1 -0
- package/dist/types/divination.d.ts +6 -0
- package/dist/types/divination.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,414 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AI 提示词增强模块
|
|
3
|
+
* 整合病药法、通关法、经典格局、神煞详解、命局分析维度
|
|
4
|
+
*/
|
|
5
|
+
import { BASIC_MAPPINGS, SAN_HE_MAP, SAN_HUI_MAP } from './baziMappingsData.js';
|
|
6
|
+
import { identifyClassicPattern, generateCareerPartnershipHints, getPeachBlossomDetail, generatePeriodAnalysis, generateAnalysisDimensionHints, generateFriendshipHints, generateMarriageMatchHints, generateChildrenFateHints, generateParentsAnalysisHints, generateSiblingsAnalysisHints, detectDiseaseMedicine, detectTongguanNeed, } from './baziEnhancement/index.js';
|
|
7
|
+
const PILLAR_KEYS = ['year', 'month', 'day', 'hour'];
|
|
8
|
+
const PILLAR_LABELS = {
|
|
9
|
+
year: '年柱',
|
|
10
|
+
month: '月柱',
|
|
11
|
+
day: '日柱',
|
|
12
|
+
hour: '时柱',
|
|
13
|
+
};
|
|
14
|
+
function extractWuxingTokens(text) {
|
|
15
|
+
if (!text)
|
|
16
|
+
return [];
|
|
17
|
+
return Array.from(new Set(text.match(/[木火土金水]/g) || []));
|
|
18
|
+
}
|
|
19
|
+
function extractMedicineWuxingCandidates(medicine) {
|
|
20
|
+
const directionalMatches = Array.from(medicine.matchAll(/([木火土金水])(?:克|泄|调|润|暖|通)/g), (match) => match[1]);
|
|
21
|
+
if (directionalMatches.length > 0) {
|
|
22
|
+
return Array.from(new Set(directionalMatches));
|
|
23
|
+
}
|
|
24
|
+
return extractWuxingTokens(medicine);
|
|
25
|
+
}
|
|
26
|
+
function shouldIncludeDiseaseMedicineSection(medicine, unfavorableWuxing) {
|
|
27
|
+
const medicineWuxings = extractMedicineWuxingCandidates(medicine);
|
|
28
|
+
if (!medicineWuxings.length)
|
|
29
|
+
return true;
|
|
30
|
+
return !medicineWuxings.some((wuxing) => unfavorableWuxing.includes(wuxing));
|
|
31
|
+
}
|
|
32
|
+
function shouldIncludeTongguanSection(tongguan, unfavorableWuxing) {
|
|
33
|
+
const tongguanWuxings = extractWuxingTokens(tongguan);
|
|
34
|
+
if (!tongguanWuxings.length)
|
|
35
|
+
return true;
|
|
36
|
+
return !tongguanWuxings.some((wuxing) => unfavorableWuxing.includes(wuxing));
|
|
37
|
+
}
|
|
38
|
+
function stripSectionTitle(text) {
|
|
39
|
+
return text.replace(/^【[^】]+】/, '').trim();
|
|
40
|
+
}
|
|
41
|
+
function buildEvidenceDrivenHintSection(title, evidence, baseHint) {
|
|
42
|
+
return `【${title}】${evidence}。${stripSectionTitle(baseHint)}`;
|
|
43
|
+
}
|
|
44
|
+
function formatClassicPatternMainClaim(claim) {
|
|
45
|
+
const normalized = claim.replace(/^人/, '');
|
|
46
|
+
return `传统多取象为${normalized},仍需结合原局成败与岁运同看。`;
|
|
47
|
+
}
|
|
48
|
+
function toClassicPatternPromptDescription(description) {
|
|
49
|
+
return description
|
|
50
|
+
.replace(/主大富大贵。?/g, '传统多视为层次较高,仍需结合原局成败与岁运同看。')
|
|
51
|
+
.replace(/主大贵。?/g, '传统多视为层次较高,仍需结合原局成败与岁运同看。')
|
|
52
|
+
.replace(/主清贵富足。?/g, '传统多视为较有清气与发展空间,仍需结合原局成败与岁运同看。')
|
|
53
|
+
.replace(/主清贵。?/g, '传统多视为较有清气与发展空间,仍需结合原局成败与岁运同看。')
|
|
54
|
+
.replace(/主名利双收。?/g, '传统多视为较易兼顾名与利,仍需结合原局成败与岁运同看。')
|
|
55
|
+
.replace(/主异路功名。?/g, '传统多视为发展路径有别于常规,仍需结合原局成败与岁运同看。')
|
|
56
|
+
.replace(/因祸得福。?/g, '传统多视为在冲动与转折中仍可能藏有转机。')
|
|
57
|
+
.replace(/财富丰厚。?/g, '传统多视为物质积累倾向较明显。')
|
|
58
|
+
.replace(/多主([^。;]+)[。;]?/g, (_match, claim) => formatClassicPatternMainClaim(claim))
|
|
59
|
+
.replace(/(^|[^日])主([^。;]+)[。;]?/g, (_match, prefix, claim) => `${prefix}${formatClassicPatternMainClaim(claim)}`);
|
|
60
|
+
}
|
|
61
|
+
function getKongWangEvidence(chartResult) {
|
|
62
|
+
const dayKongWangBranches = chartResult.kongWang?.day || [];
|
|
63
|
+
if (!dayKongWangBranches.length || !chartResult.pillars)
|
|
64
|
+
return [];
|
|
65
|
+
// 提示词只把日柱旬空作为主证,避免把神煞列表中的年空宽松口径写成强证据。
|
|
66
|
+
return PILLAR_KEYS.filter((pillar) => dayKongWangBranches.includes(chartResult.pillars[pillar].zhi)).map((pillar) => PILLAR_LABELS[pillar]);
|
|
67
|
+
}
|
|
68
|
+
function analyzePillarRelations(chartResult) {
|
|
69
|
+
const fuxin = new Set();
|
|
70
|
+
const fanyin = new Set();
|
|
71
|
+
const xingChong = new Set();
|
|
72
|
+
const { pillars } = chartResult;
|
|
73
|
+
if (!pillars) {
|
|
74
|
+
return { fuxin: [], fanyin: [], xingChong: [] };
|
|
75
|
+
}
|
|
76
|
+
for (let i = 0; i < PILLAR_KEYS.length; i += 1) {
|
|
77
|
+
for (let j = i + 1; j < PILLAR_KEYS.length; j += 1) {
|
|
78
|
+
const leftKey = PILLAR_KEYS[i];
|
|
79
|
+
const rightKey = PILLAR_KEYS[j];
|
|
80
|
+
const left = pillars[leftKey];
|
|
81
|
+
const right = pillars[rightKey];
|
|
82
|
+
const leftLabel = PILLAR_LABELS[leftKey];
|
|
83
|
+
const rightLabel = PILLAR_LABELS[rightKey];
|
|
84
|
+
if (left.gan === right.gan && left.zhi === right.zhi) {
|
|
85
|
+
fuxin.add(`${leftLabel}与${rightLabel}干支同为${left.ganZhi}`);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
if (left.gan === right.gan) {
|
|
89
|
+
fuxin.add(`${leftLabel}与${rightLabel}天干同为${left.gan}`);
|
|
90
|
+
}
|
|
91
|
+
if (left.zhi === right.zhi) {
|
|
92
|
+
fuxin.add(`${leftLabel}与${rightLabel}地支同为${left.zhi}`);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
const stemChong = BASIC_MAPPINGS.TIAN_GAN_CHONG[left.gan] === right.gan;
|
|
96
|
+
const branchChong = BASIC_MAPPINGS.DI_ZHI_CHONG[left.zhi] === right.zhi;
|
|
97
|
+
if (stemChong && branchChong) {
|
|
98
|
+
fanyin.add(`${leftLabel}${left.ganZhi}与${rightLabel}${right.ganZhi}成天克地冲`);
|
|
99
|
+
}
|
|
100
|
+
if (BASIC_MAPPINGS.TIAN_GAN_WU_HE[left.gan] === right.gan) {
|
|
101
|
+
xingChong.add(`${leftLabel}${left.gan}与${rightLabel}${right.gan}合`);
|
|
102
|
+
}
|
|
103
|
+
if (stemChong) {
|
|
104
|
+
xingChong.add(`${leftLabel}${left.gan}与${rightLabel}${right.gan}冲`);
|
|
105
|
+
}
|
|
106
|
+
if (BASIC_MAPPINGS.DI_ZHI_LIU_HE[left.zhi] === right.zhi) {
|
|
107
|
+
xingChong.add(`${leftLabel}${left.zhi}与${rightLabel}${right.zhi}六合`);
|
|
108
|
+
}
|
|
109
|
+
if (branchChong) {
|
|
110
|
+
xingChong.add(`${leftLabel}${left.zhi}与${rightLabel}${right.zhi}冲`);
|
|
111
|
+
}
|
|
112
|
+
if (BASIC_MAPPINGS.DI_ZHI_XING[left.zhi]?.includes(right.zhi)) {
|
|
113
|
+
xingChong.add(`${leftLabel}${left.zhi}与${rightLabel}${right.zhi}刑`);
|
|
114
|
+
}
|
|
115
|
+
if (BASIC_MAPPINGS.DI_ZHI_HAI[left.zhi] === right.zhi) {
|
|
116
|
+
xingChong.add(`${leftLabel}${left.zhi}与${rightLabel}${right.zhi}害`);
|
|
117
|
+
}
|
|
118
|
+
if (BASIC_MAPPINGS.DI_ZHI_PO[left.zhi] === right.zhi) {
|
|
119
|
+
xingChong.add(`${leftLabel}${left.zhi}与${rightLabel}${right.zhi}破`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
const allBranches = PILLAR_KEYS.map((pillar) => pillars[pillar].zhi);
|
|
124
|
+
for (const [name, branches] of Object.entries(SAN_HE_MAP)) {
|
|
125
|
+
if (branches.every((branch) => allBranches.includes(branch))) {
|
|
126
|
+
xingChong.add(`地支成${name}三合`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
for (const [name, branches] of Object.entries(SAN_HUI_MAP)) {
|
|
130
|
+
if (branches.every((branch) => allBranches.includes(branch))) {
|
|
131
|
+
xingChong.add(`地支成${name}三会`);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
fuxin: Array.from(fuxin),
|
|
136
|
+
fanyin: Array.from(fanyin),
|
|
137
|
+
xingChong: Array.from(xingChong),
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* 默认的分析维度配置
|
|
142
|
+
*/
|
|
143
|
+
const DEFAULT_ANALYSIS_DIMENSIONS = {
|
|
144
|
+
includeDiseaseMedicine: true,
|
|
145
|
+
includeTongguan: true,
|
|
146
|
+
includeClassicPattern: true,
|
|
147
|
+
includePeachBlossomDetail: true,
|
|
148
|
+
includeLifespan: false,
|
|
149
|
+
includeFuxin: false,
|
|
150
|
+
includeKongWang: false,
|
|
151
|
+
includeXingChong: false,
|
|
152
|
+
includePeriod: false,
|
|
153
|
+
};
|
|
154
|
+
/**
|
|
155
|
+
* 场景对应的分析维度
|
|
156
|
+
*/
|
|
157
|
+
const SCENE_ANALYSIS_DIMENSIONS = {
|
|
158
|
+
marriage: {
|
|
159
|
+
includeDiseaseMedicine: true,
|
|
160
|
+
includeTongguan: true,
|
|
161
|
+
includeClassicPattern: true,
|
|
162
|
+
includePeachBlossomDetail: true,
|
|
163
|
+
includeLifespan: false,
|
|
164
|
+
includeFuxin: true,
|
|
165
|
+
includeKongWang: true,
|
|
166
|
+
includeXingChong: true,
|
|
167
|
+
includePeriod: false,
|
|
168
|
+
},
|
|
169
|
+
career: {
|
|
170
|
+
includeDiseaseMedicine: true,
|
|
171
|
+
includeTongguan: true,
|
|
172
|
+
includeClassicPattern: true,
|
|
173
|
+
includePeachBlossomDetail: false,
|
|
174
|
+
includeLifespan: false,
|
|
175
|
+
includeFuxin: false,
|
|
176
|
+
includeKongWang: false,
|
|
177
|
+
includeXingChong: true,
|
|
178
|
+
includePeriod: true,
|
|
179
|
+
},
|
|
180
|
+
health: {
|
|
181
|
+
includeDiseaseMedicine: true,
|
|
182
|
+
includeTongguan: false,
|
|
183
|
+
includeClassicPattern: false,
|
|
184
|
+
includePeachBlossomDetail: false,
|
|
185
|
+
includeLifespan: true,
|
|
186
|
+
includeFuxin: false,
|
|
187
|
+
includeKongWang: false,
|
|
188
|
+
includeXingChong: false,
|
|
189
|
+
includePeriod: false,
|
|
190
|
+
},
|
|
191
|
+
wealth: {
|
|
192
|
+
includeDiseaseMedicine: true,
|
|
193
|
+
includeTongguan: true,
|
|
194
|
+
includeClassicPattern: true,
|
|
195
|
+
includePeachBlossomDetail: false,
|
|
196
|
+
includeLifespan: false,
|
|
197
|
+
includeFuxin: false,
|
|
198
|
+
includeKongWang: true,
|
|
199
|
+
includeXingChong: true,
|
|
200
|
+
includePeriod: false,
|
|
201
|
+
},
|
|
202
|
+
study: {
|
|
203
|
+
includeDiseaseMedicine: false,
|
|
204
|
+
includeTongguan: false,
|
|
205
|
+
includeClassicPattern: true,
|
|
206
|
+
includePeachBlossomDetail: false,
|
|
207
|
+
includeLifespan: false,
|
|
208
|
+
includeFuxin: false,
|
|
209
|
+
includeKongWang: false,
|
|
210
|
+
includeXingChong: false,
|
|
211
|
+
includePeriod: true,
|
|
212
|
+
},
|
|
213
|
+
children: {
|
|
214
|
+
includeDiseaseMedicine: true,
|
|
215
|
+
includeTongguan: false,
|
|
216
|
+
includeClassicPattern: false,
|
|
217
|
+
includePeachBlossomDetail: true,
|
|
218
|
+
includeLifespan: false,
|
|
219
|
+
includeFuxin: true,
|
|
220
|
+
includeKongWang: true,
|
|
221
|
+
includeXingChong: true,
|
|
222
|
+
includePeriod: false,
|
|
223
|
+
},
|
|
224
|
+
parents: {
|
|
225
|
+
includeDiseaseMedicine: true,
|
|
226
|
+
includeTongguan: false,
|
|
227
|
+
includeClassicPattern: false,
|
|
228
|
+
includePeachBlossomDetail: false,
|
|
229
|
+
includeLifespan: true,
|
|
230
|
+
includeFuxin: false,
|
|
231
|
+
includeKongWang: true,
|
|
232
|
+
includeXingChong: true,
|
|
233
|
+
includePeriod: false,
|
|
234
|
+
},
|
|
235
|
+
general: {
|
|
236
|
+
includeDiseaseMedicine: true,
|
|
237
|
+
includeTongguan: true,
|
|
238
|
+
includeClassicPattern: true,
|
|
239
|
+
includePeachBlossomDetail: true,
|
|
240
|
+
includeLifespan: false,
|
|
241
|
+
includeFuxin: false,
|
|
242
|
+
includeKongWang: false,
|
|
243
|
+
includeXingChong: false,
|
|
244
|
+
includePeriod: false,
|
|
245
|
+
},
|
|
246
|
+
};
|
|
247
|
+
/**
|
|
248
|
+
* 生成经典格局分析片段
|
|
249
|
+
*/
|
|
250
|
+
function generateClassicPatternSection(chartResult) {
|
|
251
|
+
if (!chartResult.pillars)
|
|
252
|
+
return '';
|
|
253
|
+
const dayStem = chartResult.pillars.day.gan;
|
|
254
|
+
const monthBranch = chartResult.pillars.month.zhi;
|
|
255
|
+
const classicPattern = identifyClassicPattern(dayStem, monthBranch, chartResult.pillars, chartResult.hiddenStems, chartResult.analysis?.mingGe?.pattern);
|
|
256
|
+
if (!classicPattern)
|
|
257
|
+
return '';
|
|
258
|
+
return `【经典格局】${classicPattern.name}(传统等级参考:${classicPattern.level},需复核成败) | ${toClassicPatternPromptDescription(classicPattern.description)}`;
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
261
|
+
* 生成桃花详解片段
|
|
262
|
+
*/
|
|
263
|
+
function generatePeachBlossomDetailSection(chartResult) {
|
|
264
|
+
const globalTaohua = chartResult.shensha?.global?.filter((s) => s.includes('桃花')) || [];
|
|
265
|
+
const taohuaPillars = PILLAR_KEYS.filter((pillar) => chartResult.shensha?.[pillar]?.some((s) => s.includes('桃花')));
|
|
266
|
+
if (!globalTaohua.length && !taohuaPillars.length)
|
|
267
|
+
return '';
|
|
268
|
+
const overview = globalTaohua.length
|
|
269
|
+
? globalTaohua.join('、')
|
|
270
|
+
: taohuaPillars.map((pillar) => PILLAR_LABELS[pillar]).join('、');
|
|
271
|
+
const lines = [`【桃花详解】命盘见桃花:${overview}`];
|
|
272
|
+
for (const pillar of PILLAR_KEYS) {
|
|
273
|
+
const pillarTaohua = chartResult.shensha?.[pillar]?.find((s) => s.includes('桃花'));
|
|
274
|
+
if (pillarTaohua) {
|
|
275
|
+
const d = getPeachBlossomDetail(pillar);
|
|
276
|
+
lines.push(`${PILLAR_LABELS[pillar]}:${d.type} | ${d.description} | 提示:${d.favorable} | 留意:${d.unfavorable}`);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
return lines.join('\n');
|
|
280
|
+
}
|
|
281
|
+
function generateFuxinSection(chartResult) {
|
|
282
|
+
const relations = analyzePillarRelations(chartResult);
|
|
283
|
+
const evidences = relations.fuxin.length && relations.fanyin.length
|
|
284
|
+
? [...relations.fuxin, ...relations.fanyin]
|
|
285
|
+
: relations.fuxin.length
|
|
286
|
+
? relations.fuxin
|
|
287
|
+
: relations.fanyin;
|
|
288
|
+
if (!evidences.length)
|
|
289
|
+
return '';
|
|
290
|
+
const evidenceLabel = relations.fuxin.length && relations.fanyin.length
|
|
291
|
+
? '命盘见伏吟、反吟'
|
|
292
|
+
: relations.fuxin.length
|
|
293
|
+
? '命盘见伏吟'
|
|
294
|
+
: '命盘见反吟';
|
|
295
|
+
return buildEvidenceDrivenHintSection('伏吟反吟', `${evidenceLabel}:${evidences.join(';')}`, generateAnalysisDimensionHints('fuxin'));
|
|
296
|
+
}
|
|
297
|
+
function generateKongWangSection(chartResult) {
|
|
298
|
+
const kongWangPillars = getKongWangEvidence(chartResult);
|
|
299
|
+
if (!kongWangPillars.length)
|
|
300
|
+
return '';
|
|
301
|
+
return buildEvidenceDrivenHintSection('空亡详解', `命盘见空亡:${kongWangPillars.join('、')}`, generateAnalysisDimensionHints('kongwang'));
|
|
302
|
+
}
|
|
303
|
+
function generateXingChongSection(chartResult) {
|
|
304
|
+
const relations = analyzePillarRelations(chartResult);
|
|
305
|
+
if (!relations.xingChong.length)
|
|
306
|
+
return '';
|
|
307
|
+
return buildEvidenceDrivenHintSection('刑冲合会破', `命盘见:${relations.xingChong.join(';')}`, generateAnalysisDimensionHints('xingchong'));
|
|
308
|
+
}
|
|
309
|
+
/**
|
|
310
|
+
* 生成限运分析片段
|
|
311
|
+
*/
|
|
312
|
+
function generatePeriodAnalysisSection(chartResult) {
|
|
313
|
+
const { analysis } = chartResult;
|
|
314
|
+
const period = generatePeriodAnalysis(analysis.mingGe, analysis.dayMasterStrength.status, chartResult.pillars?.day.gan || '');
|
|
315
|
+
return `【限运分析】少年(1-16):${period.earlyStage.description}重点:${period.earlyStage.focus.join('、')};青中年(17-45):${period.midStage.description}重点:${period.midStage.focus.join('、')};中老年(46+):${period.lateStage.description}重点:${period.lateStage.focus.join('、')}`;
|
|
316
|
+
}
|
|
317
|
+
/**
|
|
318
|
+
* 根据场景生成增强分析片段
|
|
319
|
+
*/
|
|
320
|
+
export function generateEnhancedAnalysisSection(chartResult, scene = 'general') {
|
|
321
|
+
const config = SCENE_ANALYSIS_DIMENSIONS[scene] || DEFAULT_ANALYSIS_DIMENSIONS;
|
|
322
|
+
const sections = [];
|
|
323
|
+
// 病药法
|
|
324
|
+
if (config.includeDiseaseMedicine) {
|
|
325
|
+
const wuxingCounts = chartResult.wuxingStrength?.percentages;
|
|
326
|
+
if (wuxingCounts && chartResult.analysis?.mingGe) {
|
|
327
|
+
const dm = detectDiseaseMedicine(wuxingCounts, chartResult.analysis.mingGe, chartResult.analysis.dayMasterStrength.status);
|
|
328
|
+
const unfavorableWuxing = chartResult.analysis?.usefulGod?.unfavorableWuxing || [];
|
|
329
|
+
if (dm.hasDisease &&
|
|
330
|
+
dm.medicine &&
|
|
331
|
+
shouldIncludeDiseaseMedicineSection(dm.medicine, unfavorableWuxing)) {
|
|
332
|
+
sections.push(`【病药法】病:${dm.disease} | 药:${dm.medicine}`);
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
// 通关法
|
|
337
|
+
if (config.includeTongguan) {
|
|
338
|
+
const wuxingCounts = chartResult.wuxingStrength?.percentages;
|
|
339
|
+
const favorableWuxing = chartResult.analysis?.usefulGod?.favorableWuxing || [];
|
|
340
|
+
const unfavorableWuxing = chartResult.analysis?.usefulGod?.unfavorableWuxing || [];
|
|
341
|
+
if (wuxingCounts && favorableWuxing.length > 0) {
|
|
342
|
+
const tg = detectTongguanNeed(wuxingCounts, favorableWuxing, unfavorableWuxing);
|
|
343
|
+
if (tg.need &&
|
|
344
|
+
tg.conflict &&
|
|
345
|
+
tg.tongguan &&
|
|
346
|
+
shouldIncludeTongguanSection(tg.tongguan, unfavorableWuxing)) {
|
|
347
|
+
sections.push(`【通关法】${tg.conflict[0]}与${tg.conflict[1]}相战,以${tg.tongguan}通关调和`);
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
// 经典格局
|
|
352
|
+
if (config.includeClassicPattern) {
|
|
353
|
+
const classicSection = generateClassicPatternSection(chartResult);
|
|
354
|
+
if (classicSection)
|
|
355
|
+
sections.push(classicSection);
|
|
356
|
+
}
|
|
357
|
+
// 桃花详解
|
|
358
|
+
if (config.includePeachBlossomDetail) {
|
|
359
|
+
const taohuaSection = generatePeachBlossomDetailSection(chartResult);
|
|
360
|
+
if (taohuaSection)
|
|
361
|
+
sections.push(taohuaSection);
|
|
362
|
+
}
|
|
363
|
+
// 伏吟反吟
|
|
364
|
+
if (config.includeFuxin) {
|
|
365
|
+
const fuxinSection = generateFuxinSection(chartResult);
|
|
366
|
+
if (fuxinSection)
|
|
367
|
+
sections.push(fuxinSection);
|
|
368
|
+
}
|
|
369
|
+
// 空亡详解
|
|
370
|
+
if (config.includeKongWang) {
|
|
371
|
+
const kongWangSection = generateKongWangSection(chartResult);
|
|
372
|
+
if (kongWangSection)
|
|
373
|
+
sections.push(kongWangSection);
|
|
374
|
+
}
|
|
375
|
+
// 刑冲合会破
|
|
376
|
+
if (config.includeXingChong) {
|
|
377
|
+
const xingChongSection = generateXingChongSection(chartResult);
|
|
378
|
+
if (xingChongSection)
|
|
379
|
+
sections.push(xingChongSection);
|
|
380
|
+
}
|
|
381
|
+
// 限运分析
|
|
382
|
+
if (config.includePeriod) {
|
|
383
|
+
const periodSection = generatePeriodAnalysisSection(chartResult);
|
|
384
|
+
if (periodSection)
|
|
385
|
+
sections.push(periodSection);
|
|
386
|
+
}
|
|
387
|
+
// 寿元分析
|
|
388
|
+
if (config.includeLifespan) {
|
|
389
|
+
sections.push(generateAnalysisDimensionHints('lifespan'));
|
|
390
|
+
}
|
|
391
|
+
return sections.join('\n\n');
|
|
392
|
+
}
|
|
393
|
+
/**
|
|
394
|
+
* 生成合盘分析增强片段
|
|
395
|
+
*/
|
|
396
|
+
export function generateCompatibilityEnhancedSection(type) {
|
|
397
|
+
switch (type) {
|
|
398
|
+
case 'marriage':
|
|
399
|
+
return generateMarriageMatchHints();
|
|
400
|
+
case 'career':
|
|
401
|
+
return generateCareerPartnershipHints();
|
|
402
|
+
case 'friendship':
|
|
403
|
+
return generateFriendshipHints();
|
|
404
|
+
case 'children':
|
|
405
|
+
return generateChildrenFateHints();
|
|
406
|
+
case 'parents':
|
|
407
|
+
return generateParentsAnalysisHints();
|
|
408
|
+
case 'siblings':
|
|
409
|
+
return generateSiblingsAnalysisHints();
|
|
410
|
+
default:
|
|
411
|
+
return '';
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
//# sourceMappingURL=baziPromptEnhancement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"baziPromptEnhancement.js","sourceRoot":"","sources":["../../src/bazi/baziPromptEnhancement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dayRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/dayRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE3D;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"dayRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/dayRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE3D;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CA0L9D"}
|
|
@@ -3,7 +3,7 @@ import { BASIC_MAPPINGS } from '../../baziDefinitions.js';
|
|
|
3
3
|
* 吉日凶煞神煞规则
|
|
4
4
|
*/
|
|
5
5
|
export function buildDayRules(ctx) {
|
|
6
|
-
const { zhi, pillarIndex, yueZhi, riGan, riGZ, pillarGZ, ctg } = ctx;
|
|
6
|
+
const { zhi, pillarIndex, yueZhi, riGan, riGZ, pillarGZ, ctg, variants } = ctx;
|
|
7
7
|
return {
|
|
8
8
|
天赦日: () => {
|
|
9
9
|
if (pillarIndex !== 2)
|
|
@@ -103,8 +103,9 @@ export function buildDayRules(ctx) {
|
|
|
103
103
|
return badDays.includes(riGZ);
|
|
104
104
|
},
|
|
105
105
|
童子煞: () => {
|
|
106
|
-
if (pillarIndex !== 2 && pillarIndex !== 3)
|
|
106
|
+
if (variants.tongZiScope === 'day-hour' && pillarIndex !== 2 && pillarIndex !== 3) {
|
|
107
107
|
return false;
|
|
108
|
+
}
|
|
108
109
|
const seasonMap = {
|
|
109
110
|
寅: '春',
|
|
110
111
|
卯: '春',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dayRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/dayRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,GAAgB;IAC5C,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"dayRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/dayRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disasterRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/disasterRules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"disasterRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/disasterRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE3D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CAyInE"}
|
|
@@ -1,25 +1,18 @@
|
|
|
1
|
+
import { calculateKongWangBranches } from '../../kongWang.js';
|
|
1
2
|
/**
|
|
2
3
|
* 灾厄神煞规则
|
|
3
4
|
*/
|
|
4
5
|
export function buildDisasterRules(ctx) {
|
|
5
|
-
const { zhi, nianGan, nianZhi, yueZhi, riGan, riZhi, isMan, ctg, cdz, zhiIdx, baziArray } = ctx;
|
|
6
|
+
const { zhi, nianGan, nianZhi, yueZhi, riGan, riZhi, isMan, ctg, cdz, zhiIdx, baziArray, variants, } = ctx;
|
|
6
7
|
return {
|
|
7
8
|
空亡: () => {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
return [];
|
|
16
|
-
const e1 = (10 + zIdx - gIdx) % 12;
|
|
17
|
-
const e2 = (11 + zIdx - gIdx) % 12;
|
|
18
|
-
return [cdz[e1], cdz[e2]];
|
|
19
|
-
};
|
|
20
|
-
const riEmpty = getEmptyBranches(riGan, riZhi);
|
|
21
|
-
const nianEmpty = getEmptyBranches(nianGan, nianZhi);
|
|
22
|
-
return riEmpty.includes(zhi) || nianEmpty.includes(zhi);
|
|
9
|
+
const riEmpty = calculateKongWangBranches(riGan, riZhi);
|
|
10
|
+
if (riEmpty.includes(zhi))
|
|
11
|
+
return true;
|
|
12
|
+
if (variants.kongWangBasis !== 'day-and-year')
|
|
13
|
+
return false;
|
|
14
|
+
const nianEmpty = calculateKongWangBranches(nianGan, nianZhi);
|
|
15
|
+
return nianEmpty.includes(zhi);
|
|
23
16
|
},
|
|
24
17
|
亡神: () => {
|
|
25
18
|
const map = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disasterRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/disasterRules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"disasterRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/disasterRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"luRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/luRules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"luRules.d.ts","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/luRules.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAa3D;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,CAgH7D"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
|
+
import { REN_BRANCH_MAP, TWELVE_STAGES_MAP } from '../../baziDefinitions.js';
|
|
2
|
+
function getYangRenMap(includeYinRen) {
|
|
3
|
+
if (!includeYinRen)
|
|
4
|
+
return REN_BRANCH_MAP;
|
|
5
|
+
return Object.fromEntries(Object.entries(TWELVE_STAGES_MAP).map(([stem, stages]) => {
|
|
6
|
+
const wangBranch = Object.entries(stages).find(([, stage]) => stage === '帝旺');
|
|
7
|
+
return [stem, wangBranch ? wangBranch[0] : ''];
|
|
8
|
+
}));
|
|
9
|
+
}
|
|
1
10
|
/**
|
|
2
11
|
* 禄刃马星神煞规则
|
|
3
12
|
*/
|
|
4
13
|
export function buildLuRules(ctx) {
|
|
5
|
-
const { zhi, pillarIndex, nianGan, nianZhi, riGan, riZhi, pillarGZ } = ctx;
|
|
14
|
+
const { zhi, pillarIndex, nianGan, nianZhi, riGan, riZhi, pillarGZ, variants } = ctx;
|
|
15
|
+
const yangRenMap = getYangRenMap(variants.yangRenMode === 'include-yin-ren');
|
|
6
16
|
return {
|
|
7
17
|
禄神: () => {
|
|
8
18
|
const map = {
|
|
@@ -20,35 +30,9 @@ export function buildLuRules(ctx) {
|
|
|
20
30
|
return map[riGan] === zhi;
|
|
21
31
|
},
|
|
22
32
|
羊刃: () => {
|
|
23
|
-
|
|
24
|
-
// 注意:月刃格判定(REN_BRANCH_MAP)仅限阳干,此为神煞体系口径更宽,两者不矛盾
|
|
25
|
-
const map = {
|
|
26
|
-
甲: '卯',
|
|
27
|
-
乙: '寅',
|
|
28
|
-
丙: '午',
|
|
29
|
-
丁: '巳',
|
|
30
|
-
戊: '午',
|
|
31
|
-
己: '巳',
|
|
32
|
-
庚: '酉',
|
|
33
|
-
辛: '申',
|
|
34
|
-
壬: '子',
|
|
35
|
-
癸: '亥',
|
|
36
|
-
};
|
|
37
|
-
return map[riGan] === zhi;
|
|
33
|
+
return yangRenMap[riGan] === zhi;
|
|
38
34
|
},
|
|
39
35
|
飞刃: () => {
|
|
40
|
-
const yangRenMap = {
|
|
41
|
-
甲: '卯',
|
|
42
|
-
乙: '寅',
|
|
43
|
-
丙: '午',
|
|
44
|
-
丁: '巳',
|
|
45
|
-
戊: '午',
|
|
46
|
-
己: '巳',
|
|
47
|
-
庚: '酉',
|
|
48
|
-
辛: '申',
|
|
49
|
-
壬: '子',
|
|
50
|
-
癸: '亥',
|
|
51
|
-
};
|
|
52
36
|
const yangRenZhi = yangRenMap[riGan];
|
|
53
37
|
if (!yangRenZhi)
|
|
54
38
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"luRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/luRules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"luRules.js","sourceRoot":"","sources":["../../../../src/bazi/baziShenSha/helpers/luRules.ts"],"names":[],"mappings":"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"}
|