volleyballsimtypes 0.0.510 → 0.0.511

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

@@ -1,6 +1,7 @@
 export interface RallyMetricsEvent {
     readonly eventType: number;
     readonly failure?: number;
+    readonly type?: number;
 }
 export interface RallyMetricsRally {
     readonly servingTeamId: string;

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

@@ -14,7 +14,9 @@ function isServiceError(rally) {
 // 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);
+    // An attack is a SPIKE, or a SET whose type is DUMP (the setter attacking on the second ball). Counting the
+    // dump matches the report builder's attack test, so a first-ball sideout won on a dump is not dropped.
+    return rally.events.reduce((n, e) => (e.eventType === event_1.EventTypeEnum.SPIKE || (e.eventType === event_1.EventTypeEnum.SET && e.type === event_1.SetTypeEnum.DUMP)) ? 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.

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

@@ -90,3 +90,25 @@ describe('computeRallyMetrics() first ball sideout', () => {
         expect(fm.total.home.modFbsoPct).toBe(0);
     });
 });
+// The positional engine emits a setter DUMP as a SET event (type DUMP), not a SPIKE. A first-ball sideout won
+// on a dump is still a first attack and must count as an FBSO. (Regression: spikeCount used to count only SPIKE.)
+const dumpEv = () => ({ eventType: event_1.EventTypeEnum.SET, type: event_1.SetTypeEnum.DUMP, failure: 0 });
+// serving H, A ; winners A, A (A 2 - H 0). A sides out on rally 0 via a single setter dump (no spike).
+const dumpSet = {
+    homePoints: 0,
+    awayPoints: 2,
+    homeSetterStartZone: null,
+    awaySetterStartZone: null,
+    rallies: [
+        { servingTeamId: HOME, events: [serveEv(), dumpEv()] }, // A sideout on a dump -> A FBSO
+        { servingTeamId: AWAY, events: [serveEv()] } // A breakpoint (A serving) -> not a reception win
+    ]
+};
+const dm = (0, rally_metrics_1.computeRallyMetrics)([dumpSet], HOME, AWAY);
+describe('computeRallyMetrics() first ball sideout - setter dump', () => {
+    it('counts a first-ball sideout won on a setter dump (SET type DUMP), not just a spike', () => {
+        expect(dm.total.away.receptions).toBe(1);
+        expect(dm.total.away.fbsoWins).toBe(1);
+        expect(dm.total.away.fbsoPct).toBeCloseTo(100, 5);
+    });
+});

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

@@ -1,6 +1,7 @@
 export interface RallyMetricsEvent {
     readonly eventType: number;
     readonly failure?: number;
+    readonly type?: number;
 }
 export interface RallyMetricsRally {
     readonly servingTeamId: string;

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

@@ -1,4 +1,4 @@
-import { EventTypeEnum } from '../event';
+import { EventTypeEnum, SetTypeEnum } from '../event';
 import { rotatePosition } from './court-position';
 function newAcc() {
     return { serves: 0, breakpointWins: 0, receptions: 0, sideoutWins: 0, serviceErrorsReceived: 0, fbsoWins: 0, rotations: new Map() };
@@ -11,7 +11,9 @@ function isServiceError(rally) {
 // 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);
+    // An attack is a SPIKE, or a SET whose type is DUMP (the setter attacking on the second ball). Counting the
+    // dump matches the report builder's attack test, so a first-ball sideout won on a dump is not dropped.
+    return rally.events.reduce((n, e) => (e.eventType === EventTypeEnum.SPIKE || (e.eventType === EventTypeEnum.SET && e.type === SetTypeEnum.DUMP)) ? 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.

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

@@ -1,5 +1,5 @@
 import { computeRallyMetrics } from './rally-metrics';
-import { EventTypeEnum } from '../event';
+import { EventTypeEnum, SetTypeEnum } from '../event';
 const serve = (failure = 0) => ({
     events: [{ eventType: EventTypeEnum.SERVE, failure }]
 });
@@ -88,3 +88,25 @@ describe('computeRallyMetrics() first ball sideout', () => {
         expect(fm.total.home.modFbsoPct).toBe(0);
     });
 });
+// The positional engine emits a setter DUMP as a SET event (type DUMP), not a SPIKE. A first-ball sideout won
+// on a dump is still a first attack and must count as an FBSO. (Regression: spikeCount used to count only SPIKE.)
+const dumpEv = () => ({ eventType: EventTypeEnum.SET, type: SetTypeEnum.DUMP, failure: 0 });
+// serving H, A ; winners A, A (A 2 - H 0). A sides out on rally 0 via a single setter dump (no spike).
+const dumpSet = {
+    homePoints: 0,
+    awayPoints: 2,
+    homeSetterStartZone: null,
+    awaySetterStartZone: null,
+    rallies: [
+        { servingTeamId: HOME, events: [serveEv(), dumpEv()] }, // A sideout on a dump -> A FBSO
+        { servingTeamId: AWAY, events: [serveEv()] } // A breakpoint (A serving) -> not a reception win
+    ]
+};
+const dm = computeRallyMetrics([dumpSet], HOME, AWAY);
+describe('computeRallyMetrics() first ball sideout - setter dump', () => {
+    it('counts a first-ball sideout won on a setter dump (SET type DUMP), not just a spike', () => {
+        expect(dm.total.away.receptions).toBe(1);
+        expect(dm.total.away.fbsoWins).toBe(1);
+        expect(dm.total.away.fbsoPct).toBeCloseTo(100, 5);
+    });
+});

package/package.json

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