♳ score computation

Author: Platane

src/App/Ui/ScoreSheet/ScoreSheetContent.tsx

@@ -4,6 +4,7 @@ import {
   categories,
   Category,
   DiceValue,
+  getScoreSheetScore,
   ScoreSheet,
 } from "../../../gameRules/types";
 import { getScore } from "../../../gameRules/getScore";
@@ -72,11 +73,7 @@ export const ScoreSheetContent = ({
         <td />
         <Td style={{ border: "1px solid #ddd" }}>
           <div style={{ marginLeft: "auto" }}>
-            {categories.reduce((s, c) => {
-              const roll = scoreSheet[c];
-
-              return s + (roll ? getScore(c, roll) : 0);
-            }, 0)}
+            {getScoreSheetScore(scoreSheet)}
           </div>
         </Td>
       </tr>

src/gameRules/getScore.ts

@@ -1,4 +1,4 @@
-import { Category, DiceValue } from "./types";
+import type { Category, DiceValue } from "./types";
 
 export const getScore = (category: Category, set: DiceValue[]) => {
   switch (category) {

src/gameRules/types.ts

@@ -1,3 +1,5 @@
+import { getScore } from "./getScore";
+
 export const categories = [
   "Aces",
   "Two",
@@ -20,6 +22,15 @@ export type Category = (typeof categories)[number];
 export type DiceValue = 1 | 2 | 3 | 4 | 5 | 6;
 
 export type ScoreSheet = Record<Category, DiceValue[] | null>;
+export type FinishedScoreSheet = Record<Category, DiceValue[]>;
+
+export const isScoreSheet = (s: any, nDice: number): s is ScoreSheet =>
+  s &&
+  categories.every(
+    (c) =>
+      !s[c] ||
+      (Array.isArray(s[c]) && s[c].length === nDice && s[c].every(isDiceValue))
+  );
 
 export const isDiceValue = (d: any): d is DiceValue =>
   d === 1 || d === 2 || d === 3 || d === 4 || d === 5 || d === 6;
@@ -29,8 +40,15 @@ export const createEmptyScoreSheet = () =>
     categories.map((category) => [category, null])
   ) as ScoreSheet;
 
-export const isScoreSheetFinished = (scoreSheet: ScoreSheet) =>
-  categories.every((c) => scoreSheet[c]);
+export const isScoreSheetFinished = (
+  scoreSheet: ScoreSheet
+): scoreSheet is FinishedScoreSheet => categories.every((c) => scoreSheet[c]);
 
 export const isScoreSheetEmpty = (scoreSheet: ScoreSheet) =>
   !categories.some((c) => scoreSheet[c]);
+
+export const getScoreSheetScore = (scoreSheet: ScoreSheet) =>
+  categories.reduce(
+    (sum, c) => sum + (scoreSheet[c] ? getScore(c, scoreSheet[c]) : 0),
+    0
+  );