volleyballsimtypes 0.0.514 → 0.0.516

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

@@ -94,7 +94,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
                 { rotationSystem: '4-2', designatedSetters: [p1, p4] }
             ],
             offensivePreferenceSets: [
-                [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }],
+                [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }],
                 []
             ]
         }));
@@ -103,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, weights: { [p3.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 2, priorities: { [p3.id]: 'HIGH' } }]]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -152,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, weights: { [p2.id]: 100 } }, { rotation: 1, weights: { [p3.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 1, priorities: { [p2.id]: 'HIGH' } }, { rotation: 1, priorities: { [p3.id]: 'HIGH' } }]]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -162,25 +162,38 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects a per-set preferences map that keys a non-starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, weights: { [reserve.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 1, priorities: { [reserve.id]: 'HIGH' } }]]
         }));
         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', () => {
+    it('accepts offensive priorities with no sum constraint', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 40 } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'LOW' } }]
+        }));
+        expect(res.success).toBe(true);
+    });
+    it('rejects an invalid attack priority value', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'MEGA' } }]
         }));
         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 a priority / tempo / no-block keyed by a designated substitute', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [reserve] },
+            designatedSubs: [{ starter: p2, bench: reserve }],
+            offensivePreferences: [{ rotation: 1, priorities: { [reserve.id]: 'HIGH' }, tempos: { [reserve.id]: 'FAST' } }],
+            blockingPreferences: [{ rotation: 1, commit: {}, noBlock: { DEF_L: [reserve.id], DEF_M: [], DEF_R: [] } }],
+            basePositions: { coords: {}, receive: {}, receiveByPlayer: { 1: { [reserve.id]: false } } }
+        }));
+        expect(res.success).toBe(true);
     });
     it('accepts offensive preferences with a starter-keyed tempos map', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -189,7 +202,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, weights: { [p2.id]: 100 }, tempos: { [reserve.id]: 'FAST' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH' }, tempos: { [reserve.id]: 'FAST' } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -198,7 +211,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects an invalid tempo value', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [p2.id]: 'SLOW' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH' }, tempos: { [p2.id]: 'SLOW' } }]
         }));
         expect(res.success).toBe(false);
     });
@@ -323,83 +336,3 @@ describe('TacticsInputSchema — blocking preferences', () => {
         expect(res.success).toBe(false);
     });
 });
-describe('TacticsInputSchema — serve attack shares', () => {
-    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);
-    // p5 sits at zone 5 (back row) and is the configured libero replacement, so it may carry a serve share.
-    function baseInput(overrides = {}) {
-        return {
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            ...overrides
-        };
-    }
-    it('accepts a serve share keyed by a libero replacement, value in band', () => {
-        const res = TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 30 } }));
-        expect(res.success).toBe(true);
-        if (res.success)
-            expect(res.data.serveAttackShares[p5.id]).toBe(30);
-    });
-    it('accepts 0 and 100 at the band edges', () => {
-        expect(TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 0 } })).success).toBe(true);
-        expect(TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 100 } })).success).toBe(true);
-    });
-    it('rejects a serve share keyed by a starter who is not a libero replacement', () => {
-        const res = TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p2.id]: 30 } }));
-        expect(res.success).toBe(false);
-        if (!res.success) {
-            expect(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_NOT_A_LIBERO_REPLACEMENT')).toBe(true);
-        }
-    });
-    it('rejects a serve share keyed by a reserve', () => {
-        const res = TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [reserve.id]: 30 } }));
-        expect(res.success).toBe(false);
-        if (!res.success) {
-            expect(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_NOT_A_LIBERO_REPLACEMENT')).toBe(true);
-        }
-    });
-    it('rejects an out-of-band serve share (over 100)', () => {
-        const res = TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 101 } }));
-        expect(res.success).toBe(false);
-        if (!res.success) {
-            expect(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_OUT_OF_BAND')).toBe(true);
-        }
-    });
-    it('rejects a negative serve share', () => {
-        const res = TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: -1 } }));
-        expect(res.success).toBe(false);
-        if (!res.success) {
-            expect(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_OUT_OF_BAND')).toBe(true);
-        }
-    });
-    it('validates independently of the offensive-preference sum-to-100 (never enters that total)', () => {
-        // The other attackers' weights sum to exactly 100; the serve share on the libero replacement is separate
-        // and must not push the rotation over 100 or otherwise fail.
-        const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 50 } }],
-            serveAttackShares: { [p5.id]: 40 }
-        }));
-        expect(res.success).toBe(true);
-    });
-    it('accepts a serve share on a per-set libero replacement', () => {
-        // p6 is a back-row starter made a libero replacement only via liberoReplacementSets.
-        const res = TacticsInputSchema.safeParse(baseInput({
-            liberoReplacements: [],
-            liberoReplacementSets: [[p6]],
-            serveAttackShares: { [p6.id]: 25 }
-        }));
-        expect(res.success).toBe(true);
-    });
-    it('defaults serveAttackShares to an empty map when omitted', () => {
-        const res = TacticsInputSchema.safeParse(baseInput());
-        expect(res.success).toBe(true);
-        if (res.success)
-            expect(res.data.serveAttackShares).toEqual({});
-    });
-});

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

@@ -269,23 +269,32 @@ 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;
-            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+            priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+                HIGH: "HIGH";
+                MID: "MID";
+                LOW: "LOW";
+                NONE: "NONE";
+            }>>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-                FAST: "FAST";
                 HIGH: "HIGH";
+                FAST: "FAST";
             }>>>;
         }, z.core.$strip>>>;
-        serveAttackShares: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodNumber>>;
         systemSets: z.ZodOptional<z.ZodArray<z.ZodObject<{
             rotationSystem: z.ZodEnum<typeof import("..").RotationSystemEnum>;
             designatedSetters: z.ZodArray<z.ZodCustom<Player, Player>>;
         }, z.core.$strip>>>;
         offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+            priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+                HIGH: "HIGH";
+                MID: "MID";
+                LOW: "LOW";
+                NONE: "NONE";
+            }>>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-                FAST: "FAST";
                 HIGH: "HIGH";
+                FAST: "FAST";
             }>>>;
         }, z.core.$strip>>>>;
         blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -312,7 +321,12 @@ export declare const TeamInputSchema: z.ZodObject<{
                 r: z.ZodNumber;
             }, z.core.$strip>>>>;
             receive: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>;
+            receiveByPlayer: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>;
             blocking: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>>;
+            attackContact: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
+                d: z.ZodNumber;
+                r: z.ZodNumber;
+            }, z.core.$strip>>>>;
         }, z.core.$strip>>;
         replaceKnockedImmediately: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
         injuryReplacements: z.ZodDefault<z.ZodArray<z.ZodObject<{

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

@@ -35,7 +35,6 @@ export interface TacticsOpts {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
-    readonly serveAttackShares: Record<string, number>;
     readonly systemSets?: SystemSet[];
     readonly offensivePreferenceSets?: OffensivePreference[][];
     readonly replaceKnockedImmediately: Record<string, boolean>;
@@ -57,7 +56,6 @@ export declare class Tactics {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
-    readonly serveAttackShares: Record<string, number>;
     readonly systemSets?: SystemSet[];
     readonly offensivePreferenceSets?: OffensivePreference[][];
     readonly replaceKnockedImmediately: Record<string, boolean>;

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 = [], serveAttackShares = {}, systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury, blockingPreferences = [], blockingPreferenceSets, basePositions }) {
+    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, basePositions }) {
         this.lineup = lineup;
         this.liberoReplacements = liberoReplacements;
         this.receiveRotationOffset = receiveRotationOffset;
@@ -27,7 +27,6 @@ export class Tactics {
         this.rotationSystem = rotationSystem;
         this.designatedSetters = designatedSetters;
         this.offensivePreferences = offensivePreferences;
-        this.serveAttackShares = serveAttackShares;
         this.systemSets = systemSets;
         this.offensivePreferenceSets = offensivePreferenceSets;
         this.replaceKnockedImmediately = replaceKnockedImmediately;

package/package.json

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