volleyballsimtypes 0.0.480 → 0.0.482

package/dist/esm/src/service/team/schemas/tactics.z.test.js

@@ -1,5 +1,6 @@
 import { describe, it, expect } from '@jest/globals';
 import { TacticsInputSchema } from './tactics.z';
+import { RoleEnum } from '../../player';
 import { makeCountry, makePlayer } from '../../test-helpers';
 describe('TacticsInputSchema — second libero rules', () => {
     const country = makeCountry();
@@ -93,7 +94,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
                 { rotationSystem: '4-2', designatedSetters: [p1, p4] }
             ],
             offensivePreferenceSets: [
-                [{ rotation: 1, order: [p2, p3] }],
+                [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }],
                 []
             ]
         }));
@@ -102,7 +103,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     it('carries the per-set fields through Tactics.create parsing', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
             systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
-            offensivePreferenceSets: [[{ rotation: 2, order: [p3] }]]
+            offensivePreferenceSets: [[{ rotation: 2, weights: { [p3.id]: 100 } }]]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -151,7 +152,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects a per-set preferences list with a duplicate rotation', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, order: [p2] }, { rotation: 1, order: [p3] }]]
+            offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 100 } }, { rotation: 1, weights: { [p3.id]: 100 } }]]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -159,18 +160,27 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
             expect(issue?.path).toEqual(['offensivePreferenceSets', 0]);
         }
     });
-    it('rejects a per-set preferences order that lists a non-starter', () => {
+    it('rejects a per-set preferences map that keys a non-starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, order: [reserve] }]]
+            offensivePreferenceSets: [[{ rotation: 1, weights: { [reserve.id]: 100 } }]]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
             expect(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER')).toBe(true);
         }
     });
+    it('rejects offensive preference weights that do not sum to 100', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 40 } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_WEIGHTS_MUST_SUM_TO_100')).toBe(true);
+        }
+    });
     it('accepts offensive preferences with a starter-keyed tempos map', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2, p3], tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -179,7 +189,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects a tempos map keyed by a non-starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2], tempos: { [reserve.id]: 'FAST' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [reserve.id]: 'FAST' } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -188,7 +198,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects an invalid tempo value', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2], tempos: { [p2.id]: 'SLOW' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [p2.id]: 'SLOW' } }]
         }));
         expect(res.success).toBe(false);
     });
@@ -206,3 +216,66 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
         }
     });
 });
+describe('TacticsInputSchema — blocking preferences', () => {
+    const country = makeCountry();
+    const p1 = makePlayer(country);
+    const p2 = makePlayer(country);
+    const p3 = makePlayer(country);
+    const p4 = makePlayer(country);
+    const p5 = makePlayer(country);
+    const p6 = makePlayer(country);
+    const reserve = makePlayer(country);
+    // Front-row starters (zones 2/3/4) are p2, p3, p4; the validator only requires target keys to be starters.
+    function baseInput(overrides = {}) {
+        return {
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            ...overrides
+        };
+    }
+    it('accepts a blocking preference that keys starters to attacking functions', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }]
+        }));
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.blockingPreferences[0].targets[p4.id]).toBe(RoleEnum.OUTSIDE_HITTER);
+        }
+    });
+    it('rejects a blocking target that is not a starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [reserve.id]: RoleEnum.OUTSIDE_HITTER } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_PREFERENCE_BLOCKER_NOT_A_STARTER')).toBe(true);
+        }
+    });
+    it('rejects a blocking target function of libero', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.LIBERO } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_TARGET_CANNOT_BE_LIBERO')).toBe(true);
+        }
+    });
+    it('rejects a duplicate rotation in blocking preferences', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [
+                { rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER } },
+                { rotation: 1, targets: { [p3.id]: RoleEnum.MIDDLE_BLOCKER } }
+            ]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_PREFERENCE_DUPLICATE_ROTATION')).toBe(true);
+        }
+    });
+    it('accepts per-set blocking preference overrides', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferenceSets: [[{ rotation: 1, targets: { [p4.id]: RoleEnum.OPPOSITE_HITTER } }], []]
+        }));
+        expect(res.success).toBe(true);
+    });
+});

package/dist/esm/src/service/team/schemas/team.z.d.ts

@@ -277,7 +277,7 @@ export declare const TeamInputSchema: z.ZodObject<{
         designatedSetters: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;
         offensivePreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            order: z.ZodArray<z.ZodCustom<Player, Player>>;
+            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
                 FAST: "FAST";
                 HIGH: "HIGH";
@@ -289,12 +289,20 @@ export declare const TeamInputSchema: z.ZodObject<{
         }, z.core.$strip>>>;
         offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            order: z.ZodArray<z.ZodCustom<Player, Player>>;
+            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
                 FAST: "FAST";
                 HIGH: "HIGH";
             }>>>;
         }, z.core.$strip>>>>;
+        blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
+            rotation: z.ZodNumber;
+            targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof import("../../player").RoleEnum> & z.ZodType<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum, z.core.$ZodTypeInternals<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum>>>;
+        }, z.core.$strip>>>;
+        blockingPreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+            rotation: z.ZodNumber;
+            targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof import("../../player").RoleEnum> & z.ZodType<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum, z.core.$ZodTypeInternals<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum>>>;
+        }, z.core.$strip>>>>;
         replaceKnockedImmediately: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
         injuryReplacements: z.ZodDefault<z.ZodArray<z.ZodObject<{
             starter: z.ZodCustom<Player, Player>;

package/dist/esm/src/service/team/tactics.d.ts

@@ -5,6 +5,7 @@ import { LiberoSubConfig } from './libero-sub';
 import { SubBand } from './energy-band';
 import { RotationSystemEnum } from './rotation-system';
 import { OffensivePreference } from './offensive-preference';
+import { BlockingPreference } from './blocking-preference';
 import { InjuryReplacement } from './injury-replacement';
 import { LiberoInjuryConfig } from './libero-injury';
 export interface StartingLineup {
@@ -38,6 +39,8 @@ export interface TacticsOpts {
     readonly replaceKnockedImmediately: Record<string, boolean>;
     readonly injuryReplacements: InjuryReplacement[];
     readonly liberoInjury?: LiberoInjuryConfig;
+    readonly blockingPreferences: BlockingPreference[];
+    readonly blockingPreferenceSets?: BlockingPreference[][];
 }
 export declare class Tactics {
     readonly lineup: StartingLineup;
@@ -56,6 +59,8 @@ export declare class Tactics {
     readonly replaceKnockedImmediately: Record<string, boolean>;
     readonly injuryReplacements: InjuryReplacement[];
     readonly liberoInjury?: LiberoInjuryConfig;
+    readonly blockingPreferences: BlockingPreference[];
+    readonly blockingPreferenceSets?: BlockingPreference[][];
     static create(input: unknown): Tactics;
     private constructor();
     findPlayerInLineup(id: string): CourtPosition | undefined;

package/dist/esm/src/service/team/tactics.js

@@ -15,7 +15,7 @@ export class Tactics {
         }
         return new Tactics(result.data);
     }
-    constructor({ lineup, liberoReplacements, receiveRotationOffset = false, designatedSubs = [], substitutionBand = EnergyBand.TIRED, secondLibero, liberoSub, liberoReplacementSets, rotationSystem = RotationSystemEnum.SIX_ZERO, designatedSetters = [], offensivePreferences = [], systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury }) {
+    constructor({ lineup, liberoReplacements, receiveRotationOffset = false, designatedSubs = [], substitutionBand = EnergyBand.TIRED, secondLibero, liberoSub, liberoReplacementSets, rotationSystem = RotationSystemEnum.SIX_ZERO, designatedSetters = [], offensivePreferences = [], systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury, blockingPreferences = [], blockingPreferenceSets }) {
         this.lineup = lineup;
         this.liberoReplacements = liberoReplacements;
         this.receiveRotationOffset = receiveRotationOffset;
@@ -32,6 +32,8 @@ export class Tactics {
         this.replaceKnockedImmediately = replaceKnockedImmediately;
         this.injuryReplacements = injuryReplacements;
         this.liberoInjury = liberoInjury;
+        this.blockingPreferences = blockingPreferences;
+        this.blockingPreferenceSets = blockingPreferenceSets;
     }
     findPlayerInLineup(id) {
         if (this.lineup.bench.some(p => p.id === id))

package/package.json

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