@jjlmoya/utils-sports 1.63.0 → 1.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jjlmoya/utils-sports",
-    "version": "1.63.0",
+    "version": "1.65.0",
     "type": "module",
     "main": "./src/index.ts",
     "types": "./src/index.ts",

package/src/tool/dartsScoreKeeper/component.astro

@@ -13,6 +13,10 @@ const t = (ui ?? {}) as DartsScoreKeeperUI;
 
 <div class="tn-console" id="tn-card" data-tn-ui={JSON.stringify(t)}>
   <div class="tn-header-panel">
+    <div class="tn-mode-group" role="group" aria-label={t.modeLabel ?? 'Game mode'}>
+      <button type="button" class="tn-mode-btn" data-dt-mode="solo">{t.soloMode ?? 'Solo'}</button>
+      <button type="button" class="tn-mode-btn tn-mode-active" data-dt-mode="versus">{t.versusMode ?? 'Two players'}</button>
+    </div>
     <div class="tn-header-actions">
       <button class="tn-action-btn" id="tn-toggle-view-btn" title="Toggle View">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

package/src/tool/dartsScoreKeeper/darts-scorekeeper.css

@@ -70,13 +70,39 @@
 
 .tn-header-panel {
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
   align-items: center;
   padding: 0.5rem 1.25rem;
   background: var(--tn-bg-panel);
   border-bottom: 1px solid var(--tn-border-base);
 }
 
+.tn-mode-group {
+  display: inline-flex;
+  gap: 0.25rem;
+  padding: 0.2rem;
+  border: 1px solid var(--tn-border-base);
+  border-radius: 999px;
+  background: var(--tn-bg-console);
+}
+
+.tn-mode-btn {
+  padding: 0.42rem 0.72rem;
+  border: 0;
+  border-radius: 999px;
+  color: var(--tn-text-muted);
+  background: transparent;
+  font: inherit;
+  font-size: 0.72rem;
+  font-weight: 800;
+  cursor: pointer;
+}
+
+.tn-mode-btn.tn-mode-active {
+  color: #0d1118;
+  background: var(--tn-color-active-border);
+}
+
 .tn-header-actions {
   display: flex;
   gap: 0.5rem;
@@ -109,6 +135,24 @@
   background: var(--tn-bg-panel);
 }
 
+.tn-mode-solo .tn-scoreboard {
+  grid-template-columns: minmax(0, 1fr);
+}
+
+.tn-mode-solo #tn-card-b {
+  display: none;
+}
+
+.tn-mode-solo .tn-history-grid {
+  max-width: 22rem;
+  margin-inline: auto;
+}
+
+.tn-history-solo .tn-history-header-row,
+.tn-history-solo .tn-history-row {
+  grid-template-columns: minmax(0, 1fr) 3rem;
+}
+
 .tn-player-card {
   background: var(--tn-bg-card);
   border: 2px solid var(--tn-border-base);

package/src/tool/dartsScoreKeeper/game-logic.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest';
+import { createInitialScore, processThrow } from './game-logic';
+
+function completeTurn(mode: 'solo' | 'versus') {
+  let score = createInitialScore('501', true, mode);
+  score = processThrow(score, 1, 20);
+  score = processThrow(score, 1, 20);
+  return processThrow(score, 1, 20);
+}
+
+describe('darts game modes', () => {
+  it('keeps player A active after a solo turn', () => {
+    const score = completeTurn('solo');
+    expect(score.activePlayer).toBe('a');
+    expect(score.playerA.remainingScore).toBe(441);
+    expect(score.playerB.remainingScore).toBe(501);
+    expect(score.history).toHaveLength(1);
+  });
+
+  it('alternates players in versus mode', () => {
+    const score = completeTurn('versus');
+    expect(score.activePlayer).toBe('b');
+    expect(score.playerA.remainingScore).toBe(441);
+  });
+
+  it('defaults existing callers to versus mode', () => {
+    expect(createInitialScore().mode).toBe('versus');
+  });
+});

package/src/tool/dartsScoreKeeper/game-logic.ts

@@ -1,5 +1,6 @@
 export type PlayerKey = 'a' | 'b';
 export type DartsFormat = '501' | '301';
+export type DartsMode = 'solo' | 'versus';
 
 export interface PlayerState {
   remainingScore: number;
@@ -31,6 +32,7 @@ export interface TurnRecord {
 
 export interface DartsMatchScore {
   format: DartsFormat;
+  mode: DartsMode;
   doubleOut: boolean;
   playerA: PlayerState;
   playerB: PlayerState;
@@ -50,10 +52,15 @@ export function createInitialPlayer(score: number): PlayerState {
   };
 }
 
-export function createInitialScore(format: DartsFormat = '501', doubleOut: boolean = true): DartsMatchScore {
+export function createInitialScore(
+  format: DartsFormat = '501',
+  doubleOut: boolean = true,
+  mode: DartsMode = 'versus',
+): DartsMatchScore {
   const start = format === '501' ? 501 : 301;
   return {
     format,
+    mode,
     doubleOut,
     playerA: createInitialPlayer(start),
     playerB: createInitialPlayer(start),
@@ -184,7 +191,11 @@ function concludeTurn(score: DartsMatchScore): void {
     isBusted: score.turn.isBusted,
   };
   score.history.push(record);
-  score.activePlayer = score.activePlayer === 'a' ? 'b' : 'a';
+  if (score.mode === 'solo') {
+    score.activePlayer = 'a';
+  } else {
+    score.activePlayer = score.activePlayer === 'a' ? 'b' : 'a';
+  }
   score.turn = {
     throws: [],
     isBusted: false,

package/src/tool/dartsScoreKeeper/i18n/de.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Darts Durchgang',
     score301: '301',
     score501: '501',
+    modeLabel: 'Spielmodus',
+    soloMode: 'Allein',
+    versusMode: 'Zwei Spieler',
     doubleOut: 'Double Out',
     noCheckout: 'Kein Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/en.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Darts Turn',
     score301: '301',
     score501: '501',
+    modeLabel: 'Game mode',
+    soloMode: 'Solo',
+    versusMode: 'Two players',
     doubleOut: 'Double Out',
     noCheckout: 'No Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/es.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Turno de Dardos',
     score301: '301',
     score501: '501',
+    modeLabel: 'Modo de juego',
+    soloMode: 'Individual',
+    versusMode: 'Dos jugadores',
     doubleOut: 'Cierre con Doble',
     noCheckout: 'Sin Cierre',
   },

package/src/tool/dartsScoreKeeper/i18n/fr.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Tour de Fléchettes',
     score301: '301',
     score501: '501',
+    modeLabel: 'Mode de jeu',
+    soloMode: 'Solo',
+    versusMode: 'Deux joueurs',
     doubleOut: 'Double Sortie',
     noCheckout: 'Pas de Fermeture',
   },

package/src/tool/dartsScoreKeeper/i18n/id.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Giliran Dart',
     score301: '301',
     score501: '501',
+    modeLabel: 'Mode permainan',
+    soloMode: 'Solo',
+    versusMode: 'Dua pemain',
     doubleOut: 'Double Out',
     noCheckout: 'Tidak Ada Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/it.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Turno Freccette',
     score301: '301',
     score501: '501',
+    modeLabel: 'Modalità di gioco',
+    soloMode: 'Singolo',
+    versusMode: 'Due giocatori',
     doubleOut: 'Doppia Uscita',
     noCheckout: 'Nessuna Chiusura',
   },

package/src/tool/dartsScoreKeeper/i18n/ja.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'ダーツターン',
     score301: '301',
     score501: '501',
+    modeLabel: 'ゲームモード',
+    soloMode: '一人',
+    versusMode: '二人対戦',
     doubleOut: 'ダブルアウト',
     noCheckout: 'チェックアウトなし',
   },

package/src/tool/dartsScoreKeeper/i18n/ko.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: '다트 턴',
     score301: '301',
     score501: '501',
+    modeLabel: '게임 모드',
+    soloMode: '혼자 하기',
+    versusMode: '두 명',
     doubleOut: '더블 아웃',
     noCheckout: '체크아웃 없음',
   },

package/src/tool/dartsScoreKeeper/i18n/nl.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Pijlen Beurt',
     score301: '301',
     score501: '501',
+    modeLabel: 'Spelmodus',
+    soloMode: 'Solo',
+    versusMode: 'Twee spelers',
     doubleOut: 'Double Out',
     noCheckout: 'Geen Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/pl.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Rzut Darta',
     score301: '301',
     score501: '501',
+    modeLabel: 'Tryb gry',
+    soloMode: 'Solo',
+    versusMode: 'Dwóch graczy',
     doubleOut: 'Double Out',
     noCheckout: 'Brak Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/pt.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Vez de Dardos',
     score301: '301',
     score501: '501',
+    modeLabel: 'Modo de jogo',
+    soloMode: 'Individual',
+    versusMode: 'Dois jogadores',
     doubleOut: 'Fecho com Duplo',
     noCheckout: 'Sem Fecho',
   },

package/src/tool/dartsScoreKeeper/i18n/ru.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Бросок дротика',
     score301: '301',
     score501: '501',
+    modeLabel: 'Режим игры',
+    soloMode: 'Один игрок',
+    versusMode: 'Два игрока',
     doubleOut: 'Double Out',
     noCheckout: 'Нет Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/sv.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Pil Kast',
     score301: '301',
     score501: '501',
+    modeLabel: 'Spelläge',
+    soloMode: 'Solo',
+    versusMode: 'Två spelare',
     doubleOut: 'Double Out',
     noCheckout: 'Ingen Checkout',
   },

package/src/tool/dartsScoreKeeper/i18n/tr.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: 'Dart Atışı',
     score301: '301',
     score501: '501',
+    modeLabel: 'Oyun modu',
+    soloMode: 'Tek oyuncu',
+    versusMode: 'İki oyuncu',
     doubleOut: 'Double Out',
     noCheckout: 'Checkout Yok',
   },

package/src/tool/dartsScoreKeeper/i18n/zh.ts

@@ -192,6 +192,9 @@ export const content: ToolLocaleContent<DartsScoreKeeperUI> = {
     dart: '飞镖回合',
     score301: '301',
     score501: '501',
+    modeLabel: '游戏模式',
+    soloMode: '单人',
+    versusMode: '双人',
     doubleOut: '双倍结束',
     noCheckout: '无法结算',
   },

package/src/tool/dartsScoreKeeper/logic.ts

@@ -2,6 +2,7 @@ import type { DartsScoreKeeperUI } from './ui';
 import {
   type DartsMatchScore,
   type DartsFormat,
+  type DartsMode,
   createInitialScore,
   processThrow,
 } from './game-logic';
@@ -10,8 +11,9 @@ import {
   render,
 } from './render';
 import { buildDartboardSVG } from './dartboard';
+import { setupMode, syncMode } from './mode';
+import { clearStoredScore, loadInitialScore, persistScore } from './score-storage';
 
-const STORAGE_KEY = 'dt_match_state';
 const NAMES_KEY = 'dt_names';
 
 interface GameContext {
@@ -183,49 +185,42 @@ function setupViewToggles(card: HTMLElement): void {
   });
 }
 
-function loadInitialScore(): DartsMatchScore {
-  try {
-    const s = localStorage.getItem(STORAGE_KEY);
-    if (s) return JSON.parse(s);
-  } catch {
-    return createInitialScore();
-  }
-  return createInitialScore();
-}
-
 function createSaveFn(stateRef: { score: DartsMatchScore; history: DartsMatchScore[] }, t: DartsScoreKeeperUI): (s: DartsMatchScore, pushHistory?: boolean) => void {
   return (s: DartsMatchScore, pushHistory = true) => {
     if (pushHistory) stateRef.history.push(JSON.parse(JSON.stringify(stateRef.score)));
     stateRef.score = s;
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(stateRef.score));
+    persistScore(stateRef.score);
     render(stateRef.score, t);
   };
 }
 
-function createApiObject(stateRef: { score: DartsMatchScore; history: DartsMatchScore[] }, save: (s: DartsMatchScore, pushHistory?: boolean) => void, t: DartsScoreKeeperUI) {
+function createApiObject(stateRef: { score: DartsMatchScore; history: DartsMatchScore[] }, save: (s: DartsMatchScore, pushHistory?: boolean) => void, t: DartsScoreKeeperUI, card: HTMLElement) {
   return {
     resetAll() {
-      localStorage.removeItem(STORAGE_KEY);
+      clearStoredScore();
       stateRef.history = [];
-      save(createInitialScore(stateRef.score.format, stateRef.score.doubleOut), false);
+      save(createInitialScore(stateRef.score.format, stateRef.score.doubleOut, stateRef.score.mode), false);
     },
     setFormat(f: DartsFormat) {
       document.querySelectorAll('.tn-format-btn').forEach((b) => b.classList.remove('tn-format-active'));
       document.querySelector(`[data-dt-format="${f}"]`)?.classList.add('tn-format-active');
-      save(createInitialScore(f, stateRef.score.doubleOut));
+      save(createInitialScore(f, stateRef.score.doubleOut, stateRef.score.mode));
     },
     toggleDoubleOut() {
       const nextD = !stateRef.score.doubleOut;
       document.querySelector('[data-dt-doubleout]')?.classList.toggle('tn-doubleout-active', nextD);
-      save(createInitialScore(stateRef.score.format, nextD));
+      save(createInitialScore(stateRef.score.format, nextD, stateRef.score.mode));
+    },
+    setMode(mode: DartsMode) {
+      syncMode(card, mode);
+      save(createInitialScore(stateRef.score.format, stateRef.score.doubleOut, mode));
     },
     undo() {
       const prev = stateRef.history.pop();
-      if (prev) {
-        stateRef.score = prev;
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(stateRef.score));
-        render(stateRef.score, t);
-      }
+      if (!prev) return;
+      stateRef.score = prev;
+      persistScore(stateRef.score);
+      render(stateRef.score, t);
     }
   };
 }
@@ -248,11 +243,13 @@ function runInit(): void {
       document.querySelector(`[data-dt-mod="${m}"]`)?.classList.add('tn-mod-active');
     }
   };
-  const api = createApiObject(stateRef, save, t);
+  syncMode(card, stateRef.score.mode);
+  const api = createApiObject(stateRef, save, t, card);
   bindClickDelegation({ stateRef, t, saveFn: save }, multRef);
   setupResetModal(card, api);
   setupUndoAndFormat(card, api);
   setupMultiplier(card, multRef);
+  setupMode(card, api.setMode);
   setupViewToggles(card);
 }
 

package/src/tool/dartsScoreKeeper/mode.ts

@@ -0,0 +1,14 @@
+import type { DartsMode } from './game-logic';
+
+export function syncMode(root: HTMLElement, mode: DartsMode): void {
+  root.classList.toggle('tn-mode-solo', mode === 'solo');
+  root.querySelectorAll<HTMLElement>('[data-dt-mode]').forEach((button) => {
+    button.classList.toggle('tn-mode-active', button.dataset.dtMode === mode);
+  });
+}
+
+export function setupMode(root: HTMLElement, setMode: (mode: DartsMode) => void): void {
+  root.querySelectorAll<HTMLElement>('[data-dt-mode]').forEach((button) => {
+    button.addEventListener('click', () => setMode(button.dataset.dtMode as DartsMode));
+  });
+}

package/src/tool/dartsScoreKeeper/render.ts

@@ -63,14 +63,17 @@ function renderTurnDots(score: DartsMatchScore): void {
   }
 }
 
-function renderHistoryHeader(t: DartsScoreKeeperUI, histGrid: HTMLElement): void {
+function renderHistoryHeader(score: DartsMatchScore, t: DartsScoreKeeperUI, histGrid: HTMLElement): void {
   const nameA = el('tn-name-a') as HTMLInputElement;
   const nameB = el('tn-name-b') as HTMLInputElement;
   const labelA = nameA ? nameA.value : t.playerA;
   const labelB = nameB ? nameB.value : t.playerB;
   const headerRow = document.createElement('div');
   headerRow.className = 'tn-history-header-row';
-  headerRow.innerHTML = `
+  headerRow.innerHTML = score.mode === 'solo' ? `
+    <span class="tn-hist-name tn-hist-a">${labelA}</span>
+    <span class="tn-hist-round-lbl">Rnd</span>
+  ` : `
     <span class="tn-hist-name tn-hist-a">${labelA}</span>
     <span class="tn-hist-round-lbl">Rnd</span>
     <span class="tn-hist-name tn-hist-b">${labelB}</span>
@@ -78,7 +81,7 @@ function renderHistoryHeader(t: DartsScoreKeeperUI, histGrid: HTMLElement): void
   histGrid.appendChild(headerRow);
 }
 
-function renderHistoryRow(round: { roundNum: number; a?: typeof score.history[0]; b?: typeof score.history[0] }, histGrid: HTMLElement): void {
+function renderHistoryRow(round: { roundNum: number; a?: typeof score.history[0]; b?: typeof score.history[0] }, histGrid: HTMLElement, solo: boolean): void {
   const row = document.createElement('div');
   row.className = 'tn-history-row';
   const renderTurn = (turn?: typeof round.a) => {
@@ -88,7 +91,10 @@ function renderHistoryRow(round: { roundNum: number; a?: typeof score.history[0]
     }
     return `<span class="tn-hist-val">${turn.points} <span class="tn-hist-sub">(${turn.scoreAfter})</span></span>`;
   };
-  row.innerHTML = `
+  row.innerHTML = solo ? `
+    <div class="tn-hist-cell tn-hist-cell-a">${renderTurn(round.a)}</div>
+    <div class="tn-hist-cell tn-hist-cell-round">${round.roundNum}</div>
+  ` : `
     <div class="tn-hist-cell tn-hist-cell-a">${renderTurn(round.a)}</div>
     <div class="tn-hist-cell tn-hist-cell-round">${round.roundNum}</div>
     <div class="tn-hist-cell tn-hist-cell-b">${renderTurn(round.b)}</div>
@@ -100,7 +106,8 @@ function renderHistoryList(score: DartsMatchScore, t: DartsScoreKeeperUI): void
   const histGrid = el('tn-history-list');
   if (!histGrid) return;
   histGrid.innerHTML = '';
-  renderHistoryHeader(t, histGrid);
+  renderHistoryHeader(score, t, histGrid);
+  histGrid.classList.toggle('tn-history-solo', score.mode === 'solo');
   interface RoundRow {
     roundNum: number;
     a?: typeof score.history[0];
@@ -120,7 +127,7 @@ function renderHistoryList(score: DartsMatchScore, t: DartsScoreKeeperUI): void
     }
   });
   rounds.slice(-6).reverse().forEach((round) => {
-    renderHistoryRow(round, histGrid);
+    renderHistoryRow(round, histGrid, score.mode === 'solo');
   });
 }
 

package/src/tool/dartsScoreKeeper/score-storage.ts

@@ -0,0 +1,24 @@
+import { createInitialScore, type DartsMatchScore } from './game-logic';
+
+const STORAGE_KEY = 'dt_match_state';
+
+export function loadInitialScore(): DartsMatchScore {
+  try {
+    const stored = localStorage.getItem(STORAGE_KEY);
+    if (stored) {
+      const saved = JSON.parse(stored) as DartsMatchScore;
+      return { ...saved, mode: saved.mode ?? 'versus' };
+    }
+  } catch {
+    return createInitialScore();
+  }
+  return createInitialScore();
+}
+
+export function persistScore(score: DartsMatchScore): void {
+  localStorage.setItem(STORAGE_KEY, JSON.stringify(score));
+}
+
+export function clearStoredScore(): void {
+  localStorage.removeItem(STORAGE_KEY);
+}

package/src/tool/dartsScoreKeeper/ui.ts

@@ -15,6 +15,9 @@ export interface DartsScoreKeeperUI {
   dart: string;
   score301: string;
   score501: string;
+  modeLabel?: string;
+  soloMode?: string;
+  versusMode?: string;
   doubleOut: string;
   noCheckout: string;
 }