@jjlmoya/utils-sports 1.60.0 → 1.61.0

package/package.json

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

package/src/tool/rugbyScoreKeeper/component.astro

@@ -8,16 +8,21 @@ interface Props {
 }
 
 const { ui } = Astro.props;
-const t = (ui ?? {}) as RugbyScoreKeeperUI;
+const t = (ui ?? {}) as unknown as RugbyScoreKeeperUI;
 ---
 
 <div class="rg-app" id="rg-app" data-rg-ui={JSON.stringify(t)}>
 
   <div class="rg-main-card">
 
+  <div class="rg-save-status" id="rg-save-status" role="status">
+    <span class="rg-save-dot" aria-hidden="true"></span>
+    <span id="rg-save-status-text">{t.savedLocally}</span>
+  </div>
+
   <div class="rg-strip">
-    <div class="rg-team">
-      <input type="text" class="rg-name" id="rg-name-home" value={t.home} aria-label={t.home} />
+    <div class="rg-team rg-team-home">
+      <input type="text" class="rg-name" id="rg-name-home" value={t.home} maxlength="40" aria-label={t.home} />
       <div class="rg-score" id="rg-score-home" aria-live="polite">0</div>
       <div class="rg-bonus" id="rg-bonus-home"></div>
     </div>
@@ -25,8 +30,8 @@ const t = (ui ?? {}) as RugbyScoreKeeperUI;
       <span class="rg-vs">VS</span>
       <div class="rg-half-badge" id="rg-half-badge">{t.half1}</div>
     </div>
-    <div class="rg-team">
-      <input type="text" class="rg-name" id="rg-name-away" value={t.away} aria-label={t.away} />
+    <div class="rg-team rg-team-away">
+      <input type="text" class="rg-name" id="rg-name-away" value={t.away} maxlength="40" aria-label={t.away} />
       <div class="rg-score" id="rg-score-away" aria-live="polite">0</div>
       <div class="rg-bonus" id="rg-bonus-away"></div>
     </div>
@@ -34,23 +39,24 @@ const t = (ui ?? {}) as RugbyScoreKeeperUI;
 
   <div class="rg-columns">
     <div class="rg-col" data-team="home">
-      <div class="rg-col-label">{t.home}</div>
-      <button class="rg-btn rg-btn-try" data-action="try">+5 {t.tryLabel}</button>
-      <button class="rg-btn rg-btn-conv" id="rg-conv-home" data-action="conv" disabled>+2 {t.conversion}</button>
-      <button class="rg-btn rg-btn-pen" data-action="pen">+3 {t.penalty}</button>
-      <button class="rg-btn rg-btn-drop" data-action="drop">+3 {t.dropGoal}</button>
+      <div class="rg-col-label" id="rg-col-label-home">{t.home}</div>
+      <button type="button" class="rg-btn rg-btn-try" data-action="try">{t.tryLabel}</button>
+      <button type="button" class="rg-btn rg-btn-conv" id="rg-conv-home" data-action="conv" disabled>{t.conversion}</button>
+      <button type="button" class="rg-btn rg-btn-pen" data-action="pen">{t.penalty}</button>
+      <button type="button" class="rg-btn rg-btn-drop" data-action="drop">{t.dropGoal}</button>
     </div>
     <div class="rg-col" data-team="away">
-      <div class="rg-col-label">{t.away}</div>
-      <button class="rg-btn rg-btn-try" data-action="try">+5 {t.tryLabel}</button>
-      <button class="rg-btn rg-btn-conv" id="rg-conv-away" data-action="conv" disabled>+2 {t.conversion}</button>
-      <button class="rg-btn rg-btn-pen" data-action="pen">+3 {t.penalty}</button>
-      <button class="rg-btn rg-btn-drop" data-action="drop">+3 {t.dropGoal}</button>
+      <div class="rg-col-label" id="rg-col-label-away">{t.away}</div>
+      <button type="button" class="rg-btn rg-btn-try" data-action="try">{t.tryLabel}</button>
+      <button type="button" class="rg-btn rg-btn-conv" id="rg-conv-away" data-action="conv" disabled>{t.conversion}</button>
+      <button type="button" class="rg-btn rg-btn-pen" data-action="pen">{t.penalty}</button>
+      <button type="button" class="rg-btn rg-btn-drop" data-action="drop">{t.dropGoal}</button>
     </div>
   </div>
 
   <div class="rg-mid-row">
     <div class="rg-clock-panel">
+      <div class="rg-panel-header">{t.matchClock}</div>
       <div class="rg-clock-ring">
         <svg class="rg-clock-svg" viewBox="0 0 120 120">
           <circle class="rg-clock-bg" cx="60" cy="60" r="54" />
@@ -61,17 +67,23 @@ const t = (ui ?? {}) as RugbyScoreKeeperUI;
           <div class="rg-clock-label">{t.half} <span id="rg-half-label">1</span></div>
         </div>
       </div>
-      <button class="rg-btn rg-btn-clock" id="rg-btn-clock">{t.startMatch}</button>
+      <button type="button" class="rg-btn rg-btn-clock" id="rg-btn-clock">{t.startMatch}</button>
     </div>
     <div class="rg-sinbin-panel">
-      <div class="rg-panel-header">{t.sinBin}</div>
+      <div class="rg-panel-header">{t.sinBinTitle}</div>
       <div class="rg-sinbin-form">
-        <input type="text" class="rg-input" id="rg-sinbin-input" placeholder={t.sinBinPlayer} aria-label={t.sinBinPlayer} />
-        <select class="rg-select" id="rg-sinbin-duration" aria-label={t.sinBin + " duration"}>
-          <option value="600">10 {t.minutesShort}</option>
-          <option value="300">5 {t.minutesShort}</option>
-        </select>
-        <button class="rg-btn rg-btn-yellow" id="rg-btn-sinbin">{t.sinBinAdd}</button>
+        <input type="text" class="rg-input" id="rg-sinbin-input" maxlength="80" placeholder={t.sinBinPlayer} aria-label={t.sinBinPlayer} />
+        <div class="rg-choice-row">
+          <div class="rg-choice-group" role="group" aria-label={t.teamLabel}>
+            <button type="button" class="rg-choice rg-choice-home is-active" data-sinbin-team="home" aria-pressed="true">{t.home}</button>
+            <button type="button" class="rg-choice rg-choice-away" data-sinbin-team="away" aria-pressed="false">{t.away}</button>
+          </div>
+          <div class="rg-choice-group" role="group" aria-label={t.durationLabel}>
+            <button type="button" class="rg-choice is-active" data-sinbin-duration="600" aria-pressed="true">10 {t.minutesShort}</button>
+            <button type="button" class="rg-choice" data-sinbin-duration="300" aria-pressed="false">5 {t.minutesShort}</button>
+          </div>
+        </div>
+        <button type="button" class="rg-btn rg-btn-yellow" id="rg-btn-sinbin">{t.sinBinAdd}</button>
       </div>
       <div class="rg-sinbin-list" id="rg-sinbin-list">
         <div class="rg-sinbin-empty">{t.sinBinEmpty}</div>
@@ -85,13 +97,13 @@ const t = (ui ?? {}) as RugbyScoreKeeperUI;
       <div class="rg-history-list" id="rg-history-list">
         <div class="rg-history-empty">{t.eventEmpty}</div>
       </div>
-      <button class="rg-btn rg-btn-undo" id="rg-btn-undo" disabled>{t.undoBtn}</button>
+      <button type="button" class="rg-btn rg-btn-undo" id="rg-btn-undo" disabled>{t.undoBtn}</button>
     </div>
     <div class="rg-summary">
       <div class="rg-panel-header">{t.scoringSummary}</div>
       <table class="rg-table">
         <thead>
-          <tr><th></th><th>{t.home}</th><th>{t.away}</th></tr>
+          <tr><th></th><th class="rg-th-home" id="rg-summary-home">{t.home}</th><th class="rg-th-away" id="rg-summary-away">{t.away}</th></tr>
         </thead>
         <tbody id="rg-summary-body">
           <tr><td>{t.tryScored}</td><td>0</td><td>0</td></tr>
@@ -114,25 +126,25 @@ const t = (ui ?? {}) as RugbyScoreKeeperUI;
     <div class="rg-banner-text" id="rg-banner-text"></div>
   </div>
 
-  <div class="rg-reset-modal" id="rg-modal" role="dialog" aria-modal="true" aria-labelledby="rg-modal-title">
+  <div class="rg-reset-modal" id="rg-modal" role="dialog" aria-modal="true" aria-hidden="true" aria-labelledby="rg-modal-title">
     <div class="rg-modal-content">
       <h2 class="rg-modal-title" id="rg-modal-title">{t.resetMatch}</h2>
       <div class="rg-modal-text">{t.resetConfirm}</div>
       <div class="rg-modal-btns">
-        <button class="rg-btn rg-btn-modal-cancel" id="rg-modal-cancel">{t.cancel}</button>
-        <button class="rg-btn rg-btn-modal-confirm" id="rg-modal-confirm">{t.confirm}</button>
+        <button type="button" class="rg-btn rg-btn-modal-cancel" id="rg-modal-cancel">{t.cancel}</button>
+        <button type="button" class="rg-btn rg-btn-modal-confirm" id="rg-modal-confirm">{t.confirm}</button>
       </div>
     </div>
   </div>
 
   <div class="rg-actions">
-    <button class="rg-btn rg-btn-reset" id="rg-btn-reset">{t.resetMatch}</button>
+    <button type="button" class="rg-btn rg-btn-reset" id="rg-btn-reset">{t.resetMatch}</button>
   </div>
 
   </div>
 </div>
 
 <script>
-  import { initRugbyScorekeeper } from './ui-init';
+  import { initRugbyScorekeeper } from './ui-runtime';
   initRugbyScorekeeper();
 </script>

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Zeit Läuft',
     fullTime: 'Spielende',
     minutesShort: 'Min.',
+    savedLocally: 'Auf diesem Gerät gespeichert',
+    saveUnavailable: 'Speichern nicht verfügbar',
+    teamLabel: 'Team',
+    durationLabel: 'Dauer',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Time On',
     fullTime: 'Full time',
     minutesShort: 'min',
+    savedLocally: 'Saved on this device',
+    saveUnavailable: 'Saving unavailable',
+    teamLabel: 'Team',
+    durationLabel: 'Duration',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Tiempo en Marcha',
     fullTime: 'Fin del partido',
     minutesShort: 'min',
+    savedLocally: 'Guardado en este dispositivo',
+    saveUnavailable: 'No se puede guardar',
+    teamLabel: 'Equipo',
+    durationLabel: 'Duración',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Temps en Marche',
     fullTime: 'Fin du match',
     minutesShort: 'min',
+    savedLocally: 'Enregistré sur cet appareil',
+    saveUnavailable: 'Enregistrement indisponible',
+    teamLabel: 'Équipe',
+    durationLabel: 'Durée',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Waktu Berjalan',
     fullTime: 'Pertandingan Selesai',
     minutesShort: 'mnt',
+    savedLocally: 'Tersimpan di perangkat ini',
+    saveUnavailable: 'Penyimpanan tidak tersedia',
+    teamLabel: 'Tim',
+    durationLabel: 'Durasi',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Tempo in Gioco',
     fullTime: 'Fine partita',
     minutesShort: 'min',
+    savedLocally: 'Salvato su questo dispositivo',
+    saveUnavailable: 'Salvataggio non disponibile',
+    teamLabel: 'Squadra',
+    durationLabel: 'Durata',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'タイムオン',
     fullTime: '試合終了',
     minutesShort: '分',
+    savedLocally: 'この端末に保存済み',
+    saveUnavailable: '保存できません',
+    teamLabel: 'チーム',
+    durationLabel: '時間',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: '타임 온',
     fullTime: '경기 종료',
     minutesShort: '분',
+    savedLocally: '이 기기에 저장됨',
+    saveUnavailable: '저장할 수 없음',
+    teamLabel: '팀',
+    durationLabel: '시간',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Tijd Loopt',
     fullTime: 'Einde wedstrijd',
     minutesShort: 'min',
+    savedLocally: 'Op dit apparaat opgeslagen',
+    saveUnavailable: 'Opslaan niet beschikbaar',
+    teamLabel: 'Team',
+    durationLabel: 'Duur',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Czas włączony',
     fullTime: 'Koniec meczu',
     minutesShort: 'min',
+    savedLocally: 'Zapisano na tym urządzeniu',
+    saveUnavailable: 'Zapisywanie niedostępne',
+    teamLabel: 'Drużyna',
+    durationLabel: 'Czas',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Tempo em Jogo',
     fullTime: 'Fim de jogo',
     minutesShort: 'min',
+    savedLocally: 'Guardado neste dispositivo',
+    saveUnavailable: 'Não foi possível guardar',
+    teamLabel: 'Equipa',
+    durationLabel: 'Duração',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Время вкл',
     fullTime: 'Матч окончен',
     minutesShort: 'мин',
+    savedLocally: 'Сохранено на этом устройстве',
+    saveUnavailable: 'Сохранение недоступно',
+    teamLabel: 'Команда',
+    durationLabel: 'Длительность',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Tid igång',
     fullTime: 'Matchen är slut',
     minutesShort: 'min',
+    savedLocally: 'Sparat på den här enheten',
+    saveUnavailable: 'Det går inte att spara',
+    teamLabel: 'Lag',
+    durationLabel: 'Längd',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: 'Süre başladı',
     fullTime: 'Maç bitti',
     minutesShort: 'dk',
+    savedLocally: 'Bu cihazda kaydedildi',
+    saveUnavailable: 'Kaydetme kullanılamıyor',
+    teamLabel: 'Takım',
+    durationLabel: 'Süre',
   },
 };

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

@@ -216,5 +216,9 @@ export const content: RugbyScoreKeeperLocaleContent = {
     timeOn: '时间开',
     fullTime: '比赛结束',
     minutesShort: '分钟',
+    savedLocally: '已保存到此设备',
+    saveUnavailable: '无法保存',
+    teamLabel: '球队',
+    durationLabel: '时长',
   },
 };

package/src/tool/rugbyScoreKeeper/logic.test.ts

@@ -70,9 +70,11 @@ describe('rugbyScoreKeeper game clock', () => {
   });
 
   it('undoes a sin-bin event and its timer together', () => {
-    const withSinBin = addSinBin(createInitialState(), '  Player <x>  ', 600);
+    const withSinBin = addSinBin(createInitialState(), '  Player <x>  ', 600, 'away');
     expect(withSinBin.sinBin).toHaveLength(1);
     expect(withSinBin.sinBin[0]?.player).toBe('Player <x>');
+    expect(withSinBin.sinBin[0]?.team).toBe('away');
+    expect(withSinBin.history[0]?.team).toBe('away');
     const undone = undoLast(withSinBin);
     expect(undone.sinBin).toEqual([]);
     expect(undone.history).toEqual([]);
@@ -99,4 +101,13 @@ describe('rugbyScoreKeeper game clock', () => {
     const homeTry = scoreTry(state, 'home');
     expect(losingBonus(homeTry.home, homeTry.away, 'away')).toBe(true);
   });
+
+  it('only reduces sin-bin time by clock time actually played before halftime', () => {
+    let state = addSinBin(createInitialState(), 'Number 4', 600, 'home');
+    state = startMatch({ ...state, elapsed: 2390 });
+    state = tickClock(state, 120);
+    expect(state.elapsed).toBe(2400);
+    expect(state.clockRunning).toBe(false);
+    expect(state.sinBin[0]?.remaining).toBe(590);
+  });
 });

package/src/tool/rugbyScoreKeeper/logic.ts

@@ -21,6 +21,7 @@ export interface TeamScore {
 
 export interface SinBinEntry {
   id: number;
+  team: TeamKey;
   player: string;
   remaining: number;
   total: number;
@@ -105,13 +106,13 @@ export function scoreDropGoal(state: MatchState, team: TeamKey): MatchState {
   return s;
 }
 
-export function addSinBin(state: MatchState, player: string, duration: number): MatchState {
+export function addSinBin(state: MatchState, player: string, duration: number, team: TeamKey = 'home'): MatchState {
   const cleanPlayer = player.trim();
   if (state.matchEnded || !cleanPlayer || !Number.isFinite(duration) || duration <= 0) return state;
   const s = structuredClone(state);
   const id = Math.max(Date.now(), ...s.sinBin.map((entry) => entry.id + 1));
-  s.sinBin.push({ id, player: cleanPlayer, remaining: duration, total: duration });
-  pushEvent(s, 'sinbin', 'home', { label: `${cleanPlayer} SIN BIN`, player: cleanPlayer, sinBinId: id });
+  s.sinBin.push({ id, team, player: cleanPlayer, remaining: duration, total: duration });
+  pushEvent(s, 'sinbin', team, { label: `${cleanPlayer} SIN BIN`, player: cleanPlayer, sinBinId: id });
   return s;
 }
 
@@ -127,17 +128,13 @@ export function tickSinBin(state: MatchState, delta: number): MatchState {
 export function tickClock(state: MatchState, delta: number): MatchState {
   const s = structuredClone(state);
   if (!s.clockRunning || s.matchEnded || !Number.isFinite(delta) || delta <= 0) return s;
-  s.elapsed += delta;
-  if (s.elapsed >= 2400 && s.half === 1) {
-    s.elapsed = 2400;
-    s.clockRunning = false;
-  }
-  if (s.elapsed >= 4800) {
-    s.elapsed = 4800;
-    s.clockRunning = false;
-    s.matchEnded = true;
-  }
-  return tickSinBin(s, delta);
+  const limit = s.half === 1 ? 2400 : 4800;
+  const nextElapsed = Math.min(s.elapsed + delta, limit);
+  const appliedDelta = nextElapsed - s.elapsed;
+  s.elapsed = nextElapsed;
+  s.clockRunning = s.elapsed < limit;
+  s.matchEnded = s.elapsed === 4800;
+  return tickSinBin(s, appliedDelta);
 }
 
 export function startMatch(state: MatchState): MatchState {