mingyu-core 0.1.8 → 0.1.9

package/dist/bazi/baziAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baziAnalysis.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAcxD,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAgD;gBAG9D,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,EACvC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,EACrD,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAqBnD,gBAAgB,CACrB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,cAAc,CAAC,EAAE,MAAM,EACvB,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,GAC5C,kBAAkB;CAQtB"}
+{"version":3,"file":"baziAnalysis.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAaxD,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAgD;gBAG9D,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,EACvC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,EACrD,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAoBnD,gBAAgB,CACrB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,cAAc,CAAC,EAAE,MAAM,EACvB,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,GAC5C,kBAAkB;CAQtB"}

package/dist/bazi/baziAnalysis.js

@@ -2,7 +2,6 @@ import { analyzeFormation, analyzeRoot, analyzeSupport, analyzeConstraint, analy
 import { determinePattern } from './baziPatternStrategy.js';
 import { determineUsefulGod } from './baziUsefulGodStrategy.js';
 import { createBaziAnalysisPipeline } from './baziAnalysisPipeline.js';
-// Re-implement BaziAnalyzer based on usage in baziCalculator.ts
 export class BaziAnalyzer {
     getWuxing;
     getTenGod;
@@ -26,7 +25,6 @@ export class BaziAnalyzer {
             determineUsefulGod,
         });
     }
-    // Main analysis function
     analyzeBaziChart(pillars, hiddenStems, monthCommander, seasonInfo) {
         return this.pipeline.run({
             pillars,

package/dist/bazi/baziAnalysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"baziAnalysis.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysis.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,gEAAgE;AAChE,MAAM,OAAO,YAAY;IACf,SAAS,CAA+B;IACxC,SAAS,CAA6C;IACtD,eAAe,CAA0C;IACzD,QAAQ,CAAgD;IAEhE,YACE,SAAuC,EACvC,SAAqD,EACrD,eAAwD;QAExD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,0BAA0B,CAAC;YACzC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB;YAChB,WAAW;YACX,cAAc;YACd,iBAAiB;YACjB,qBAAqB;YACrB,wBAAwB;YACxB,gBAAgB;YAChB,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC;IAED,yBAAyB;IAClB,gBAAgB,CACrB,OAAgB,EAChB,WAAwB,EACxB,cAAuB,EACvB,UAA6C;QAE7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YACvB,OAAO;YACP,WAAW;YACX,cAAc;YACd,UAAU;SACX,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"baziAnalysis.js","sourceRoot":"","sources":["../../src/bazi/baziAnalysis.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,MAAM,OAAO,YAAY;IACf,SAAS,CAA+B;IACxC,SAAS,CAA6C;IACtD,eAAe,CAA0C;IACzD,QAAQ,CAAgD;IAEhE,YACE,SAAuC,EACvC,SAAqD,EACrD,eAAwD;QAExD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,0BAA0B,CAAC;YACzC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB;YAChB,WAAW;YACX,cAAc;YACd,iBAAiB;YACjB,qBAAqB;YACrB,wBAAwB;YACxB,gBAAgB;YAChB,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC;IAEM,gBAAgB,CACrB,OAAgB,EAChB,WAAwB,EACxB,cAAuB,EACvB,UAA6C;QAE7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YACvB,OAAO;YACP,WAAW;YACX,cAAc;YACd,UAAU;SACX,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/bazi/baziAnalysisFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baziAnalysisFormatter.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysisFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAenD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,SAAS,GACT,eAAe,GACf,eAAe,GACf,SAAS,CAAC;AA+Wd,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,eAAe,EAC3B,eAAe,GAAE,OAAc,EAC/B,KAAK,GAAE,gBAA4B,GAClC,MAAM,CAIR"}
+{"version":3,"file":"baziAnalysisFormatter.d.ts","sourceRoot":"","sources":["../../src/bazi/baziAnalysisFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAenD,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,SAAS,GACT,eAAe,GACf,eAAe,GACf,SAAS,CAAC;AAwXd,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,eAAe,EAC3B,eAAe,GAAE,OAAc,EAC/B,KAAK,GAAE,gBAA4B,GAClC,MAAM,CAIR"}

package/dist/bazi/baziAnalysisFormatter.js

@@ -94,6 +94,12 @@ function buildBaziText(baziResult, options) {
     result += `出生历法: 阳历${solarDate.year}年${solarDate.month}月${solarDate.day}日 | 农历${formatLunarDate(baziResult)} | 生肖:${baziResult.zodiac}\n`;
     if (baziResult.timing?.enabled) {
         result += `真太阳时: ${baziResult.timing.correctedTime.year}年${baziResult.timing.correctedTime.month}月${baziResult.timing.correctedTime.day}日 ${String(baziResult.timing.correctedTime.hour).padStart(2, '0')}:${String(baziResult.timing.correctedTime.minute).padStart(2, '0')} | 出生地:${baziResult.timing.birthPlace || '未填写'} | 经度:${baziResult.timing.birthLongitude}\n`;
+        if (baziResult.timing.dstCorrectionMinutes) {
+            result += `夏令时校正: ${baziResult.timing.dstCorrectionMinutes} 分钟（中国夏令时 1986-1991）\n`;
+        }
+    }
+    if (baziResult.warnings?.length) {
+        result += `【排盘预警】\n${baziResult.warnings.map((w) => `⚠ ${w}`).join('\n')}\n`;
     }
     result += `日元本命: ${dayMaster.gan}${dayMaster.element} (${dayMaster.yinYang})\n`;
     if (baziResult.monthCommander)
@@ -105,6 +111,9 @@ function buildBaziText(baziResult, options) {
     if (wuxingSeasonStatus)
         result += `月令旺相: ${wuxingSeasonStatus}\n`;
     const specialPillars = [
+        baziResult.mingGua
+            ? `命卦:${baziResult.mingGua.gua}${baziResult.mingGua.number}(${baziResult.mingGua.eastWest})`
+            : '',
         baziResult.mingGong ? `命宫:${baziResult.mingGong}` : '',
         baziResult.shenGong ? `身宫:${baziResult.shenGong}` : '',
         baziResult.taiYuan ? `胎元:${baziResult.taiYuan}` : '',

package/dist/bazi/baziAnalysisFormatter.js.map

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

package/dist/bazi/baziCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baziCalculator.d.ts","sourceRoot":"","sources":["../../src/bazi/baziCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,SAAS,CAAC;AAiCvD,OAAO,EACL,MAAM,EAGN,eAAe,EACf,uBAAuB,EACvB,WAAW,EAGZ,MAAM,aAAa,CAAC;AAIrB,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AAGjE;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,gBAAgB,CAAmB;;IAgB3C;;;;OAIG;IACI,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxD;;;;OAIG;IACI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjE;;OAEG;IACI,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,uBAAuB;IAuOjE;;OAEG;IACI,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;IAerD;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAkGtB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI9D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI1E,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIzE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB;IAIvD;;OAEG;IACI,yBAAyB,CAC9B,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,SAAS,EACxD,UAAU,EAAE,eAAe,GAC1B;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE;IAgB5D,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,cAAc;CAavB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"baziCalculator.d.ts","sourceRoot":"","sources":["../../src/bazi/baziCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,SAAS,CAAC;AAmCvD,OAAO,EACL,MAAM,EAGN,eAAe,EACf,uBAAuB,EACvB,WAAW,EAGZ,MAAM,aAAa,CAAC;AAKrB,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AAgBjE;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,gBAAgB,CAAmB;;IAgB3C;;;;OAIG;IACI,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIxD;;;;OAIG;IACI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjE;;OAEG;IACI,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,uBAAuB;IAmTjE;;OAEG;IACI,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;IAerD;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAgGtB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI9D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAI1E,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAIzE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB;IAIvD;;OAEG;IACI,yBAAyB,CAC9B,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,SAAS,EACxD,UAAU,EAAE,eAAe,GAC1B;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE;IAgB5D,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,cAAc;CAavB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}

package/dist/bazi/baziCalculator.js

@@ -1,6 +1,8 @@
 import { SolarTime, Gender, LunarHour } from 'tyme4ts';
 import { TIME_MAP } from './baziDefinitions.js';
 import { calculateTrueSolarTime } from './trueSolarTime.js';
+import { checkChinaDst, isDateInChinaDstRange } from './chinaDst.js';
+import { collectBoundaryWarnings } from './paipanWarnings.js';
 import { ShenShaCalculator } from './baziShenSha/index.js';
 import { BaziAnalyzer } from './baziAnalysis.js';
 import { LuckCalculator } from './LuckCalculator.js';
@@ -10,6 +12,18 @@ import { calculateHiddenStems, calculateHiddenTenGods, calculateKongWang, calcul
 import { calculateLiuri, calculateLiuriRange, calculateLiuyue, calculateSeasonInfo, getCategorizedYearShenSha, getMonthCommander, } from './baziCalculatorTime.js';
 import { getTimeIndexFromClock } from '../calendar/dateUtils.js';
 import { getBirthDateValidationMessage } from '../calendar/date-validation.js';
+import { calculateMingGua } from './mingGua.js';
+function getMidYearPillarName(year) {
+    return SolarTime.fromYmdHms(year, 6, 1, 12, 0, 0)
+        .getLunarHour()
+        .getEightChar()
+        .getYear()
+        .getName();
+}
+function resolveMingGuaYear(solarTime, baziYearPillarName) {
+    const solarYear = solarTime.getSolarDay().getYear();
+    return getMidYearPillarName(solarYear) === baziYearPillarName ? solarYear : solarYear - 1;
+}
 /**
  * 八字计算工具类
  * 整合了所有计算逻辑
@@ -109,6 +123,8 @@ export class BaziCalculator {
             solarTime = SolarTime.fromYmdHms(year, month, day, baseHour, baseMinute, 0);
             lunarHour = solarTime.getLunarHour();
         }
+        const applyChinaDst = person.applyChinaDst !== false;
+        const warnings = [];
         if (useTrueSolarTime) {
             const standardTime = {
                 year: solarTime.getYear(),
@@ -118,7 +134,33 @@ export class BaziCalculator {
                 minute: solarTime.getMinute(),
                 second: solarTime.getSecond(),
             };
-            const trueSolarResult = calculateTrueSolarTime(standardTime, birthLongitude);
+            // 中国夏令时（1986-1991）：钟表时间快 1 小时，先回拨再做真太阳时校正
+            let dstCorrectionMinutes = 0;
+            let dstInput = standardTime;
+            if (applyChinaDst) {
+                const dst = checkChinaDst(standardTime.year, standardTime.month, standardTime.day, standardTime.hour, standardTime.minute);
+                if (dst.inDst) {
+                    dstCorrectionMinutes = dst.offsetMinutes;
+                    const shifted = new Date(Date.UTC(standardTime.year, standardTime.month - 1, standardTime.day, standardTime.hour, standardTime.minute, standardTime.second) +
+                        dstCorrectionMinutes * 60000);
+                    dstInput = {
+                        year: shifted.getUTCFullYear(),
+                        month: shifted.getUTCMonth() + 1,
+                        day: shifted.getUTCDate(),
+                        hour: shifted.getUTCHours(),
+                        minute: shifted.getUTCMinutes(),
+                        second: shifted.getUTCSeconds(),
+                    };
+                    warnings.push('出生时刻处于中国夏令时期间（1986-1991），钟表时间比北京标准时间快 1 小时，已自动回拨 60 分钟后排盘。如所记时间已折算为标准时间，请设置 applyChinaDst: false。');
+                    if (dst.ambiguous) {
+                        warnings.push('出生时刻落在夏令时结束日 01:00-02:00 的重复时段，该钟表时刻当天出现两次，无法唯一判定，建议按夏令时/标准时两种口径分别参详。');
+                    }
+                    if (dst.nonexistent) {
+                        warnings.push('出生时刻落在夏令时开始日 02:00-03:00 的跳变时段，该钟表时刻当天并不存在，出生记录可能有误，请核实。');
+                    }
+                }
+            }
+            const trueSolarResult = calculateTrueSolarTime(dstInput, birthLongitude);
             solarTime = SolarTime.fromYmdHms(trueSolarResult.correctedTime.year, trueSolarResult.correctedTime.month, trueSolarResult.correctedTime.day, trueSolarResult.correctedTime.hour, trueSolarResult.correctedTime.minute, trueSolarResult.correctedTime.second);
             lunarHour = solarTime.getLunarHour();
             timing = {
@@ -130,7 +172,22 @@ export class BaziCalculator {
                 longitudeCorrectionMinutes: trueSolarResult.longitudeCorrectionMinutes,
                 equationOfTimeMinutes: trueSolarResult.equationOfTimeMinutes,
                 totalCorrectionMinutes: trueSolarResult.totalCorrectionMinutes,
+                ...(dstCorrectionMinutes !== 0 ? { dstCorrectionMinutes } : {}),
             };
+            // 边界预警：基于校正后的最终时刻检查节气交接/时辰边界/换日线
+            warnings.push(...collectBoundaryWarnings({
+                year: solarTime.getYear(),
+                month: solarTime.getMonth(),
+                day: solarTime.getDay(),
+                hour: solarTime.getHour(),
+                minute: solarTime.getMinute(),
+                second: solarTime.getSecond(),
+            }));
+        }
+        else if (applyChinaDst &&
+            isDateInChinaDstRange(solarTime.getYear(), solarTime.getMonth(), solarTime.getDay())) {
+            // 仅时辰精度：无法安全做 -1 小时校正，只提示
+            warnings.push('出生日期位于中国夏令时期间（1986-1991），钟表时间比北京标准时间快 1 小时，时辰可能需前移。建议改用真太阳时模式并提供精确出生时间。');
         }
         const eightChar = lunarHour.getEightChar();
         const yearColumn = eightChar.getYear();
@@ -159,6 +216,7 @@ export class BaziCalculator {
                 ganZhi: hourColumn.getName(),
             },
         };
+        const mingGuaYear = resolveMingGuaYear(solarTime, pillars.year.ganZhi);
         const finalTimeInfo = timing
             ? this.getTimeInfoFromClock(timing.correctedTime.hour, timing.correctedTime.minute)
             : selectedTimeInfo;
@@ -183,6 +241,7 @@ export class BaziCalculator {
             },
             timeInfo: finalTimeInfo,
             pillars,
+            warnings,
             dayMaster: {
                 gan: dayMasterGan,
                 element: getWuxingUtil(dayMasterGan),
@@ -197,6 +256,7 @@ export class BaziCalculator {
                 .getZodiac()
                 .getName(),
             constellation: solarTime.getSolarDay().getConstellation().getName(),
+            mingGua: calculateMingGua(mingGuaYear, gender),
             luckInfo,
             liunian,
             timing,
@@ -287,10 +347,8 @@ export class BaziCalculator {
         const shenShaCalculator = person.shenShaVariants
             ? new ShenShaCalculator({ variants: person.shenShaVariants })
             : this.shenShaCalculator;
-        // Calculate basic data first
         const tenGods = calculateTenGods(pillars, dayMasterGan);
         const shensha = shenShaCalculator.calculateAllShenSha(baziArray, gender);
-        // Calculate ShenSha interactions
         const shenShaAnalysis = {
             year: [],
             month: [],

package/dist/bazi/baziCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"baziCalculator.js","sourceRoot":"","sources":["../../src/bazi/baziCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,SAAS,IAAI,aAAa,EAC1B,aAAa,EACb,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,cAAc,GACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,yBAAyB,EACzB,gBAAgB,EAChB,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAW9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAK5E;;;GAGG;AACH,MAAM,OAAO,cAAc;IACjB,OAAO,GAAe,QAAQ,CAAC;IAC/B,iBAAiB,CAAoB;IACrC,QAAQ,CAAe;IACvB,cAAc,CAAiB;IAC/B,gBAAgB,CAAmB;IAE3C;QACE,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACjD,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAU,EAAE;YAC7C,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YACvC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,OAAO,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;IAC1E,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,GAAW,EAAE,SAAiB;QAC7C,OAAO,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,GAAW,EAAE,SAAiB;QACtD,OAAO,kBAAkB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,MAAc;QACrC,MAAM,EACJ,IAAI,EACJ,KAAK,EACL,GAAG,EACH,SAAS,EACT,MAAM,EACN,GAAG,EACH,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,WAAW,EACX,UAAU,EACV,cAAc,GACf,GAAG,MAAM,CAAC;QACX,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QACD,IACE,gBAAgB;YAChB,CAAC,OAAO,SAAS,KAAK,QAAQ;gBAC5B,OAAO,WAAW,KAAK,QAAQ;gBAC/B,OAAO,cAAc,KAAK,QAAQ,CAAC,EACrC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,gBAAgB,IAAI,CAAC,SAAU,GAAG,CAAC,IAAI,SAAU,GAAG,EAAE,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,gBAAgB,IAAI,CAAC,WAAY,GAAG,CAAC,IAAI,WAAY,GAAG,EAAE,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,gBAAgB,IAAI,CAAC,cAAe,GAAG,CAAC,GAAG,IAAI,cAAe,GAAG,GAAG,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;YACtD,IAAI;YACJ,KAAK;YACL,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;YACrC,WAAW;SACZ,CAAC,CAAC;QACH,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,oBAAoB;QACpB,IAAI,SAA4B,CAAC;QACjC,IAAI,SAA4B,CAAC;QACjC,IAAI,MAA8B,CAAC;QACnC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,gBAAiB,CAAC,IAAI,CAAC;QACxE,MAAM,UAAU,GAAG,gBAAgB,CAAC,CAAC,CAAC,WAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvD,IAAI,OAAO,EAAE,CAAC;YACZ,sDAAsD;YACtD,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC1D,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YACjF,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,qCAAqC;YACrC,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;YAC5E,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QACvC,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,YAAY,GAAG;gBACnB,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE;gBACzB,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE;gBAC3B,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE;gBACvB,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE;gBACzB,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE;gBAC7B,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE;aAC9B,CAAC;YACF,MAAM,eAAe,GAAG,sBAAsB,CAAC,YAAY,EAAE,cAAe,CAAC,CAAC;YAE9E,SAAS,GAAG,SAAS,CAAC,UAAU,CAC9B,eAAe,CAAC,aAAa,CAAC,IAAI,EAClC,eAAe,CAAC,aAAa,CAAC,KAAK,EACnC,eAAe,CAAC,aAAa,CAAC,GAAG,EACjC,eAAe,CAAC,aAAa,CAAC,IAAI,EAClC,eAAe,CAAC,aAAa,CAAC,MAAM,EACpC,eAAe,CAAC,aAAa,CAAC,MAAM,CACrC,CAAC;YACF,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,GAAG;gBACP,OAAO,EAAE,IAAI;gBACb,YAAY;gBACZ,aAAa,EAAE,eAAe,CAAC,aAAa;gBAC5C,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;gBACpC,cAAc;gBACd,0BAA0B,EAAE,eAAe,CAAC,0BAA0B;gBACtE,qBAAqB,EAAE,eAAe,CAAC,qBAAqB;gBAC5D,sBAAsB,EAAE,eAAe,CAAC,sBAAsB;aAC/D,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QAE3C,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAEvC,MAAM,OAAO,GAAY;YACvB,IAAI,EAAE;gBACJ,GAAG,EAAE,UAAU,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE;gBACzC,GAAG,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;gBAC1C,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE;aAC7B;YACD,KAAK,EAAE;gBACL,GAAG,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE;gBAC1C,GAAG,EAAE,WAAW,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;gBAC3C,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE;aAC9B;YACD,GAAG,EAAE;gBACH,GAAG,EAAE,SAAS,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE;gBACxC,GAAG,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;gBACzC,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE;aAC5B;YACD,IAAI,EAAE;gBACJ,GAAG,EAAE,UAAU,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE;gBACzC,GAAG,EAAE,UAAU,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;gBAC1C,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE;aAC7B;SACF,CAAC;QACF,MAAM,aAAa,GAAG,MAAM;YAC1B,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC;YACnF,CAAC,CAAC,gBAAiB,CAAC;QAEtB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QAC5F,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE9C,OAAO;YACL,MAAM,EAAE,kCAAkC;YAC1C,GAAG;YACH,SAAS,EAAE;gBACT,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;gBACvC,KAAK,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACzC,GAAG,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE;aACtC;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE;gBACtE,KAAK,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE;gBACzD,GAAG,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE;gBACrC,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE;gBAC5D,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;aAC3C;YACD,QAAQ,EAAE,aAAa;YACvB,OAAO;YACP,SAAS,EAAE;gBACT,GAAG,EAAE,YAAY;gBACjB,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;gBACpC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;aACrC;YACD,MAAM,EAAE,SAAS;iBACd,WAAW,EAAE;iBACb,aAAa,EAAE;iBACf,YAAY,EAAE;iBACd,aAAa,EAAE;iBACf,cAAc,EAAE;iBAChB,SAAS,EAAE;iBACX,OAAO,EAAE;YACZ,aAAa,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE;YACnE,QAAQ;YACR,OAAO;YACP,MAAM;YACN,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvD,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE;gBACd,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;gBAC7C,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;gBACxC,OAAO,EAAE,EAAE;aACZ;YACD,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,EAAE;YACd,gBAAgB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC5D,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACjD,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC/D,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACjD,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACpD,kBAAkB,EAAE,EAAE;YACtB,cAAc,EAAE,EAAE;YAClB,UAAU,EAAE;gBACV,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,aAAa,EAAE,CAAC;gBAChB,UAAU,EAAE,CAAC;gBACb,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,EAAE;aACd;YACD,QAAQ,EAAE;gBACR,iBAAiB,EAAE;oBACjB,KAAK,EAAE,CAAC;oBACR,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE;wBACP,aAAa,EAAE,CAAC;wBAChB,MAAM,EAAE,KAAK;wBACb,iBAAiB,EAAE,CAAC;wBACpB,YAAY,EAAE,CAAC;wBACf,eAAe,EAAE,CAAC;wBAClB,kBAAkB,EAAE,CAAC;qBACtB;iBACF;gBACD,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;gBAC3C,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;aACrE;YACD,eAAe,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACxE,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,MAAc;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAEtE,MAAM,WAAW,GAA4B;YAC3C,GAAG,UAAU;YACb,GAAG,cAAc;SAClB,CAAC;QAEF,OAAO,WAAW,CAAC,SAAS,CAAC;QAC7B,OAAO,WAAW,CAAC,SAAS,CAAC;QAE7B,OAAO,WAA8B,CAAC;IACxC,CAAC;IAED;;OAEG;IACK,qBAAqB,CAC3B,MAAc,EACd,UAAmC;QAuBnC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAC1B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAEhE,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC;QAEnC,MAAM,SAAS,GAAuB;YACpC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YACpC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;YACtC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YAClC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;SACrC,CAAC;QAEF,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvE,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CACzE,OAAO,EACP,cAAc,CACf,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,CAAC,eAAe;YAC9C,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAE3B,6BAA6B;QAC7B,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzE,iCAAiC;QACjC,MAAM,eAAe,GAAG;YACtB,IAAI,EAAE,EAAc;YACpB,KAAK,EAAE,EAAc;YACrB,GAAG,EAAE,EAAc;YACnB,IAAI,EAAE,EAAc;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;SACrF,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAU,CAAC;QAC7D,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,eAAe,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,OAAO;YACP,WAAW;YACX,aAAa,EAAE,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC;YAChE,cAAc,EAAE,qBAAqB;YACrC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE;YAC1C,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;YAC3C,OAAO,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;YAC7C,KAAK,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE;YAC3C,UAAU,EAAE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC;YACtD,gBAAgB,EAAE,yBAAyB,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC;YAC9B,OAAO;YACP,eAAe;YACf,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC;YAC9B,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC;YACpC,kBAAkB,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;YACtD,cAAc;YACd,UAAU;YACV,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE;gBAC7E,YAAY,EAAE,UAAU,CAAC,YAAY;aACtC,CAAC;SACH,CAAC;IACJ,CAAC;IAEM,eAAe,CAAC,IAAY,EAAE,KAAa,EAAE,SAAiB;QACnE,OAAO,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW,EAAE,SAAiB;QAC/E,OAAO,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAEM,mBAAmB,CAAC,SAAiB,EAAE,OAAe,EAAE,SAAiB;QAC9E,OAAO,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IAEM,mBAAmB,CAAC,SAA4B;QACrD,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,yBAAyB,CAC9B,QAAwD,EACxD,UAA2B;QAE3B,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;YAC9C,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACjD,CAAC;QACD,IAAI,CAAC;YACH,OAAO,yBAAyB,CAC9B,QAAQ,EACR,UAAU,EACV,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,EACpF,cAAc,CACf,CAAC;QACJ,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACjD,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,IAAY,EAAE,MAAc;QACvD,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,cAAc,CAAC,QAAuD;QAC5E,MAAM,UAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;QAElD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,KAAK,CAAC;YACvD,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC/B,6BAA6B;gBAC7B,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;AACnD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"baziCalculator.js","sourceRoot":"","sources":["../../src/bazi/baziCalculator.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziConditionMatchers/branchMatchers.d.ts

@@ -1,5 +1,6 @@
 import type { Matcher } from './types';
 export declare const chongMatcher: Matcher;
 export declare const jianZhiMatcher: Matcher;
+export declare const noJianZhiMatcher: Matcher;
 export declare const diZhiDuoMatcher: Matcher;
 //# sourceMappingURL=branchMatchers.d.ts.map

package/dist/bazi/baziConditionMatchers/branchMatchers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branchMatchers.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/branchMatchers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAMvC,eAAO,MAAM,YAAY,EAAE,OAI1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAI5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,OAM7B,CAAC"}
+{"version":3,"file":"branchMatchers.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/branchMatchers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAQvC,eAAO,MAAM,YAAY,EAAE,OAI1B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAI5B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAI9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,OAc7B,CAAC"}

package/dist/bazi/baziConditionMatchers/branchMatchers.js

@@ -1,6 +1,8 @@
 const CHONG_REGEX = /([子丑寅卯辰巳午未申酉戌亥])([子丑寅卯辰巳午未申酉戌亥])冲/;
 const JIAN_ZHI_REGEX = /见([子丑寅卯辰巳午未申酉戌亥])/;
+const NO_JIAN_ZHI_REGEX = /不见地支([子丑寅卯辰巳午未申酉戌亥])/;
 const DI_ZHI_DUO_REGEX = /地支多([子丑寅卯辰巳午未申酉戌亥])/;
+const DI_ZHI_TWO_REGEX = /地支有两([子丑寅卯辰巳午未申酉戌亥])/;
 export const chongMatcher = ({ condition, allBranches }) => {
     const match = condition.match(CHONG_REGEX);
     if (!match)
@@ -13,8 +15,18 @@ export const jianZhiMatcher = ({ condition, allBranches }) => {
         return null;
     return allBranches.includes(match[1]);
 };
+export const noJianZhiMatcher = ({ condition, allBranches }) => {
+    const match = condition.match(NO_JIAN_ZHI_REGEX);
+    if (!match)
+        return null;
+    return !allBranches.includes(match[1]);
+};
 export const diZhiDuoMatcher = ({ condition, allBranches }) => {
-    const match = condition.match(DI_ZHI_DUO_REGEX);
+    if (condition.includes('子午各二')) {
+        return (allBranches.filter((branch) => branch === '子').length >= 2 &&
+            allBranches.filter((branch) => branch === '午').length >= 2);
+    }
+    const match = condition.match(DI_ZHI_DUO_REGEX) || condition.match(DI_ZHI_TWO_REGEX);
     if (!match)
         return null;
     const target = match[1];

package/dist/bazi/baziConditionMatchers/branchMatchers.js.map

@@ -1 +1 @@
-{"version":3,"file":"branchMatchers.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/branchMatchers.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,mCAAmC,CAAC;AACxD,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAC3C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IAClE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IACpE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IACrE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAC7D,OAAO,KAAK,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC"}
+{"version":3,"file":"branchMatchers.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/branchMatchers.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,mCAAmC,CAAC;AACxD,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAC3C,MAAM,iBAAiB,GAAG,sBAAsB,CAAC;AACjD,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AAC/C,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IAClE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IACpE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;IACrE,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,CACL,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC;YAC1D,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAC3D,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACrF,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAC7D,OAAO,KAAK,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC"}

package/dist/bazi/baziConditionMatchers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAepD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAsBrD,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,GAC1C,OAAO,CAoBT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAgBpD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAwBrD,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,GAC1C,OAAO,CAoBT"}

package/dist/bazi/baziConditionMatchers/index.js

@@ -1,7 +1,7 @@
 import { sanHeMatcher, sanHuiMatcher, siKuMatcher } from './formationMatchers.js';
 import { shiZhuMatcher, shiZhiMatcher, riZhiMatcher, riZhuMatcher } from './pillarMatchers.js';
-import { chongMatcher, jianZhiMatcher, diZhiDuoMatcher } from './branchMatchers.js';
-import { touGanMatcher, faYongMatcher, tianGanDuoMatcher, wuHeMatcher, noZhengHeMatcher, } from './stemMatchers.js';
+import { chongMatcher, jianZhiMatcher, noJianZhiMatcher, diZhiDuoMatcher } from './branchMatchers.js';
+import { touGanMatcher, faYongMatcher, tianGanDuoMatcher, wuHeMatcher, noZhengHeMatcher, noTouGanMatcher, } from './stemMatchers.js';
 import { strengthMatcher } from './strengthMatchers.js';
 import { luShenChongMatcher } from './miscMatchers.js';
 export { branchesContain } from './helpers.js';
@@ -15,10 +15,12 @@ const MATCHERS = [
     riZhiMatcher,
     riZhuMatcher,
     jianZhiMatcher,
+    noJianZhiMatcher,
     touGanMatcher,
     faYongMatcher,
     strengthMatcher,
     tianGanDuoMatcher,
+    noTouGanMatcher,
     luShenChongMatcher,
     diZhiDuoMatcher,
     wuHeMatcher,

package/dist/bazi/baziConditionMatchers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EACL,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,QAAQ,GAAc;IAC1B,YAAY;IACZ,aAAa;IACb,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,aAAa;IACb,aAAa;IACb,eAAe;IACf,iBAAiB;IACjB,kBAAkB;IAClB,eAAe;IACf,WAAW;IACX,gBAAgB;CACjB,CAAC;AAEF,MAAM,UAAU,cAAc,CAC5B,SAAiB,EACjB,OAAe,EACf,OAAmC,EACnC,WAA2C;IAE3C,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7F,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAiB;QACxB,SAAS;QACT,OAAO;QACP,OAAO;QACP,WAAW;QACX,WAAW;QACX,QAAQ;KACT,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EACL,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,eAAe,GAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,QAAQ,GAAc;IAC1B,YAAY;IACZ,aAAa;IACb,WAAW;IACX,YAAY;IACZ,aAAa;IACb,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,aAAa;IACb,aAAa;IACb,eAAe;IACf,iBAAiB;IACjB,eAAe;IACf,kBAAkB;IAClB,eAAe;IACf,WAAW;IACX,gBAAgB;CACjB,CAAC;AAEF,MAAM,UAAU,cAAc,CAC5B,SAAiB,EACjB,OAAe,EACf,OAAmC,EACnC,WAA2C;IAE3C,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7F,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1F,MAAM,GAAG,GAAiB;QACxB,SAAS;QACT,OAAO;QACP,OAAO;QACP,WAAW;QACX,WAAW;QACX,QAAQ;KACT,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/bazi/baziConditionMatchers/stemMatchers.d.ts

@@ -3,5 +3,6 @@ export declare const touGanMatcher: Matcher;
 export declare const faYongMatcher: Matcher;
 export declare const tianGanDuoMatcher: Matcher;
 export declare const wuHeMatcher: Matcher;
+export declare const noTouGanMatcher: Matcher;
 export declare const noZhengHeMatcher: Matcher;
 //# sourceMappingURL=stemMatchers.d.ts.map

package/dist/bazi/baziConditionMatchers/stemMatchers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stemMatchers.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/stemMatchers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAQvC,eAAO,MAAM,aAAa,EAAE,OAI3B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAI3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,OAM/B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,OAIzB,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAS9B,CAAC"}
+{"version":3,"file":"stemMatchers.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/stemMatchers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AASvC,eAAO,MAAM,aAAa,EAAE,OAI3B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAI3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,OAM/B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,OAIzB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,OAI7B,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAM9B,CAAC"}

package/dist/bazi/baziConditionMatchers/stemMatchers.js

@@ -3,6 +3,7 @@ const FA_YONG_REGEX = /([甲乙丙丁戊己庚辛壬癸])[金木水火土]?发
 const TIAN_GAN_DUO_REGEX = /天干三([甲乙丙丁戊己庚辛壬癸])/;
 const WU_HE_REGEX = /([甲乙丙丁戊己庚辛壬癸])([甲乙丙丁戊己庚辛壬癸])同透/;
 const NO_ZHENG_HE_REGEX = /无([甲乙丙丁戊己庚辛壬癸])([甲乙丙丁戊己庚辛壬癸])争合/;
+const NO_TOU_GAN_REGEX = /不见天干([甲乙丙丁戊己庚辛壬癸])/;
 export const touGanMatcher = ({ condition, allStems }) => {
     const match = condition.match(TOU_GAN_REGEX);
     if (!match)
@@ -29,13 +30,16 @@ export const wuHeMatcher = ({ condition, allStems }) => {
         return null;
     return allStems.includes(match[1]) && allStems.includes(match[2]);
 };
+export const noTouGanMatcher = ({ condition, allStems }) => {
+    const match = condition.match(NO_TOU_GAN_REGEX);
+    if (!match)
+        return null;
+    return !allStems.includes(match[1]);
+};
 export const noZhengHeMatcher = ({ condition, allStems }) => {
     const match = condition.match(NO_ZHENG_HE_REGEX);
     if (!match)
         return null;
-    // 争合（妒合）指一干合多干：合干之一在命局出现 ≥2 次方为争合、破化气之纯；
-    // 乙庚各一为正合，化气成立。原实现“两干同时出现即判争合”，而化气格本就要求
-    // 乙庚同透，会令所有化气格恒被破局。
     const count1 = allStems.filter((s) => s === match[1]).length;
     const count2 = allStems.filter((s) => s === match[2]).length;
     return !(count1 >= 2 || count2 >= 2);

package/dist/bazi/baziConditionMatchers/stemMatchers.js.map

@@ -1 +1 @@
-{"version":3,"file":"stemMatchers.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/stemMatchers.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAC/C,MAAM,WAAW,GAAG,gCAAgC,CAAC;AACrD,MAAM,iBAAiB,GAAG,iCAAiC,CAAC;AAE5D,MAAM,CAAC,MAAM,aAAa,GAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IAChE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IAC1D,OAAO,KAAK,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IACnE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,yCAAyC;IACzC,wCAAwC;IACxC,oBAAoB;IACpB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7D,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"stemMatchers.js","sourceRoot":"","sources":["../../../src/bazi/baziConditionMatchers/stemMatchers.ts"],"names":[],"mappings":"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"}

package/dist/bazi/baziEnhancement/classicPatterns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classicPatterns.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziEnhancement/classicPatterns.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QACV,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;CAC3B;AA4bD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,EAC3C,cAAc,CAAC,EAAE,MAAM,GACtB,cAAc,GAAG,IAAI,CA6CvB"}
+{"version":3,"file":"classicPatterns.d.ts","sourceRoot":"","sources":["../../../src/bazi/baziEnhancement/classicPatterns.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QACV,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;KAC5B,CAAC;IACF,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;CAC3B;AA4cD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,eAAe,CAAC,aAAa,CAAC,EAC3C,cAAc,CAAC,EAAE,MAAM,GACtB,cAAc,GAAG,IAAI,CA6CvB"}

package/dist/bazi/baziEnhancement/classicPatterns.js

@@ -67,10 +67,16 @@ const CLASSIC_PATTERNS = [
     {
         id: 'jing-lan-cha',
         name: '井栏叉格',
-        description: '庚申、庚子、庚辰三柱重逢，天干三庚、地支申子辰三合水局。忌丙丁火破局，喜水木清华。主清贵富足。',
+        description: '庚日地支申子辰全，取水局暗冲寅午戌中财官印。忌丙丁巳午填实破局。',
         conditions: {
             dayStems: ['庚'],
-            otherConditions: ['天干三庚', '申子辰三合水局'],
+            otherConditions: [
+                '申子辰三合水局',
+                '不见天干丙',
+                '不见天干丁',
+                '不见地支巳',
+                '不见地支午',
+            ],
         },
         favorableWuxing: ['水', '木'],
         unfavorableWuxing: ['火', '土'],
@@ -91,10 +97,10 @@ const CLASSIC_PATTERNS = [
     {
         id: 'ren-qi-long',
         name: '壬骑龙背格',
-        description: '壬辰日生，辰为水库，壬水得辰中癸水帮扶。多见辰字更贵，忌戌冲辰破局。主大富大贵。',
+        description: '壬辰日生，地支多辰，取辰多冲戌中官星。忌戌字填实冲破。',
         conditions: {
             dayStems: ['壬'],
-            otherConditions: ['日柱为壬辰'],
+            otherConditions: ['日柱为壬辰', '地支多辰', '不见地支戌'],
         },
         favorableWuxing: ['水', '木'],
         unfavorableWuxing: ['土', '戌'],
@@ -103,10 +109,10 @@ const CLASSIC_PATTERNS = [
     {
         id: 'liu-yin-chao-yang',
         name: '六阴朝阳格',
-        description: '辛日见戊子时。六阴至子而朝阳，辛金得戊土生扶、子水润泽。忌午冲子破局，忌丙丁火出干混局。主清贵。',
+        description: '辛日见戊子时，取子位一阳来复。忌午冲子，忌丙丁火出干填实。',
         conditions: {
             dayStems: ['辛'],
-            otherConditions: ['时柱为戊子'],
+            otherConditions: ['时柱为戊子', '不见地支午', '不见天干丙', '不见天干丁'],
         },
         favorableWuxing: ['金', '水'],
         unfavorableWuxing: ['火', '午'],
@@ -193,10 +199,17 @@ const CLASSIC_PATTERNS = [
     {
         id: 'fei-tian-lu-ma-geng',
         name: '飞天禄马格',
-        description: '庚日子时或壬日子时。庚禄在申、壬禄在亥，借子位暗冲丙火官星、午火财星。忌丙丁巳午填实，喜金水助之。主大贵。',
+        description: '庚子日地支多子，暗冲午中丁火为官、己土为印。忌丑绊、午冲及丁己填实。',
         conditions: {
             dayStems: ['庚'],
-            otherConditions: ['时柱为丙子'],
+            otherConditions: [
+                '日柱为庚子',
+                '地支多子',
+                '不见地支丑',
+                '不见地支午',
+                '不见天干丁',
+                '不见天干己',
+            ],
         },
         favorableWuxing: ['金', '水'],
         unfavorableWuxing: ['火', '土'],
@@ -205,10 +218,17 @@ const CLASSIC_PATTERNS = [
     {
         id: 'fei-tian-lu-ma-ren',
         name: '飞天禄马格',
-        description: '庚日子时或壬日子时。庚禄在申、壬禄在亥，借子位暗冲丙火官星、午火财星。忌丙丁巳午填实，喜金水助之。主大贵。',
+        description: '壬子日地支多子，暗冲午中丁火为财、己土为官。忌丑绊、午冲及丁己填实。',
         conditions: {
             dayStems: ['壬'],
-            otherConditions: ['时柱为庚子'],
+            otherConditions: [
+                '日柱为壬子',
+                '地支多子',
+                '不见地支丑',
+                '不见地支午',
+                '不见天干丁',
+                '不见天干己',
+            ],
         },
         favorableWuxing: ['金', '水'],
         unfavorableWuxing: ['火', '土'],
@@ -392,7 +412,7 @@ const CLASSIC_PATTERNS = [
         description: '四柱中有两子、两午，或子午各二。子午为坎离水火，子午双包主阴阳调和、水火既济。忌丑未破局。主人聪明智慧。',
         conditions: {
             dayStems: ['甲', '乙', '丙', '丁', '戊', '己', '庚', '辛', '壬', '癸'],
-            otherConditions: ['地支有两子', '地支有两午', '子午各二'],
+            anyConditions: ['地支有两子', '地支有两午', '子午各二'],
         },
         favorableWuxing: ['水', '火'],
         unfavorableWuxing: ['土'],