volleyballsimtypes 0.0.444 → 0.0.447

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

@@ -105,6 +105,16 @@ function transformToObject(model, roster) {
     const secondLibero = (hasStartingLibero && model.second_libero != null && !inLineupIds.has(model.second_libero))
         ? roster.find((p) => p.id === model.second_libero)
         : undefined;
+    // A persisted `libero_replacement_sets` whose entries are ALL empty (a stale [[],[],[],[],[]] left by an
+    // older "configure each set independently" session that a later "apply to all sets" save could not clear --
+    // the pre-fix write omitted the column instead of nulling it) silently benches the libero: the sim picks
+    // `sets?.[i] ?? liberoReplacements`, and an empty array is not nullish, so every set gets an empty target
+    // list and the libero never enters the court. Treat an all-empty per-set list as absent so the sim falls
+    // back to the flat `liberoReplacements`; the next tactics save rewrites the column cleanly.
+    const mappedLiberoReplacementSets = model.libero_replacement_sets?.map(set => set.map((id) => findPlayer(id, roster)));
+    const liberoReplacementSets = mappedLiberoReplacementSets?.some(set => set.length > 0) === true
+        ? mappedLiberoReplacementSets
+        : undefined;
     return service_1.Tactics.create({
         receiveRotationOffset: model.receive_rotation_offset,
         lineup,
@@ -112,7 +122,7 @@ function transformToObject(model, roster) {
         substitutionBand: model.substitution_band,
         secondLibero,
         liberoSub: secondLibero != null ? (model.libero_sub ?? undefined) : undefined,
-        liberoReplacementSets: model.libero_replacement_sets?.map(set => set.map((id) => findPlayer(id, roster))),
+        liberoReplacementSets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starter: findPlayer(d.starterId, roster),
             bench: d.benchId != null ? findPlayer(d.benchId, roster) : undefined,
@@ -160,6 +170,12 @@ function tacticsColumnsToApiDto(model) {
     const validSecondLibero = (model.second_libero != null && model.lineup[service_1.CourtPosition.LIBERO_ZONE] != null && !lineupIds.has(model.second_libero))
         ? model.second_libero
         : undefined;
+    // Same all-empty heal as transformToObject: an all-empty per-set `libero_replacement_sets` is a stale
+    // artifact that shadows the flat `liberoReplacements` in the sim, so don't surface it to the API/preset
+    // shape -- otherwise the UI would reload it as "configure each set independently" (all blank) and re-emit it.
+    const validLiberoReplacementSets = model.libero_replacement_sets?.some(set => set.length > 0) === true
+        ? model.libero_replacement_sets
+        : undefined;
     return {
         lineup: model.lineup,
         liberoReplacements: model.libero_replacements,
@@ -167,7 +183,7 @@ function tacticsColumnsToApiDto(model) {
         substitutionBand: model.substitution_band,
         secondLibero: validSecondLibero,
         liberoSub: validSecondLibero != null ? model.libero_sub : undefined,
-        liberoReplacementSets: model.libero_replacement_sets,
+        liberoReplacementSets: validLiberoReplacementSets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starterId: d.starterId,
             benchId: d.benchId,

package/dist/cjs/src/service/player/stats.js

@@ -24,7 +24,7 @@ function getMultipliers(statName, performanceStats) {
             return {
                 spike: 0.55,
                 backAttack: 0.1,
-                power: performanceStats == null ? 0.125 : performanceStats.power > performanceStats.quick ? 0.2 : 0.05,
+                power: performanceStats == null ? 0.125 : performanceStats.power >= performanceStats.quick ? 0.2 : 0.05,
                 quick: performanceStats == null ? 0.125 : performanceStats.quick > performanceStats.power ? 0.2 : 0.05,
                 awareness: 0.05,
                 attack: 0.05
@@ -54,7 +54,7 @@ function getMultipliers(statName, performanceStats) {
         case StatsEnum.BLOCK:
             return {
                 block: 0.65,
-                read: performanceStats == null ? 0.125 : performanceStats.read > performanceStats.commit ? 0.2 : 0.05,
+                read: performanceStats == null ? 0.125 : performanceStats.read >= performanceStats.commit ? 0.2 : 0.05,
                 commit: performanceStats == null ? 0.125 : performanceStats.commit > performanceStats.read ? 0.2 : 0.05,
                 focus: 0.04,
                 defense: 0.04,

package/dist/cjs/src/service/player/stats.test.js

@@ -33,6 +33,18 @@ function makeStats(base = 50, overrides = {}) {
             const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
             (0, globals_1.expect)(total).toBeCloseTo(1, 10);
         });
+        // Regression: on a tie the `>` comparisons used to give BOTH sides 0.05 (pair = 0.10), dropping the stat's
+        // weights to 0.85. With `>=` the higher-or-equal side keeps 0.2 so the pair is 0.25 and the total stays 1.
+        (0, globals_1.it)('on a power === quick tie, power keeps 0.2 and quick 0.05 (pair sums to 0.25)', () => {
+            const m = (0, stats_1.getMultipliers)(stats_1.StatsEnum.ATTACK, makeStats(50, { power: 50, quick: 50 }));
+            (0, globals_1.expect)(m.power).toBe(0.2);
+            (0, globals_1.expect)(m.quick).toBe(0.05);
+        });
+        (0, globals_1.it)('multipliers sum to 1 on a power === quick tie', () => {
+            const m = (0, stats_1.getMultipliers)(stats_1.StatsEnum.ATTACK, makeStats(50, { power: 50, quick: 50 }));
+            const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+            (0, globals_1.expect)(total).toBeCloseTo(1, 10);
+        });
     });
     (0, globals_1.describe)('SET', () => {
         (0, globals_1.it)('multipliers sum to 1', () => {
@@ -91,6 +103,17 @@ function makeStats(base = 50, overrides = {}) {
             const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
             (0, globals_1.expect)(total).toBeCloseTo(1, 10);
         });
+        // Regression: same tie bug as ATTACK's power/quick. On read === commit both used to fall to 0.05.
+        (0, globals_1.it)('on a read === commit tie, read keeps 0.2 and commit 0.05 (pair sums to 0.25)', () => {
+            const m = (0, stats_1.getMultipliers)(stats_1.StatsEnum.BLOCK, makeStats(50, { read: 50, commit: 50 }));
+            (0, globals_1.expect)(m.read).toBe(0.2);
+            (0, globals_1.expect)(m.commit).toBe(0.05);
+        });
+        (0, globals_1.it)('multipliers sum to 1 on a read === commit tie', () => {
+            const m = (0, stats_1.getMultipliers)(stats_1.StatsEnum.BLOCK, makeStats(50, { read: 50, commit: 50 }));
+            const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+            (0, globals_1.expect)(total).toBeCloseTo(1, 10);
+        });
     });
     (0, globals_1.describe)('STAMINA', () => {
         (0, globals_1.it)('returns exactly { stamina: 1 }', () => {
@@ -131,3 +154,43 @@ function makeStats(base = 50, overrides = {}) {
         (0, globals_1.expect)((0, stats_1.calculateStatScore)(stats, stats_1.StatsEnum.SERVE)).toBe(84);
     });
 });
+// ─── invariants (every stat, every branch) ────────────────────────────────────
+// These are the catch-all guards. The per-stat suites above each test one branch by hand; the original
+// power===quick / read===commit weight-sum bug slipped through precisely because no suite swept ALL branches.
+(0, globals_1.describe)('multiplier + score invariants (every stat)', () => {
+    const ALL_STATS = Object.values(stats_1.StatsEnum);
+    // Profiles that exercise the conditional ATTACK/BLOCK branches: the omitted-stats default, the equal tie (the
+    // edge the `>` comparisons mishandled), and both `>` orderings. Non-conditional stats are weight-stable across
+    // all four, which is itself worth pinning. Every branch MUST keep the weights summing to 1 or the general stat
+    // silently mis-scales.
+    const profiles = [
+        ['omitted', undefined],
+        ['uniform (power===quick, read===commit)', makeStats(50)],
+        ['power & read dominant', makeStats(50, { power: 80, quick: 20, read: 80, commit: 20 })],
+        ['quick & commit dominant', makeStats(50, { quick: 80, power: 20, commit: 80, read: 20 })]
+    ];
+    for (const stat of ALL_STATS) {
+        for (const [label, ps] of profiles) {
+            (0, globals_1.it)(`${stat}: multipliers sum to 1 (${label})`, () => {
+                const m = (0, stats_1.getMultipliers)(stat, ps);
+                const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+                (0, globals_1.expect)(total).toBeCloseTo(1, 10);
+            });
+        }
+    }
+    // The strongest single guard: because the weights sum to 1, a uniformly-rated player scores that exact rating.
+    // Uniform stats also create the power===quick / read===commit ties, so this fails loudly on any mis-summed branch
+    // (pre-fix, ATTACK/BLOCK would have scored ~54 here, not 63).
+    for (const stat of ALL_STATS) {
+        (0, globals_1.it)(`${stat}: a uniformly-rated player scores that exact rating`, () => {
+            (0, globals_1.expect)((0, stats_1.calculateStatScore)(makeStats(63), stat)).toBe(63);
+        });
+    }
+    // The general stat shares the substat scale, so an all-99 (SPECIAL-cap) player must not exceed 99 either way:
+    // this catches the opposite failure of weights summing to MORE than 1.
+    for (const stat of ALL_STATS) {
+        (0, globals_1.it)(`${stat}: an all-99 player does not exceed the 99 cap`, () => {
+            (0, globals_1.expect)((0, stats_1.calculateStatScore)(makeStats(99), stat)).toBeLessThanOrEqual(99);
+        });
+    }
+});

package/dist/cjs/src/stat-config/traits.json

@@ -5,7 +5,8 @@
         "chance": 0.25,
         "roles": [
             "SETTER",
-            "LIBERO"
+            "LIBERO",
+            "OUTSIDE_HITTER"
         ]
     },
     {
@@ -25,7 +26,8 @@
         "roles": [
             "MIDDLE_BLOCKER",
             "OPPOSITE_HITTER",
-            "SETTER"
+            "SETTER",
+            "OUTSIDE_HITTER"
         ]
     },
     {
@@ -35,8 +37,7 @@
         "roles": [
             "SETTER",
             "OPPOSITE_HITTER",
-            "OUTSIDE_HITTER",
-            "MIDDLE_BLOCKER"
+            "OUTSIDE_HITTER"
         ]
     },
     {

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

@@ -100,6 +100,16 @@ function transformToObject(model, roster) {
     const secondLibero = (hasStartingLibero && model.second_libero != null && !inLineupIds.has(model.second_libero))
         ? roster.find((p) => p.id === model.second_libero)
         : undefined;
+    // A persisted `libero_replacement_sets` whose entries are ALL empty (a stale [[],[],[],[],[]] left by an
+    // older "configure each set independently" session that a later "apply to all sets" save could not clear --
+    // the pre-fix write omitted the column instead of nulling it) silently benches the libero: the sim picks
+    // `sets?.[i] ?? liberoReplacements`, and an empty array is not nullish, so every set gets an empty target
+    // list and the libero never enters the court. Treat an all-empty per-set list as absent so the sim falls
+    // back to the flat `liberoReplacements`; the next tactics save rewrites the column cleanly.
+    const mappedLiberoReplacementSets = model.libero_replacement_sets?.map(set => set.map((id) => findPlayer(id, roster)));
+    const liberoReplacementSets = mappedLiberoReplacementSets?.some(set => set.length > 0) === true
+        ? mappedLiberoReplacementSets
+        : undefined;
     return Tactics.create({
         receiveRotationOffset: model.receive_rotation_offset,
         lineup,
@@ -107,7 +117,7 @@ function transformToObject(model, roster) {
         substitutionBand: model.substitution_band,
         secondLibero,
         liberoSub: secondLibero != null ? (model.libero_sub ?? undefined) : undefined,
-        liberoReplacementSets: model.libero_replacement_sets?.map(set => set.map((id) => findPlayer(id, roster))),
+        liberoReplacementSets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starter: findPlayer(d.starterId, roster),
             bench: d.benchId != null ? findPlayer(d.benchId, roster) : undefined,
@@ -155,6 +165,12 @@ function tacticsColumnsToApiDto(model) {
     const validSecondLibero = (model.second_libero != null && model.lineup[CourtPosition.LIBERO_ZONE] != null && !lineupIds.has(model.second_libero))
         ? model.second_libero
         : undefined;
+    // Same all-empty heal as transformToObject: an all-empty per-set `libero_replacement_sets` is a stale
+    // artifact that shadows the flat `liberoReplacements` in the sim, so don't surface it to the API/preset
+    // shape -- otherwise the UI would reload it as "configure each set independently" (all blank) and re-emit it.
+    const validLiberoReplacementSets = model.libero_replacement_sets?.some(set => set.length > 0) === true
+        ? model.libero_replacement_sets
+        : undefined;
     return {
         lineup: model.lineup,
         liberoReplacements: model.libero_replacements,
@@ -162,7 +178,7 @@ function tacticsColumnsToApiDto(model) {
         substitutionBand: model.substitution_band,
         secondLibero: validSecondLibero,
         liberoSub: validSecondLibero != null ? model.libero_sub : undefined,
-        liberoReplacementSets: model.libero_replacement_sets,
+        liberoReplacementSets: validLiberoReplacementSets,
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starterId: d.starterId,
             benchId: d.benchId,

package/dist/esm/src/service/player/stats.js

@@ -19,7 +19,7 @@ export function getMultipliers(statName, performanceStats) {
             return {
                 spike: 0.55,
                 backAttack: 0.1,
-                power: performanceStats == null ? 0.125 : performanceStats.power > performanceStats.quick ? 0.2 : 0.05,
+                power: performanceStats == null ? 0.125 : performanceStats.power >= performanceStats.quick ? 0.2 : 0.05,
                 quick: performanceStats == null ? 0.125 : performanceStats.quick > performanceStats.power ? 0.2 : 0.05,
                 awareness: 0.05,
                 attack: 0.05
@@ -49,7 +49,7 @@ export function getMultipliers(statName, performanceStats) {
         case StatsEnum.BLOCK:
             return {
                 block: 0.65,
-                read: performanceStats == null ? 0.125 : performanceStats.read > performanceStats.commit ? 0.2 : 0.05,
+                read: performanceStats == null ? 0.125 : performanceStats.read >= performanceStats.commit ? 0.2 : 0.05,
                 commit: performanceStats == null ? 0.125 : performanceStats.commit > performanceStats.read ? 0.2 : 0.05,
                 focus: 0.04,
                 defense: 0.04,

package/dist/esm/src/service/player/stats.test.js

@@ -31,6 +31,18 @@ describe('getMultipliers()', () => {
             const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
             expect(total).toBeCloseTo(1, 10);
         });
+        // Regression: on a tie the `>` comparisons used to give BOTH sides 0.05 (pair = 0.10), dropping the stat's
+        // weights to 0.85. With `>=` the higher-or-equal side keeps 0.2 so the pair is 0.25 and the total stays 1.
+        it('on a power === quick tie, power keeps 0.2 and quick 0.05 (pair sums to 0.25)', () => {
+            const m = getMultipliers(StatsEnum.ATTACK, makeStats(50, { power: 50, quick: 50 }));
+            expect(m.power).toBe(0.2);
+            expect(m.quick).toBe(0.05);
+        });
+        it('multipliers sum to 1 on a power === quick tie', () => {
+            const m = getMultipliers(StatsEnum.ATTACK, makeStats(50, { power: 50, quick: 50 }));
+            const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+            expect(total).toBeCloseTo(1, 10);
+        });
     });
     describe('SET', () => {
         it('multipliers sum to 1', () => {
@@ -89,6 +101,17 @@ describe('getMultipliers()', () => {
             const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
             expect(total).toBeCloseTo(1, 10);
         });
+        // Regression: same tie bug as ATTACK's power/quick. On read === commit both used to fall to 0.05.
+        it('on a read === commit tie, read keeps 0.2 and commit 0.05 (pair sums to 0.25)', () => {
+            const m = getMultipliers(StatsEnum.BLOCK, makeStats(50, { read: 50, commit: 50 }));
+            expect(m.read).toBe(0.2);
+            expect(m.commit).toBe(0.05);
+        });
+        it('multipliers sum to 1 on a read === commit tie', () => {
+            const m = getMultipliers(StatsEnum.BLOCK, makeStats(50, { read: 50, commit: 50 }));
+            const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+            expect(total).toBeCloseTo(1, 10);
+        });
     });
     describe('STAMINA', () => {
         it('returns exactly { stamina: 1 }', () => {
@@ -129,3 +152,43 @@ describe('calculateStatScore()', () => {
         expect(calculateStatScore(stats, StatsEnum.SERVE)).toBe(84);
     });
 });
+// ─── invariants (every stat, every branch) ────────────────────────────────────
+// These are the catch-all guards. The per-stat suites above each test one branch by hand; the original
+// power===quick / read===commit weight-sum bug slipped through precisely because no suite swept ALL branches.
+describe('multiplier + score invariants (every stat)', () => {
+    const ALL_STATS = Object.values(StatsEnum);
+    // Profiles that exercise the conditional ATTACK/BLOCK branches: the omitted-stats default, the equal tie (the
+    // edge the `>` comparisons mishandled), and both `>` orderings. Non-conditional stats are weight-stable across
+    // all four, which is itself worth pinning. Every branch MUST keep the weights summing to 1 or the general stat
+    // silently mis-scales.
+    const profiles = [
+        ['omitted', undefined],
+        ['uniform (power===quick, read===commit)', makeStats(50)],
+        ['power & read dominant', makeStats(50, { power: 80, quick: 20, read: 80, commit: 20 })],
+        ['quick & commit dominant', makeStats(50, { quick: 80, power: 20, commit: 80, read: 20 })]
+    ];
+    for (const stat of ALL_STATS) {
+        for (const [label, ps] of profiles) {
+            it(`${stat}: multipliers sum to 1 (${label})`, () => {
+                const m = getMultipliers(stat, ps);
+                const total = Object.values(m).reduce((s, v) => s + (v ?? 0), 0);
+                expect(total).toBeCloseTo(1, 10);
+            });
+        }
+    }
+    // The strongest single guard: because the weights sum to 1, a uniformly-rated player scores that exact rating.
+    // Uniform stats also create the power===quick / read===commit ties, so this fails loudly on any mis-summed branch
+    // (pre-fix, ATTACK/BLOCK would have scored ~54 here, not 63).
+    for (const stat of ALL_STATS) {
+        it(`${stat}: a uniformly-rated player scores that exact rating`, () => {
+            expect(calculateStatScore(makeStats(63), stat)).toBe(63);
+        });
+    }
+    // The general stat shares the substat scale, so an all-99 (SPECIAL-cap) player must not exceed 99 either way:
+    // this catches the opposite failure of weights summing to MORE than 1.
+    for (const stat of ALL_STATS) {
+        it(`${stat}: an all-99 player does not exceed the 99 cap`, () => {
+            expect(calculateStatScore(makeStats(99), stat)).toBeLessThanOrEqual(99);
+        });
+    }
+});

package/dist/esm/src/stat-config/traits.json

@@ -5,7 +5,8 @@
         "chance": 0.25,
         "roles": [
             "SETTER",
-            "LIBERO"
+            "LIBERO",
+            "OUTSIDE_HITTER"
         ]
     },
     {
@@ -25,7 +26,8 @@
         "roles": [
             "MIDDLE_BLOCKER",
             "OPPOSITE_HITTER",
-            "SETTER"
+            "SETTER",
+            "OUTSIDE_HITTER"
         ]
     },
     {
@@ -35,8 +37,7 @@
         "roles": [
             "SETTER",
             "OPPOSITE_HITTER",
-            "OUTSIDE_HITTER",
-            "MIDDLE_BLOCKER"
+            "OUTSIDE_HITTER"
         ]
     },
     {

package/package.json

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