volleyballsimtypes 0.0.481 → 0.0.483

package/dist/esm/src/service/team/sub-config-convert.js

@@ -0,0 +1,85 @@
+import { EnergyBand } from './energy-band';
+import { PinchConditionType } from './pinch-condition';
+function isRecord(v) {
+    return typeof v === 'object' && v != null && !Array.isArray(v);
+}
+function fatigueCondition(band) {
+    return Object.values(EnergyBand).includes(band)
+        ? { type: PinchConditionType.FATIGUE, band }
+        : { type: PinchConditionType.FATIGUE };
+}
+/**
+ * Convert ONE legacy set-sub config (flat or per-set entry). Handles BOTH legacy generations:
+ * mode-era rows ({mode: NEVER|FATIGUE|PINCH}) and the oldest isPinchServer-era rows (no mode;
+ * isPinchServer flag + a 'NEVER' fatigueBand for the old never-sub state). Non-records and
+ * already-unified shapes (neither mode nor isPinchServer nor fatigueBand keys) pass through.
+ */
+export function convertLegacySetSubConfig(raw) {
+    if (!isRecord(raw))
+        return raw;
+    // Derive the mode for the oldest (pre-mode) generation; a unified shape has none of these keys.
+    const mode = raw.mode ?? (raw.isPinchServer === true
+        ? 'PINCH'
+        : raw.fatigueBand === 'NEVER'
+            ? 'NEVER'
+            : raw.fatigueBand != null || 'isPinchServer' in raw ? 'FATIGUE' : null);
+    if (mode == null)
+        return raw;
+    const { mode: _m, fatigueBand, isPinchServer: _p, ...rest } = raw;
+    if (mode === 'NEVER') {
+        // Old NEVER dropped every other field; an explicit empty condition list = never substituted.
+        return { conditions: [] };
+    }
+    if (mode === 'FATIGUE') {
+        return {
+            ...rest,
+            conditions: [fatigueCondition(fatigueBand)],
+            conditionLogic: 'ALL',
+            pinchServer: false,
+            subBackMode: rest.subBackMode ?? 'FATIGUE'
+        };
+    }
+    if (mode === 'PINCH') {
+        // A legacy PINCH row without the flag is a serve-and-return pinch server (the documented default).
+        return { ...rest, pinchServer: rest.pinchServer ?? true };
+    }
+    // Unknown legacy mode: strip it and let validation judge the rest.
+    return rest;
+}
+/** Convert a legacy DesignatedSub (flat fields + per-set entries); unified shapes pass through. */
+export function convertLegacyDesignatedSub(raw) {
+    if (!isRecord(raw))
+        return raw;
+    const { starter, sets, ...cfg } = raw;
+    const flat = convertLegacySetSubConfig(cfg);
+    const out = { ...(isRecord(flat) ? flat : {}), starter };
+    if (Array.isArray(sets))
+        out.sets = sets.map(convertLegacySetSubConfig);
+    return out;
+}
+/** Convert ONE legacy libero set-sub config; unified shapes pass through. */
+export function convertLegacyLiberoSetSubConfig(raw) {
+    if (!isRecord(raw) || raw.mode == null)
+        return raw;
+    const { mode, fatigueBand, ...rest } = raw;
+    if (mode === 'NEVER')
+        return { conditions: [] };
+    if (mode === 'ALWAYS')
+        return { ...rest, conditions: [{ type: PinchConditionType.ASAP }], conditionLogic: 'ALL' };
+    if (mode === 'FATIGUE')
+        return { ...rest, conditions: [fatigueCondition(fatigueBand)], conditionLogic: 'ALL' };
+    if (mode === 'CONDITIONS')
+        return rest;
+    return rest;
+}
+/** Convert a legacy LiberoSubConfig (flat fields + per-set entries); unified shapes pass through. */
+export function convertLegacyLiberoSubConfig(raw) {
+    if (!isRecord(raw))
+        return raw;
+    const { sets, ...cfg } = raw;
+    const flat = convertLegacyLiberoSetSubConfig(cfg);
+    const out = { ...(isRecord(flat) ? flat : {}) };
+    if (Array.isArray(sets))
+        out.sets = sets.map(convertLegacyLiberoSetSubConfig);
+    return out;
+}

package/dist/esm/src/service/team/sub-config-convert.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/service/team/sub-config-convert.test.js

@@ -0,0 +1,82 @@
+import { describe, it, expect } from '@jest/globals';
+import { EnergyBand } from './energy-band';
+import { PinchConditionType } from './pinch-condition';
+import { convertLegacyDesignatedSub, convertLegacyLiberoSetSubConfig, convertLegacySetSubConfig } from './sub-config-convert';
+// The conversion matrix for the unified condition engine: every legacy generation must land on the exact
+// unified shape (these functions are the single conversion authority used by the schema preprocess, the
+// transformers, and the API repo's read path).
+describe('convertLegacySetSubConfig', () => {
+    it('passes an already-unified config through untouched', () => {
+        const unified = { bench: 'X', conditions: [{ type: PinchConditionType.ASAP }], pinchServer: true };
+        expect(convertLegacySetSubConfig(unified)).toBe(unified);
+    });
+    it('converts mode NEVER to an explicit empty condition list, dropping every other field', () => {
+        expect(convertLegacySetSubConfig({ mode: 'NEVER', bench: 'X' })).toEqual({ conditions: [] });
+    });
+    it('converts mode FATIGUE with a band to a FATIGUE condition + FATIGUE sub-back', () => {
+        expect(convertLegacySetSubConfig({ mode: 'FATIGUE', fatigueBand: EnergyBand.WORN, bench: 'X', benchFatigueBand: EnergyBand.TIRED })).toEqual({
+            bench: 'X',
+            benchFatigueBand: EnergyBand.TIRED,
+            conditions: [{ type: PinchConditionType.FATIGUE, band: EnergyBand.WORN }],
+            conditionLogic: 'ALL',
+            pinchServer: false,
+            subBackMode: 'FATIGUE'
+        });
+    });
+    it('converts mode FATIGUE without a band to a bandless FATIGUE condition (team default)', () => {
+        const out = convertLegacySetSubConfig({ mode: 'FATIGUE' });
+        expect(out.conditions).toEqual([{ type: PinchConditionType.FATIGUE }]);
+    });
+    it('converts mode PINCH keeping conditions and defaulting a missing pinchServer flag to true', () => {
+        expect(convertLegacySetSubConfig({ mode: 'PINCH', bench: 'X', conditions: [{ type: PinchConditionType.ASAP }] })).toEqual({
+            bench: 'X',
+            conditions: [{ type: PinchConditionType.ASAP }],
+            pinchServer: true
+        });
+    });
+    it('keeps an explicit pinchServer false on a legacy PINCH regular conditional sub', () => {
+        const out = convertLegacySetSubConfig({ mode: 'PINCH', bench: 'X', conditions: [{ type: PinchConditionType.ASAP }], pinchServer: false, subBackMode: 'CONDITIONS', subBackConditions: [{ type: PinchConditionType.ASAP }] });
+        expect(out.pinchServer).toBe(false);
+        expect(out.subBackMode).toBe('CONDITIONS');
+    });
+    it('converts the oldest isPinchServer-era row to a pinch server', () => {
+        expect(convertLegacySetSubConfig({ isPinchServer: true, bench: 'X', conditions: [{ type: PinchConditionType.ASAP }] })).toEqual({
+            bench: 'X',
+            conditions: [{ type: PinchConditionType.ASAP }],
+            pinchServer: true
+        });
+    });
+    it("converts the oldest 'NEVER' fatigueBand row to never (empty conditions)", () => {
+        expect(convertLegacySetSubConfig({ fatigueBand: 'NEVER' })).toEqual({ conditions: [] });
+    });
+    it('converts the oldest band-only row to a FATIGUE condition', () => {
+        const out = convertLegacySetSubConfig({ fatigueBand: EnergyBand.EXHAUSTED });
+        expect(out.conditions).toEqual([{ type: PinchConditionType.FATIGUE, band: EnergyBand.EXHAUSTED }]);
+    });
+    it('strips an unknown legacy mode and keeps the rest (lenient heal)', () => {
+        expect(convertLegacySetSubConfig({ mode: 'SOMETIMES', bench: 'X' })).toEqual({ bench: 'X' });
+    });
+});
+describe('convertLegacyDesignatedSub', () => {
+    it('converts the flat fields and every per-set entry, keeping the starter', () => {
+        const out = convertLegacyDesignatedSub({
+            starter: 'S',
+            mode: 'FATIGUE',
+            fatigueBand: EnergyBand.TIRED,
+            sets: [{ mode: 'NEVER' }, { mode: 'PINCH', bench: 'X', conditions: [{ type: PinchConditionType.ASAP }] }]
+        });
+        expect(out.starter).toBe('S');
+        expect(out.conditions).toEqual([{ type: PinchConditionType.FATIGUE, band: EnergyBand.TIRED }]);
+        expect(out.sets[0]).toEqual({ conditions: [] });
+        expect(out.sets[1].pinchServer).toBe(true);
+    });
+});
+describe('convertLegacyLiberoSetSubConfig', () => {
+    it('maps each legacy libero mode to its unified condition list', () => {
+        expect(convertLegacyLiberoSetSubConfig({ mode: 'NEVER' })).toEqual({ conditions: [] });
+        expect(convertLegacyLiberoSetSubConfig({ mode: 'ALWAYS' })).toEqual({ conditions: [{ type: PinchConditionType.ASAP }], conditionLogic: 'ALL' });
+        expect(convertLegacyLiberoSetSubConfig({ mode: 'FATIGUE', fatigueBand: EnergyBand.WORN })).toEqual({ conditions: [{ type: PinchConditionType.FATIGUE, band: EnergyBand.WORN }], conditionLogic: 'ALL' });
+        const conditions = [{ type: PinchConditionType.PHASE, phase: 'RECEIVING' }];
+        expect(convertLegacyLiberoSetSubConfig({ mode: 'CONDITIONS', conditions, conditionLogic: 'ANY' })).toEqual({ conditions, conditionLogic: 'ANY' });
+    });
+});

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.481",
+  "version": "0.0.483",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",