volleyballsimtypes 0.0.394 → 0.0.396

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

@@ -47,6 +47,8 @@ function initModels(sequelize) {
     const NationalCountry = models_1.NationalCountryModel.initModel(sequelize);
     const Team = models_1.TeamModel.initModel(sequelize);
     const TeamReplacement = models_1.TeamReplacementModel.initModel(sequelize);
+    const LegacyTeamFlag = models_1.LegacyTeamFlagModel.initModel(sequelize);
+    const AppConfig = models_1.AppConfigModel.initModel(sequelize);
     const VPER = models_1.VPERModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     AuthUser.hasMany(AuthIdentity, { as: 'AuthIdentities', foreignKey: 'user_id' });
@@ -226,6 +228,9 @@ function initModels(sequelize) {
     Team.hasOne(TeamReplacement, { as: 'TeamReplacement', foreignKey: 'team_id' });
     TeamReplacement.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     TeamReplacement.belongsTo(Team, { as: 'replacedByTeam', foreignKey: 'replaced_by' });
+    Team.hasOne(LegacyTeamFlag, { as: 'LegacyTeamFlag', foreignKey: 'team_id' });
+    LegacyTeamFlag.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
+    LegacyTeamFlag.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Player.hasOne(UserPlayerProgress, { as: 'UserPlayerProgress', foreignKey: 'player_id' });
     UserPlayerProgress.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     return {
@@ -273,6 +278,8 @@ function initModels(sequelize) {
         Notification,
         Coach,
         CurrencyTransaction,
-        VPER
+        VPER,
+        LegacyTeamFlag,
+        AppConfig
     };
 }

package/dist/cjs/src/data/models/app-config.d.ts

@@ -0,0 +1,17 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+export interface AppConfigAttributes {
+    key: string;
+    value: Record<string, unknown>;
+    updated_at: Date;
+}
+export type AppConfigPk = 'key';
+export type AppConfigId = AppConfigModel[AppConfigPk];
+export type AppConfigOptionalAttributes = 'value' | 'updated_at';
+export type AppConfigCreationAttributes = Optional<AppConfigAttributes, AppConfigOptionalAttributes>;
+export declare class AppConfigModel extends Model<AppConfigAttributes, AppConfigCreationAttributes> implements AppConfigAttributes {
+    key: string;
+    value: Record<string, unknown>;
+    updated_at: Date;
+    static initModel(sequelize: Sequelize.Sequelize): typeof AppConfigModel;
+}

package/dist/cjs/src/data/models/app-config.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppConfigModel = void 0;
+const sequelize_1 = require("sequelize");
+class AppConfigModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return AppConfigModel.init({
+            key: {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: false,
+                primaryKey: true
+            },
+            value: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
+            },
+            updated_at: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.NOW
+            }
+        }, {
+            sequelize,
+            tableName: 'AppConfig',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'AppConfig_pk',
+                    unique: true,
+                    fields: [{ name: 'key' }]
+                }]
+        });
+    }
+}
+exports.AppConfigModel = AppConfigModel;

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

@@ -43,3 +43,5 @@ export * from './user-settings';
 export * from './notification';
 export * from './vper';
 export * from './views';
+export * from './app-config';
+export * from './legacy-team-flag';

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

@@ -59,3 +59,5 @@ __exportStar(require("./user-settings"), exports);
 __exportStar(require("./notification"), exports);
 __exportStar(require("./vper"), exports);
 __exportStar(require("./views"), exports);
+__exportStar(require("./app-config"), exports);
+__exportStar(require("./legacy-team-flag"), exports);

package/dist/cjs/src/data/models/legacy-team-flag.d.ts

@@ -0,0 +1,23 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { CountryId, CountryModel, TeamId, TeamModel } from '.';
+export interface LegacyTeamFlagAttributes {
+    team_id: string;
+    country_id: string;
+}
+export type LegacyTeamFlagPk = 'team_id';
+export type LegacyTeamFlagId = LegacyTeamFlagModel[LegacyTeamFlagPk];
+export type LegacyTeamFlagCreationAttributes = LegacyTeamFlagAttributes;
+export declare class LegacyTeamFlagModel extends Model<LegacyTeamFlagAttributes, LegacyTeamFlagCreationAttributes> implements LegacyTeamFlagAttributes {
+    team_id: string;
+    country_id: string;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    country: CountryModel;
+    getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
+    setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;
+    createCountry: Sequelize.BelongsToCreateAssociationMixin<CountryModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof LegacyTeamFlagModel;
+}

package/dist/cjs/src/data/models/legacy-team-flag.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LegacyTeamFlagModel = void 0;
+const sequelize_1 = require("sequelize");
+class LegacyTeamFlagModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return LegacyTeamFlagModel.init({
+            team_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            country_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'Country',
+                    key: 'country_id'
+                }
+            }
+        }, {
+            sequelize,
+            tableName: 'LegacyTeamFlag',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'LegacyTeamFlag_pk',
+                    unique: true,
+                    fields: [{ name: 'team_id' }]
+                }]
+        });
+    }
+}
+exports.LegacyTeamFlagModel = LegacyTeamFlagModel;

package/dist/cjs/src/data/models/team.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
+import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, LegacyTeamFlagModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
 export interface TeamAttributes {
     team_id: string;
     name: string;
@@ -33,6 +33,8 @@ export declare class TeamModel extends Model<TeamAttributes, TeamCreationAttribu
     getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
     setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;
     createCountry: Sequelize.BelongsToCreateAssociationMixin<CountryModel>;
+    LegacyTeamFlag?: LegacyTeamFlagModel;
+    getLegacyTeamFlag: Sequelize.HasOneGetAssociationMixin<LegacyTeamFlagModel>;
     Competitions: CompetitionModel[];
     getCompetitions: Sequelize.BelongsToManyGetAssociationsMixin<CompetitionModel>;
     setCompetitions: Sequelize.BelongsToManySetAssociationsMixin<CompetitionModel, CompetitionId>;

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

@@ -26,6 +26,9 @@ function transformToObject(model, currentIteration) {
         name: model.name,
         shortName: model.short_name,
         country: (0, _1.transformToCountry)(model.country),
+        legacyFlagCountry: model.LegacyTeamFlag?.country != null
+            ? (0, _1.transformToCountry)(model.LegacyTeamFlag.country)
+            : undefined,
         rating: model.rating,
         tactics,
         roster,

package/dist/cjs/src/service/team/base-position.d.ts

@@ -14,6 +14,7 @@ export interface BaseResolverInput {
     readonly system: RotationSystemEnum;
     readonly designatedSetterIds: string[];
     readonly players: BasePlayer[];
+    readonly liberoId?: string;
 }
 export type BaseMap = Map<string, CourtPosition>;
 export interface ResolvedBases {

package/dist/cjs/src/service/team/base-position.js

@@ -8,8 +8,9 @@ const player_1 = require("../player");
 const rotation_system_1 = require("./rotation-system");
 const lineup_function_1 = require("./lineup-function");
 // The rally phase a base lookup is resolved against. Two contexts are enough in the 6-zone model:
-//  - SERVE_RECEIVE: first contact when receiving serve. The setter is hidden at the net (not a passer); serves
-//    are aimed at the back-row passers, so the setter / penetrating setter never receives.
+//  - SERVE_RECEIVE: first contact when receiving serve. The passers (libero + outsides) hold the back row; the
+//    setter(s) and the opposite are hidden in the front (not passers). Serves are aimed at the back-row passers,
+//    so the setter / penetrating setter / opposite never receive by default (they can be deliberately hunted).
 //  - BASE: open play (offense AND defense). In the discrete 6-zone model these coincide: every player is at their
 //    one specialist lane whether attacking or digging. There is no visual layer and no benefit to splitting them.
 var BaseContext;
@@ -58,7 +59,7 @@ function identityBases(players) {
 // rotational layout in both contexts (= pre-feature behavior). Each returned map is a bijection over {1..6}; the
 // sim asserts this after applying it.
 function resolveBases(input) {
-    const { system, designatedSetterIds, players } = input;
+    const { system, designatedSetterIds, players, liberoId } = input;
     if (system === rotation_system_1.RotationSystemEnum.SIX_ZERO)
         return identityBases(players);
     const mainSetter = players.find(p => p.playerId === designatedSetterIds[0]);
@@ -70,18 +71,43 @@ function resolveBases(input) {
         const fn = (0, lineup_function_1.slotFunctionAt)(system, mainSetter.position, p.position);
         base.set(p.playerId, specialistZone(fn, (0, match_1.isFrontRow)(p.position)));
     }
-    // SERVE-RECEIVE: hide the rally-setter at RIGHT_FRONT so they are not a passer (serves are aimed at the back
-    // row). Swapping with the current RIGHT_FRONT occupant keeps the map a bijection.
-    const serveReceive = new Map(base);
+    return { serveReceive: buildServeReceive(system, designatedSetterIds, players, mainSetter, liberoId), base };
+}
+// The serve-receive base. Only the back row handles the serve, so the three back-row zones go to the actual
+// passers (the libero + the two outside-hitter slots) and the three front zones hide the non-passers (the
+// setter(s), the opposite, and a middle). This keeps the opposite -- which shares the right lane with the setter
+// in open play -- out of the passing lanes; a server can still deliberately hunt the hidden setter or opposite
+// (handled sim-side). Without a libero on court the back-row middle fills the third passing slot. Always a
+// bijection over {1..6} (three front + three back, distinct zones).
+function buildServeReceive(system, designatedSetterIds, players, mainSetter, liberoId) {
+    // Zone order, declared in-function so CourtPosition is read at call time, not module load: the service<->match
+    // import cycle leaves CourtPosition unbound while this module is first evaluated, so a module-level array would
+    // crash. Hidden players fill the front (rally-setter first -> RIGHT_FRONT); passers fill the back (libero first
+    // -> MIDDLE_BACK).
+    const frontZones = [match_1.CourtPosition.RIGHT_FRONT, match_1.CourtPosition.LEFT_FRONT, match_1.CourtPosition.MIDDLE_FRONT];
+    const backZones = [match_1.CourtPosition.MIDDLE_BACK, match_1.CourtPosition.LEFT_BACK, match_1.CourtPosition.RIGHT_BACK];
     const setterId = rallySetterId(system, designatedSetterIds, players);
-    if (setterId != null) {
-        const setterZone = serveReceive.get(setterId);
-        if (setterZone != null && setterZone !== match_1.CourtPosition.RIGHT_FRONT) {
-            const occupant = [...serveReceive.entries()].find(([, z]) => z === match_1.CourtPosition.RIGHT_FRONT);
-            serveReceive.set(setterId, match_1.CourtPosition.RIGHT_FRONT);
-            if (occupant != null)
-                serveReceive.set(occupant[0], setterZone);
-        }
+    const fnOf = (p) => (0, lineup_function_1.slotFunctionAt)(system, mainSetter.position, p.position);
+    const passers = [];
+    const middles = [];
+    const hidden = []; // setter(s) + opposite
+    for (const p of players) {
+        if (p.playerId === liberoId || fnOf(p) === player_1.RoleEnum.OUTSIDE_HITTER)
+            passers.push(p);
+        else if (fnOf(p) === player_1.RoleEnum.MIDDLE_BLOCKER)
+            middles.push(p);
+        else
+            hidden.push(p);
     }
-    return { serveReceive, base };
+    // Fill to three passers from the middles (back-row first, so a front-row middle stays hidden); the rest hide.
+    middles.sort((a, b) => Number((0, match_1.isFrontRow)(a.position)) - Number((0, match_1.isFrontRow)(b.position)));
+    while (passers.length < 3 && middles.length > 0)
+        passers.push(middles.shift());
+    hidden.push(...middles);
+    hidden.sort((a, b) => Number(b.playerId === setterId) - Number(a.playerId === setterId));
+    passers.sort((a, b) => Number(b.playerId === liberoId) - Number(a.playerId === liberoId));
+    const sr = new Map();
+    hidden.forEach((p, i) => sr.set(p.playerId, frontZones[i]));
+    passers.forEach((p, i) => sr.set(p.playerId, backZones[i]));
+    return sr;
 }

package/dist/cjs/src/service/team/base-position.test.js

@@ -16,6 +16,20 @@ function baseLineup() {
         { playerId: 'MB2', position: match_1.CourtPosition.MIDDLE_BACK, roles: [player_1.RoleEnum.MIDDLE_BLOCKER] }
     ];
 }
+// 5-1 with the libero on court in the back-row middle slot (replacing MB2).
+function lineupWithLibero() {
+    return {
+        players: [
+            { playerId: 'S', position: match_1.CourtPosition.RIGHT_BACK, roles: [player_1.RoleEnum.SETTER] },
+            { playerId: 'OH1', position: match_1.CourtPosition.RIGHT_FRONT, roles: [player_1.RoleEnum.OUTSIDE_HITTER] },
+            { playerId: 'MB1', position: match_1.CourtPosition.MIDDLE_FRONT, roles: [player_1.RoleEnum.MIDDLE_BLOCKER] },
+            { playerId: 'OPP', position: match_1.CourtPosition.LEFT_FRONT, roles: [player_1.RoleEnum.OPPOSITE_HITTER] },
+            { playerId: 'OH2', position: match_1.CourtPosition.LEFT_BACK, roles: [player_1.RoleEnum.OUTSIDE_HITTER] },
+            { playerId: 'LIB', position: match_1.CourtPosition.MIDDLE_BACK, roles: [player_1.RoleEnum.LIBERO] }
+        ],
+        liberoId: 'LIB'
+    };
+}
 function rotate(players, times) {
     let out = players;
     for (let i = 0; i < times; i++)
@@ -63,6 +77,31 @@ describe('resolveBases() serve-receive hides the setter', () => {
         }
     });
 });
+describe('resolveBases() serve-receive hides the opposite (regression: opposites were receiving most serves)', () => {
+    it('5-1 opposite is hidden in the front, never in the serve-receive back row, every rotation', () => {
+        for (let r = 0; r < 6; r++) {
+            const players = rotate(baseLineup(), r);
+            const bases = (0, base_position_1.resolveBases)({ system: rotation_system_1.RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players });
+            expect((0, match_1.isFrontRow)(bases.serveReceive.get('OPP'))).toBe(true);
+        }
+    });
+    it('5-1 serve-receive back row holds exactly the passers -- never the setter or the opposite', () => {
+        for (let r = 0; r < 6; r++) {
+            const players = rotate(baseLineup(), r);
+            const bases = (0, base_position_1.resolveBases)({ system: rotation_system_1.RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players });
+            const backRow = [...bases.serveReceive.entries()].filter(([, z]) => !(0, match_1.isFrontRow)(z)).map(([id]) => id);
+            expect(backRow).toHaveLength(3);
+            expect(backRow).not.toContain('S');
+            expect(backRow).not.toContain('OPP');
+        }
+    });
+    it('the on-court libero is always a passer (back row) while the opposite stays hidden', () => {
+        const { players, liberoId } = lineupWithLibero();
+        const bases = (0, base_position_1.resolveBases)({ system: rotation_system_1.RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players, liberoId });
+        expect((0, match_1.isFrontRow)(bases.serveReceive.get(liberoId))).toBe(false);
+        expect((0, match_1.isFrontRow)(bases.serveReceive.get('OPP'))).toBe(true);
+    });
+});
 describe('rallySetterId()', () => {
     it('5-1 returns the single setter in every rotation', () => {
         for (let r = 0; r < 6; r++) {

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

@@ -9,6 +9,7 @@ export declare const TeamInputSchema: z.ZodObject<{
     divisionId: z.ZodUUID;
     roster: z.ZodArray<z.ZodCustom<Player, Player>>;
     country: z.ZodCustom<Country, Country>;
+    legacyFlagCountry: z.ZodOptional<z.ZodCustom<Country, Country>>;
     tactics: z.ZodOptional<z.ZodObject<{
         lineup: z.ZodObject<{
             4: z.ZodCustom<Player, Player>;

package/dist/cjs/src/service/team/schemas/team.z.js

@@ -19,6 +19,7 @@ exports.TeamInputSchema = zod_1.z.object({
     divisionId: zod_1.z.uuid(),
     roster: zod_1.z.array(playerInstanceSchema),
     country: countrySchema,
+    legacyFlagCountry: countrySchema.optional(),
     tactics: tactics_z_1.TacticsInputSchema.optional()
 }).superRefine((data, ctx) => {
     const ids = data.roster.map(p => p.id);

package/dist/cjs/src/service/team/team.d.ts

@@ -9,6 +9,7 @@ export declare class Team {
     readonly divisionId: string;
     readonly tactics?: Tactics;
     readonly country: Country;
+    readonly legacyFlagCountry?: Country;
     private _rating;
     static create(input: unknown): Team;
     private constructor();

package/dist/cjs/src/service/team/team.js

@@ -19,7 +19,7 @@ class Team {
             tactics: result.data.tactics != null ? tactics_1.Tactics.create(result.data.tactics) : undefined
         });
     }
-    constructor({ id, rating, name, shortName, divisionId, country, roster, tactics }) {
+    constructor({ id, rating, name, shortName, divisionId, country, legacyFlagCountry, roster, tactics }) {
         this.id = id;
         this._rating = rating;
         this.roster = roster;
@@ -28,6 +28,7 @@ class Team {
         this.shortName = shortName;
         this.divisionId = divisionId;
         this.country = country;
+        this.legacyFlagCountry = legacyFlagCountry;
     }
     get rating() {
         return this._rating;

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

@@ -1,4 +1,4 @@
-import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, 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, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel } from './models';
+import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, 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, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const CurrencyTransaction = CurrencyTransactionModel.initModel(sequelize);
@@ -44,6 +44,8 @@ export function initModels(sequelize) {
     const NationalCountry = NationalCountryModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
     const TeamReplacement = TeamReplacementModel.initModel(sequelize);
+    const LegacyTeamFlag = LegacyTeamFlagModel.initModel(sequelize);
+    const AppConfig = AppConfigModel.initModel(sequelize);
     const VPER = VPERModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     AuthUser.hasMany(AuthIdentity, { as: 'AuthIdentities', foreignKey: 'user_id' });
@@ -223,6 +225,9 @@ export function initModels(sequelize) {
     Team.hasOne(TeamReplacement, { as: 'TeamReplacement', foreignKey: 'team_id' });
     TeamReplacement.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     TeamReplacement.belongsTo(Team, { as: 'replacedByTeam', foreignKey: 'replaced_by' });
+    Team.hasOne(LegacyTeamFlag, { as: 'LegacyTeamFlag', foreignKey: 'team_id' });
+    LegacyTeamFlag.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
+    LegacyTeamFlag.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Player.hasOne(UserPlayerProgress, { as: 'UserPlayerProgress', foreignKey: 'player_id' });
     UserPlayerProgress.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     return {
@@ -270,6 +275,8 @@ export function initModels(sequelize) {
         Notification,
         Coach,
         CurrencyTransaction,
-        VPER
+        VPER,
+        LegacyTeamFlag,
+        AppConfig
     };
 }

package/dist/esm/src/data/models/app-config.d.ts

@@ -0,0 +1,17 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+export interface AppConfigAttributes {
+    key: string;
+    value: Record<string, unknown>;
+    updated_at: Date;
+}
+export type AppConfigPk = 'key';
+export type AppConfigId = AppConfigModel[AppConfigPk];
+export type AppConfigOptionalAttributes = 'value' | 'updated_at';
+export type AppConfigCreationAttributes = Optional<AppConfigAttributes, AppConfigOptionalAttributes>;
+export declare class AppConfigModel extends Model<AppConfigAttributes, AppConfigCreationAttributes> implements AppConfigAttributes {
+    key: string;
+    value: Record<string, unknown>;
+    updated_at: Date;
+    static initModel(sequelize: Sequelize.Sequelize): typeof AppConfigModel;
+}

package/dist/esm/src/data/models/app-config.js

@@ -0,0 +1,32 @@
+import { DataTypes, Model } from 'sequelize';
+export class AppConfigModel extends Model {
+    static initModel(sequelize) {
+        return AppConfigModel.init({
+            key: {
+                type: DataTypes.STRING,
+                allowNull: false,
+                primaryKey: true
+            },
+            value: {
+                type: DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
+            },
+            updated_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            }
+        }, {
+            sequelize,
+            tableName: 'AppConfig',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'AppConfig_pk',
+                    unique: true,
+                    fields: [{ name: 'key' }]
+                }]
+        });
+    }
+}

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

@@ -43,3 +43,5 @@ export * from './user-settings';
 export * from './notification';
 export * from './vper';
 export * from './views';
+export * from './app-config';
+export * from './legacy-team-flag';

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

@@ -43,3 +43,5 @@ export * from './user-settings';
 export * from './notification';
 export * from './vper';
 export * from './views';
+export * from './app-config';
+export * from './legacy-team-flag';

package/dist/esm/src/data/models/legacy-team-flag.d.ts

@@ -0,0 +1,23 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { CountryId, CountryModel, TeamId, TeamModel } from '.';
+export interface LegacyTeamFlagAttributes {
+    team_id: string;
+    country_id: string;
+}
+export type LegacyTeamFlagPk = 'team_id';
+export type LegacyTeamFlagId = LegacyTeamFlagModel[LegacyTeamFlagPk];
+export type LegacyTeamFlagCreationAttributes = LegacyTeamFlagAttributes;
+export declare class LegacyTeamFlagModel extends Model<LegacyTeamFlagAttributes, LegacyTeamFlagCreationAttributes> implements LegacyTeamFlagAttributes {
+    team_id: string;
+    country_id: string;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    country: CountryModel;
+    getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
+    setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;
+    createCountry: Sequelize.BelongsToCreateAssociationMixin<CountryModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof LegacyTeamFlagModel;
+}

package/dist/esm/src/data/models/legacy-team-flag.js

@@ -0,0 +1,34 @@
+import { DataTypes, Model } from 'sequelize';
+export class LegacyTeamFlagModel extends Model {
+    static initModel(sequelize) {
+        return LegacyTeamFlagModel.init({
+            team_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            country_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'Country',
+                    key: 'country_id'
+                }
+            }
+        }, {
+            sequelize,
+            tableName: 'LegacyTeamFlag',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'LegacyTeamFlag_pk',
+                    unique: true,
+                    fields: [{ name: 'team_id' }]
+                }]
+        });
+    }
+}

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
+import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, LegacyTeamFlagModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
 export interface TeamAttributes {
     team_id: string;
     name: string;
@@ -33,6 +33,8 @@ export declare class TeamModel extends Model<TeamAttributes, TeamCreationAttribu
     getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
     setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;
     createCountry: Sequelize.BelongsToCreateAssociationMixin<CountryModel>;
+    LegacyTeamFlag?: LegacyTeamFlagModel;
+    getLegacyTeamFlag: Sequelize.HasOneGetAssociationMixin<LegacyTeamFlagModel>;
     Competitions: CompetitionModel[];
     getCompetitions: Sequelize.BelongsToManyGetAssociationsMixin<CompetitionModel>;
     setCompetitions: Sequelize.BelongsToManySetAssociationsMixin<CompetitionModel, CompetitionId>;

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

@@ -22,6 +22,9 @@ function transformToObject(model, currentIteration) {
         name: model.name,
         shortName: model.short_name,
         country: transformToCountry(model.country),
+        legacyFlagCountry: model.LegacyTeamFlag?.country != null
+            ? transformToCountry(model.LegacyTeamFlag.country)
+            : undefined,
         rating: model.rating,
         tactics,
         roster,

package/dist/esm/src/service/team/base-position.d.ts

@@ -14,6 +14,7 @@ export interface BaseResolverInput {
     readonly system: RotationSystemEnum;
     readonly designatedSetterIds: string[];
     readonly players: BasePlayer[];
+    readonly liberoId?: string;
 }
 export type BaseMap = Map<string, CourtPosition>;
 export interface ResolvedBases {

package/dist/esm/src/service/team/base-position.js

@@ -3,8 +3,9 @@ import { RoleEnum } from '../player';
 import { RotationSystemEnum } from './rotation-system';
 import { slotFunctionAt } from './lineup-function';
 // The rally phase a base lookup is resolved against. Two contexts are enough in the 6-zone model:
-//  - SERVE_RECEIVE: first contact when receiving serve. The setter is hidden at the net (not a passer); serves
-//    are aimed at the back-row passers, so the setter / penetrating setter never receives.
+//  - SERVE_RECEIVE: first contact when receiving serve. The passers (libero + outsides) hold the back row; the
+//    setter(s) and the opposite are hidden in the front (not passers). Serves are aimed at the back-row passers,
+//    so the setter / penetrating setter / opposite never receive by default (they can be deliberately hunted).
 //  - BASE: open play (offense AND defense). In the discrete 6-zone model these coincide: every player is at their
 //    one specialist lane whether attacking or digging. There is no visual layer and no benefit to splitting them.
 export var BaseContext;
@@ -53,7 +54,7 @@ function identityBases(players) {
 // rotational layout in both contexts (= pre-feature behavior). Each returned map is a bijection over {1..6}; the
 // sim asserts this after applying it.
 export function resolveBases(input) {
-    const { system, designatedSetterIds, players } = input;
+    const { system, designatedSetterIds, players, liberoId } = input;
     if (system === RotationSystemEnum.SIX_ZERO)
         return identityBases(players);
     const mainSetter = players.find(p => p.playerId === designatedSetterIds[0]);
@@ -65,18 +66,43 @@ export function resolveBases(input) {
         const fn = slotFunctionAt(system, mainSetter.position, p.position);
         base.set(p.playerId, specialistZone(fn, isFrontRow(p.position)));
     }
-    // SERVE-RECEIVE: hide the rally-setter at RIGHT_FRONT so they are not a passer (serves are aimed at the back
-    // row). Swapping with the current RIGHT_FRONT occupant keeps the map a bijection.
-    const serveReceive = new Map(base);
+    return { serveReceive: buildServeReceive(system, designatedSetterIds, players, mainSetter, liberoId), base };
+}
+// The serve-receive base. Only the back row handles the serve, so the three back-row zones go to the actual
+// passers (the libero + the two outside-hitter slots) and the three front zones hide the non-passers (the
+// setter(s), the opposite, and a middle). This keeps the opposite -- which shares the right lane with the setter
+// in open play -- out of the passing lanes; a server can still deliberately hunt the hidden setter or opposite
+// (handled sim-side). Without a libero on court the back-row middle fills the third passing slot. Always a
+// bijection over {1..6} (three front + three back, distinct zones).
+function buildServeReceive(system, designatedSetterIds, players, mainSetter, liberoId) {
+    // Zone order, declared in-function so CourtPosition is read at call time, not module load: the service<->match
+    // import cycle leaves CourtPosition unbound while this module is first evaluated, so a module-level array would
+    // crash. Hidden players fill the front (rally-setter first -> RIGHT_FRONT); passers fill the back (libero first
+    // -> MIDDLE_BACK).
+    const frontZones = [CourtPosition.RIGHT_FRONT, CourtPosition.LEFT_FRONT, CourtPosition.MIDDLE_FRONT];
+    const backZones = [CourtPosition.MIDDLE_BACK, CourtPosition.LEFT_BACK, CourtPosition.RIGHT_BACK];
     const setterId = rallySetterId(system, designatedSetterIds, players);
-    if (setterId != null) {
-        const setterZone = serveReceive.get(setterId);
-        if (setterZone != null && setterZone !== CourtPosition.RIGHT_FRONT) {
-            const occupant = [...serveReceive.entries()].find(([, z]) => z === CourtPosition.RIGHT_FRONT);
-            serveReceive.set(setterId, CourtPosition.RIGHT_FRONT);
-            if (occupant != null)
-                serveReceive.set(occupant[0], setterZone);
-        }
+    const fnOf = (p) => slotFunctionAt(system, mainSetter.position, p.position);
+    const passers = [];
+    const middles = [];
+    const hidden = []; // setter(s) + opposite
+    for (const p of players) {
+        if (p.playerId === liberoId || fnOf(p) === RoleEnum.OUTSIDE_HITTER)
+            passers.push(p);
+        else if (fnOf(p) === RoleEnum.MIDDLE_BLOCKER)
+            middles.push(p);
+        else
+            hidden.push(p);
     }
-    return { serveReceive, base };
+    // Fill to three passers from the middles (back-row first, so a front-row middle stays hidden); the rest hide.
+    middles.sort((a, b) => Number(isFrontRow(a.position)) - Number(isFrontRow(b.position)));
+    while (passers.length < 3 && middles.length > 0)
+        passers.push(middles.shift());
+    hidden.push(...middles);
+    hidden.sort((a, b) => Number(b.playerId === setterId) - Number(a.playerId === setterId));
+    passers.sort((a, b) => Number(b.playerId === liberoId) - Number(a.playerId === liberoId));
+    const sr = new Map();
+    hidden.forEach((p, i) => sr.set(p.playerId, frontZones[i]));
+    passers.forEach((p, i) => sr.set(p.playerId, backZones[i]));
+    return sr;
 }

package/dist/esm/src/service/team/base-position.test.js

@@ -1,4 +1,4 @@
-import { CourtPosition, rotatePosition } from '../match';
+import { CourtPosition, isFrontRow, rotatePosition } from '../match';
 import { RoleEnum } from '../player';
 import { RotationSystemEnum } from './rotation-system';
 import { getLineupFunctions, isOutOfPosition, outOfPositionPenalty, OUT_OF_POSITION_PENALTY, slotFunctionAt } from './lineup-function';
@@ -14,6 +14,20 @@ function baseLineup() {
         { playerId: 'MB2', position: CourtPosition.MIDDLE_BACK, roles: [RoleEnum.MIDDLE_BLOCKER] }
     ];
 }
+// 5-1 with the libero on court in the back-row middle slot (replacing MB2).
+function lineupWithLibero() {
+    return {
+        players: [
+            { playerId: 'S', position: CourtPosition.RIGHT_BACK, roles: [RoleEnum.SETTER] },
+            { playerId: 'OH1', position: CourtPosition.RIGHT_FRONT, roles: [RoleEnum.OUTSIDE_HITTER] },
+            { playerId: 'MB1', position: CourtPosition.MIDDLE_FRONT, roles: [RoleEnum.MIDDLE_BLOCKER] },
+            { playerId: 'OPP', position: CourtPosition.LEFT_FRONT, roles: [RoleEnum.OPPOSITE_HITTER] },
+            { playerId: 'OH2', position: CourtPosition.LEFT_BACK, roles: [RoleEnum.OUTSIDE_HITTER] },
+            { playerId: 'LIB', position: CourtPosition.MIDDLE_BACK, roles: [RoleEnum.LIBERO] }
+        ],
+        liberoId: 'LIB'
+    };
+}
 function rotate(players, times) {
     let out = players;
     for (let i = 0; i < times; i++)
@@ -61,6 +75,31 @@ describe('resolveBases() serve-receive hides the setter', () => {
         }
     });
 });
+describe('resolveBases() serve-receive hides the opposite (regression: opposites were receiving most serves)', () => {
+    it('5-1 opposite is hidden in the front, never in the serve-receive back row, every rotation', () => {
+        for (let r = 0; r < 6; r++) {
+            const players = rotate(baseLineup(), r);
+            const bases = resolveBases({ system: RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players });
+            expect(isFrontRow(bases.serveReceive.get('OPP'))).toBe(true);
+        }
+    });
+    it('5-1 serve-receive back row holds exactly the passers -- never the setter or the opposite', () => {
+        for (let r = 0; r < 6; r++) {
+            const players = rotate(baseLineup(), r);
+            const bases = resolveBases({ system: RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players });
+            const backRow = [...bases.serveReceive.entries()].filter(([, z]) => !isFrontRow(z)).map(([id]) => id);
+            expect(backRow).toHaveLength(3);
+            expect(backRow).not.toContain('S');
+            expect(backRow).not.toContain('OPP');
+        }
+    });
+    it('the on-court libero is always a passer (back row) while the opposite stays hidden', () => {
+        const { players, liberoId } = lineupWithLibero();
+        const bases = resolveBases({ system: RotationSystemEnum.FIVE_ONE, designatedSetterIds: ['S'], players, liberoId });
+        expect(isFrontRow(bases.serveReceive.get(liberoId))).toBe(false);
+        expect(isFrontRow(bases.serveReceive.get('OPP'))).toBe(true);
+    });
+});
 describe('rallySetterId()', () => {
     it('5-1 returns the single setter in every rotation', () => {
         for (let r = 0; r < 6; r++) {

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

@@ -9,6 +9,7 @@ export declare const TeamInputSchema: z.ZodObject<{
     divisionId: z.ZodUUID;
     roster: z.ZodArray<z.ZodCustom<Player, Player>>;
     country: z.ZodCustom<Country, Country>;
+    legacyFlagCountry: z.ZodOptional<z.ZodCustom<Country, Country>>;
     tactics: z.ZodOptional<z.ZodObject<{
         lineup: z.ZodObject<{
             4: z.ZodCustom<Player, Player>;

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

@@ -16,6 +16,7 @@ export const TeamInputSchema = z.object({
     divisionId: z.uuid(),
     roster: z.array(playerInstanceSchema),
     country: countrySchema,
+    legacyFlagCountry: countrySchema.optional(),
     tactics: TacticsInputSchema.optional()
 }).superRefine((data, ctx) => {
     const ids = data.roster.map(p => p.id);

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

@@ -9,6 +9,7 @@ export declare class Team {
     readonly divisionId: string;
     readonly tactics?: Tactics;
     readonly country: Country;
+    readonly legacyFlagCountry?: Country;
     private _rating;
     static create(input: unknown): Team;
     private constructor();

package/dist/esm/src/service/team/team.js

@@ -16,7 +16,7 @@ export class Team {
             tactics: result.data.tactics != null ? Tactics.create(result.data.tactics) : undefined
         });
     }
-    constructor({ id, rating, name, shortName, divisionId, country, roster, tactics }) {
+    constructor({ id, rating, name, shortName, divisionId, country, legacyFlagCountry, roster, tactics }) {
         this.id = id;
         this._rating = rating;
         this.roster = roster;
@@ -25,6 +25,7 @@ export class Team {
         this.shortName = shortName;
         this.divisionId = divisionId;
         this.country = country;
+        this.legacyFlagCountry = legacyFlagCountry;
     }
     get rating() {
         return this._rating;

package/package.json

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