liuyao 0.3.0 → 0.3.1

package/dist/index.d.ts

@@ -301,8 +301,8 @@ declare class Hexagram {
      * This output is meant for AI skills.
      */
     toAIReadable(): {
-        本卦: HexagramAIReadable<'本卦'>;
-        变卦: HexagramAIReadable<'变卦'> | null;
+        本卦: HexagramAIReadable;
+        变卦: HexagramAIReadable | '无';
         世应变化: string;
     };
     clone(): Hexagram;
@@ -311,10 +311,10 @@ declare class Hexagram {
 }
 interface YaoInfo {
     爻: string;
-    类型: '世' | '应' | null;
-    六亲地支五行: string;
+    类型?: '世' | '应';
+    六亲: string;
 }
-interface HexagramAIReadable<T extends '本卦' | '变卦'> {
+interface HexagramAIReadable {
     初爻: YaoInfo;
     二爻: YaoInfo;
     三爻: YaoInfo;

package/dist/index.mjs

@@ -1731,76 +1731,36 @@ class l {
         n.includes(t) && ("世" === e.hostGuest && s.push(`新世爻为${i.info.id}的${r[t]}`), "应" === e.hostGuest && s.push(`新应爻为${i.info.id}的${r[t]}`));
       });
     } else s.push("没有新的世应爻出现，世应不变");
+    const t = (n, i, e) => {
+      const s = {
+        "爻": this.yaos[e].name,
+        "六亲": i[e].kin,
+        "类型": i[e].hostGuest
+      };
+      return s.类型 || delete s.类型, s;
+    };
     return {
       "本卦": {
-        "上爻": {
-          "爻": this.yaos[5].name,
-          "类型": n[5].hostGuest || null,
-          "六亲地支五行": n[5].kin
-        },
-        "五爻": {
-          "爻": this.yaos[4].name,
-          "类型": n[4].hostGuest || null,
-          "六亲地支五行": n[4].kin
-        },
-        "四爻": {
-          "爻": this.yaos[3].name,
-          "类型": n[3].hostGuest || null,
-          "六亲地支五行": n[3].kin
-        },
-        "三爻": {
-          "爻": this.yaos[2].name,
-          "类型": n[2].hostGuest || null,
-          "六亲地支五行": n[2].kin
-        },
-        "二爻": {
-          "爻": this.yaos[1].name,
-          "类型": n[1].hostGuest || null,
-          "六亲地支五行": n[1].kin
-        },
-        "初爻": {
-          "爻": this.yaos[0].name,
-          "类型": n[0].hostGuest || null,
-          "六亲地支五行": n[0].kin
-        },
+        "上爻": t(this.yaos, n, 5),
+        "五爻": t(this.yaos, n, 4),
+        "四爻": t(this.yaos, n, 3),
+        "三爻": t(this.yaos, n, 2),
+        "二爻": t(this.yaos, n, 1),
+        "初爻": t(this.yaos, n, 0),
         "卦名": this.info.id,
         "宫": this.palace,
         "变爻": this.isDynamic ? this.yaos.map((n, i) => n.isDynamic ? r[i] : null).filter(n => null !== n) : void 0
       },
       "变卦": e ? {
-        "上爻": {
-          "爻": i.yaos[5].name,
-          "类型": e[5].hostGuest || null,
-          "六亲地支五行": e[5].kin
-        },
-        "五爻": {
-          "爻": i.yaos[4].name,
-          "类型": e[4].hostGuest || null,
-          "六亲地支五行": e[4].kin
-        },
-        "四爻": {
-          "爻": i.yaos[3].name,
-          "类型": e[3].hostGuest || null,
-          "六亲地支五行": e[3].kin
-        },
-        "三爻": {
-          "爻": i.yaos[2].name,
-          "类型": e[2].hostGuest || null,
-          "六亲地支五行": e[2].kin
-        },
-        "二爻": {
-          "爻": i.yaos[1].name,
-          "类型": e[1].hostGuest || null,
-          "六亲地支五行": e[1].kin
-        },
-        "初爻": {
-          "爻": i.yaos[0].name,
-          "类型": e[0].hostGuest || null,
-          "六亲地支五行": e[0].kin
-        },
+        "上爻": t(i.yaos, e, 5),
+        "五爻": t(i.yaos, e, 4),
+        "四爻": t(i.yaos, e, 3),
+        "三爻": t(i.yaos, e, 2),
+        "二爻": t(i.yaos, e, 1),
+        "初爻": t(i.yaos, e, 0),
         "卦名": i.info.id,
         "宫": i.palace
-      } : null,
+      } : "无",
       "世应变化": s.join("，")
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liuyao",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": {
     "name": "Kasukabe Tsumugi",
     "email": "futami16237@gmail.com"
@@ -45,4 +45,4 @@
   "dependencies": {
     "solarlunar": "^3.1.0"
   }
-}
+}