volleyballsimtypes 0.0.434 → 0.0.436

package/dist/cjs/src/data/transformers/tactics.js

@@ -92,15 +92,26 @@ function buildPinchServerSubs(pinchServerSubs, roster) {
 }
 function transformToObject(model, roster) {
     const lineup = transformToLineup(model.lineup, roster);
-    // A second libero only makes sense alongside a starting libero (LIBERO_ZONE). Edge/legacy data can carry a
-    // second_libero (and its swap config) with no starting libero -- e.g. the starting libero was removed
-    // without clearing it -- which fails validation on load and would crash the whole sim batch. Drop the
-    // orphaned pair so the team still loads (it just plays without liberos); the next tactics save rewrites it.
-    // Drop the second libero when there's no starting libero, OR when the L2 player is no longer on the roster
-    // (e.g. retired/dismissed) -- both leave it orphaned. Use roster.find (not findPlayer) so a gone L2 yields
+    // A second libero is only valid as a RESERVE: it needs a starting libero (LIBERO_ZONE), the L2 player must be
+    // on the roster, and it must NOT already occupy the lineup (the 6 starters, the libero zone, or the bench).
+    // Edge/legacy data can violate any of these -- the starting libero was removed without clearing the L2, the
+    // L2 retired/was dismissed, or the L2 is also the starting libero -- and any such row fails validation on
+    // load (SECOND_LIBERO_MUST_BE_RESERVE / REQUIRES_LIBERO) and would crash the whole sim batch. Drop the
+    // offending second libero (and, via the gate below, its swap config) so the team still loads and plays
+    // without an L2; the next tactics save rewrites it cleanly. roster.find (not findPlayer) so a gone L2 yields
     // undefined instead of throwing.
+    const inLineupIds = new Set([
+        lineup[service_1.CourtPosition.LEFT_FRONT].id,
+        lineup[service_1.CourtPosition.MIDDLE_FRONT].id,
+        lineup[service_1.CourtPosition.RIGHT_FRONT].id,
+        lineup[service_1.CourtPosition.LEFT_BACK].id,
+        lineup[service_1.CourtPosition.MIDDLE_BACK].id,
+        lineup[service_1.CourtPosition.RIGHT_BACK].id,
+        ...(lineup[service_1.CourtPosition.LIBERO_ZONE] != null ? [lineup[service_1.CourtPosition.LIBERO_ZONE].id] : []),
+        ...lineup.bench.map((b) => b.id)
+    ]);
     const hasStartingLibero = lineup[service_1.CourtPosition.LIBERO_ZONE] != null;
-    const secondLibero = (hasStartingLibero && model.second_libero != null)
+    const secondLibero = (hasStartingLibero && model.second_libero != null && !inLineupIds.has(model.second_libero))
         ? roster.find((p) => p.id === model.second_libero)
         : undefined;
     return service_1.Tactics.create({
@@ -143,6 +154,23 @@ function transformToObject(model, roster) {
 // to keep the active preset and the mirrored Tactics row in the same shape. Applies the same legacy fixups as
 // the service transformer: resolve the designated-sub `mode` and drop a legacy 'NEVER' fatigueBand.
 function tacticsColumnsToApiDto(model) {
+    // Same reserve-only fixup as the service transformer (transformToObject): a second libero with no starting
+    // libero, or one that already occupies the lineup (6 starters + libero zone + bench), is invalid, so don't
+    // surface it (or its swap config) to the API/preset shape -- otherwise the UI would reload and re-emit a
+    // collision that the server then rejects.
+    const lineupIds = new Set([
+        model.lineup[service_1.CourtPosition.LEFT_FRONT],
+        model.lineup[service_1.CourtPosition.MIDDLE_FRONT],
+        model.lineup[service_1.CourtPosition.RIGHT_FRONT],
+        model.lineup[service_1.CourtPosition.LEFT_BACK],
+        model.lineup[service_1.CourtPosition.MIDDLE_BACK],
+        model.lineup[service_1.CourtPosition.RIGHT_BACK],
+        ...(model.lineup[service_1.CourtPosition.LIBERO_ZONE] != null ? [model.lineup[service_1.CourtPosition.LIBERO_ZONE]] : []),
+        ...model.lineup.bench
+    ]);
+    const validSecondLibero = (model.second_libero != null && model.lineup[service_1.CourtPosition.LIBERO_ZONE] != null && !lineupIds.has(model.second_libero))
+        ? model.second_libero
+        : undefined;
     return {
         lineup: model.lineup,
         substitutionTolerance: model.substitution_tolerance,
@@ -150,8 +178,8 @@ function tacticsColumnsToApiDto(model) {
         pinchServerSubs: model.pinch_server_subs,
         receiveRotationOffset: model.receive_rotation_offset,
         substitutionBand: model.substitution_band,
-        secondLibero: model.second_libero,
-        liberoSub: model.libero_sub,
+        secondLibero: validSecondLibero,
+        liberoSub: validSecondLibero != null ? model.libero_sub : undefined,
         liberoReplacementSets: model.libero_replacement_sets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starterId: d.starterId,

package/dist/cjs/src/data/transformers/tactics.test.js

@@ -63,4 +63,22 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(dto.designatedSubs[0].fatigueBand).toBe(service_1.EnergyBand.WORN);
         (0, globals_1.expect)(dto.designatedSubs[0].benchFatigueBand).toBe(service_1.EnergyBand.TIRED);
     });
+    (0, globals_1.it)('drops a second libero that collides with the starting libero (not a reserve)', () => {
+        const model = makeTactics([]);
+        model.lineup[service_1.CourtPosition.LIBERO_ZONE] = 'libero1';
+        model.second_libero = 'libero1'; // same player as the starting libero -> invalid
+        model.libero_sub = { mode: 'FATIGUE' };
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
+        (0, globals_1.expect)(dto.secondLibero).toBeUndefined();
+        (0, globals_1.expect)(dto.liberoSub).toBeUndefined();
+    });
+    (0, globals_1.it)('keeps a second libero that is a genuine reserve', () => {
+        const model = makeTactics([]);
+        model.lineup[service_1.CourtPosition.LIBERO_ZONE] = 'libero1';
+        model.second_libero = 'reserve1'; // not in the lineup -> valid reserve
+        model.libero_sub = { mode: 'FATIGUE' };
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
+        (0, globals_1.expect)(dto.secondLibero).toBe('reserve1');
+        (0, globals_1.expect)(dto.liberoSub).toEqual({ mode: 'FATIGUE' });
+    });
 });

package/dist/esm/src/data/transformers/tactics.js

@@ -87,15 +87,26 @@ function buildPinchServerSubs(pinchServerSubs, roster) {
 }
 function transformToObject(model, roster) {
     const lineup = transformToLineup(model.lineup, roster);
-    // A second libero only makes sense alongside a starting libero (LIBERO_ZONE). Edge/legacy data can carry a
-    // second_libero (and its swap config) with no starting libero -- e.g. the starting libero was removed
-    // without clearing it -- which fails validation on load and would crash the whole sim batch. Drop the
-    // orphaned pair so the team still loads (it just plays without liberos); the next tactics save rewrites it.
-    // Drop the second libero when there's no starting libero, OR when the L2 player is no longer on the roster
-    // (e.g. retired/dismissed) -- both leave it orphaned. Use roster.find (not findPlayer) so a gone L2 yields
+    // A second libero is only valid as a RESERVE: it needs a starting libero (LIBERO_ZONE), the L2 player must be
+    // on the roster, and it must NOT already occupy the lineup (the 6 starters, the libero zone, or the bench).
+    // Edge/legacy data can violate any of these -- the starting libero was removed without clearing the L2, the
+    // L2 retired/was dismissed, or the L2 is also the starting libero -- and any such row fails validation on
+    // load (SECOND_LIBERO_MUST_BE_RESERVE / REQUIRES_LIBERO) and would crash the whole sim batch. Drop the
+    // offending second libero (and, via the gate below, its swap config) so the team still loads and plays
+    // without an L2; the next tactics save rewrites it cleanly. roster.find (not findPlayer) so a gone L2 yields
     // undefined instead of throwing.
+    const inLineupIds = new Set([
+        lineup[CourtPosition.LEFT_FRONT].id,
+        lineup[CourtPosition.MIDDLE_FRONT].id,
+        lineup[CourtPosition.RIGHT_FRONT].id,
+        lineup[CourtPosition.LEFT_BACK].id,
+        lineup[CourtPosition.MIDDLE_BACK].id,
+        lineup[CourtPosition.RIGHT_BACK].id,
+        ...(lineup[CourtPosition.LIBERO_ZONE] != null ? [lineup[CourtPosition.LIBERO_ZONE].id] : []),
+        ...lineup.bench.map((b) => b.id)
+    ]);
     const hasStartingLibero = lineup[CourtPosition.LIBERO_ZONE] != null;
-    const secondLibero = (hasStartingLibero && model.second_libero != null)
+    const secondLibero = (hasStartingLibero && model.second_libero != null && !inLineupIds.has(model.second_libero))
         ? roster.find((p) => p.id === model.second_libero)
         : undefined;
     return Tactics.create({
@@ -138,6 +149,23 @@ function transformToObject(model, roster) {
 // to keep the active preset and the mirrored Tactics row in the same shape. Applies the same legacy fixups as
 // the service transformer: resolve the designated-sub `mode` and drop a legacy 'NEVER' fatigueBand.
 function tacticsColumnsToApiDto(model) {
+    // Same reserve-only fixup as the service transformer (transformToObject): a second libero with no starting
+    // libero, or one that already occupies the lineup (6 starters + libero zone + bench), is invalid, so don't
+    // surface it (or its swap config) to the API/preset shape -- otherwise the UI would reload and re-emit a
+    // collision that the server then rejects.
+    const lineupIds = new Set([
+        model.lineup[CourtPosition.LEFT_FRONT],
+        model.lineup[CourtPosition.MIDDLE_FRONT],
+        model.lineup[CourtPosition.RIGHT_FRONT],
+        model.lineup[CourtPosition.LEFT_BACK],
+        model.lineup[CourtPosition.MIDDLE_BACK],
+        model.lineup[CourtPosition.RIGHT_BACK],
+        ...(model.lineup[CourtPosition.LIBERO_ZONE] != null ? [model.lineup[CourtPosition.LIBERO_ZONE]] : []),
+        ...model.lineup.bench
+    ]);
+    const validSecondLibero = (model.second_libero != null && model.lineup[CourtPosition.LIBERO_ZONE] != null && !lineupIds.has(model.second_libero))
+        ? model.second_libero
+        : undefined;
     return {
         lineup: model.lineup,
         substitutionTolerance: model.substitution_tolerance,
@@ -145,8 +173,8 @@ function tacticsColumnsToApiDto(model) {
         pinchServerSubs: model.pinch_server_subs,
         receiveRotationOffset: model.receive_rotation_offset,
         substitutionBand: model.substitution_band,
-        secondLibero: model.second_libero,
-        liberoSub: model.libero_sub,
+        secondLibero: validSecondLibero,
+        liberoSub: validSecondLibero != null ? model.libero_sub : undefined,
         liberoReplacementSets: model.libero_replacement_sets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starterId: d.starterId,

package/dist/esm/src/data/transformers/tactics.test.js

@@ -61,4 +61,22 @@ describe('tacticsColumnsToApiDto()', () => {
         expect(dto.designatedSubs[0].fatigueBand).toBe(EnergyBand.WORN);
         expect(dto.designatedSubs[0].benchFatigueBand).toBe(EnergyBand.TIRED);
     });
+    it('drops a second libero that collides with the starting libero (not a reserve)', () => {
+        const model = makeTactics([]);
+        model.lineup[CourtPosition.LIBERO_ZONE] = 'libero1';
+        model.second_libero = 'libero1'; // same player as the starting libero -> invalid
+        model.libero_sub = { mode: 'FATIGUE' };
+        const dto = tacticsColumnsToApiDto(model);
+        expect(dto.secondLibero).toBeUndefined();
+        expect(dto.liberoSub).toBeUndefined();
+    });
+    it('keeps a second libero that is a genuine reserve', () => {
+        const model = makeTactics([]);
+        model.lineup[CourtPosition.LIBERO_ZONE] = 'libero1';
+        model.second_libero = 'reserve1'; // not in the lineup -> valid reserve
+        model.libero_sub = { mode: 'FATIGUE' };
+        const dto = tacticsColumnsToApiDto(model);
+        expect(dto.secondLibero).toBe('reserve1');
+        expect(dto.liberoSub).toEqual({ mode: 'FATIGUE' });
+    });
 });

package/package.json

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