npm - mingyu-core - Versions diffs - 0.1.9 → 0.1.11 - Mend

mingyu-core 0.1.9 → 0.1.11

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.

Files changed (62) hide show

package/README.md +20 -3
package/dist/bazi/baziAnalysisFormatter.js +1 -1
package/dist/bazi/baziAnalysisFormatter.js.map +1 -1
package/dist/bazi/baziAnalysisPipeline.d.ts +1 -1
package/dist/bazi/baziAnalysisPipeline.d.ts.map +1 -1
package/dist/bazi/baziAnalysisPipeline.js +1 -1
package/dist/bazi/baziAnalysisPipeline.js.map +1 -1
package/dist/bazi/baziStrengthAnalyzer.d.ts +5 -1
package/dist/bazi/baziStrengthAnalyzer.d.ts.map +1 -1
package/dist/bazi/baziStrengthAnalyzer.js +37 -6
package/dist/bazi/baziStrengthAnalyzer.js.map +1 -1
package/dist/bazi/baziTypes.d.ts +1 -0
package/dist/bazi/baziTypes.d.ts.map +1 -1
package/dist/bazi/matterFocus.d.ts +1 -1
package/dist/bazi/matterFocus.d.ts.map +1 -1
package/dist/bazi/matterFocus.js +2 -9
package/dist/bazi/matterFocus.js.map +1 -1
package/dist/bazi/monthCommand.d.ts.map +1 -1
package/dist/bazi/monthCommand.js +77 -23
package/dist/bazi/monthCommand.js.map +1 -1
package/dist/bazi/paipanWarnings.d.ts.map +1 -1
package/dist/bazi/paipanWarnings.js +11 -12
package/dist/bazi/paipanWarnings.js.map +1 -1
package/dist/divination/algorithms/astrolabe.d.ts.map +1 -1
package/dist/divination/algorithms/astrolabe.js +26 -2
package/dist/divination/algorithms/astrolabe.js.map +1 -1
package/dist/divination/algorithms/lenormand.d.ts +2 -2
package/dist/divination/algorithms/lenormand.d.ts.map +1 -1
package/dist/divination/algorithms/lenormand.js +4 -4
package/dist/divination/algorithms/lenormand.js.map +1 -1
package/dist/divination/algorithms/meihua/helpers/methods.d.ts +6 -16
package/dist/divination/algorithms/meihua/helpers/methods.d.ts.map +1 -1
package/dist/divination/algorithms/meihua/helpers/methods.js +8 -62
package/dist/divination/algorithms/meihua/helpers/methods.js.map +1 -1
package/dist/divination/algorithms/meihua/index.d.ts +2 -2
package/dist/divination/algorithms/meihua/index.d.ts.map +1 -1
package/dist/divination/algorithms/meihua/index.js +3 -16
package/dist/divination/algorithms/meihua/index.js.map +1 -1
package/dist/divination/algorithms/qimen/helpers/seasonality.d.ts +0 -16
package/dist/divination/algorithms/qimen/helpers/seasonality.d.ts.map +1 -1
package/dist/divination/algorithms/qimen/helpers/seasonality.js +0 -85
package/dist/divination/algorithms/qimen/helpers/seasonality.js.map +1 -1
package/dist/divination/engine/liuren-template.d.ts.map +1 -1
package/dist/divination/engine/liuren-template.js +3 -2
package/dist/divination/engine/liuren-template.js.map +1 -1
package/dist/divination/engine/liuyao-template.d.ts +1 -1
package/dist/divination/engine/liuyao-template.d.ts.map +1 -1
package/dist/divination/engine/liuyao-template.js +10 -10
package/dist/divination/engine/liuyao-template.js.map +1 -1
package/dist/divination/engine/method-text.d.ts +4 -4
package/dist/divination/engine/method-text.d.ts.map +1 -1
package/dist/divination/engine/method-text.js +7 -7
package/dist/divination/engine/method-text.js.map +1 -1
package/dist/divination/index.d.ts +3 -0
package/dist/divination/index.d.ts.map +1 -1
package/dist/divination/index.js +3 -0
package/dist/divination/index.js.map +1 -1
package/dist/ziwei/iztro/index.d.ts +5 -1
package/dist/ziwei/iztro/index.d.ts.map +1 -1
package/dist/ziwei/iztro/index.js +5 -1
package/dist/ziwei/iztro/index.js.map +1 -1
package/package.json +13 -1

package/README.md CHANGED Viewed

@@ -56,16 +56,18 @@ yarn add mingyu-core
 |------|--------|------|
 | **八字 Bazi** | `mingyu-core/bazi` | 四柱排盘、神煞、调候用神、格局、大运、五行强度，含透干根气、十神结构、合化评估、命卦、小运等增强分析 |
 | **六爻 Liuyao** | `mingyu-core/divination/liuyao` | 京房八宫法、纳甲、世应、六亲六神、月破日破、化进退神 |
-| **梅花易数 Meihua** | `mingyu-core/divination/meihua` | 时间/数字/随机/外应/时辰纳卦五种起卦法、体用生克 |
+| **梅花易数 Meihua** | `mingyu-core/divination/meihua` | 时间/数字/随机/外应起卦，timeTrigram 旧参数按时间起卦兼容、体用生克 |
 | **奇门遁甲 Qimen** | `mingyu-core/divination/qimen` | 转盘法、拆补定局、经典格局、节令背景、复合格局、方位应期 |
 | **大六壬 Liuren** | `mingyu-core/divination/liuren` | 月将、贵人、九宗门取传、三传、天将、神煞 |
 | **小六壬 Xiaoliuren** | `mingyu-core/divination/xiaoliuren` | 六宫掌诀、五行生克、月令旺衰 |
 | **择日 Almanac** | `mingyu-core/divination/almanac` | 黄历择日、神煞评分、二十八宿、彭祖百忌 |
 | **灵签 SSGW** | `mingyu-core/divination/ssgw` | 三山国王 92 签随机抽签 |
 | **雷诺曼 Lenormand** | `mingyu-core/divination/lenormand` | 36 张牌、8 种牌阵、牌义组合 |
-| **西洋占星 Astrolabe** | `mingyu-core/divination/astrolabe` | 本命盘、Placidus 宫位、十大相位、行运 |
+| **西洋占星 Astrolabe** | `mingyu-core/divination/astrolabe` | 本命盘、Placidus 宫位、行星、凯龙/四小行星/交点/莉莉丝/福点等扩展点、相位与行运 |
 | **历法 Calendar** | `mingyu-core/calendar` | 农历、干支、节气、空亡、真太阳时 |
 | **类型 Types** | `mingyu-core/types` | 所有共享类型定义 |
+| **占法配置 Config** | `mingyu-core/divination/config` | 占法列表、起盘方式和前端共享配置 |
+| **占法提示文本** | `mingyu-core/divination/engine/method-text`、`mingyu-core/divination/engine/liuyao-template` | 占法方法说明与六爻通用/专项模板 |
 | **原始数据 Data** | `mingyu-core/divination/divination-data` | 五行、六亲、纳甲、星曜等配置数据 |
 | **梅花外应配置** | `mingyu-core/divination/meihua-omens` | 梅花易数外应物象映射 |
 | **六十四卦数据** | `mingyu-core/divination/hexagram-data` | 六爻卦象数据、梅花八卦索引 |
@@ -104,6 +106,8 @@ console.log(result.dayMaster);     // { gan:'乙', element:'木', yinYang:'阴'
 console.log(result.shensha);       // 各柱神煞
 console.log(result.analysis);      // 强度、格局、用神
 console.log(result.luckInfo);      // 大运
+console.log(result.mingGua);       // 命卦（八宅，按立春年界计算）
+console.log(result.warnings);      // 排盘预警；无预警时为空数组
 ```
 神煞争议口径默认采用主流算法：空亡按日柱旬空、羊刃只取阳干帝旺、童子煞只查日柱和时柱。需要兼容其他系统时，可显式传入 `shenShaVariants`：
@@ -145,6 +149,19 @@ const result2 = baziCalculator.calculateBazi({
 });
 ```
+1986-1991 年中国夏令时期间，真太阳时模式会默认把钟表时间自动回拨 60 分钟，并在 `warnings` 中提示校正依据。若你的出生记录已经折算为北京标准时间，可关闭自动校正：
+```typescript
+const result = baziCalculator.calculateBazi({
+  year: 1988, month: 7, day: 15,
+  gender: 'male',
+  useTrueSolarTime: true,
+  birthHour: 12, birthMinute: 0,
+  birthLongitude: 116.4,
+  applyChinaDst: false,
+});
+```
 ### 占卜算法
 ```typescript
@@ -226,7 +243,7 @@ const voidBranches = getVoidBranches('甲子');      // ['戌','亥'] 旬空
 | `analyzeUsefulGodPlacement` | 函数 | 用神落点分析 |
 | `analyzeNayinProfile` | 函数 | 纳音五行分析 |
 | `analyzeMonthQiProfile` | 函数 | 月令气数（旺相休囚死） |
-| `analyzeMatterFocusProfile` | 函数 | 事项宫位分析 |
+| `analyzeMatterFocusProfile` | 函数 | 兼容保留，当前返回空列表，不输出无依据事项分析 |
 | `calculateMingGua` | 函数 | 命卦计算 |
 | `calculateXiaoYunProfile` | 函数 | 小运（童限逐年） |
 | `buildLuckDirectionProfile` | 函数 | 大运顺逆方向 |

package/dist/bazi/baziAnalysisFormatter.js CHANGED Viewed

@@ -126,7 +126,7 @@ function buildBaziText(baziResult, options) {
     result += '\n【核心判断依据】\n';
     const analysis = baziResult.analysis;
     result += `旺衰: ${analysis.dayMasterStrength.status}（得分:${analysis.dayMasterStrength.score}）\n`;
-    result += `旺衰拆分: 月令:${formatSignedScore(analysis.dayMasterStrength.details.seasonalScore)} | 成局:${formatSignedScore(analysis.dayMasterStrength.details.formationStrength)} | 通根:${formatSignedScore(analysis.dayMasterStrength.details.rootStrength)} | 帮扶:${formatSignedScore(analysis.dayMasterStrength.details.supportStrength)} | 克泄耗:${formatSignedScore(-analysis.dayMasterStrength.details.constraintStrength)}\n`;
+    result += `旺衰拆分: 月令:${formatSignedScore(analysis.dayMasterStrength.details.seasonalScore)} | 司令:${formatSignedScore(analysis.dayMasterStrength.details.commanderScore ?? 0)} | 成局:${formatSignedScore(analysis.dayMasterStrength.details.formationStrength)} | 通根:${formatSignedScore(analysis.dayMasterStrength.details.rootStrength)} | 帮扶:${formatSignedScore(analysis.dayMasterStrength.details.supportStrength)} | 克泄耗:${formatSignedScore(-analysis.dayMasterStrength.details.constraintStrength)}\n`;
     result += `格局: ${analysis.mingGe.pattern}\n`;
     if (analysis.mingGe.basis) {
         result += `格局依据: ${analysis.mingGe.basis}\n`;

package/dist/bazi/baziAnalysisFormatter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziAnalysisFormatter.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysisFormatter.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"baziAnalysisFormatter.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysisFormatter.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziAnalysisPipeline.d.ts CHANGED Viewed

@@ -9,7 +9,7 @@ export interface BaziAnalysisPipelineDeps {
     analyzeFormation: (dayMaster: string, pillars: Pillars, getWuxing: (ganOrZhi: string) => Wuxing) => FormationAnalysis;
     analyzeSupport: (dayMaster: string, pillars: Pillars, hiddenStems: HiddenStems, getWuxing: (ganOrZhi: string) => Wuxing) => SupportAnalysis;
     analyzeConstraint: (dayMaster: string, pillars: Pillars, hiddenStems: HiddenStems, getWuxing: (ganOrZhi: string) => Wuxing) => ConstraintAnalysis;
-    analyzeSeasonalStatus: (dayMaster: string, monthBranch: string, getSeasonStatus: (zhi: string) => Record<string, string>, getWuxing: (ganOrZhi: string) => Wuxing) => SeasonalStatusAnalysis;
+    analyzeSeasonalStatus: (dayMaster: string, monthBranch: string, getSeasonStatus: (zhi: string) => Record<string, string>, getWuxing: (ganOrZhi: string) => Wuxing, monthCommander?: string) => SeasonalStatusAnalysis;
     analyzeDayMasterStrength: (seasonalStatus: SeasonalStatusAnalysis, formationAnalysis: FormationAnalysis, rootAnalysis: RootAnalysis, supportAnalysis: SupportAnalysis, constraintAnalysis: ConstraintAnalysis) => DayMasterStrengthAnalysis;
     determinePattern: (pillars: Pillars, strengthStatus: string, getTenGod: (gan: string, dayMaster: string) => string, monthCommander?: string) => PatternAnalysis;
     determineUsefulGod: (strengthStatus: string, pattern: PatternAnalysis, dmWuxing: string, monthBranch?: string, monthCommander?: string, dayMasterStem?: string, climateContext?: {

package/dist/bazi/baziAnalysisPipeline.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziAnalysisPipeline.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysisPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,EACX,eAAe,EACf,OAAO,EACP,YAAY,EACZ,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,MAAM,EACP,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAExF,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzD,WAAW,EAAE,CACX,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,KACpC,YAAY,CAAC;IAClB,gBAAgB,EAAE,CAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,KACpC,iBAAiB,CAAC;IACvB,cAAc,EAAE,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,KACpC,eAAe,CAAC;IACrB,iBAAiB,EAAE,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,KACpC,kBAAkB,CAAC;IACxB,qBAAqB,EAAE,CACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,~~KACpC~~,sBAAsB,CAAC;IAC5B,wBAAwB,EAAE,CACxB,cAAc,EAAE,sBAAsB,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,KACnC,yBAAyB,CAAC;IAC/B,gBAAgB,EAAE,CAChB,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,EACrD,cAAc,CAAC,EAAE,MAAM,KACpB,eAAe,CAAC;IACrB,kBAAkB,EAAE,CAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,MAAM,EACtB,cAAc,CAAC,EAAE;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;QACzC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACvC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC5B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACvC,KACE,iBAAiB,GAAG;QAAE,eAAe,EAAE,MAAM,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACrF;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;CAC/C;~~AAqJD~~,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,wBAAwB;eAE1D,yBAAyB,GAAG,kBAAkB;EAI5D"}
1	+ {"version":3,"file":"baziAnalysisPipeline.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysisPipeline.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziAnalysisPipeline.js CHANGED Viewed

@@ -64,7 +64,7 @@ function buildPipelineState(input, deps) {
     const formationAnalysis = deps.analyzeFormation(dayMaster, pillars, deps.getWuxing);
     const supportAnalysis = deps.analyzeSupport(dayMaster, pillars, hiddenStems, deps.getWuxing);
     const constraintAnalysis = deps.analyzeConstraint(dayMaster, pillars, hiddenStems, deps.getWuxing);
-    const seasonalStatus = deps.analyzeSeasonalStatus(dayMaster, monthBranch, deps.getSeasonStatus, deps.getWuxing);
+    const seasonalStatus = deps.analyzeSeasonalStatus(dayMaster, monthBranch, deps.getSeasonStatus, deps.getWuxing, monthCommander);
     const dayMasterStrength = deps.analyzeDayMasterStrength(seasonalStatus, formationAnalysis, rootAnalysis, supportAnalysis, constraintAnalysis);
     const pattern = deps.determinePattern(pillars, dayMasterStrength.status, deps.getTenGod, monthCommander);
     const usefulGod = deps.determineUsefulGod(dayMasterStrength.status, pattern, dayMasterElement, monthBranch, monthCommander, dayMaster, {

package/dist/bazi/baziAnalysisPipeline.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziAnalysisPipeline.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysisPipeline.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;~~AAmFvE~~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"}
1	+ {"version":3,"file":"baziAnalysisPipeline.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysisPipeline.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziStrengthAnalyzer.d.ts CHANGED Viewed

@@ -2,6 +2,10 @@ import type { ConstraintAnalysis, DayMasterStrengthAnalysis, HiddenStems, Pillar
 export interface SeasonalStatusAnalysis {
     status: string;
     score: number;
+    baseScore?: number;
+    commanderStem?: string;
+    commanderScore?: number;
+    commanderEffect?: '助身' | '生身' | '泄身' | '耗身' | '克身' | '中性';
     isTimely: boolean;
 }
 export interface FormationAnalysis {
@@ -19,7 +23,7 @@ type GetSeasonStatusFn = (zhi: string) => Record<string, string>;
 export declare function analyzeRoot(dayMaster: string, pillars: Pillars, hiddenStems: HiddenStems, getWuxing: GetWuxingFn): RootAnalysis;
 export declare function analyzeSupport(dayMaster: string, pillars: Pillars, hiddenStems: HiddenStems, getWuxing: GetWuxingFn): SupportAnalysis;
 export declare function analyzeConstraint(dayMaster: string, pillars: Pillars, hiddenStems: HiddenStems, getWuxing: GetWuxingFn): ConstraintAnalysis;
-export declare function analyzeSeasonalStatus(dayMaster: string, monthBranch: string, getSeasonStatus: GetSeasonStatusFn, getWuxing: GetWuxingFn): SeasonalStatusAnalysis;
+export declare function analyzeSeasonalStatus(dayMaster: string, monthBranch: string, getSeasonStatus: GetSeasonStatusFn, getWuxing: GetWuxingFn, monthCommander?: string): SeasonalStatusAnalysis;
 export declare function analyzeFormation(dayMaster: string, pillars: Pillars, getWuxing: GetWuxingFn): FormationAnalysis;
 export declare function analyzeDayMasterStrength(seasonalStatus: SeasonalStatusAnalysis, formationAnalysis: FormationAnalysis, rootAnalysis: RootAnalysis, supportAnalysis: SupportAnalysis, constraintAnalysis: ConstraintAnalysis): DayMasterStrengthAnalysis;
 export {};

package/dist/bazi/baziStrengthAnalyzer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziStrengthAnalyzer.d.ts","sourceRoot":"","sources":["../../src/bazi/baziStrengthAnalyzer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,EACX,OAAO,EACP,YAAY,EACZ,eAAe,EACf,MAAM,EACP,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,KAAK,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QACzC,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,KAAK,WAAW,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;AAChD,KAAK,iBAAiB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;~~AAEjE~~,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,YAAY,CA6Bd;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,eAAe,CAiDjB;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,kBAAkB,CAuEpB;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,iBAAiB,EAClC,SAAS,EAAE,WAAW,~~GACrB~~,sBAAsB,~~CAiBxB~~;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,GACrB,iBAAiB,CAqEnB;AAED,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,sBAAsB,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,GACrC,yBAAyB,~~CA4C3B~~"}
1	+ {"version":3,"file":"baziStrengthAnalyzer.d.ts","sourceRoot":"","sources":["../../src/bazi/baziStrengthAnalyzer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,EACX,OAAO,EACP,YAAY,EACZ,eAAe,EACf,MAAM,EACP,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1D,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,KAAK,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QACzC,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,KAAK,WAAW,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;AAChD,KAAK,iBAAiB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AA6BjE,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,YAAY,CA6Bd;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,eAAe,CAiDjB;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,WAAW,GACrB,kBAAkB,CAuEpB;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,iBAAiB,EAClC,SAAS,EAAE,WAAW,EACtB,cAAc,CAAC,EAAE,MAAM,GACtB,sBAAsB,CA2BxB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,GACrB,iBAAiB,CAqEnB;AAED,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,sBAAsB,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,kBAAkB,GACrC,yBAAyB,CAiD3B"}

package/dist/bazi/baziStrengthAnalyzer.js CHANGED Viewed

@@ -1,5 +1,23 @@
 import { BASIC_MAPPINGS } from './baziDefinitions.js';
 import { collectCompleteBranchFormations } from './baziFormationUtils.js';
+function resolveCommanderEffect(dayMasterWuxing, commanderWuxing) {
+    if (commanderWuxing === dayMasterWuxing) {
+        return { commanderScore: 1.5, commanderEffect: '助身' };
+    }
+    if (BASIC_MAPPINGS.WUXING_SHENG[commanderWuxing] === dayMasterWuxing) {
+        return { commanderScore: 1, commanderEffect: '生身' };
+    }
+    if (BASIC_MAPPINGS.WUXING_SHENG[dayMasterWuxing] === commanderWuxing) {
+        return { commanderScore: -0.8, commanderEffect: '泄身' };
+    }
+    if (BASIC_MAPPINGS.WUXING_KE[dayMasterWuxing] === commanderWuxing) {
+        return { commanderScore: -1, commanderEffect: '耗身' };
+    }
+    if (BASIC_MAPPINGS.WUXING_KE[commanderWuxing] === dayMasterWuxing) {
+        return { commanderScore: -1.3, commanderEffect: '克身' };
+    }
+    return { commanderScore: 0, commanderEffect: '中性' };
+}
 export function analyzeRoot(dayMaster, pillars, hiddenStems, getWuxing) {
     const roots = [];
     let totalStrength = 0;
@@ -124,7 +142,7 @@ export function analyzeConstraint(dayMaster, pillars, hiddenStems, getWuxing) {
         hasConstraint: constraints.length > 0,
     };
 }
-export function analyzeSeasonalStatus(dayMaster, monthBranch, getSeasonStatus, getWuxing) {
+export function analyzeSeasonalStatus(dayMaster, monthBranch, getSeasonStatus, getWuxing, monthCommander) {
     const season = getSeasonStatus(monthBranch);
     const dayMasterWuxing = getWuxing(dayMaster);
     const seasonStatus = season[dayMasterWuxing];
@@ -135,9 +153,18 @@ export function analyzeSeasonalStatus(dayMaster, monthBranch, getSeasonStatus, g
         囚: -2,
         死: -4,
     };
+    const baseScore = scoreMap[seasonStatus] ?? 0;
+    const commanderWuxing = monthCommander ? getWuxing(monthCommander) : undefined;
+    const commander = commanderWuxing
+        ? resolveCommanderEffect(dayMasterWuxing, commanderWuxing)
+        : { commanderScore: 0, commanderEffect: '中性' };
     return {
         status: seasonStatus || '未知',
-        score: scoreMap[seasonStatus] ?? 0,
+        score: Number((baseScore + (commander.commanderScore ?? 0)).toFixed(1)),
+        baseScore,
+        commanderStem: monthCommander,
+        commanderScore: commander.commanderScore,
+        commanderEffect: commander.commanderEffect,
         isTimely: seasonStatus === '旺' || seasonStatus === '相',
     };
 }
@@ -198,7 +225,10 @@ export function analyzeFormation(dayMaster, pillars, getWuxing) {
     };
 }
 export function analyzeDayMasterStrength(seasonalStatus, formationAnalysis, rootAnalysis, supportAnalysis, constraintAnalysis) {
-    const score = Number((seasonalStatus.score +
+    const seasonalBaseScore = seasonalStatus.baseScore ?? seasonalStatus.score;
+    const commanderScore = seasonalStatus.commanderScore ?? 0;
+    const seasonalTotalScore = seasonalStatus.baseScore === undefined ? seasonalStatus.score : seasonalBaseScore + commanderScore;
+    const score = Number((seasonalTotalScore +
         formationAnalysis.totalStrength +
         rootAnalysis.totalStrength +
         supportAnalysis.totalStrength -
@@ -213,13 +243,13 @@ export function analyzeDayMasterStrength(seasonalStatus, formationAnalysis, root
     if (score <= 1)
         status = '身弱';
     if (rootAnalysis.strongRoot &&
-        seasonalStatus.score >= 2 &&
+        seasonalTotalScore >= 2 &&
         formationAnalysis.totalStrength >= 0 &&
         constraintAnalysis.totalStrength <= 1.5) {
         status = '极强';
     }
     if (!rootAnalysis.hasRoot &&
-        seasonalStatus.score <= 0 &&
+        seasonalTotalScore <= 0 &&
         (supportAnalysis.totalStrength <= 0.5 || score <= 0)) {
         status = '极弱';
     }
@@ -227,7 +257,8 @@ export function analyzeDayMasterStrength(seasonalStatus, formationAnalysis, root
         score,
         status,
         details: {
-            seasonalScore: seasonalStatus.score,
+            seasonalScore: seasonalBaseScore,
+            commanderScore,
             timely: seasonalStatus.isTimely,
             formationStrength: formationAnalysis.totalStrength,
             rootStrength: rootAnalysis.totalStrength,

package/dist/bazi/baziStrengthAnalyzer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziStrengthAnalyzer.js","sourceRoot":"","sources":["../../src/bazi/baziStrengthAnalyzer.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"baziStrengthAnalyzer.js","sourceRoot":"","sources":["../../src/bazi/baziStrengthAnalyzer.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziTypes.d.ts CHANGED Viewed

@@ -186,6 +186,7 @@ export interface DayMasterStrengthAnalysis {
     status: string;
     details: {
         seasonalScore: number;
+        commanderScore?: number;
         timely: boolean;
         formationStrength: number;
         rootStrength: number;

package/dist/bazi/baziTypes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baziTypes.d.ts","sourceRoot":"","sources":["../../src/bazi/baziTypes.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"baziTypes.d.ts","sourceRoot":"","sources":["../../src/bazi/baziTypes.ts"],"names":[],"mappings":"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"}

package/dist/bazi/matterFocus.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { MatterFocusProfile } from '../types/analysis';
-export declare function analyzeMatterFocusProfile(gender: string, favorableWuxing: string[]): MatterFocusProfile;
+export declare function analyzeMatterFocusProfile(_gender: string, _favorableWuxing: string[]): MatterFocusProfile;
 //# sourceMappingURL=matterFocus.d.ts.map

package/dist/bazi/matterFocus.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"matterFocus.d.ts","sourceRoot":"","sources":["../../src/bazi/matterFocus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,~~EAAmB~~,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;~~AAE7E~~,wBAAgB,yBAAyB,CACvC,~~MAAM~~,EAAE,MAAM,~~EACd~~,~~eAAe~~,EAAE,MAAM,EAAE,~~GACxB~~,kBAAkB,~~CASpB~~"}
1	+ {"version":3,"file":"matterFocus.d.ts","sourceRoot":"","sources":["../../src/bazi/matterFocus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,EAAE,GACzB,kBAAkB,CAEpB"}

package/dist/bazi/matterFocus.js CHANGED Viewed

@@ -1,11 +1,4 @@
-export function analyzeMatterFocusProfile(gender, favorableWuxing) {
-    const items = [
-        { topic: '事业', relatedPalaces: ['官禄', '迁移'], keyStars: [''], priority: 10 },
-        { topic: '财运', relatedPalaces: ['财帛', '田宅'], keyStars: [''], priority: 9 },
-        { topic: '感情', relatedPalaces: ['夫妻', '子女'], keyStars: [''], priority: 8 },
-        { topic: '健康', relatedPalaces: ['疾厄'], keyStars: [''], priority: 7 },
-        { topic: '人际', relatedPalaces: ['兄弟', '父母'], keyStars: [''], priority: 6 },
-    ];
-    return { items };
+export function analyzeMatterFocusProfile(_gender, _favorableWuxing) {
+    return { items: [] };
 }
 //# sourceMappingURL=matterFocus.js.map

package/dist/bazi/matterFocus.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"matterFocus.js","sourceRoot":"","sources":["../../src/bazi/matterFocus.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,yBAAyB,CACvC,~~MAAc~~,~~EACd~~,~~eAAyB~~;~~IAEzB~~,~~MAAM~~,~~KAAK,GAAsB;QAC/B,~~EAAE,KAAK,EAAE,~~IAAI,~~EAAE,~~cAAc,~~EAAE,CAAC~~,IAAI,EAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE~~;~~QAC1E~~,~~EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,~~CAAC,IAAI,EAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;QACzE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;QACzE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;QACpE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;KAC1E,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC"}
1	+ {"version":3,"file":"matterFocus.js","sourceRoot":"","sources":["../../src/bazi/matterFocus.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,gBAA0B;IAE1B,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AACvB,CAAC"}

package/dist/bazi/monthCommand.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monthCommand.d.ts","sourceRoot":"","sources":["../../src/bazi/monthCommand.ts"],"names":[],"mappings":"~~AACA~~,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,mBAAmB,CAAC;~~AAE5E~~,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,cAAc,~~CAsBhB~~"}
1	+ {"version":3,"file":"monthCommand.d.ts","sourceRoot":"","sources":["../../src/bazi/monthCommand.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAwC5E,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,cAAc,CAyDhB"}

package/dist/bazi/monthCommand.js CHANGED Viewed

@@ -1,27 +1,81 @@
+import { BASIC_MAPPINGS, SEASON_STATUS } from './baziDefinitions.js';
+import { WUXING } from './baziTypes.js';
+const STATUS_SCORE = {
+    旺: 4,
+    相: 2,
+    休: 0,
+    囚: -2,
+    死: -4,
+};
+const STATUS_WEIGHT = {
+    旺: 40,
+    相: 26,
+    休: 16,
+    囚: 10,
+    死: 8,
+};
+function getStemWuxing(stem) {
+    if (!stem)
+        return undefined;
+    const index = BASIC_MAPPINGS.HEAVENLY_STEMS.indexOf(stem);
+    return index >= 0 ? BASIC_MAPPINGS.STEM_WUXING[index] : undefined;
+}
+function getBranchWuxing(branch) {
+    const index = BASIC_MAPPINGS.EARTHLY_BRANCHES.indexOf(branch);
+    return index >= 0 ? BASIC_MAPPINGS.BRANCH_WUXING[index] : undefined;
+}
+function getMonthLeadingElement(monthBranch) {
+    const season = SEASON_STATUS[monthBranch];
+    const wangElement = Object.entries(season ?? {}).find(([, status]) => status === '旺')?.[0];
+    return wangElement ?? getBranchWuxing(monthBranch);
+}
+function formatSignedScore(value) {
+    const rounded = Number(value.toFixed(1));
+    return `${rounded >= 0 ? '+' : ''}${rounded}`;
+}
 export function analyzeMonthQiProfile(monthBranch, commanderStem) {
-    const elemMap = { 寅: '木', 卯: '木', 辰: '土', 巳: '火', 午: '火', 未: '土', 申: '金', 酉: '金', 戌: '土', 亥: '水', 子: '水', 丑: '土' };
-    const seasonElements = ['木', '火', '土', '金', '水'];
-    const monthElement = elemMap[monthBranch] || '土';
-    const items = seasonElements.map((elem) => {
-        let seasonStatus = '平';
-        if (elem === monthElement)
-            seasonStatus = '旺';
-        else if ((monthElement === '木' && elem === '火') || (monthElement === '火' && elem === '土') ||
-            (monthElement === '土' && elem === '金') || (monthElement === '金' && elem === '水') ||
-            (monthElement === '水' && elem === '木'))
-            seasonStatus = '相';
-        else if ((elem === '木' && monthElement === '火') || (elem === '火' && monthElement === '土') ||
-            (elem === '土' && monthElement === '金') || (elem === '金' && monthElement === '水') ||
-            (elem === '水' && monthElement === '木'))
-            seasonStatus = '休';
-        else if ((monthElement === '木' && elem === '金') || (monthElement === '火' && elem === '水') ||
-            (monthElement === '土' && elem === '木') || (monthElement === '金' && elem === '火') ||
-            (monthElement === '水' && elem === '土'))
-            seasonStatus = '囚';
-        else
-            seasonStatus = '死';
-        return { element: elem, seasonStatus, score: 0, percent: 0, count: 0, summary: elem + '于' + monthBranch + '月' + seasonStatus };
+    const season = SEASON_STATUS[monthBranch] ?? {};
+    const commanderWuxing = getStemWuxing(commanderStem);
+    const rawItems = WUXING.map((element) => {
+        const seasonStatus = season[element] ?? '平';
+        const commanderBonus = commanderWuxing === element ? 1.5 : 0;
+        const score = Number(((STATUS_SCORE[seasonStatus] ?? 0) + commanderBonus).toFixed(1));
+        const weight = (STATUS_WEIGHT[seasonStatus] ?? 12) + (commanderBonus > 0 ? 12 : 0);
+        const count = (season[element] ? 1 : 0) + (commanderBonus > 0 ? 1 : 0);
+        return {
+            element,
+            seasonStatus,
+            score,
+            weight,
+            count,
+        };
+    });
+    const totalWeight = rawItems.reduce((sum, item) => sum + item.weight, 0) || 1;
+    const items = rawItems.map((item) => {
+        const percent = Number(((item.weight / totalWeight) * 100).toFixed(1));
+        const commanderText = commanderWuxing === item.element && commanderStem ? `，${commanderStem}司令加权` : '';
+        return {
+            element: item.element,
+            seasonStatus: item.seasonStatus,
+            score: item.score,
+            percent,
+            count: item.count,
+            summary: `${item.element}于${monthBranch}月${item.seasonStatus}，分数${formatSignedScore(item.score)}，气数约${percent}%${commanderText}`,
+        };
     });
-    return { commanderStem: commanderStem || '', leadingElements: [monthElement], items, summary: monthBranch + '月令分析' };
+    const leadingElements = [
+        ...new Set([getMonthLeadingElement(monthBranch), commanderWuxing].filter((element) => Boolean(element))),
+    ];
+    return {
+        commanderStem: commanderStem || '',
+        leadingElements,
+        items,
+        summary: [
+            `${monthBranch}月令以${leadingElements.join('、') || '未知'}为主`,
+            commanderStem && commanderWuxing ? `${commanderStem}${commanderWuxing}司令` : '',
+        ]
+            .filter(Boolean)
+            .join('，'),
+    };
 }
 //# sourceMappingURL=monthCommand.js.map

package/dist/bazi/monthCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monthCommand.js","sourceRoot":"","sources":["../../src/bazi/monthCommand.ts"],"names":[],"mappings":"~~AAGA~~,MAAM,~~UAAU~~,~~qBAAqB~~,~~CACnC~~,~~WAAmB~~,~~EACnB~~,~~aAAsB~~;~~IAEtB~~,MAAM,~~OAAO~~,GAA2B,EAAE,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC,~~CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC,~~CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAC~~,CAAC,~~EAAC~~,GAAG,~~EAAC~~,CAAC,~~EAAC~~,~~GAAG~~,~~EAAE~~,CAAC;~~IACpH~~,~~MAAM~~,~~cAAc~~,~~GAAG~~,CAAC,~~GAAG~~,~~EAAC~~,~~GAAG~~,~~EAAC~~,~~GAAG~~,~~EAAC~~,~~GAAG~~,~~EAAC~~,~~GAAG~~,CAAC,CAAC;~~IAC7C~~,MAAM,~~YAAY~~,GAAG,~~OAAO~~,CAAC,~~WAAW~~,CAAC,~~IAAI~~,~~GAAG~~,CAAC;~~IAEjD~~,~~MAAM~~,KAAK,~~GAAyB~~,~~cAAc~~,CAAC,~~GAAG~~,CAAC,CAAC,~~IAAI~~,~~EAAE~~,~~EAAE;QAC9D~~,~~IAAI~~,~~YAAY~~,~~GAAG~~,~~GAAG~~,CAAC;~~QACvB~~,~~IAAI~~,~~IAAI~~,~~KAAK~~,~~YAAY~~;~~YAAE~~,~~YAAY~~,~~GAAG~~,GAAG,CAAC~~;aACzC~~,~~IAAI~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,IAAI,~~KAAK~~,~~GAAG~~,CAAC,IAAI,CAAC,~~YAAY~~,KAAK,GAAG,~~IAAI~~,IAAI,~~KAAK~~,~~GAAG~~,CAAC;~~YAChF~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,~~IAAI~~,KAAK,~~GAAG~~,CAAC,~~IAAI~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,IAAI,~~KAAK~~,GAAG,CAAC;~~YAChF~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,IAAI,~~KAAK~~,GAAG,CAAC;~~YAAE~~,~~YAAY~~,~~GAAG~~,GAAG,CAAC~~;aAC/D~~,~~IAAI~~,CAAC,~~IAAI~~,~~KAAK~~,~~GAAG~~,~~IAAI~~,YAAY,~~KAAK,~~GAAG,CAAC,~~IAAI~~,CAAC,IAAI,~~KAAK~~,GAAG,~~IAAI~~,~~YAAY,~~KAAK,GAAG,CAAC~~;YAChF~~,CAAC,~~IAAI~~,KAAK,GAAG,~~IAAI~~,YAAY,~~KAAK~~,~~GAAG~~,CAAC,IAAI,CAAC,~~IAAI~~,~~KAAK,~~GAAG,~~IAAI~~,~~YAAY~~,~~KAAK~~,~~GAAG~~,CAAC~~;YAChF~~,CAAC,~~IAAI~~,~~KAAK~~,GAAG,~~IAAI~~,YAAY,~~KAAK~~,GAAG,CAAC~~;YAAE~~,~~YAAY~~,GAAG,~~GAAG~~,CAAC~~;aAC/D~~,~~IAAI~~,CAAC,~~YAAY~~,KAAK,GAAG,~~IAAI~~,~~IAAI~~,~~KAAK~~,GAAG,CAAC,~~IAAI~~,CAAC,YAAY,KAAK,~~GAAG~~,~~IAAI~~,~~IAAI~~,~~KAAK~~,~~GAAG~~,CAAC;~~YAChF~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,IAAI,~~KAAK~~,~~GAAG~~,CAAC,IAAI,CAAC,~~YAAY~~,~~KAAK~~,~~GAAG~~,~~IAAI~~,IAAI,KAAK,GAAG,CAAC~~;YAChF~~,CAAC,~~YAAY~~,~~KAAK~~,GAAG,~~IAAI~~,IAAI,~~KAAK~~,GAAG,CAAC~~;YAAE~~,~~YAAY,~~GAAG,GAAG,CAAC~~;;YAC/D~~,~~YAAY~~,~~GAAG~~,~~GAAG~~,CAAC;~~QACxB~~,OAAO,EAAE,OAAO,EAAE,IAAI,~~EAAE~~,YAAY,EAAE,KAAK,EAAE,CAAC,~~EAAE~~,OAAO,EAAE,CAAC,~~EAAE,~~KAAK,EAAE,CAAC,~~EAAE~~,OAAO,~~EAAE~~,IAAI,GAAG,GAAG,GAAG,WAAW,~~GAAG~~,~~GAAG~~,~~GAAG~~,~~YAAY~~,EAAE,CAAC~~;IACjI~~,CAAC,CAAC,CAAC;~~IAEH~~,OAAO,~~EAAE,~~aAAa,EAAE,aAAa,IAAI,EAAE,EAAE,eAAe,~~EAAE~~,CAAC,~~YAAY~~,CAAC,~~EAAE~~,~~KAAK~~,~~EAAE~~,~~OAAO~~,~~EAAE~~,~~WAAW~~,GAAG,~~MAAM~~,EAAE,CAAC;~~AACvH~~,CAAC"}
1	+ {"version":3,"file":"monthCommand.js","sourceRoot":"","sources":["../../src/bazi/monthCommand.ts"],"names":[],"mappings":"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"}

package/dist/bazi/paipanWarnings.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"paipanWarnings.d.ts","sourceRoot":"","sources":["../../src/bazi/paipanWarnings.ts"],"names":[],"mappings":"AAaA,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAkB5C,MAAM,WAAW,kBAAkB;IACjC,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,CAAC,EAAE,MAAM,CAAC;CACjB;AAgCD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,~~CA0ClE~~;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,CA6BpE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAEvE"}
1	+ {"version":3,"file":"paipanWarnings.d.ts","sourceRoot":"","sources":["../../src/bazi/paipanWarnings.ts"],"names":[],"mappings":"AAaA,iBAAiB;AACjB,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAkB5C,MAAM,WAAW,kBAAkB;IACjC,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,CAAC,EAAE,MAAM,CAAC;CACjB;AAgCD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAyClE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,CA6BpE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAEvE"}