ziwei-cli 1.1.2 → 1.1.3

package/lib/commands/palace.js

@@ -16,28 +16,13 @@ function buildQueryDate(year, month = 1, day = 1) {
 }
 
 /**
- * 获取指定层级的宫位及三方四正
+ * 获取指定层级的宫位及三方四正（统一走 horoscope 接口）
  */
-function getScopedPalaceAndSurrounded(astrolabe, palaceName, scope, queryDate) {
-  if (scope === 'origin') {
-    // 本命层直接从 astrolabe 获取
-    const targetPalace = astrolabe.palace(palaceName);
-    const surroundedPalaces = astrolabe.surroundedPalaces(palaceName);
-    return { targetPalace, surroundedPalaces, scopeData: {} };
-  } else {
-    // 运限层从 horoscope 获取
-    const horoscope = astrolabe.horoscope(queryDate);
-    const scopeData = horoscope[scope];
-
-    if (!scopeData) {
-      throw new Error(`无效的运限范围: ${scope}`);
-    }
-
-    const targetPalace = horoscope.palace(palaceName, scope);
-    const surroundedPalaces = horoscope.surroundPalaces(palaceName, scope);
-
-    return { targetPalace, surroundedPalaces, scopeData };
-  }
+function getScopedPalaceAndSurrounded(horoscope, palaceName, scope) {
+  const scopeData = horoscope[scope] || {};
+  const targetPalace = horoscope.palace(palaceName, scope);
+  const surroundedPalaces = horoscope.surroundPalaces(palaceName, scope);
+  return { targetPalace, surroundedPalaces, scopeData };
 }
 
 /**
@@ -87,18 +72,20 @@ export async function executePalace(options) {
       is_leap: leap || false
     });
 
-    // 获取目标宫位名称
-    // origin 模式需要带"宫"字，horoscope 模式不需要
-    const palaceNameWithSuffix = palace.replace(/宫$/, '') + '宫';
-    const palaceNameWithoutSuffix = palace.replace(/宫$/, '');
-    const targetPalaceName = scope === 'origin' ? palaceNameWithSuffix : palaceNameWithoutSuffix;
+    // 归一化宫位名称：iztro 内部除"命宫"外均不带"宫"字
+    const base = palace.replace(/宫$/, '');
+    const targetPalaceName = base === '命' ? '命宫' : base;
+
+    // 构建查询日期（origin 用今天的日期，不影响本命数据）
+    const queryDate = scope !== 'origin'
+      ? buildQueryDate(year, month || 1, day || 1)
+      : new Date().toISOString().slice(0, 10);
 
-    // 构建查询日期
-    const queryDate = scope !== 'origin' ? buildQueryDate(year, month || 1, day || 1) : null;
+    // 统一通过 horoscope 接口查询所有层级
+    const horoscope = astrolabe.horoscope(queryDate);
 
-    // 获取目标宫位和三方四正
     const { targetPalace, surroundedPalaces, scopeData } = getScopedPalaceAndSurrounded(
-      astrolabe, targetPalaceName, scope, queryDate
+      horoscope, targetPalaceName, scope
     );
 
     if (!targetPalace) {
@@ -109,13 +96,7 @@ export async function executePalace(options) {
     }
 
     // 检测格局
-    let patterns;
-    if (scope === 'origin') {
-      patterns = detectPatterns(astrolabe);
-    } else {
-      const horoscope = astrolabe.horoscope(queryDate);
-      patterns = detectPatterns(horoscope, scope);
-    }
+    const patterns = detectPatterns(horoscope, scope);
 
     // 构建结果
     const result = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ziwei-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "紫微斗数 + 八字命理分析 CLI 工具 - Claude Code / OpenClaw Skill",
   "type": "module",
   "main": "bin/ziwei.js",