volleyballsimtypes 0.0.457 → 0.0.462

package/dist/esm/src/data/init-models.js

@@ -1,4 +1,4 @@
-import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
+import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, UserDeviceTokenModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const Scout = ScoutModel.initModel(sequelize);
@@ -13,6 +13,7 @@ export function initModels(sequelize) {
     const UserPullGrant = UserPullGrantModel.initModel(sequelize);
     const Wishlist = WishlistModel.initModel(sequelize);
     const UserSettings = UserSettingsModel.initModel(sequelize);
+    const UserDeviceToken = UserDeviceTokenModel.initModel(sequelize);
     const Notification = NotificationModel.initModel(sequelize);
     const AuthIdentity = AuthIdentityModel.initModel(sequelize);
     const AuthSession = AuthSessionModel.initModel(sequelize);
@@ -60,7 +61,9 @@ export function initModels(sequelize) {
     AuthUser.hasOne(GachaPity, { as: 'GachaPity', foreignKey: 'user_id' });
     AuthUser.hasOne(Wishlist, { as: 'Wishlist', foreignKey: 'user_id' });
     AuthUser.hasOne(UserSettings, { as: 'UserSettings', foreignKey: 'user_id' });
+    AuthUser.hasMany(UserDeviceToken, { as: 'UserDeviceTokens', foreignKey: 'user_id' });
     AuthUser.hasMany(Notification, { as: 'Notifications', foreignKey: 'user_id' });
+    UserDeviceToken.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     Notification.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     AuthUser.hasMany(GachaPullHistory, { as: 'GachaPullHistory', foreignKey: 'user_id' });
     AuthUser.hasMany(UserPullGrant, { as: 'UserPullGrants', foreignKey: 'user_id' });
@@ -291,6 +294,7 @@ export function initModels(sequelize) {
         UserPullGrant,
         Wishlist,
         UserSettings,
+        UserDeviceToken,
         Notification,
         Coach,
         Scout,

package/dist/esm/src/data/models/index.d.ts

@@ -44,6 +44,7 @@ export * from './wishlist';
 export * from './currency-transaction';
 export * from './user-pull-grant';
 export * from './user-settings';
+export * from './user-device-token';
 export * from './notification';
 export * from './vper';
 export * from './views';

package/dist/esm/src/data/models/index.js

@@ -44,6 +44,7 @@ export * from './wishlist';
 export * from './currency-transaction';
 export * from './user-pull-grant';
 export * from './user-settings';
+export * from './user-device-token';
 export * from './notification';
 export * from './vper';
 export * from './views';

package/dist/esm/src/data/models/tactics.d.ts

@@ -35,6 +35,10 @@ export interface OffensivePreferenceAttributes {
     rotation: number;
     order: PlayerId[];
 }
+export interface SystemSetAttributes {
+    rotationSystem: RotationSystemEnum;
+    designatedSetters: PlayerId[];
+}
 export interface LiberoSetSubConfigAttributes {
     mode: LiberoSubMode;
     fatigueBand?: EnergyBand;
@@ -55,10 +59,12 @@ export interface TacticsAttributes {
     rotation_system: RotationSystemEnum;
     designated_setters: PlayerId[];
     offensive_preferences: OffensivePreferenceAttributes[];
+    system_sets?: SystemSetAttributes[];
+    offensive_preference_sets?: OffensivePreferenceAttributes[][];
 }
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences';
+export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -73,6 +79,8 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     rotation_system: RotationSystemEnum;
     designated_setters: PlayerId[];
     offensive_preferences: OffensivePreferenceAttributes[];
+    system_sets?: SystemSetAttributes[];
+    offensive_preference_sets?: OffensivePreferenceAttributes[][];
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

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

@@ -63,6 +63,14 @@ export class TacticsModel extends Model {
                 type: DataTypes.JSONB,
                 allowNull: false,
                 defaultValue: []
+            },
+            system_sets: {
+                type: DataTypes.JSONB,
+                allowNull: true
+            },
+            offensive_preference_sets: {
+                type: DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/esm/src/data/models/user-device-token.d.ts

@@ -0,0 +1,23 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+export interface UserDeviceTokenAttributes {
+    user_device_token_id: string;
+    user_id: string;
+    device_token: string;
+    platform: string;
+    created_at?: Date;
+    updated_at?: Date;
+}
+export type UserDeviceTokenPk = 'user_device_token_id';
+export type UserDeviceTokenId = UserDeviceTokenModel[UserDeviceTokenPk];
+export type UserDeviceTokenOptionalAttributes = 'user_device_token_id' | 'platform' | 'created_at' | 'updated_at';
+export type UserDeviceTokenCreationAttributes = Optional<UserDeviceTokenAttributes, UserDeviceTokenOptionalAttributes>;
+export declare class UserDeviceTokenModel extends Model<UserDeviceTokenAttributes, UserDeviceTokenCreationAttributes> implements UserDeviceTokenAttributes {
+    user_device_token_id: string;
+    user_id: string;
+    device_token: string;
+    platform: string;
+    created_at?: Date;
+    updated_at?: Date;
+    static initModel(sequelize: Sequelize.Sequelize): typeof UserDeviceTokenModel;
+}

package/dist/esm/src/data/models/user-device-token.js

@@ -0,0 +1,61 @@
+import { DataTypes, Model } from 'sequelize';
+export class UserDeviceTokenModel extends Model {
+    static initModel(sequelize) {
+        return UserDeviceTokenModel.init({
+            user_device_token_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: DataTypes.UUIDV4
+            },
+            user_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'AuthUser',
+                    key: 'user_id'
+                }
+            },
+            device_token: {
+                type: DataTypes.TEXT,
+                allowNull: false
+            },
+            platform: {
+                type: DataTypes.TEXT,
+                allowNull: false,
+                defaultValue: 'android'
+            },
+            created_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            },
+            updated_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            }
+        }, {
+            sequelize,
+            tableName: 'UserDeviceToken',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'UserDeviceToken_pk',
+                    unique: true,
+                    fields: [{ name: 'user_device_token_id' }]
+                },
+                {
+                    name: 'UserDeviceToken_user_id_device_token_uq',
+                    unique: true,
+                    fields: [{ name: 'user_id' }, { name: 'device_token' }]
+                },
+                {
+                    name: 'UserDeviceToken_user_id_idx',
+                    fields: [{ name: 'user_id' }]
+                }
+            ]
+        });
+    }
+}

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

@@ -73,7 +73,15 @@ function transformToAttributes(tactics, teamId) {
         offensive_preferences: tactics.offensivePreferences.map(p => ({
             rotation: p.rotation,
             order: p.order.map((a) => a.id)
-        }))
+        })),
+        system_sets: tactics.systemSets?.map(s => ({
+            rotationSystem: s.rotationSystem,
+            designatedSetters: s.designatedSetters.map((p) => p.id)
+        })),
+        offensive_preference_sets: tactics.offensivePreferenceSets?.map(prefs => prefs.map(p => ({
+            rotation: p.rotation,
+            order: p.order.map((a) => a.id)
+        })))
     };
 }
 function transformToObject(model, roster) {
@@ -140,7 +148,15 @@ function transformToObject(model, roster) {
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
             order: p.order.map((id) => findPlayer(id, roster))
-        }))
+        })),
+        systemSets: model.system_sets?.map(s => ({
+            rotationSystem: s.rotationSystem,
+            designatedSetters: s.designatedSetters.map((id) => findPlayer(id, roster))
+        })),
+        offensivePreferenceSets: model.offensive_preference_sets?.map(prefs => prefs.map(p => ({
+            rotation: p.rotation,
+            order: p.order.map((id) => findPlayer(id, roster))
+        })))
     });
 }
 // Serialize a Tactics ROW (db columns) straight to the API Tactics DTO (player references stay as ids; no
@@ -198,7 +214,9 @@ function tacticsColumnsToApiDto(model) {
         })),
         rotationSystem: model.rotation_system,
         designatedSetters: model.designated_setters,
-        offensivePreferences: model.offensive_preferences
+        offensivePreferences: model.offensive_preferences,
+        systemSets: model.system_sets,
+        offensivePreferenceSets: model.offensive_preference_sets
     };
 }
 export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto };

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

@@ -1,6 +1,7 @@
 import { describe, it, expect } from '@jest/globals';
-import { tacticsColumnsToApiDto } from './tactics';
-import { CourtPosition, EnergyBand } from '../../service';
+import { tacticsColumnsToApiDto, transformFromTactics, transformToTactics } from './tactics';
+import { CourtPosition, EnergyBand, RotationSystemEnum, Tactics } from '../../service';
+import { makeCountry, makePlayer } from '../../service/test-helpers';
 // Minimal TacticsModel-shaped object; cast through unknown since the transformer only reads columns.
 function makeTactics(designatedSubs) {
     return {
@@ -75,4 +76,64 @@ describe('tacticsColumnsToApiDto()', () => {
         expect(dto.secondLibero).toBe('reserve1');
         expect(dto.liberoSub).toEqual({ mode: 'FATIGUE' });
     });
+    it('passes per-set tactics columns through to the API DTO shape', () => {
+        const model = makeTactics([]);
+        model.system_sets = [{ rotationSystem: RotationSystemEnum.FIVE_ONE, designatedSetters: ['lf'] }];
+        model.offensive_preference_sets = [[{ rotation: 1, order: ['rf', 'mf'] }]];
+        const dto = tacticsColumnsToApiDto(model);
+        expect(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
+        expect(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, order: ['rf', 'mf'] }]]);
+    });
+    it('leaves the per-set DTO fields undefined when the columns are absent', () => {
+        const dto = tacticsColumnsToApiDto(makeTactics([]));
+        expect(dto.systemSets).toBeUndefined();
+        expect(dto.offensivePreferenceSets).toBeUndefined();
+    });
+});
+describe('per-set tactics — service <-> row round-trip', () => {
+    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 roster = [p1, p2, p3, p4, p5, p6];
+    const tactics = Tactics.create({
+        lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+        liberoReplacements: [],
+        systemSets: [
+            { rotationSystem: RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
+            { rotationSystem: RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
+        ],
+        offensivePreferenceSets: [[{ rotation: 1, order: [p2, p3] }]]
+    });
+    it('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
+        const attrs = transformFromTactics(tactics, 'team-1');
+        expect(attrs.system_sets).toEqual([
+            { rotationSystem: '5-1', designatedSetters: [p1.id] },
+            { rotationSystem: '6-0', designatedSetters: [] }
+        ]);
+        expect(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, order: [p2.id, p3.id] }]]);
+    });
+    it('transformToTactics resolves the stored ids back to roster players', () => {
+        const attrs = transformFromTactics(tactics, 'team-1');
+        const back = transformToTactics(attrs, roster);
+        expect(back.systemSets?.[0].rotationSystem).toBe(RotationSystemEnum.FIVE_ONE);
+        expect(back.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
+        expect(back.systemSets?.[1].designatedSetters).toEqual([]);
+        expect(back.offensivePreferenceSets?.[0][0].order.map(p => p.id)).toEqual([p2.id, p3.id]);
+    });
+    it('omits the per-set columns entirely for an all-sets config', () => {
+        const flat = Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: []
+        });
+        const attrs = transformFromTactics(flat, 'team-1');
+        expect(attrs.system_sets).toBeUndefined();
+        expect(attrs.offensive_preference_sets).toBeUndefined();
+        const back = transformToTactics(attrs, roster);
+        expect(back.systemSets).toBeUndefined();
+        expect(back.offensivePreferenceSets).toBeUndefined();
+    });
 });

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

@@ -115,5 +115,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
         rotation: z.ZodNumber;
         order: z.ZodArray<z.ZodCustom<Player, Player>>;
     }, z.core.$strip>>>;
+    systemSets: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        rotationSystem: z.ZodEnum<typeof RotationSystemEnum>;
+        designatedSetters: z.ZodArray<z.ZodCustom<Player, Player>>;
+    }, z.core.$strip>>>;
+    offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+        rotation: z.ZodNumber;
+        order: z.ZodArray<z.ZodCustom<Player, Player>>;
+    }, z.core.$strip>>>>;
 }, z.core.$strip>;
 export type TacticsInput = z.infer<typeof TacticsInputSchema>;

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

@@ -51,6 +51,11 @@ const offensivePreferenceSchema = z.object({
     rotation: z.number().int().min(1).max(6),
     order: z.array(playerInstanceSchema)
 });
+// One set's rotation-system override (per-set tactics): system + its designated setters travel together.
+const systemSetSchema = z.object({
+    rotationSystem: z.nativeEnum(RotationSystemEnum),
+    designatedSetters: z.array(playerInstanceSchema)
+});
 export const TacticsInputSchema = z.object({
     lineup: lineupSchema,
     liberoReplacements: z.array(playerInstanceSchema),
@@ -68,7 +73,11 @@ export const TacticsInputSchema = z.object({
     // Tactics.create({...}) call valid and make an unconfigured team play exactly as before.
     rotationSystem: z.nativeEnum(RotationSystemEnum).default(RotationSystemEnum.SIX_ZERO),
     designatedSetters: z.array(playerInstanceSchema).default([]),
-    offensivePreferences: z.array(offensivePreferenceSchema).default([])
+    offensivePreferences: z.array(offensivePreferenceSchema).default([]),
+    // Per-set overrides (5 entries, index 0 = set 1; absent => the flat fields apply to all sets). Each entry is
+    // validated with the same cross-field rules as the flat fields (see superRefine below).
+    systemSets: z.array(systemSetSchema).max(5).optional(),
+    offensivePreferenceSets: z.array(z.array(offensivePreferenceSchema)).max(5).optional()
 }).superRefine((data, ctx) => {
     // Cross-field rules for the rotation system. These keep an invalid config from ever reaching the sim (the
     // pinch-server outage was caused by an unvalidated tactics payload).
@@ -87,41 +96,54 @@ export const TacticsInputSchema = z.object({
     const starters = slots.map(([position, player]) => ({ position, id: player.id }));
     const starterIds = new Set(starters.map(s => s.id));
     const positionById = new Map(starters.map(s => [s.id, s.position]));
-    // Designated setters: count must match the system, and each must be an on-court starter.
-    const expectedSetters = setterCountFor(data.rotationSystem);
-    if (data.designatedSetters.length !== expectedSetters) {
-        ctx.addIssue({ code: 'custom', message: `DESIGNATED_SETTERS_COUNT_${data.rotationSystem}_EXPECTED_${expectedSetters}`, path: ['designatedSetters'] });
-    }
-    for (const setter of data.designatedSetters) {
-        if (!starterIds.has(setter.id)) {
-            ctx.addIssue({ code: 'custom', message: 'DESIGNATED_SETTER_NOT_A_STARTER', path: ['designatedSetters'] });
-        }
-    }
-    // 4-2 / 6-2: the two setters sit in opposite slots (3 rotations apart).
-    if ((data.rotationSystem === RotationSystemEnum.FOUR_TWO || data.rotationSystem === RotationSystemEnum.SIX_TWO) &&
-        data.designatedSetters.length === 2) {
-        const a = positionById.get(data.designatedSetters[0].id);
-        const b = positionById.get(data.designatedSetters[1].id);
-        if (a != null && b != null && ((((a - b) % 6) + 6) % 6) !== 3) {
-            ctx.addIssue({ code: 'custom', message: 'DESIGNATED_SETTERS_NOT_IN_OPPOSITE_SLOTS', path: ['designatedSetters'] });
+    // Designated setters: count must match the system, each must be an on-court starter, and in 4-2 / 6-2 the two
+    // setters sit in opposite slots (3 rotations apart). Run on the flat fields and on every per-set entry.
+    const validateSystem = (rotationSystem, designatedSetters, path) => {
+        const expectedSetters = setterCountFor(rotationSystem);
+        if (designatedSetters.length !== expectedSetters) {
+            ctx.addIssue({ code: 'custom', message: `DESIGNATED_SETTERS_COUNT_${rotationSystem}_EXPECTED_${expectedSetters}`, path });
         }
-    }
-    // Offensive preferences: unique rotations, and each order lists only on-court starters with no duplicates.
-    const seenRotations = new Set();
-    for (const pref of data.offensivePreferences) {
-        if (seenRotations.has(pref.rotation)) {
-            ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION', path: ['offensivePreferences'] });
+        for (const setter of designatedSetters) {
+            if (!starterIds.has(setter.id)) {
+                ctx.addIssue({ code: 'custom', message: 'DESIGNATED_SETTER_NOT_A_STARTER', path });
+            }
         }
-        seenRotations.add(pref.rotation);
-        const ids = pref.order.map(p => p.id);
-        if (new Set(ids).size !== ids.length) {
-            ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ATTACKER', path: ['offensivePreferences'] });
+        if ((rotationSystem === RotationSystemEnum.FOUR_TWO || rotationSystem === RotationSystemEnum.SIX_TWO) &&
+            designatedSetters.length === 2) {
+            const a = positionById.get(designatedSetters[0].id);
+            const b = positionById.get(designatedSetters[1].id);
+            if (a != null && b != null && ((((a - b) % 6) + 6) % 6) !== 3) {
+                ctx.addIssue({ code: 'custom', message: 'DESIGNATED_SETTERS_NOT_IN_OPPOSITE_SLOTS', path });
+            }
         }
-        for (const id of ids) {
-            if (!starterIds.has(id)) {
-                ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER', path: ['offensivePreferences'] });
+    };
+    // Offensive preferences: unique rotations, and each order lists only on-court starters with no duplicates.
+    // Run on the flat list and on every per-set list.
+    const validateOffensivePreferences = (preferences, path) => {
+        const seenRotations = new Set();
+        for (const pref of preferences) {
+            if (seenRotations.has(pref.rotation)) {
+                ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION', path });
+            }
+            seenRotations.add(pref.rotation);
+            const ids = pref.order.map(p => p.id);
+            if (new Set(ids).size !== ids.length) {
+                ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ATTACKER', path });
+            }
+            for (const id of ids) {
+                if (!starterIds.has(id)) {
+                    ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER', path });
+                }
             }
         }
+    };
+    validateSystem(data.rotationSystem, data.designatedSetters, ['designatedSetters']);
+    for (const [i, systemSet] of (data.systemSets ?? []).entries()) {
+        validateSystem(systemSet.rotationSystem, systemSet.designatedSetters, ['systemSets', i]);
+    }
+    validateOffensivePreferences(data.offensivePreferences, ['offensivePreferences']);
+    for (const [i, preferences] of (data.offensivePreferenceSets ?? []).entries()) {
+        validateOffensivePreferences(preferences, ['offensivePreferenceSets', i]);
     }
     // Second libero (L2). The second libero is a reserve (not a starter, the libero, or a bench player). A swap
     // rule (FATIGUE/ALWAYS in any set) needs someone to swap in, so it requires a second libero, and a second

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

@@ -67,3 +67,118 @@ describe('TacticsInputSchema — second libero rules', () => {
         }
     });
 });
+describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferenceSets)', () => {
+    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);
+    // Minimal valid flat input (6-0 default: no setters, no preferences). Zone layout: p1@1, p2@2, p3@3,
+    // p4@4, p5@5, p6@6 — opposite slot pairs (3 apart) are (1,4), (2,5), (3,6).
+    function baseInput(overrides = {}) {
+        return {
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            ...overrides
+        };
+    }
+    it('accepts valid per-set overrides for both scopes', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [
+                { rotationSystem: '5-1', designatedSetters: [p1] },
+                { rotationSystem: '6-0', designatedSetters: [] },
+                { rotationSystem: '4-2', designatedSetters: [p1, p4] }
+            ],
+            offensivePreferenceSets: [
+                [{ rotation: 1, order: [p2, p3] }],
+                []
+            ]
+        }));
+        expect(res.success).toBe(true);
+    });
+    it('carries the per-set fields through Tactics.create parsing', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
+            offensivePreferenceSets: [[{ rotation: 2, order: [p3] }]]
+        }));
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.systemSets?.[0].rotationSystem).toBe('5-1');
+            expect(res.data.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
+            expect(res.data.offensivePreferenceSets?.[0][0]).toMatchObject({ rotation: 2 });
+        }
+    });
+    it('rejects more than 5 per-set entries', () => {
+        const entry = { rotationSystem: '6-0', designatedSetters: [] };
+        expect(TacticsInputSchema.safeParse(baseInput({ systemSets: Array.from({ length: 6 }, () => entry) })).success).toBe(false);
+        expect(TacticsInputSchema.safeParse(baseInput({ offensivePreferenceSets: Array.from({ length: 6 }, () => []) })).success).toBe(false);
+    });
+    it('rejects a set entry whose setter count does not match its system (5-1 with none)', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            expect(issue?.path).toEqual(['systemSets', 0]);
+        }
+    });
+    it('rejects a set entry whose setter is not a court starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [
+                { rotationSystem: '6-0', designatedSetters: [] },
+                { rotationSystem: '5-1', designatedSetters: [reserve] }
+            ]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTER_NOT_A_STARTER');
+            expect(issue?.path).toEqual(['systemSets', 1]);
+        }
+    });
+    it('rejects a 4-2 set entry whose setters are not in opposite slots', () => {
+        // p1@1 and p2@2 are adjacent (not 3 apart), so the 4-2 pair rule fails for that set entry.
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '4-2', designatedSetters: [p1, p2] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'DESIGNATED_SETTERS_NOT_IN_OPPOSITE_SLOTS')).toBe(true);
+        }
+    });
+    it('rejects a per-set preferences list with a duplicate rotation', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [p2] }, { rotation: 1, order: [p3] }]]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION');
+            expect(issue?.path).toEqual(['offensivePreferenceSets', 0]);
+        }
+    });
+    it('rejects a per-set preferences order that lists a non-starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [reserve] }]]
+        }));
+        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('still validates the flat fields when per-set overrides are present', () => {
+        // Flat 5-1 with no setter is invalid even though every set entry is valid.
+        const res = TacticsInputSchema.safeParse(baseInput({
+            rotationSystem: '5-1',
+            designatedSetters: [],
+            systemSets: [{ rotationSystem: '6-0', designatedSetters: [] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            expect(issue?.path).toEqual(['designatedSetters']);
+        }
+    });
+});

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

@@ -123,6 +123,14 @@ export declare const TeamInputSchema: z.ZodObject<{
             rotation: z.ZodNumber;
             order: z.ZodArray<z.ZodCustom<Player, Player>>;
         }, z.core.$strip>>>;
+        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;
+            order: z.ZodArray<z.ZodCustom<Player, Player>>;
+        }, z.core.$strip>>>>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type TeamInput = z.infer<typeof TeamInputSchema>;

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

@@ -15,6 +15,10 @@ export interface StartingLineup {
     readonly [CourtPosition.LIBERO_ZONE]?: Player;
     readonly bench: Player[];
 }
+export interface SystemSet {
+    readonly rotationSystem: RotationSystemEnum;
+    readonly designatedSetters: Player[];
+}
 export interface TacticsOpts {
     readonly lineup: StartingLineup;
     readonly liberoReplacements: Player[];
@@ -27,6 +31,8 @@ export interface TacticsOpts {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
+    readonly systemSets?: SystemSet[];
+    readonly offensivePreferenceSets?: OffensivePreference[][];
 }
 export declare class Tactics {
     readonly lineup: StartingLineup;
@@ -40,6 +46,8 @@ export declare class Tactics {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
+    readonly systemSets?: SystemSet[];
+    readonly offensivePreferenceSets?: OffensivePreference[][];
     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 = [] }) {
+    constructor({ lineup, liberoReplacements, receiveRotationOffset = false, designatedSubs = [], substitutionBand = EnergyBand.TIRED, secondLibero, liberoSub, liberoReplacementSets, rotationSystem = RotationSystemEnum.SIX_ZERO, designatedSetters = [], offensivePreferences = [], systemSets, offensivePreferenceSets }) {
         this.lineup = lineup;
         this.liberoReplacements = liberoReplacements;
         this.receiveRotationOffset = receiveRotationOffset;
@@ -27,6 +27,8 @@ export class Tactics {
         this.rotationSystem = rotationSystem;
         this.designatedSetters = designatedSetters;
         this.offensivePreferences = offensivePreferences;
+        this.systemSets = systemSets;
+        this.offensivePreferenceSets = offensivePreferenceSets;
     }
     findPlayerInLineup(id) {
         if (this.lineup.bench.some(p => p.id === id))

package/package.json

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