volleyballsimtypes 0.0.443 → 0.0.445

package/dist/cjs/src/api/index.d.ts

@@ -47,6 +47,8 @@ export type Match = Omit<DataProps<_Match>, 'sets' | 'homeTeam' | 'awayTeam' | '
     breakdown?: PointBreakdown;
     homeForm?: MatchForm[];
     awayForm?: MatchForm[];
+    isFriendly?: boolean;
+    detailUnavailable?: boolean;
 };
 export type RallyEvent = DataProps<_RallyEvent> & {
     teamId?: string;

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

@@ -45,6 +45,7 @@ function initModels(sequelize) {
     const RetiredPlayer = models_1.RetiredPlayerModel.initModel(sequelize);
     const Rally = models_1.RallyModel.initModel(sequelize);
     const PromotionMatch = models_1.PromotionMatchModel.initModel(sequelize);
+    const Friendly = models_1.FriendlyModel.initModel(sequelize);
     const RegionQualifier = models_1.RegionQualifierModel.initModel(sequelize);
     const NationalCountry = models_1.NationalCountryModel.initModel(sequelize);
     const Team = models_1.TeamModel.initModel(sequelize);
@@ -132,6 +133,7 @@ function initModels(sequelize) {
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
     Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
+    Match.hasOne(Friendly, { as: 'Friendly', foreignKey: 'match_id' });
     MatchResult.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     MatchResult.belongsTo(Team, { as: 'Winner', foreignKey: 'winner_team_id' });
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
@@ -183,6 +185,8 @@ function initModels(sequelize) {
     PromotionMatch.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     PromotionMatch.belongsTo(Competition, { as: 'upperCompetition', foreignKey: 'upper_competition' });
     PromotionMatch.belongsTo(Competition, { as: 'lowerCompetition', foreignKey: 'lower_competition' });
+    Friendly.belongsTo(Iteration, { as: 'iterationData', foreignKey: 'iteration' });
+    Friendly.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     RegionQualifier.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     RegionQualifier.belongsTo(Country, { as: 'countryRegion', foreignKey: 'region_code', targetKey: 'region_code' });
     RegionQualifier.belongsTo(Competition, { as: 'competition', foreignKey: 'competition_id' });
@@ -269,6 +273,7 @@ function initModels(sequelize) {
         RetiredPlayer,
         PlayerImprovementLog,
         PromotionMatch,
+        Friendly,
         RegionQualifier,
         NationalCountry,
         Rally,

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

@@ -0,0 +1,28 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+import { IterationId, IterationModel, MatchAttributes, MatchId, MatchModel } from '.';
+export interface FriendlyAttributes {
+    match_id: string;
+    iteration: number;
+    wave_key: string;
+    purged_at: Date | null;
+    match?: MatchAttributes;
+}
+export type FriendlyPk = 'match_id';
+export type FriendlyId = FriendlyModel[FriendlyPk];
+export type FriendlyCreationAttributes = Optional<FriendlyAttributes, 'purged_at'>;
+export declare class FriendlyModel extends Model<FriendlyAttributes, FriendlyCreationAttributes> implements FriendlyAttributes {
+    match_id: string;
+    iteration: number;
+    wave_key: string;
+    purged_at: Date | null;
+    Match: MatchModel;
+    getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
+    setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
+    createMatch: Sequelize.BelongsToCreateAssociationMixin<MatchModel>;
+    iterationData: IterationModel;
+    getIterationData: Sequelize.BelongsToGetAssociationMixin<IterationModel>;
+    setIterationData: Sequelize.BelongsToSetAssociationMixin<IterationModel, IterationId>;
+    createIterationData: Sequelize.BelongsToCreateAssociationMixin<IterationModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof FriendlyModel;
+}

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FriendlyModel = void 0;
+const sequelize_1 = require("sequelize");
+class FriendlyModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return FriendlyModel.init({
+            match_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Match',
+                    key: 'match_id'
+                }
+            },
+            iteration: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                references: {
+                    model: 'Iteration',
+                    key: 'iteration_id'
+                }
+            },
+            wave_key: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false
+            },
+            purged_at: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: true
+            }
+        }, {
+            sequelize,
+            tableName: 'Friendly',
+            schema: 'public',
+            timestamps: false
+        });
+    }
+}
+exports.FriendlyModel = FriendlyModel;

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

@@ -26,6 +26,7 @@ export * from './player-team';
 export * from './retired-player';
 export * from './rally';
 export * from './promotion-match';
+export * from './friendly';
 export * from './region-qualifier';
 export * from './national-country';
 export * from './coach';

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

@@ -42,6 +42,7 @@ __exportStar(require("./player-team"), exports);
 __exportStar(require("./retired-player"), exports);
 __exportStar(require("./rally"), exports);
 __exportStar(require("./promotion-match"), exports);
+__exportStar(require("./friendly"), exports);
 __exportStar(require("./region-qualifier"), exports);
 __exportStar(require("./national-country"), exports);
 __exportStar(require("./coach"), exports);

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/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/api/index.d.ts

@@ -47,6 +47,8 @@ export type Match = Omit<DataProps<_Match>, 'sets' | 'homeTeam' | 'awayTeam' | '
     breakdown?: PointBreakdown;
     homeForm?: MatchForm[];
     awayForm?: MatchForm[];
+    isFriendly?: boolean;
+    detailUnavailable?: boolean;
 };
 export type RallyEvent = DataProps<_RallyEvent> & {
     teamId?: string;

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, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, 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, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, 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);
@@ -42,6 +42,7 @@ export function initModels(sequelize) {
     const RetiredPlayer = RetiredPlayerModel.initModel(sequelize);
     const Rally = RallyModel.initModel(sequelize);
     const PromotionMatch = PromotionMatchModel.initModel(sequelize);
+    const Friendly = FriendlyModel.initModel(sequelize);
     const RegionQualifier = RegionQualifierModel.initModel(sequelize);
     const NationalCountry = NationalCountryModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
@@ -129,6 +130,7 @@ export function initModels(sequelize) {
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
     Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
+    Match.hasOne(Friendly, { as: 'Friendly', foreignKey: 'match_id' });
     MatchResult.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     MatchResult.belongsTo(Team, { as: 'Winner', foreignKey: 'winner_team_id' });
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
@@ -180,6 +182,8 @@ export function initModels(sequelize) {
     PromotionMatch.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     PromotionMatch.belongsTo(Competition, { as: 'upperCompetition', foreignKey: 'upper_competition' });
     PromotionMatch.belongsTo(Competition, { as: 'lowerCompetition', foreignKey: 'lower_competition' });
+    Friendly.belongsTo(Iteration, { as: 'iterationData', foreignKey: 'iteration' });
+    Friendly.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     RegionQualifier.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     RegionQualifier.belongsTo(Country, { as: 'countryRegion', foreignKey: 'region_code', targetKey: 'region_code' });
     RegionQualifier.belongsTo(Competition, { as: 'competition', foreignKey: 'competition_id' });
@@ -266,6 +270,7 @@ export function initModels(sequelize) {
         RetiredPlayer,
         PlayerImprovementLog,
         PromotionMatch,
+        Friendly,
         RegionQualifier,
         NationalCountry,
         Rally,

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

@@ -0,0 +1,28 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+import { IterationId, IterationModel, MatchAttributes, MatchId, MatchModel } from '.';
+export interface FriendlyAttributes {
+    match_id: string;
+    iteration: number;
+    wave_key: string;
+    purged_at: Date | null;
+    match?: MatchAttributes;
+}
+export type FriendlyPk = 'match_id';
+export type FriendlyId = FriendlyModel[FriendlyPk];
+export type FriendlyCreationAttributes = Optional<FriendlyAttributes, 'purged_at'>;
+export declare class FriendlyModel extends Model<FriendlyAttributes, FriendlyCreationAttributes> implements FriendlyAttributes {
+    match_id: string;
+    iteration: number;
+    wave_key: string;
+    purged_at: Date | null;
+    Match: MatchModel;
+    getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
+    setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
+    createMatch: Sequelize.BelongsToCreateAssociationMixin<MatchModel>;
+    iterationData: IterationModel;
+    getIterationData: Sequelize.BelongsToGetAssociationMixin<IterationModel>;
+    setIterationData: Sequelize.BelongsToSetAssociationMixin<IterationModel, IterationId>;
+    createIterationData: Sequelize.BelongsToCreateAssociationMixin<IterationModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof FriendlyModel;
+}

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

@@ -0,0 +1,37 @@
+import { DataTypes, Model } from 'sequelize';
+export class FriendlyModel extends Model {
+    static initModel(sequelize) {
+        return FriendlyModel.init({
+            match_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Match',
+                    key: 'match_id'
+                }
+            },
+            iteration: {
+                type: DataTypes.INTEGER,
+                allowNull: false,
+                references: {
+                    model: 'Iteration',
+                    key: 'iteration_id'
+                }
+            },
+            wave_key: {
+                type: DataTypes.TEXT,
+                allowNull: false
+            },
+            purged_at: {
+                type: DataTypes.DATE,
+                allowNull: true
+            }
+        }, {
+            sequelize,
+            tableName: 'Friendly',
+            schema: 'public',
+            timestamps: false
+        });
+    }
+}

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

@@ -26,6 +26,7 @@ export * from './player-team';
 export * from './retired-player';
 export * from './rally';
 export * from './promotion-match';
+export * from './friendly';
 export * from './region-qualifier';
 export * from './national-country';
 export * from './coach';

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

@@ -26,6 +26,7 @@ export * from './player-team';
 export * from './retired-player';
 export * from './rally';
 export * from './promotion-match';
+export * from './friendly';
 export * from './region-qualifier';
 export * from './national-country';
 export * from './coach';

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