volleyballsimtypes 0.0.423 → 0.0.424

package/dist/cjs/src/service/match/rally-metrics.d.ts

@@ -31,6 +31,9 @@ export interface TeamRallyMetrics {
     modReceptions: number;
     modSideoutWins: number;
     modSideoutPct: number;
+    fbsoWins: number;
+    fbsoPct: number;
+    modFbsoPct: number;
     rotations: RotationMetrics[];
 }
 export interface SetRallyMetrics {

package/dist/cjs/src/service/match/rally-metrics.js

@@ -4,12 +4,18 @@ exports.computeRallyMetrics = computeRallyMetrics;
 const event_1 = require("../event");
 const court_position_1 = require("./court-position");
 function newAcc() {
-    return { serves: 0, breakpointWins: 0, receptions: 0, sideoutWins: 0, serviceErrorsReceived: 0, rotations: new Map() };
+    return { serves: 0, breakpointWins: 0, receptions: 0, sideoutWins: 0, serviceErrorsReceived: 0, fbsoWins: 0, rotations: new Map() };
 }
 function isServiceError(rally) {
     const serve = rally.events.find(e => e.eventType === event_1.EventTypeEnum.SERVE);
     return serve != null && (serve.failure ?? 0) > 0;
 }
+// A first-ball sideout is won on the receiving team's first attack: the rally has exactly one spike (the
+// engine scores a second spike as a transition). This counts first-ball kills and the block errors forced
+// on that first attack, and excludes service-error sideouts (no spike) and dig-and-transition rallies (2+).
+function spikeCount(rally) {
+    return rally.events.reduce((n, e) => e.eventType === event_1.EventTypeEnum.SPIKE ? n + 1 : n, 0);
+}
 // The setter's zone after (rotationIndex - 1) rotations from their start zone, using the engine's own
 // rotatePosition (each rotation moves a player one zone: 2->1, 1->6, ...). null when no setter.
 function setterZoneAt(startZone, rotationIndex) {
@@ -62,6 +68,8 @@ function accumulateSet(set, homeId, awayId, homeAcc, awayAcc) {
         }
         else {
             receiving.sideoutWins++;
+            if (spikeCount(rallies[i]) === 1)
+                receiving.fbsoWins++;
             addRotationPoint(winner, zone, rotIdx, 'sideout');
         }
         // The sideout winner gains serve, so they rotate (after the point is attributed to their old rotation).
@@ -86,6 +94,9 @@ function finalizeTeam(acc) {
         modReceptions,
         modSideoutWins,
         modSideoutPct: modReceptions > 0 ? (modSideoutWins / modReceptions) * 100 : 0,
+        fbsoWins: acc.fbsoWins,
+        fbsoPct: acc.receptions > 0 ? (acc.fbsoWins / acc.receptions) * 100 : 0,
+        modFbsoPct: modReceptions > 0 ? (acc.fbsoWins / modReceptions) * 100 : 0,
         rotations
     };
 }

package/dist/cjs/src/service/match/rally-metrics.test.js

@@ -57,3 +57,36 @@ describe('computeRallyMetrics()', () => {
         ]);
     });
 });
+// First ball sideout: a sideout won on the receiving team's first attack (exactly one spike in the rally).
+const serveEv = (failure = 0) => ({ eventType: event_1.EventTypeEnum.SERVE, failure });
+const spikeEv = () => ({ eventType: event_1.EventTypeEnum.SPIKE, failure: 0 });
+// serving H, A, H, A ; winners A, H, A, A (A 3 - H 1). Setter-agnostic, so no setters.
+const fbsoSet = {
+    homePoints: 1,
+    awayPoints: 3,
+    homeSetterStartZone: null,
+    awaySetterStartZone: null,
+    rallies: [
+        { servingTeamId: HOME, events: [serveEv(), spikeEv()] }, // A sideout on 1 spike -> A FBSO
+        { servingTeamId: AWAY, events: [serveEv(), spikeEv(), spikeEv()] }, // H sideout on 2 spikes -> transition, not FBSO
+        { servingTeamId: HOME, events: [serveEv(1)] }, // A sideout via H service error, 0 spikes -> not FBSO
+        { servingTeamId: AWAY, events: [serveEv(), spikeEv()] } // A breakpoint (A serving) -> not a reception win
+    ]
+};
+const fm = (0, rally_metrics_1.computeRallyMetrics)([fbsoSet], HOME, AWAY);
+describe('computeRallyMetrics() first ball sideout', () => {
+    it('counts only sideouts won on the first attack (one spike)', () => {
+        expect(fm.total.away.receptions).toBe(2);
+        expect(fm.total.away.fbsoWins).toBe(1);
+        expect(fm.total.away.fbsoPct).toBeCloseTo(50, 5);
+    });
+    it('modified FBSO excludes opponent service errors from the denominator', () => {
+        expect(fm.total.away.serviceErrorsReceived).toBe(1);
+        expect(fm.total.away.modFbsoPct).toBeCloseTo(100, 5);
+    });
+    it('ignores transition sideouts (2+ spikes) and reception losses', () => {
+        expect(fm.total.home.fbsoWins).toBe(0);
+        expect(fm.total.home.fbsoPct).toBe(0);
+        expect(fm.total.home.modFbsoPct).toBe(0);
+    });
+});

package/dist/esm/src/service/match/rally-metrics.d.ts

@@ -31,6 +31,9 @@ export interface TeamRallyMetrics {
     modReceptions: number;
     modSideoutWins: number;
     modSideoutPct: number;
+    fbsoWins: number;
+    fbsoPct: number;
+    modFbsoPct: number;
     rotations: RotationMetrics[];
 }
 export interface SetRallyMetrics {

package/dist/esm/src/service/match/rally-metrics.js

@@ -1,12 +1,18 @@
 import { EventTypeEnum } from '../event';
 import { rotatePosition } from './court-position';
 function newAcc() {
-    return { serves: 0, breakpointWins: 0, receptions: 0, sideoutWins: 0, serviceErrorsReceived: 0, rotations: new Map() };
+    return { serves: 0, breakpointWins: 0, receptions: 0, sideoutWins: 0, serviceErrorsReceived: 0, fbsoWins: 0, rotations: new Map() };
 }
 function isServiceError(rally) {
     const serve = rally.events.find(e => e.eventType === EventTypeEnum.SERVE);
     return serve != null && (serve.failure ?? 0) > 0;
 }
+// A first-ball sideout is won on the receiving team's first attack: the rally has exactly one spike (the
+// engine scores a second spike as a transition). This counts first-ball kills and the block errors forced
+// on that first attack, and excludes service-error sideouts (no spike) and dig-and-transition rallies (2+).
+function spikeCount(rally) {
+    return rally.events.reduce((n, e) => e.eventType === EventTypeEnum.SPIKE ? n + 1 : n, 0);
+}
 // The setter's zone after (rotationIndex - 1) rotations from their start zone, using the engine's own
 // rotatePosition (each rotation moves a player one zone: 2->1, 1->6, ...). null when no setter.
 function setterZoneAt(startZone, rotationIndex) {
@@ -59,6 +65,8 @@ function accumulateSet(set, homeId, awayId, homeAcc, awayAcc) {
         }
         else {
             receiving.sideoutWins++;
+            if (spikeCount(rallies[i]) === 1)
+                receiving.fbsoWins++;
             addRotationPoint(winner, zone, rotIdx, 'sideout');
         }
         // The sideout winner gains serve, so they rotate (after the point is attributed to their old rotation).
@@ -83,6 +91,9 @@ function finalizeTeam(acc) {
         modReceptions,
         modSideoutWins,
         modSideoutPct: modReceptions > 0 ? (modSideoutWins / modReceptions) * 100 : 0,
+        fbsoWins: acc.fbsoWins,
+        fbsoPct: acc.receptions > 0 ? (acc.fbsoWins / acc.receptions) * 100 : 0,
+        modFbsoPct: modReceptions > 0 ? (acc.fbsoWins / modReceptions) * 100 : 0,
         rotations
     };
 }

package/dist/esm/src/service/match/rally-metrics.test.js

@@ -55,3 +55,36 @@ describe('computeRallyMetrics()', () => {
         ]);
     });
 });
+// First ball sideout: a sideout won on the receiving team's first attack (exactly one spike in the rally).
+const serveEv = (failure = 0) => ({ eventType: EventTypeEnum.SERVE, failure });
+const spikeEv = () => ({ eventType: EventTypeEnum.SPIKE, failure: 0 });
+// serving H, A, H, A ; winners A, H, A, A (A 3 - H 1). Setter-agnostic, so no setters.
+const fbsoSet = {
+    homePoints: 1,
+    awayPoints: 3,
+    homeSetterStartZone: null,
+    awaySetterStartZone: null,
+    rallies: [
+        { servingTeamId: HOME, events: [serveEv(), spikeEv()] }, // A sideout on 1 spike -> A FBSO
+        { servingTeamId: AWAY, events: [serveEv(), spikeEv(), spikeEv()] }, // H sideout on 2 spikes -> transition, not FBSO
+        { servingTeamId: HOME, events: [serveEv(1)] }, // A sideout via H service error, 0 spikes -> not FBSO
+        { servingTeamId: AWAY, events: [serveEv(), spikeEv()] } // A breakpoint (A serving) -> not a reception win
+    ]
+};
+const fm = computeRallyMetrics([fbsoSet], HOME, AWAY);
+describe('computeRallyMetrics() first ball sideout', () => {
+    it('counts only sideouts won on the first attack (one spike)', () => {
+        expect(fm.total.away.receptions).toBe(2);
+        expect(fm.total.away.fbsoWins).toBe(1);
+        expect(fm.total.away.fbsoPct).toBeCloseTo(50, 5);
+    });
+    it('modified FBSO excludes opponent service errors from the denominator', () => {
+        expect(fm.total.away.serviceErrorsReceived).toBe(1);
+        expect(fm.total.away.modFbsoPct).toBeCloseTo(100, 5);
+    });
+    it('ignores transition sideouts (2+ spikes) and reception losses', () => {
+        expect(fm.total.home.fbsoWins).toBe(0);
+        expect(fm.total.home.fbsoPct).toBe(0);
+        expect(fm.total.home.modFbsoPct).toBe(0);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volleyballsimtypes",
-  "version": "0.0.423",
+  "version": "0.0.424",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",