volleyballsimtypes 0.0.377 → 0.0.378

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

@@ -1,4 +1,4 @@
-import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, Country as _Country, CourtPosition } from '../service';
+import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, National as _National, NationalMatch as _NationalMatch, Country as _Country, CourtPosition } from '../service';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
     awayPlayerPosition: PlayerPosition[];
@@ -24,6 +24,7 @@ export type Match = Omit<DataProps<_Match>, 'sets' | 'homeTeam' | 'awayTeam' | '
     season?: Season;
     tournament?: Tournament;
     qualifier?: Qualifier;
+    national?: National;
     results?: Results;
 };
 export type RallyEvent = DataProps<_RallyEvent> & {
@@ -100,6 +101,12 @@ export type QualifierMatch = Omit<DataProps<_QualifierMatch>, 'match'> & {
 export type Qualifier = Omit<DataProps<_Qualifier>, 'matches'> & {
     matches: QualifierMatch[];
 };
+export type NationalMatch = Omit<DataProps<_NationalMatch>, 'match'> & {
+    match: Match;
+};
+export type National = Omit<DataProps<_National>, 'matches' | 'teamsByTier'> & {
+    matches: NationalMatch[];
+};
 export interface VPER {
     playerId: string;
     value: number;

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, 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 } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const CurrencyTransaction = CurrencyTransactionModel.initModel(sequelize);
@@ -41,6 +41,7 @@ export function initModels(sequelize) {
     const Rally = RallyModel.initModel(sequelize);
     const PromotionMatch = PromotionMatchModel.initModel(sequelize);
     const RegionQualifier = RegionQualifierModel.initModel(sequelize);
+    const NationalCountry = NationalCountryModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
     const TeamReplacement = TeamReplacementModel.initModel(sequelize);
     const VPER = VPERModel.initModel(sequelize);
@@ -179,6 +180,12 @@ export function initModels(sequelize) {
     RegionQualifier.belongsTo(Country, { as: 'countryRegion', foreignKey: 'region_code', targetKey: 'region_code' });
     RegionQualifier.belongsTo(Competition, { as: 'competition', foreignKey: 'competition_id' });
     Competition.hasOne(RegionQualifier, { as: 'RegionQualifier', foreignKey: 'competition_id' });
+    NationalCountry.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
+    NationalCountry.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
+    NationalCountry.belongsTo(Competition, { as: 'competition', foreignKey: 'competition_id' });
+    Competition.hasOne(NationalCountry, { as: 'NationalCountry', foreignKey: 'competition_id' });
+    Country.hasMany(NationalCountry, { as: 'NationalCountries', foreignKey: 'country_id' });
+    Iteration.hasMany(NationalCountry, { as: 'NationalCountries', foreignKey: 'iteration' });
     VPER.belongsTo(Player, { as: 'Player', foreignKey: 'player_id' });
     VPER.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     Team.hasOne(Coach, { as: 'Coach', foreignKey: 'team_id' });
@@ -247,6 +254,7 @@ export function initModels(sequelize) {
         PlayerImprovementLog,
         PromotionMatch,
         RegionQualifier,
+        NationalCountry,
         Rally,
         Team,
         TeamReplacement,

package/dist/esm/src/data/models/competition-match.d.ts

@@ -6,6 +6,7 @@ export interface CompetitionMatchAttributes {
     match_id: string;
     index: number;
     stage: CompetitionStage;
+    round?: number | null;
     Match?: MatchAttributes;
 }
 export type CompetitionMatchPk = 'match_id';
@@ -17,6 +18,7 @@ export declare class CompetitionMatchModel extends Model<CompetitionMatchAttribu
     match_id: string;
     index: number;
     stage: CompetitionStage;
+    round: number | null;
     Competition: CompetitionModel;
     getCompetition: Sequelize.BelongsToGetAssociationMixin<CompetitionModel>;
     setCompetition: Sequelize.BelongsToSetAssociationMixin<CompetitionModel, CompetitionId>;

package/dist/esm/src/data/models/competition-match.js

@@ -26,6 +26,10 @@ export class CompetitionMatchModel extends Model {
             stage: {
                 type: DataTypes.ENUM('FINAL', 'LEAGUE', 'QUARTERFINALS', 'ROUND_OF_8', 'THIRD_PLACE', 'SEMIFINALS', 'ROUND_OF_16', 'ROUND_OF_32', 'ROUND_OF_64', 'ROUND_OF_128', 'ROUND_OF_256'),
                 allowNull: false
+            },
+            round: {
+                type: DataTypes.INTEGER,
+                allowNull: true
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CompetitionChampionAttributes, CompetitionChampionId, CompetitionChampionModel, CompetitionMVPAttributes, CompetitionMVPId, CompetitionMVPModel, CompetitionMatchAttributes, CompetitionMatchId, CompetitionMatchModel, CompetitionStandingsAttributes, CompetitionStandingsId, CompetitionStandingsModel, CompetitionTeamsAttributes, CompetitionTeamsId, CompetitionTeamsModel, PromotionMatchAttributes, PromotionMatchId, PromotionMatchModel, RegionQualifierAttributes, RegionQualifierId, RegionQualifierModel, DivisionSeasonAttributes, DivisionSeasonId, DivisionSeasonModel, IterationId, IterationModel, TeamId, TeamModel } from '.';
+import { CompetitionChampionAttributes, CompetitionChampionId, CompetitionChampionModel, CompetitionMVPAttributes, CompetitionMVPId, CompetitionMVPModel, CompetitionMatchAttributes, CompetitionMatchId, CompetitionMatchModel, CompetitionStandingsAttributes, CompetitionStandingsId, CompetitionStandingsModel, CompetitionTeamsAttributes, CompetitionTeamsId, CompetitionTeamsModel, PromotionMatchAttributes, PromotionMatchId, PromotionMatchModel, RegionQualifierAttributes, RegionQualifierId, RegionQualifierModel, NationalCountryAttributes, NationalCountryId, NationalCountryModel, DivisionSeasonAttributes, DivisionSeasonId, DivisionSeasonModel, IterationId, IterationModel, TeamId, TeamModel } from '.';
 import { Status } from '../common';
 export interface CompetitionAttributes {
     competition_id: string;
@@ -14,11 +14,12 @@ export interface CompetitionAttributes {
     CompetitionStandings?: CompetitionStandingsAttributes[];
     CompetitionTeams?: CompetitionTeamsAttributes[];
     RegionQualifier?: RegionQualifierAttributes;
+    NationalCountry?: NationalCountryAttributes;
     UpperPromotionMatches?: PromotionMatchAttributes[];
     LowerPromotionMatches?: PromotionMatchAttributes[];
 }
 export type CompetitionPk = 'competition_id';
-export type CompetitionType = 'LEAGUE' | 'TOURNAMENT' | 'QUALIFIER';
+export type CompetitionType = 'LEAGUE' | 'TOURNAMENT' | 'QUALIFIER' | 'NATIONAL';
 export type CompetitionId = CompetitionModel[CompetitionPk];
 export type CompetitionCreationAttributes = CompetitionAttributes;
 export declare class CompetitionModel extends Model<CompetitionAttributes, CompetitionCreationAttributes> implements CompetitionAttributes {
@@ -67,6 +68,10 @@ export declare class CompetitionModel extends Model<CompetitionAttributes, Compe
     getRegionQualifier: Sequelize.HasOneGetAssociationMixin<RegionQualifierModel>;
     setRegionQualifier: Sequelize.HasOneSetAssociationMixin<RegionQualifierModel, RegionQualifierId>;
     createRegionQualifier: Sequelize.HasOneCreateAssociationMixin<RegionQualifierModel>;
+    NationalCountry: NationalCountryModel;
+    getNationalCountry: Sequelize.HasOneGetAssociationMixin<NationalCountryModel>;
+    setNationalCountry: Sequelize.HasOneSetAssociationMixin<NationalCountryModel, NationalCountryId>;
+    createNationalCountry: Sequelize.HasOneCreateAssociationMixin<NationalCountryModel>;
     UpperPromotionMatches: PromotionMatchModel[];
     getUpperPromotionMatches: Sequelize.HasManyGetAssociationsMixin<PromotionMatchModel>;
     setUpperPromotionMatches: Sequelize.HasManySetAssociationsMixin<PromotionMatchModel, PromotionMatchId>;

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

@@ -1,5 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
-import { RegionQualifierModel, DivisionSeasonModel, IterationModel } from '.';
+import { RegionQualifierModel, NationalCountryModel, DivisionSeasonModel, IterationModel } from '.';
 import { StatusDataType } from '../common';
 export class CompetitionModel extends Model {
     static initModel(sequelize) {
@@ -18,7 +18,7 @@ export class CompetitionModel extends Model {
                 }
             },
             type: {
-                type: DataTypes.ENUM('LEAGUE', 'TOURNAMENT', 'QUALIFIER'),
+                type: DataTypes.ENUM('LEAGUE', 'TOURNAMENT', 'QUALIFIER', 'NATIONAL'),
                 allowNull: false
             },
             status: {
@@ -41,6 +41,9 @@ export class CompetitionModel extends Model {
                     }, {
                         model: RegionQualifierModel,
                         as: 'RegionQualifier'
+                    }, {
+                        model: NationalCountryModel,
+                        as: 'NationalCountry'
                     }]
             },
             indexes: [{

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

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

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

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

package/dist/esm/src/data/models/national-country.d.ts

@@ -0,0 +1,29 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { CompetitionId, CompetitionModel, CountryId, CountryModel, IterationId, IterationModel } from '.';
+export interface NationalCountryAttributes {
+    competition_id: string;
+    country_id: string;
+    iteration: number;
+}
+export type NationalCountryPk = 'country_id' | 'iteration';
+export type NationalCountryId = NationalCountryModel[NationalCountryPk];
+export type NationalCountryCreationAttributes = NationalCountryAttributes;
+export declare class NationalCountryModel extends Model<NationalCountryAttributes, NationalCountryCreationAttributes> implements NationalCountryAttributes {
+    competition_id: string;
+    country_id: string;
+    iteration: number;
+    Iteration: IterationModel;
+    getIteration: Sequelize.BelongsToGetAssociationMixin<IterationModel>;
+    setIteration: Sequelize.BelongsToSetAssociationMixin<IterationModel, IterationId>;
+    createIteration: Sequelize.BelongsToCreateAssociationMixin<IterationModel>;
+    competition: CompetitionModel;
+    getCompetition: Sequelize.BelongsToGetAssociationMixin<CompetitionModel>;
+    setCompetition: Sequelize.BelongsToSetAssociationMixin<CompetitionModel, CompetitionId>;
+    createCompetition: Sequelize.BelongsToCreateAssociationMixin<CompetitionModel>;
+    country: CountryModel;
+    getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
+    setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;
+    createCountry: Sequelize.BelongsToCreateAssociationMixin<CountryModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof NationalCountryModel;
+}

package/dist/esm/src/data/models/national-country.js

@@ -0,0 +1,47 @@
+import { DataTypes, Model } from 'sequelize';
+export class NationalCountryModel extends Model {
+    static initModel(sequelize) {
+        return NationalCountryModel.init({
+            country_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Country',
+                    key: 'country_id'
+                }
+            },
+            iteration: {
+                type: DataTypes.INTEGER,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Iteration',
+                    key: 'iteration_id'
+                }
+            },
+            competition_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'Competition',
+                    key: 'competition_id'
+                }
+            }
+        }, {
+            sequelize,
+            tableName: 'NationalCountry',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'nationalcountry_pk',
+                    unique: true,
+                    fields: [{ name: 'country_id' }, { name: 'iteration' }]
+                }, {
+                    name: 'nationalcountry_competition_uq',
+                    unique: true,
+                    fields: [{ name: 'competition_id' }]
+                }]
+        });
+    }
+}

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

@@ -22,6 +22,8 @@ export * from './competition-team-order';
 export * from './region-qualifier';
 export * from './qualifier';
 export * from './qualifier-match';
+export * from './national';
+export * from './national-match';
 export * from './team';
 export * from './tactics';
 export * from './vper';

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

@@ -22,6 +22,8 @@ export * from './competition-team-order';
 export * from './region-qualifier';
 export * from './qualifier';
 export * from './qualifier-match';
+export * from './national';
+export * from './national-match';
 export * from './team';
 export * from './tactics';
 export * from './vper';

package/dist/esm/src/data/transformers/national-match.d.ts

@@ -0,0 +1,5 @@
+import { NationalMatch } from '../../service';
+import { CompetitionMatchAttributes, CompetitionMatchModel } from '../models';
+declare function transformToAttributes(nationalMatch: NationalMatch, nationalId: string): CompetitionMatchAttributes;
+declare function transformToObject(model: CompetitionMatchModel): NationalMatch;
+export { transformToObject as transformToNationalMatch, transformToAttributes as transformFromNationalMatch };

package/dist/esm/src/data/transformers/national-match.js

@@ -0,0 +1,21 @@
+import { NationalMatch } from '../../service';
+import { transformFromMatch, transformFromStage, transformToMatch, transformToStage } from '.';
+function transformToAttributes(nationalMatch, nationalId) {
+    return {
+        competition_id: nationalId,
+        match_id: nationalMatch.match.id,
+        index: nationalMatch.index,
+        stage: transformFromStage(nationalMatch.stage),
+        round: nationalMatch.round,
+        Match: transformFromMatch(nationalMatch.match)
+    };
+}
+function transformToObject(model) {
+    return NationalMatch.create({
+        round: model.round ?? 1,
+        stage: transformToStage(model.stage),
+        match: transformToMatch(model.Match),
+        index: model.index
+    });
+}
+export { transformToObject as transformToNationalMatch, transformToAttributes as transformFromNationalMatch };

package/dist/esm/src/data/transformers/national.d.ts

@@ -0,0 +1,5 @@
+import { CompetitionAttributes, CompetitionModel } from '../models';
+import { National } from '../../service';
+declare function transformToAttributes(national: National): CompetitionAttributes;
+declare function transformToObject(model: CompetitionModel): National;
+export { transformToObject as transformToNational, transformToAttributes as transformFromNational };

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

@@ -0,0 +1,57 @@
+import { sortTeamsByCompetitionIndex, transformFromNationalMatch, transformToCountry, transformToIteration, transformToNationalMatch, transformToTeam } from '.';
+import { National } from '../../service';
+function transformToAttributes(national) {
+    const CompetitionMatches = national.matches.map((match) => transformFromNationalMatch(match, national.id));
+    const CompetitionTeams = national.teams.map((team, index) => ({
+        competition_id: national.id,
+        team_id: team.id,
+        index
+    }));
+    const NationalCountry = {
+        competition_id: national.id,
+        country_id: national.country.id,
+        iteration: national.iteration.id
+    };
+    const CompetitionChampion = (national.champion != null)
+        ? {
+            competition_id: national.id,
+            team_id: national.champion.id
+        }
+        : undefined;
+    return {
+        competition_id: national.id,
+        type: 'NATIONAL',
+        iteration: national.iteration.id,
+        status: national.status,
+        CompetitionMatches,
+        CompetitionTeams,
+        CompetitionChampion,
+        NationalCountry
+    };
+}
+function transformToObject(model) {
+    const teamModels = sortTeamsByCompetitionIndex(model.Teams ?? []);
+    const teamsByTier = new Map();
+    for (const teamModel of teamModels) {
+        const tier = teamModel.Division?.tier ?? 1;
+        const bucket = teamsByTier.get(tier) ?? [];
+        bucket.push(transformToTeam(teamModel));
+        teamsByTier.set(tier, bucket);
+    }
+    const countryModel = model.NationalCountry?.country ?? teamModels[0]?.country;
+    if (countryModel == null)
+        throw new Error(`MISSING_NATIONAL_COUNTRY competition=${model.competition_id}`);
+    const champion = model.CompetitionChampion?.team != null
+        ? transformToTeam(model.CompetitionChampion.team)
+        : undefined;
+    return National.create({
+        id: model.competition_id,
+        iteration: transformToIteration(model.Iteration),
+        country: transformToCountry(countryModel),
+        matches: (model.CompetitionMatches ?? []).map(transformToNationalMatch),
+        teamsByTier,
+        status: model.status,
+        champion
+    });
+}
+export { transformToObject as transformToNational, transformToAttributes as transformFromNational };

package/dist/esm/src/service/competition/index.d.ts

@@ -9,3 +9,5 @@ export * from './promotion-match';
 export * from './stage';
 export * from './qualifier-match';
 export * from './qualifier';
+export * from './national-match';
+export * from './national';

package/dist/esm/src/service/competition/index.js

@@ -9,3 +9,5 @@ export * from './promotion-match';
 export * from './stage';
 export * from './qualifier-match';
 export * from './qualifier';
+export * from './national-match';
+export * from './national';

package/dist/esm/src/service/competition/national-match.d.ts

@@ -0,0 +1,10 @@
+import { Match } from '../match';
+import { Stage } from './stage';
+export declare class NationalMatch {
+    readonly round: number;
+    readonly stage: Stage;
+    readonly match: Match;
+    readonly index: number;
+    static create(input: unknown): NationalMatch;
+    private constructor();
+}

package/dist/esm/src/service/competition/national-match.js

@@ -0,0 +1,28 @@
+import { Stage } from './stage';
+import { NationalMatchInputSchema } from './schemas/national-match.z';
+export class NationalMatch {
+    static create(input) {
+        const result = NationalMatchInputSchema.safeParse(input);
+        if (!result.success) {
+            throw new Error(`INVALID_NATIONAL_MATCH: ${result.error.message}. RECEIVED=${(() => { try {
+                return JSON.stringify(input);
+            }
+            catch {
+                return String(input);
+            } })()}`);
+        }
+        return new NationalMatch(result.data);
+    }
+    constructor({ round, stage, match, index }) {
+        if (round < 1)
+            throw new Error(`INVALID_ROUND: ${round}`);
+        if (index < 0)
+            throw new Error('INDEX_OUT_OF_BOUNDS');
+        if (Stage.LEAGUE === stage)
+            throw new Error(`INVALID_STAGE: ${stage}`);
+        this.round = round;
+        this.stage = stage;
+        this.match = match;
+        this.index = index;
+    }
+}

package/dist/esm/src/service/competition/national.d.ts

@@ -0,0 +1,18 @@
+import { NationalMatch } from './national-match';
+import { Team } from '../team';
+import { Iteration } from './iteration';
+import { Country } from '../country';
+import { StatusEnum } from '../../data';
+export declare class National {
+    readonly id: string;
+    readonly iteration: Iteration;
+    readonly country: Country;
+    readonly matches: NationalMatch[];
+    readonly teamsByTier: Map<number, Team[]>;
+    readonly teams: Team[];
+    readonly status: StatusEnum;
+    champion?: Team;
+    static create(input: unknown): National;
+    private constructor();
+    static sortMatchesFn(m1: NationalMatch, m2: NationalMatch): number;
+}

package/dist/esm/src/service/competition/national.js

@@ -0,0 +1,32 @@
+import { NationalInputSchema } from './schemas/national.z';
+export class National {
+    static create(input) {
+        const result = NationalInputSchema.safeParse(input);
+        if (!result.success) {
+            throw new Error(`INVALID_NATIONAL: ${result.error.message}. RECEIVED=${(() => { try {
+                return JSON.stringify(input);
+            }
+            catch {
+                return String(input);
+            } })()}`);
+        }
+        return new National(result.data);
+    }
+    constructor({ id, iteration, country, matches, teamsByTier, champion, status }) {
+        this.id = id;
+        this.iteration = iteration;
+        this.country = country;
+        this.matches = matches;
+        this.teamsByTier = teamsByTier;
+        this.teams = Array.from(teamsByTier.values()).flat();
+        this.champion = champion;
+        this.status = status;
+        this.matches.sort(National.sortMatchesFn);
+    }
+    // Ascending round, then ascending index within a round.
+    static sortMatchesFn(m1, m2) {
+        if (m1.round !== m2.round)
+            return m1.round - m2.round;
+        return m1.index - m2.index;
+    }
+}

package/dist/esm/src/service/competition/schemas/national-match.z.d.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { Match } from '../../match';
+import { Stage } from '../stage';
+export declare const NationalMatchInputSchema: z.ZodObject<{
+    round: z.ZodNumber;
+    stage: z.ZodCustom<Stage, Stage>;
+    match: z.ZodCustom<Match, Match>;
+    index: z.ZodNumber;
+}, z.core.$strip>;
+export type NationalMatchInput = z.infer<typeof NationalMatchInputSchema>;

package/dist/esm/src/service/competition/schemas/national-match.z.js

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { Match } from '../../match';
+import { Stage } from '../stage';
+const matchSchema = z.custom((v) => v instanceof Match, { message: 'INVALID_MATCH_INSTANCE' });
+export const NationalMatchInputSchema = z.object({
+    round: z.number().int().min(1),
+    stage: z.custom((v) => typeof v === 'number', { message: 'INVALID_STAGE' }),
+    match: matchSchema,
+    index: z.number().int().min(0)
+}).superRefine((data, ctx) => {
+    if (Stage.LEAGUE === data.stage) {
+        ctx.addIssue({ code: 'custom', message: `INVALID_STAGE: ${data.stage}`, path: ['stage'] });
+    }
+});

package/dist/esm/src/service/competition/schemas/national.z.d.ts

@@ -0,0 +1,20 @@
+import { z } from 'zod';
+import { Team } from '../../team';
+import { Iteration } from '../iteration';
+import { Country } from '../../country';
+import { StatusEnum } from '../../../data/common';
+import { NationalMatch } from '../national-match';
+export declare const NationalInputSchema: z.ZodObject<{
+    id: z.ZodUUID;
+    iteration: z.ZodCustom<Iteration, Iteration>;
+    country: z.ZodCustom<Country, Country>;
+    matches: z.ZodArray<z.ZodCustom<NationalMatch, NationalMatch>>;
+    teamsByTier: z.ZodMap<z.ZodNumber, z.ZodArray<z.ZodCustom<Team, Team>>>;
+    status: z.ZodEnum<{
+        PENDING: StatusEnum.PENDING;
+        IN_PROGRESS: StatusEnum.IN_PROGRESS;
+        COMPLETE: StatusEnum.COMPLETE;
+    }>;
+    champion: z.ZodOptional<z.ZodCustom<Team, Team>>;
+}, z.core.$strip>;
+export type NationalInput = z.infer<typeof NationalInputSchema>;

package/dist/esm/src/service/competition/schemas/national.z.js

@@ -0,0 +1,29 @@
+import { z } from 'zod';
+import { Team } from '../../team';
+import { Iteration } from '../iteration';
+import { Country } from '../../country';
+import { StatusEnum } from '../../../data/common';
+import { NationalMatch } from '../national-match';
+const teamSchema = z.custom((v) => v instanceof Team, { message: 'INVALID_TEAM_INSTANCE' });
+const iterationSchema = z.custom((v) => v instanceof Iteration, { message: 'INVALID_ITERATION_INSTANCE' });
+const countrySchema = z.custom((v) => v instanceof Country, { message: 'INVALID_COUNTRY_INSTANCE' });
+const nationalMatchSchema = z.custom((v) => v instanceof NationalMatch, { message: 'INVALID_NATIONAL_MATCH_INSTANCE' });
+const teamsByTierSchema = z.map(z.number().int().positive(), z.array(teamSchema));
+export const NationalInputSchema = z.object({
+    id: z.uuid(),
+    iteration: iterationSchema,
+    country: countrySchema,
+    matches: z.array(nationalMatchSchema),
+    teamsByTier: teamsByTierSchema,
+    status: z.enum(Object.values(StatusEnum)),
+    champion: teamSchema.optional()
+}).superRefine((data, ctx) => {
+    const ids = Array.from(data.teamsByTier.values()).flat().map(t => t.id);
+    if (new Set(ids).size !== ids.length) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'NATIONAL_TEAMS_CONTAINS_DUPLICATES',
+            path: ['teamsByTier']
+        });
+    }
+});

package/dist/esm/src/service/match/match-rating.d.ts

@@ -21,6 +21,7 @@ export declare class MatchRating {
     static readonly TIER_PENALTY: number;
     static readonly QUALIFIER_WEIGHT: number;
     static readonly TOURNAMENT_WEIGHT: number;
+    static readonly NATIONAL_WEIGHT: number;
     readonly match: Match;
     readonly weight: number;
     static create(input: unknown): MatchRating;

package/dist/esm/src/service/match/match-rating.js

@@ -39,6 +39,8 @@ export class MatchRating {
                 return MatchRating.applyBotPenalty(MatchRating.QUALIFIER_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'TOURNAMENT':
                 return MatchRating.applyBotPenalty(MatchRating.TOURNAMENT_WEIGHT, context.homeIsBot, context.awayIsBot);
+            case 'NATIONAL':
+                return MatchRating.applyBotPenalty(MatchRating.NATIONAL_WEIGHT, context.homeIsBot, context.awayIsBot);
         }
     }
     static calculateProbability(z) {
@@ -91,3 +93,5 @@ MatchRating.TIER_PENALTY = 5;
 MatchRating.QUALIFIER_WEIGHT = 45;
 // WCC tournament — top of the hierarchy
 MatchRating.TOURNAMENT_WEIGHT = 55;
+// National cup, between qualifier and tournament prestige
+MatchRating.NATIONAL_WEIGHT = 50;

package/dist/esm/src/service/match/schemas/match-rating.z.d.ts

@@ -19,6 +19,10 @@ export declare const MatchContextSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     kind: z.ZodLiteral<"TOURNAMENT">;
     homeIsBot: z.ZodBoolean;
     awayIsBot: z.ZodBoolean;
+}, z.core.$strip>, z.ZodObject<{
+    kind: z.ZodLiteral<"NATIONAL">;
+    homeIsBot: z.ZodBoolean;
+    awayIsBot: z.ZodBoolean;
 }, z.core.$strip>], "kind">;
 export declare const MatchRatingInputSchema: z.ZodObject<{
     match: z.ZodCustom<Match, Match>;
@@ -41,6 +45,10 @@ export declare const MatchRatingInputSchema: z.ZodObject<{
         kind: z.ZodLiteral<"TOURNAMENT">;
         homeIsBot: z.ZodBoolean;
         awayIsBot: z.ZodBoolean;
+    }, z.core.$strip>, z.ZodObject<{
+        kind: z.ZodLiteral<"NATIONAL">;
+        homeIsBot: z.ZodBoolean;
+        awayIsBot: z.ZodBoolean;
     }, z.core.$strip>], "kind">;
 }, z.core.$strip>;
 export type MatchContext = z.infer<typeof MatchContextSchema>;

package/dist/esm/src/service/match/schemas/match-rating.z.js

@@ -23,6 +23,11 @@ export const MatchContextSchema = z.discriminatedUnion('kind', [
         kind: z.literal('TOURNAMENT'),
         homeIsBot: z.boolean(),
         awayIsBot: z.boolean()
+    }),
+    z.object({
+        kind: z.literal('NATIONAL'),
+        homeIsBot: z.boolean(),
+        awayIsBot: z.boolean()
     })
 ]);
 export const MatchRatingInputSchema = z.object({

package/package.json

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