mahjong_engine 1.1.3 → 1.1.5

package/tests/testConsts.ts

@@ -37,7 +37,8 @@ export type TensuuNumCase = {
     name: string,
     desc: string,
     honsuu: number,
-    fusuu: number
+    fusuu: number,
+    isYakuman?: boolean,
     expected: TensuuResult;
 }
 
@@ -45,6 +46,7 @@ export type hanNameCase = {
     name: string,
     desc: string,
     han: number,
+    isYakuman: boolean,
     expected: string
 }
 

package/tests/yaku.test.ts

@@ -4,6 +4,8 @@ import { casesNormal } from './yaku/normal';
 import { TehaiCase } from './testConsts';
 import { YakuContext } from '../modules/yaku/YakuContext';
 import { TehaiCaseRunner } from './tehaiCaseRunner';
+import { YakuDetails } from "../modules/yaku/YakuDetails";
+import { BlockHaisList } from "../modules";
 
 type yakuMaps = Map<number, Map<string, number>>;
 
@@ -14,13 +16,13 @@ casesNormal.forEach(casenormal => testcases.push(casenormal));
 testcases.forEach(testcase => {
     describe(testcase.desc, () => {
         test(testcase.name, () => {
-            const yakuMaps: yakuMaps = new Map<number, Map<string, number>>();
+            const yakuMaps: yakuMaps = new Map();
             const runner: TehaiCaseRunner<yakuMaps> = new TehaiCaseRunner(testcase);
-            const blocks = runner.blocks;
+            const blocks:BlockHaisList[] = runner.blocks;
             blocks.forEach((block, index) => {
-                const context = new YakuContext(runner.hand, runner.ctx, block);
-                const yakuMap = new YakuChecker(context).check();
-                if(yakuMap.size > 0) yakuMaps.set(index, yakuMap);
+                const context: YakuContext = new YakuContext(runner.hand, runner.ctx, block);
+                const details: YakuDetails = new YakuChecker(context).check();
+                if(details.length > 0) yakuMaps.set(index, details.toMap());
             });
             expect(yakuMaps).toEqual(testcase.expected);
         });