volleyballsimtypes 0.0.471 → 0.0.473

package/dist/cjs/src/data/transformers/rally-event-injury.test.js

@@ -76,6 +76,33 @@ const rally_event_1 = require("./rally-event");
         const decoded = (0, rally_event_1.transformToSpike)(legacy, roster);
         (0, globals_1.expect)(decoded.incident).toBeUndefined();
     });
+    (0, globals_1.it)('packs a non-actor blocker incident with the hurt player under h and round-trips it', () => {
+        const lead = (0, uuid_1.v4)();
+        const helper = (0, uuid_1.v4)();
+        const blockRoster = [lead, helper];
+        const blockIndex = new Map(blockRoster.map((id, i) => [id, i]));
+        const block = service_1.Block.create({
+            playerId: lead,
+            blockers: [lead, helper],
+            score: 48,
+            target: 8,
+            failure: service_1.BlockFailureEnum.NO_FAILURE,
+            type: service_1.BlockTypeEnum.DOUBLE,
+            incident: { kind: 'KNOCK', severity: 3, playerId: helper }
+        });
+        const compact = (0, rally_event_1.transformToCompact)(block, blockIndex);
+        (0, globals_1.expect)(compact.i).toBe(13);
+        (0, globals_1.expect)(compact.h).toBe(1);
+        const decoded = (0, rally_event_1.transformToBlock)(compact, blockRoster);
+        (0, globals_1.expect)(decoded.incident).toEqual({ kind: 'KNOCK', severity: 3, playerId: helper });
+    });
+    (0, globals_1.it)('omits h when the hurt player IS the event actor', () => {
+        const compact = (0, rally_event_1.transformToCompact)(makeSpike({ kind: 'INJURY', severity: 2, playerId }), playerIndex);
+        (0, globals_1.expect)(compact.i).toBe(2);
+        (0, globals_1.expect)('h' in compact).toBe(false);
+        const decoded = (0, rally_event_1.transformToSpike)(compact, roster);
+        (0, globals_1.expect)(decoded.incident).toEqual({ kind: 'INJURY', severity: 2 });
+    });
     (0, globals_1.it)('rejects an out-of-range or malformed incident at the schema', () => {
         (0, globals_1.expect)(() => makeSpike({ kind: 'INJURY', severity: 5 })).toThrow(/INVALID_SPIKE/);
         (0, globals_1.expect)(() => makeSpike({ kind: 'INJURY', severity: 0 })).toThrow(/INVALID_SPIKE/);

package/dist/cjs/src/data/transformers/rally-event.d.ts

@@ -11,6 +11,7 @@ export interface CompactEvent {
     o?: number;
     j?: number;
     i?: number;
+    h?: number;
 }
 export declare function transformToCompact(evt: RallyEvent, playerIndex: Map<string, number>): CompactEvent;
 export declare function transformToBlock(event: CompactEvent, roster: string[]): Block;

package/dist/cjs/src/data/transformers/rally-event.js

@@ -15,10 +15,14 @@ function incidentToCompact(incident) {
         return undefined;
     return incident.kind === 'KNOCK' ? 10 + incident.severity : incident.severity;
 }
-function incidentFromCompact(i) {
+function incidentFromCompact(i, h, roster) {
     if (i == null)
         return undefined;
-    return i >= 10 ? { kind: 'KNOCK', severity: i - 10 } : { kind: 'INJURY', severity: i };
+    const playerId = h != null && roster != null ? roster[h] : undefined;
+    return {
+        ...(i >= 10 ? { kind: 'KNOCK', severity: i - 10 } : { kind: 'INJURY', severity: i }),
+        ...(playerId != null ? { playerId } : {})
+    };
 }
 function transformToCompact(evt, playerIndex) {
     const out = {
@@ -31,8 +35,12 @@ function transformToCompact(evt, playerIndex) {
         out.a = evt.target;
         out.s = evt.score;
         const i = incidentToCompact(evt.incident);
-        if (i != null)
+        if (i != null) {
             out.i = i;
+            if (evt.incident?.playerId != null && evt.incident.playerId !== evt.playerId) {
+                out.h = playerIndex.get(evt.incident.playerId);
+            }
+        }
         if (evt instanceof service_1.Block) {
             out.b = evt.blockers.map(id => playerIndex.get(id));
         }
@@ -56,7 +64,7 @@ function transformToBlock(event, roster) {
         target: event.a,
         blockers: (event.b ?? []).map(i => roster[i]),
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 function transformToLiberoReplacement(event, roster) {
@@ -73,7 +81,7 @@ function transformToReception(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 function transformToServe(event, roster) {
@@ -83,7 +91,7 @@ function transformToServe(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 function transformToSet(event, roster) {
@@ -93,7 +101,7 @@ function transformToSet(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 function transformToSpike(event, roster) {
@@ -103,7 +111,7 @@ function transformToSpike(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 function transformToSubstitution(event, roster) {

package/dist/cjs/src/service/event/in-play-event.d.ts

@@ -4,6 +4,7 @@ import { Trait } from '../player';
 export interface EventIncident {
     readonly kind: 'KNOCK' | 'INJURY';
     readonly severity: number;
+    readonly playerId?: string;
 }
 export interface InPlayEventOpts extends RallyEventOpts {
     readonly target: CourtTarget;

package/dist/cjs/src/service/event/schemas/block.z.d.ts

@@ -33,6 +33,7 @@ export declare const BlockInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type BlockInput = z.infer<typeof BlockInputSchema>;

package/dist/cjs/src/service/event/schemas/incident.z.d.ts

@@ -5,5 +5,6 @@ export declare const EventIncidentSchema: z.ZodObject<{
         INJURY: "INJURY";
     }>;
     severity: z.ZodNumber;
+    playerId: z.ZodOptional<z.ZodUUID>;
 }, z.core.$strip>;
 export type EventIncidentInput = z.infer<typeof EventIncidentSchema>;

package/dist/cjs/src/service/event/schemas/incident.z.js

@@ -7,5 +7,8 @@ const zod_1 = require("zod");
 // InjurySeverityEnum value (1-4).
 exports.EventIncidentSchema = zod_1.z.object({
     kind: zod_1.z.enum(['KNOCK', 'INJURY']),
-    severity: zod_1.z.number().int().min(1).max(4)
+    severity: zod_1.z.number().int().min(1).max(4),
+    // Who got hurt, ONLY when it is not the event's actor (a secondary blocker on a multi-player block);
+    // absent = the event's own playerId.
+    playerId: zod_1.z.uuid().optional()
 }).refine(v => v.kind !== 'KNOCK' || v.severity <= 3, { message: 'INVALID_KNOCK_TIER' });

package/dist/cjs/src/service/event/schemas/reception.z.d.ts

@@ -32,6 +32,7 @@ export declare const ReceptionInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type ReceptionInput = z.infer<typeof ReceptionInputSchema>;

package/dist/cjs/src/service/event/schemas/serve.z.d.ts

@@ -32,6 +32,7 @@ export declare const ServeInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type ServeInput = z.infer<typeof ServeInputSchema>;

package/dist/cjs/src/service/event/schemas/set.z.d.ts

@@ -32,6 +32,7 @@ export declare const SetInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type SetInput = z.infer<typeof SetInputSchema>;

package/dist/cjs/src/service/event/schemas/spike.z.d.ts

@@ -32,6 +32,7 @@ export declare const SpikeInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type SpikeInput = z.infer<typeof SpikeInputSchema>;

package/dist/esm/src/data/transformers/rally-event-injury.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect } from '@jest/globals';
 import { v4 as uuidv4 } from 'uuid';
-import { EventTypeEnum, Serve, ServeFailureEnum, ServeTypeEnum, Spike, SpikeFailureEnum, SpikeTypeEnum, Substitution } from '../../service';
-import { transformToCompact, transformToServe, transformToSpike, transformToSubstitution } from './rally-event';
+import { Block, BlockFailureEnum, BlockTypeEnum, EventTypeEnum, Serve, ServeFailureEnum, ServeTypeEnum, Spike, SpikeFailureEnum, SpikeTypeEnum, Substitution } from '../../service';
+import { transformToBlock, transformToCompact, transformToServe, transformToSpike, transformToSubstitution } from './rally-event';
 describe('rally-event compact round trip — injury substitution marker', () => {
     const playerIn = uuidv4();
     const playerOut = uuidv4();
@@ -74,6 +74,33 @@ describe('rally-event compact round trip — incident marker on the causing even
         const decoded = transformToSpike(legacy, roster);
         expect(decoded.incident).toBeUndefined();
     });
+    it('packs a non-actor blocker incident with the hurt player under h and round-trips it', () => {
+        const lead = uuidv4();
+        const helper = uuidv4();
+        const blockRoster = [lead, helper];
+        const blockIndex = new Map(blockRoster.map((id, i) => [id, i]));
+        const block = Block.create({
+            playerId: lead,
+            blockers: [lead, helper],
+            score: 48,
+            target: 8,
+            failure: BlockFailureEnum.NO_FAILURE,
+            type: BlockTypeEnum.DOUBLE,
+            incident: { kind: 'KNOCK', severity: 3, playerId: helper }
+        });
+        const compact = transformToCompact(block, blockIndex);
+        expect(compact.i).toBe(13);
+        expect(compact.h).toBe(1);
+        const decoded = transformToBlock(compact, blockRoster);
+        expect(decoded.incident).toEqual({ kind: 'KNOCK', severity: 3, playerId: helper });
+    });
+    it('omits h when the hurt player IS the event actor', () => {
+        const compact = transformToCompact(makeSpike({ kind: 'INJURY', severity: 2, playerId }), playerIndex);
+        expect(compact.i).toBe(2);
+        expect('h' in compact).toBe(false);
+        const decoded = transformToSpike(compact, roster);
+        expect(decoded.incident).toEqual({ kind: 'INJURY', severity: 2 });
+    });
     it('rejects an out-of-range or malformed incident at the schema', () => {
         expect(() => makeSpike({ kind: 'INJURY', severity: 5 })).toThrow(/INVALID_SPIKE/);
         expect(() => makeSpike({ kind: 'INJURY', severity: 0 })).toThrow(/INVALID_SPIKE/);

package/dist/esm/src/data/transformers/rally-event.d.ts

@@ -11,6 +11,7 @@ export interface CompactEvent {
     o?: number;
     j?: number;
     i?: number;
+    h?: number;
 }
 export declare function transformToCompact(evt: RallyEvent, playerIndex: Map<string, number>): CompactEvent;
 export declare function transformToBlock(event: CompactEvent, roster: string[]): Block;

package/dist/esm/src/data/transformers/rally-event.js

@@ -5,10 +5,14 @@ function incidentToCompact(incident) {
         return undefined;
     return incident.kind === 'KNOCK' ? 10 + incident.severity : incident.severity;
 }
-function incidentFromCompact(i) {
+function incidentFromCompact(i, h, roster) {
     if (i == null)
         return undefined;
-    return i >= 10 ? { kind: 'KNOCK', severity: i - 10 } : { kind: 'INJURY', severity: i };
+    const playerId = h != null && roster != null ? roster[h] : undefined;
+    return {
+        ...(i >= 10 ? { kind: 'KNOCK', severity: i - 10 } : { kind: 'INJURY', severity: i }),
+        ...(playerId != null ? { playerId } : {})
+    };
 }
 export function transformToCompact(evt, playerIndex) {
     const out = {
@@ -21,8 +25,12 @@ export function transformToCompact(evt, playerIndex) {
         out.a = evt.target;
         out.s = evt.score;
         const i = incidentToCompact(evt.incident);
-        if (i != null)
+        if (i != null) {
             out.i = i;
+            if (evt.incident?.playerId != null && evt.incident.playerId !== evt.playerId) {
+                out.h = playerIndex.get(evt.incident.playerId);
+            }
+        }
         if (evt instanceof Block) {
             out.b = evt.blockers.map(id => playerIndex.get(id));
         }
@@ -46,7 +54,7 @@ export function transformToBlock(event, roster) {
         target: event.a,
         blockers: (event.b ?? []).map(i => roster[i]),
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 export function transformToLiberoReplacement(event, roster) {
@@ -63,7 +71,7 @@ export function transformToReception(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 export function transformToServe(event, roster) {
@@ -73,7 +81,7 @@ export function transformToServe(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 export function transformToSet(event, roster) {
@@ -83,7 +91,7 @@ export function transformToSet(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 export function transformToSpike(event, roster) {
@@ -93,7 +101,7 @@ export function transformToSpike(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i)
+        incident: incidentFromCompact(event.i, event.h, roster)
     });
 }
 export function transformToSubstitution(event, roster) {

package/dist/esm/src/service/event/in-play-event.d.ts

@@ -4,6 +4,7 @@ import { Trait } from '../player';
 export interface EventIncident {
     readonly kind: 'KNOCK' | 'INJURY';
     readonly severity: number;
+    readonly playerId?: string;
 }
 export interface InPlayEventOpts extends RallyEventOpts {
     readonly target: CourtTarget;

package/dist/esm/src/service/event/schemas/block.z.d.ts

@@ -33,6 +33,7 @@ export declare const BlockInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type BlockInput = z.infer<typeof BlockInputSchema>;

package/dist/esm/src/service/event/schemas/incident.z.d.ts

@@ -5,5 +5,6 @@ export declare const EventIncidentSchema: z.ZodObject<{
         INJURY: "INJURY";
     }>;
     severity: z.ZodNumber;
+    playerId: z.ZodOptional<z.ZodUUID>;
 }, z.core.$strip>;
 export type EventIncidentInput = z.infer<typeof EventIncidentSchema>;

package/dist/esm/src/service/event/schemas/incident.z.js

@@ -4,5 +4,8 @@ import { z } from 'zod';
 // InjurySeverityEnum value (1-4).
 export const EventIncidentSchema = z.object({
     kind: z.enum(['KNOCK', 'INJURY']),
-    severity: z.number().int().min(1).max(4)
+    severity: z.number().int().min(1).max(4),
+    // Who got hurt, ONLY when it is not the event's actor (a secondary blocker on a multi-player block);
+    // absent = the event's own playerId.
+    playerId: z.uuid().optional()
 }).refine(v => v.kind !== 'KNOCK' || v.severity <= 3, { message: 'INVALID_KNOCK_TIER' });

package/dist/esm/src/service/event/schemas/reception.z.d.ts

@@ -32,6 +32,7 @@ export declare const ReceptionInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type ReceptionInput = z.infer<typeof ReceptionInputSchema>;

package/dist/esm/src/service/event/schemas/serve.z.d.ts

@@ -32,6 +32,7 @@ export declare const ServeInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type ServeInput = z.infer<typeof ServeInputSchema>;

package/dist/esm/src/service/event/schemas/set.z.d.ts

@@ -32,6 +32,7 @@ export declare const SetInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type SetInput = z.infer<typeof SetInputSchema>;

package/dist/esm/src/service/event/schemas/spike.z.d.ts

@@ -32,6 +32,7 @@ export declare const SpikeInputSchema: z.ZodObject<{
             INJURY: "INJURY";
         }>;
         severity: z.ZodNumber;
+        playerId: z.ZodOptional<z.ZodUUID>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type SpikeInput = z.infer<typeof SpikeInputSchema>;

package/package.json

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