@pai-forge/riichi-mahjong 0.3.4 → 0.3.5

package/dist/index.js

@@ -70,7 +70,7 @@ class MahjongError extends Error {
   constructor(message) {
     super(message);
     this.name = "MahjongError";
-    Object.setPrototypeOf(this, MahjongError.prototype);
+    Object.setPrototypeOf(this, new.target.prototype);
   }
 }
 class ShoushaiError extends MahjongError {
@@ -80,7 +80,6 @@ class ShoushaiError extends MahjongError {
   constructor(message = "手牌が規定枚数（13枚）より少ないです。") {
     super(message);
     this.name = "ShoushaiError";
-    Object.setPrototypeOf(this, ShoushaiError.prototype);
   }
 }
 class TahaiError extends MahjongError {
@@ -90,7 +89,6 @@ class TahaiError extends MahjongError {
   constructor(message = "手牌が規定枚数（13枚）より多いです。") {
     super(message);
     this.name = "TahaiError";
-    Object.setPrototypeOf(this, TahaiError.prototype);
   }
 }
 class MahjongArgumentError extends MahjongError {
@@ -100,7 +98,6 @@ class MahjongArgumentError extends MahjongError {
   constructor(message) {
     super(message);
     this.name = "MahjongArgumentError";
-    Object.setPrototypeOf(this, MahjongArgumentError.prototype);
   }
 }
 class DuplicatedHaiIdError extends MahjongError {
@@ -110,7 +107,6 @@ class DuplicatedHaiIdError extends MahjongError {
   constructor(message = "牌IDが重複しています。") {
     super(message);
     this.name = "DuplicatedHaiIdError";
-    Object.setPrototypeOf(this, DuplicatedHaiIdError.prototype);
   }
 }
 class InvalidHaiQuantityError extends MahjongError {
@@ -120,7 +116,6 @@ class InvalidHaiQuantityError extends MahjongError {
   constructor(message = "同種の牌が5枚以上存在します。") {
     super(message);
     this.name = "InvalidHaiQuantityError";
-    Object.setPrototypeOf(this, InvalidHaiQuantityError.prototype);
   }
 }
 class ChomboError extends MahjongError {
@@ -130,7 +125,6 @@ class ChomboError extends MahjongError {
   constructor(message = "不正な和了です。") {
     super(message);
     this.name = "ChomboError";
-    Object.setPrototypeOf(this, ChomboError.prototype);
   }
 }
 class NoYakuError extends ChomboError {
@@ -140,7 +134,15 @@ class NoYakuError extends ChomboError {
   constructor(message = "役が成立していません。") {
     super(message);
     this.name = "NoYakuError";
-    Object.setPrototypeOf(this, NoYakuError.prototype);
+  }
+}
+class MspzParseError extends MahjongError {
+  /**
+   *
+   */
+  constructor(message = "MSPZ文字列の解析に失敗しました。") {
+    super(message);
+    this.name = "MspzParseError";
   }
 }
 function isTuple2(arr) {
@@ -211,7 +213,7 @@ function countHaiKind(hais) {
   }
   return counts;
 }
-function validateTehai13(tehai) {
+function assertTehai13(tehai) {
   const count = calculateTehaiCount(tehai);
   if (count < 13) {
     throw new ShoushaiError();
@@ -221,7 +223,10 @@ function validateTehai13(tehai) {
   }
   validateHaiConsistency(tehai);
 }
-function validateTehai14(tehai) {
+function validateTehai13(tehai) {
+  assertTehai13(tehai);
+}
+function assertTehai14(tehai) {
   const count = calculateTehaiCount(tehai);
   if (count < 14) {
     throw new ShoushaiError();
@@ -231,6 +236,9 @@ function validateTehai14(tehai) {
   }
   validateHaiConsistency(tehai);
 }
+function validateTehai14(tehai) {
+  assertTehai14(tehai);
+}
 function validateTehai(tehai) {
   const count = calculateTehaiCount(tehai);
   if (count < 13) {
@@ -255,13 +263,7 @@ function validateHaiConsistency(tehai) {
   }
   const counts = /* @__PURE__ */ new Map();
   for (const hai of allHais) {
-    let kind = hai;
-    if (hai > 33) {
-      if (hai < 36) kind = Math.floor(hai / 4);
-      else if (hai < 72) kind = Math.floor((hai - 36) / 4) + 9;
-      else if (hai < 108) kind = Math.floor((hai - 72) / 4) + 18;
-      else kind = Math.floor((hai - 108) / 4) + 27;
-    }
+    const kind = isHaiIdMode ? haiIdToKindId(hai) : hai;
     const current = counts.get(kind) ?? 0;
     if (current + 1 > 4) {
       throw new InvalidHaiQuantityError();
@@ -355,21 +357,12 @@ function getDoraNext(indicator) {
   return indicator;
 }
 function countDora(tehai, indicators) {
-  let count = 0;
   const doraHais = indicators.map(getDoraNext);
-  for (const hai of tehai.closed) {
-    for (const dora of doraHais) {
-      if (hai === dora) count++;
-    }
-  }
-  for (const mentsu of tehai.exposed) {
-    for (const hai of mentsu.hais) {
-      for (const dora of doraHais) {
-        if (hai === dora) count++;
-      }
-    }
-  }
-  return count;
+  const allHais = [...tehai.closed, ...tehai.exposed.flatMap((m) => m.hais)];
+  return allHais.reduce(
+    (count, hai) => count + doraHais.filter((d) => d === hai).length,
+    0
+  );
 }
 function classifyMachi(hand, agariHai) {
   if (hand.type !== "Mentsu") return void 0;
@@ -566,7 +559,7 @@ function getUkeire(tehai) {
   ];
   const haiCounts = countHaiKind(allHais);
   for (let i = 0; i < 34; i++) {
-    const tile = i;
+    const tile = asHaiKindId(i);
     if (haiCounts[tile] >= 4) {
       continue;
     }
@@ -725,6 +718,53 @@ function isMenzen(tehai) {
 function isKazehai(id) {
   return id === HaiKind.Ton || id === HaiKind.Nan || id === HaiKind.Sha || id === HaiKind.Pei;
 }
+function countShuntsuPairs(hand) {
+  if (hand.type !== "Mentsu") {
+    return 0;
+  }
+  const shuntsuList = hand.fourMentsu.filter(
+    (mentsu) => mentsu.type === "Shuntsu"
+  );
+  const shuntsuCounts = /* @__PURE__ */ new Map();
+  for (const shuntsu of shuntsuList) {
+    const key = shuntsu.hais[0];
+    const currentCount = shuntsuCounts.get(key) ?? 0;
+    shuntsuCounts.set(key, currentCount + 1);
+  }
+  let pairCount = 0;
+  for (const count of shuntsuCounts.values()) {
+    pairCount += Math.floor(count / 2);
+  }
+  return pairCount;
+}
+function analyzeIshokuPattern(hand) {
+  let blocks;
+  if (hand.type === "Mentsu") {
+    blocks = [hand.jantou, ...hand.fourMentsu];
+  } else if (hand.type === "Chiitoitsu") {
+    blocks = hand.pairs;
+  } else {
+    return void 0;
+  }
+  const allHais = blocks.flatMap((b) => b.hais);
+  const hasJihai = allHais.some((k) => kindIdToHaiType(k) === HaiType.Jihai);
+  const suupais = allHais.filter((k) => isSuupai(k));
+  if (suupais.length === 0) {
+    return { hasJihai, suupaiSuit: void 0 };
+  }
+  const firstSuupai = suupais[0];
+  if (firstSuupai === void 0) {
+    return { hasJihai, suupaiSuit: void 0 };
+  }
+  const firstSuupaiType = kindIdToHaiType(firstSuupai);
+  const isAllSameType = suupais.every(
+    (k) => kindIdToHaiType(k) === firstSuupaiType
+  );
+  return {
+    hasJihai,
+    suupaiSuit: isAllSameType ? firstSuupaiType : void 0
+  };
+}
 function createYakuDefinition(yaku, check) {
   return {
     yaku,
@@ -798,25 +838,7 @@ const IIPEIKO_YAKU = {
   }
 };
 const checkIipeikou = (hand) => {
-  if (hand.type !== "Mentsu") {
-    return false;
-  }
-  const shuntsuList = hand.fourMentsu.filter(
-    (mentsu) => mentsu.type === "Shuntsu"
-  );
-  if (shuntsuList.length < 2) {
-    return false;
-  }
-  const shuntsuCounts = /* @__PURE__ */ new Map();
-  for (const shuntsu of shuntsuList) {
-    const key = shuntsu.hais[0];
-    const currentCount = shuntsuCounts.get(key) ?? 0;
-    shuntsuCounts.set(key, currentCount + 1);
-  }
-  let pairCount = 0;
-  for (const count of shuntsuCounts.values()) {
-    pairCount += Math.floor(count / 2);
-  }
+  const pairCount = countShuntsuPairs(hand);
   return pairCount === 1;
 };
 const iipeikouDefinition = createYakuDefinition(
@@ -835,22 +857,13 @@ const checkRyanpeikou = (hand) => {
   if (hand.type !== "Mentsu") {
     return false;
   }
-  const shuntsuList = hand.fourMentsu.filter(
+  const shuntsuCount = hand.fourMentsu.filter(
     (mentsu) => mentsu.type === "Shuntsu"
-  );
-  if (shuntsuList.length < 4) {
+  ).length;
+  if (shuntsuCount < 4) {
     return false;
   }
-  const shuntsuCounts = /* @__PURE__ */ new Map();
-  for (const shuntsu of shuntsuList) {
-    const key = shuntsu.hais[0];
-    const currentCount = shuntsuCounts.get(key) ?? 0;
-    shuntsuCounts.set(key, currentCount + 1);
-  }
-  let pairCount = 0;
-  for (const count of shuntsuCounts.values()) {
-    pairCount += Math.floor(count / 2);
-  }
+  const pairCount = countShuntsuPairs(hand);
   return pairCount >= 2;
 };
 const ryanpeikouDefinition = createYakuDefinition(
@@ -1510,26 +1523,9 @@ const HONITSU_YAKU = {
   }
 };
 const checkHonitsu = (hand) => {
-  let blocks;
-  if (hand.type === "Mentsu") {
-    blocks = [hand.jantou, ...hand.fourMentsu];
-  } else if (hand.type === "Chiitoitsu") {
-    blocks = hand.pairs;
-  } else {
-    return false;
-  }
-  const allHais = blocks.flatMap((b) => b.hais);
-  const hasJihai = allHais.some((k) => kindIdToHaiType(k) === HaiType.Jihai);
-  if (!hasJihai) return false;
-  const suupais = allHais.filter((k) => isSuupai(k));
-  if (suupais.length === 0) return false;
-  const firstSuupai = suupais[0];
-  if (firstSuupai === void 0) return false;
-  const firstSuupaiType = kindIdToHaiType(firstSuupai);
-  const isAllSameType = suupais.every(
-    (k) => kindIdToHaiType(k) === firstSuupaiType
-  );
-  return isAllSameType;
+  const result = analyzeIshokuPattern(hand);
+  if (result === void 0) return false;
+  return result.hasJihai && result.suupaiSuit !== void 0;
 };
 const honitsuDefinition = createYakuDefinition(
   HONITSU_YAKU,
@@ -1543,26 +1539,9 @@ const CHINITSU_YAKU = {
   }
 };
 const checkChinitsu = (hand) => {
-  let blocks;
-  if (hand.type === "Mentsu") {
-    blocks = [hand.jantou, ...hand.fourMentsu];
-  } else if (hand.type === "Chiitoitsu") {
-    blocks = hand.pairs;
-  } else {
-    return false;
-  }
-  const allHais = blocks.flatMap((b) => b.hais);
-  const hasJihai = allHais.some((k) => kindIdToHaiType(k) === HaiType.Jihai);
-  if (hasJihai) return false;
-  const suupais = allHais.filter((k) => isSuupai(k));
-  if (suupais.length === 0) return false;
-  const firstSuupai = suupais[0];
-  if (firstSuupai === void 0) return false;
-  const firstSuupaiType = kindIdToHaiType(firstSuupai);
-  const isAllSameType = suupais.every(
-    (k) => kindIdToHaiType(k) === firstSuupaiType
-  );
-  return isAllSameType;
+  const result = analyzeIshokuPattern(hand);
+  if (result === void 0) return false;
+  return !result.hasJihai && result.suupaiSuit !== void 0;
 };
 const chinitsuDefinition = createYakuDefinition(
   CHINITSU_YAKU,
@@ -1648,15 +1627,15 @@ function detectYakuForStructure(hand, context) {
 function getTotalHan(yakuResult) {
   return yakuResult.reduce((sum, [, han]) => sum + han, 0);
 }
-function detectYaku(tehai, agariHai, bakaze, jikaze, doraMarkers, uraDoraMarkers, isTsumo) {
+function detectYaku(tehai, config) {
   const context = {
     isMenzen: isMenzen(tehai),
-    agariHai,
-    bakaze: bakaze !== void 0 && isKazehai(bakaze) ? bakaze : void 0,
-    jikaze: jikaze !== void 0 && isKazehai(jikaze) ? jikaze : void 0,
-    doraMarkers: doraMarkers ?? [],
-    uraDoraMarkers: uraDoraMarkers ?? [],
-    isTsumo
+    agariHai: config.agariHai,
+    bakaze: config.bakaze,
+    jikaze: config.jikaze,
+    doraMarkers: config.doraMarkers ?? [],
+    uraDoraMarkers: config.uraDoraMarkers ?? [],
+    isTsumo: config.isTsumo
   };
   const structuralInterpretations = getHouraStructures(tehai);
   let bestResult = [];
@@ -1680,7 +1659,7 @@ function isExtendedMspz(input) {
 }
 function asExtendedMspz(input) {
   if (!isExtendedMspz(input)) {
-    throw new Error(`Invalid Extended MSPZ string: ${input}`);
+    throw new MspzParseError(`Invalid Extended MSPZ string: ${input}`);
   }
   return input;
 }
@@ -1695,25 +1674,26 @@ function parseExtendedMspz$1(input) {
   for (const char of input) {
     if (char === "[") {
       if (mode !== "closed")
-        throw new Error("Nested brackets are not supported");
+        throw new MspzParseError("Nested brackets are not supported");
       if (current.length > 0) closedParts.push(current);
       current = "[";
       mode = "open";
     } else if (char === "]") {
-      if (mode !== "open") throw new Error("Unexpected closing bracket ']'");
+      if (mode !== "open")
+        throw new MspzParseError("Unexpected closing bracket ']'");
       current += "]";
       exposed.push(parseMentsuFromExtendedMspz(asExtendedMspz(current)));
       current = "";
       mode = "closed";
     } else if (char === "(") {
       if (mode !== "closed")
-        throw new Error("Nested parentheses are not supported");
+        throw new MspzParseError("Nested parentheses are not supported");
       if (current.length > 0) closedParts.push(current);
       current = "(";
       mode = "ankan";
     } else if (char === ")") {
       if (mode !== "ankan")
-        throw new Error("Unexpected closing parenthesis ')'");
+        throw new MspzParseError("Unexpected closing parenthesis ')'");
       current += ")";
       exposed.push(parseMentsuFromExtendedMspz(asExtendedMspz(current)));
       current = "";
@@ -1723,7 +1703,8 @@ function parseExtendedMspz$1(input) {
     }
   }
   if (current.length > 0) {
-    if (mode !== "closed") throw new Error("Unclosed bracket or parenthesis");
+    if (mode !== "closed")
+      throw new MspzParseError("Unclosed bracket or parenthesis");
     closedParts.push(current);
   }
   const fullClosedMspz = closedParts.join("");
@@ -1743,22 +1724,24 @@ function parseMentsuFromExtendedMspz(block) {
     mode = "ankan";
     content = block.slice(1, -1);
   } else {
-    throw new Error(
+    throw new MspzParseError(
       `Invalid Extended MSPZ block: ${block} (must be [...] or (...))`
     );
   }
   const ids = parseMspzToHaiKindIds(asMspz(content));
   if (ids.length === 0) {
-    throw new Error("Empty mentsu specification");
+    throw new MspzParseError("Empty mentsu specification");
   }
   const count = ids.length;
   const isAllSame = ids.every((id) => id === ids[0]);
   if (mode === "ankan") {
     if (count !== 4 || !isAllSame) {
-      throw new Error(`Invalid Ankan: ${block} (must be 4 identical tiles)`);
+      throw new MspzParseError(
+        `Invalid Ankan: ${block} (must be 4 identical tiles)`
+      );
     }
     if (!isTuple4(ids)) {
-      throw new Error("Internal Error: ids length check mismatch");
+      throw new MspzParseError("Internal Error: ids length check mismatch");
     }
     const kantsu = {
       type: MentsuType.Kantsu,
@@ -1769,7 +1752,7 @@ function parseMentsuFromExtendedMspz(block) {
   }
   if (count === 4 && isAllSame) {
     if (!isTuple4(ids)) {
-      throw new Error("Internal Error: ids length check mismatch");
+      throw new MspzParseError("Internal Error: ids length check mismatch");
     }
     const kantsu = {
       type: MentsuType.Kantsu,
@@ -1780,7 +1763,7 @@ function parseMentsuFromExtendedMspz(block) {
     return kantsu;
   } else if (count === 3 && isAllSame) {
     if (!isTuple3(ids)) {
-      throw new Error("Internal Error: ids length check mismatch");
+      throw new MspzParseError("Internal Error: ids length check mismatch");
     }
     const koutsu = {
       type: MentsuType.Koutsu,
@@ -1791,7 +1774,7 @@ function parseMentsuFromExtendedMspz(block) {
     return koutsu;
   } else if (count === 3) {
     if (!isTuple3(ids)) {
-      throw new Error("Internal Error: ids length check mismatch");
+      throw new MspzParseError("Internal Error: ids length check mismatch");
     }
     const shuntsu = {
       type: MentsuType.Shuntsu,
@@ -1801,13 +1784,13 @@ function parseMentsuFromExtendedMspz(block) {
     };
     return shuntsu;
   }
-  throw new Error(
+  throw new MspzParseError(
     `Invalid Mentsu specification: ${block} (must be 3 or 4 tiles)`
   );
 }
 function asMspz(input) {
   if (!isMspz(input)) {
-    throw new Error(`Invalid MSPZ string: ${input}`);
+    throw new MspzParseError(`Invalid MSPZ string: ${input}`);
   }
   return input;
 }
@@ -1938,7 +1921,7 @@ const VALID_FU_VALUES = [
 function toFu(value) {
   const fu = VALID_FU_VALUES.find((f) => f === value);
   if (fu === void 0) {
-    throw new Error(`Invalid fu value: ${value}`);
+    throw new MahjongError(`Invalid fu value: ${value}`);
   }
   return fu;
 }
@@ -2108,7 +2091,7 @@ function getLimitBasePoints(level) {
     case ScoreLevel.Mangan:
       return SCORE_BASE_MANGAN;
     case ScoreLevel.Normal:
-      return null;
+      return void 0;
   }
 }
 function createScoreContext(tehai, config) {
@@ -2126,7 +2109,7 @@ function createScoreContext(tehai, config) {
 function calculateScoreForTehai(tehai, config) {
   const context = createScoreContext(tehai, config);
   const structuralInterpretations = getHouraStructures(tehai);
-  let bestResult = null;
+  let bestResult = void 0;
   let maxTotalPoints = -1;
   for (const hand of structuralInterpretations) {
     const yakuResult = detectYakuForStructure(hand, context);
@@ -2203,11 +2186,14 @@ export {
   MahjongArgumentError,
   MahjongError,
   MentsuType,
+  MspzParseError,
   NoYakuError,
   ShoushaiError,
   Tacha,
   TahaiError,
   YAOCHU_KIND_IDS,
+  assertTehai13,
+  assertTehai14,
   calculateScoreForTehai,
   calculateShanten,
   classifyMachi,