volleyballsimtypes 0.0.505 → 0.0.507

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

@@ -234,18 +234,31 @@ describe('TacticsInputSchema — blocking preferences', () => {
             ...overrides
         };
     }
-    it('accepts a blocking preference that keys starters to attacking functions', () => {
+    it('accepts a blocking preference that keys starters to attacking functions, per defence side', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: RoleEnum.OUTSIDE_HITTER }, DEF_M: {}, DEF_R: { [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);
+            expect(res.data.blockingPreferences[0].targets.DEF_L[p4.id]).toBe(RoleEnum.OUTSIDE_HITTER);
+            expect(res.data.blockingPreferences[0].targets.DEF_R[p3.id]).toBe(RoleEnum.MIDDLE_BLOCKER);
+            expect(res.data.blockingPreferences[0].targets.DEF_M).toEqual({}); // the middle side is independent (empty here)
         }
     });
-    it('rejects a blocking target that is not a starter', () => {
+    it('defaults the omitted defence sides to empty maps', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [reserve.id]: RoleEnum.OUTSIDE_HITTER } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: NO_BLOCK } } }]
+        }));
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.blockingPreferences[0].targets.DEF_L[p4.id]).toBe(NO_BLOCK);
+            expect(res.data.blockingPreferences[0].targets.DEF_M).toEqual({});
+            expect(res.data.blockingPreferences[0].targets.DEF_R).toEqual({});
+        }
+    });
+    it('rejects a blocking target (on any side) that is not a starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { DEF_M: { [reserve.id]: RoleEnum.OUTSIDE_HITTER } } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -254,7 +267,7 @@ describe('TacticsInputSchema — blocking preferences', () => {
     });
     it('rejects a blocking target function of libero', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.LIBERO } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: RoleEnum.LIBERO } } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -264,8 +277,8 @@ describe('TacticsInputSchema — blocking preferences', () => {
     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 } }
+                { rotation: 1, targets: { DEF_L: { [p4.id]: RoleEnum.OUTSIDE_HITTER } } },
+                { rotation: 1, targets: { DEF_M: { [p3.id]: RoleEnum.MIDDLE_BLOCKER } } }
             ]
         }));
         expect(res.success).toBe(false);
@@ -275,29 +288,29 @@ describe('TacticsInputSchema — blocking preferences', () => {
     });
     it('accepts per-set blocking preference overrides', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferenceSets: [[{ rotation: 1, targets: { [p4.id]: RoleEnum.OPPOSITE_HITTER } }], []]
+            blockingPreferenceSets: [[{ rotation: 1, targets: { DEF_R: { [p4.id]: RoleEnum.OPPOSITE_HITTER } } }], []]
         }));
         expect(res.success).toBe(true);
     });
-    it('accepts NO_BLOCK as an assignment, alongside a commit on another starter', () => {
+    it('accepts NO_BLOCK as an assignment, alongside a commit on another starter, on the same side', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER } } }]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
-            expect(res.data.blockingPreferences[0].targets[p4.id]).toBe(NO_BLOCK);
-            expect(res.data.blockingPreferences[0].targets[p3.id]).toBe(RoleEnum.MIDDLE_BLOCKER);
+            expect(res.data.blockingPreferences[0].targets.DEF_L[p4.id]).toBe(NO_BLOCK);
+            expect(res.data.blockingPreferences[0].targets.DEF_L[p3.id]).toBe(RoleEnum.MIDDLE_BLOCKER);
         }
     });
     it('accepts NO_BLOCK in a per-set override', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferenceSets: [[{ rotation: 1, targets: { [p4.id]: NO_BLOCK } }], []]
+            blockingPreferenceSets: [[{ rotation: 1, targets: { DEF_M: { [p4.id]: NO_BLOCK } } }], []]
         }));
         expect(res.success).toBe(true);
     });
     it('still rejects a NO_BLOCK assignment on a player who is not a starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [reserve.id]: NO_BLOCK } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_R: { [reserve.id]: NO_BLOCK } } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -306,7 +319,7 @@ describe('TacticsInputSchema — blocking preferences', () => {
     });
     it('rejects an unknown assignment string', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: 'NO_BLOCKING' } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: 'NO_BLOCKING' } } }]
         }));
         expect(res.success).toBe(false);
     });

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

@@ -290,11 +290,19 @@ export declare const TeamInputSchema: z.ZodObject<{
         }, z.core.$strip>>>>;
         blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            targets: z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>;
+            targets: z.ZodObject<{
+                DEF_L: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+                DEF_M: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+                DEF_R: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+            }, z.core.$strip>;
         }, z.core.$strip>>>;
         blockingPreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            targets: z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>;
+            targets: z.ZodObject<{
+                DEF_L: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+                DEF_M: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+                DEF_R: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [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.ZodLiteral<"NO_BLOCK">]>>>;
+            }, z.core.$strip>;
         }, z.core.$strip>>>>;
         basePositions: z.ZodOptional<z.ZodObject<{
             coords: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -302,6 +310,7 @@ export declare const TeamInputSchema: z.ZodObject<{
                 r: z.ZodNumber;
             }, z.core.$strip>>>>;
             receive: 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>>>>;
         }, 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/team-generator.js

@@ -5,6 +5,8 @@ import { Team } from './team';
 import { Tactics } from './tactics';
 import { EnergyBand } from './energy-band';
 import { Formation } from './formation';
+import { RotationSystemEnum } from './rotation-system';
+import { defaultBaseConfig } from './default-base-config';
 import { CourtPosition } from '../match';
 import logger from '../../logger';
 const buildBlock = (rarity, count) => Array.from({ length: count }, () => rarity);
@@ -62,7 +64,10 @@ export class TeamGenerator {
         return Tactics.create({
             lineup,
             liberoReplacements: [lineup[3], lineup[6]],
-            substitutionBand: TeamGenerator.BOT_SUB_BANDS[Math.floor(Math.random() * TeamGenerator.BOT_SUB_BANDS.length)]
+            substitutionBand: TeamGenerator.BOT_SUB_BANDS[Math.floor(Math.random() * TeamGenerator.BOT_SUB_BANDS.length)],
+            // basePositions is never null: a team always carries the default base config for its system. createTactics
+            // makes 6-0 teams (Tactics.create default); when a user picks another system the API re-materializes.
+            basePositions: defaultBaseConfig(RotationSystemEnum.SIX_ZERO)
         });
     }
     static createLineup(players, formation) {

package/package.json

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