volleyballsimtypes 0.0.100 → 0.0.102

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

@@ -1,18 +1,23 @@
 import { MatchSet } from '../../service';
-import { transformToAPIMatchSetStats, transformToAPIRally, transformToMatchSetStats, transformToPlayer, transformToRally } from '.';
+import { transformFromPlayerPosition, transformToAPIMatchSetStats, transformToAPIRally, transformToMatchSetStats, transformToPlayerPosition, transformToRally } from '.';
 function transformToAttributes(set, matchId) {
+    const homeSetPositions = set.homePlayerPosition.map(position => transformFromPlayerPosition(position, 'Home', set.id));
+    const awaySetPositions = set.awayPlayerPosition.map(position => transformFromPlayerPosition(position, 'Away', set.id));
     return {
         match_set_id: set.id,
         match_id: matchId,
         order: set.order,
-        away_libero: set.awayLibero?.id,
-        home_libero: set.homeLibero?.id,
         is_tie_break: set.isTieBreak,
         home_score: set.getHomeScore(),
-        away_score: set.getAwayScore()
+        away_score: set.getAwayScore(),
+        setPositions: [...homeSetPositions, ...awaySetPositions]
     };
 }
 function transformToObject(model) {
+    const homePlayerPosition = model.SetPositions.filter(p => p.side === 'Home')
+        .map(transformToPlayerPosition);
+    const awayPlayerPosition = model.SetPositions.filter(p => p.side === 'Away')
+        .map(transformToPlayerPosition);
     const rallies = model.Rallies != null ? model.Rallies.map(transformToRally) : [];
     rallies.sort((r1, r2) => r1.order - r2.order);
     return new MatchSet({
@@ -21,8 +26,8 @@ function transformToObject(model) {
         homeScore: model.home_score,
         awayScore: model.away_score,
         isTieBreak: model.is_tie_break,
-        awayLibero: model.awayLibero != null ? transformToPlayer(model.awayLibero) : undefined,
-        homeLibero: model.homeLibero != null ? transformToPlayer(model.homeLibero) : undefined,
+        homePlayerPosition,
+        awayPlayerPosition,
         rallies: rallies,
         stats: model.MatchSetStats != null ? model.MatchSetStats.map(transformToMatchSetStats) : []
     });
@@ -30,15 +35,19 @@ function transformToObject(model) {
 function transformToAPIObject(model) {
     const rallies = model.Rallies != null ? model.Rallies.map(transformToAPIRally) : [];
     rallies.sort((r1, r2) => r1.order - r2.order);
+    const homePlayerPosition = model.SetPositions.filter(p => p.side === 'Home')
+        .map(transformToPlayerPosition);
+    const awayPlayerPosition = model.SetPositions.filter(p => p.side === 'Away')
+        .map(transformToPlayerPosition);
     return {
         id: model.match_id,
         order: model.order,
         homeScore: model.home_score,
         awayScore: model.away_score,
         isTieBreak: model.is_tie_break,
-        awayLiberoId: model.away_libero,
-        homeLiberoId: model.home_libero,
-        rallies: model.Rallies != null ? model.Rallies.map(transformToAPIRally) : [],
+        rallies: rallies,
+        homePlayerPosition,
+        awayPlayerPosition,
         stats: model.MatchSetStats != null ? model.MatchSetStats.map(stats => transformToAPIMatchSetStats(stats, model.order)) : []
     };
 }

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

@@ -1,7 +1,7 @@
-import { MatchAttributes, MatchModel, SeasonModel, TournamentModel } from '../models';
+import { CompetitionModel, MatchAttributes, MatchModel } from '../models';
 import { Match } from '../../service';
 import { APIMatch } from '../../api';
 declare function transformToAttributes(match: Match): MatchAttributes;
 declare function transformToObject(model: MatchModel): Match;
-declare function transformToAPIObject(match: MatchModel, season?: SeasonModel, tournament?: TournamentModel): APIMatch;
+declare function transformToAPIObject(match: MatchModel, competition: CompetitionModel): APIMatch;
 export { transformToObject as transformToMatch, transformToAPIObject as transformToAPIMatch, transformToAttributes as transformFromMatch };

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

@@ -15,25 +15,25 @@ function transformToObject(model) {
         .sort((s1, s2) => s1.order - s2.order);
     return new Match({
         id: model.match_id,
-        homeTeam: transformToTeam(model.homeTeam),
-        awayTeam: transformToTeam(model.awayTeam),
+        homeTeam: transformToTeam(model.HomeTeam),
+        awayTeam: transformToTeam(model.AwayTeam),
         scheduledDate: new Date(model.scheduled_date),
         sets: sets,
         isSimulated: model.is_simulated
     });
 }
-function transformToAPIObject(match, season, tournament) {
+function transformToAPIObject(match, competition) {
     const sets = match.MatchSets == null || match.MatchSets.length < 1
         ? [] : match.MatchSets.map(transformToAPIMatchSet)
         .sort((s1, s2) => s1.order - s2.order);
     return {
         id: match.match_id,
-        homeTeam: transformToAPITeam(match.homeTeam),
-        awayTeam: transformToAPITeam(match.awayTeam),
+        homeTeam: transformToAPITeam(match.HomeTeam),
+        awayTeam: transformToAPITeam(match.AwayTeam),
         scheduledDate: new Date(match.scheduled_date),
         sets,
-        season: season != null ? transformToAPISeason(season) : undefined,
-        tournament: tournament != null ? transformToAPITournament(tournament) : undefined
+        season: competition.type === 'LEAGUE' ? transformToAPISeason(competition) : undefined,
+        tournament: competition.type === 'TOURNAMENT' ? transformToAPITournament(competition) : undefined
     };
 }
 export { transformToObject as transformToMatch, transformToAPIObject as transformToAPIMatch, transformToAttributes as transformFromMatch };

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

@@ -1,27 +1,11 @@
 import { EventTypeEnum, Rally } from '../../service';
-import { transformFromBlock, transformFromLiberoReplacement, transformFromPlayerPosition, transformFromReception, transformFromScore, transformFromServe, transformFromSet, transformFromSpike, transformFromSubstitution, transformToAPIBlock, transformToAPILiberoReplacement, transformToAPIReception, transformToAPIScore, transformToAPIServe, transformToAPISet, transformToAPISpike, transformToAPISubstitution, transformToBlock, transformToLiberoReplacement, transformToPlayerPosition, transformToReception, transformToScore, transformToServe, transformToSet, transformToSpike, transformToSubstitution, transformToTeam } from '.';
+import { transformFromBlock, transformFromLiberoReplacement, transformFromReception, transformFromServe, transformFromSet, transformFromSpike, transformFromSubstitution, transformToAPIBlock, transformToAPILiberoReplacement, transformToAPIReception, transformToAPIServe, transformToAPISet, transformToAPISpike, transformToAPISubstitution, transformToBlock, transformToLiberoReplacement, transformToReception, transformToServe, transformToSet, transformToSpike, transformToSubstitution, transformToTeam } from '.';
 function transformToAttributes(rally, setId) {
-    const rallyPositions = [
-        ...rally.awayPlayerPosition.map(pp => transformFromPlayerPosition(pp, 'Away', rally.id)),
-        ...rally.homePlayerPosition.map(pp => transformFromPlayerPosition(pp, 'Home', rally.id))
-    ];
-    const temp = {};
-    for (const p of rallyPositions) {
-        // @ts-ignore
-        if (temp[p.player_id] != null) {
-            throw new Error('DUPLICATE_KEY');
-        }
-        else {
-            // @ts-ignore
-            temp[p.player_id] = p.rally_id;
-        }
-    }
     return {
         rally_id: rally.id,
         match_set_id: setId,
         order: rally.order,
         serving_team: rally.servingTeam.id,
-        RallyPositions: rallyPositions,
         LiberoReplacements: rally.events.filter(event => event.eventType === EventTypeEnum.LIBERO_REPLACEMENT)
             .map(event => transformFromLiberoReplacement(event, rally.id)),
         Substitutions: rally.events.filter(event => event.eventType === EventTypeEnum.SUBSTITUTION)
@@ -35,9 +19,7 @@ function transformToAttributes(rally, setId) {
         Spikes: rally.events.filter(event => event.eventType === EventTypeEnum.SPIKE)
             .map(event => transformFromSpike(event, rally.id)),
         Blocks: rally.events.filter(event => event.eventType === EventTypeEnum.BLOCK)
-            .map(event => transformFromBlock(event, rally.id)),
-        Scores: rally.events.filter(event => event.eventType === EventTypeEnum.SCORE)
-            .map(event => transformFromScore(event, rally.id))
+            .map(event => transformFromBlock(event, rally.id))
     };
 }
 function transformToObject(model) {
@@ -50,19 +32,12 @@ function transformToObject(model) {
     const sets = model.Sets != null ? model.Sets.map(transformToSet) : [];
     const spikes = model.Spikes != null ? model.Spikes.map(transformToSpike) : [];
     const blocks = model.Blocks != null ? model.Blocks.map(transformToBlock) : [];
-    const scores = model.Scores != null ? model.Scores.map(transformToScore) : [];
-    const events = [...liberoReplacements, ...substitutions, ...serves, ...receptions, ...sets, ...spikes, ...blocks, ...scores]
+    const events = [...liberoReplacements, ...substitutions, ...serves, ...receptions, ...sets, ...spikes, ...blocks]
         .sort((e1, e2) => e1.order - e2.order);
-    const awayPlayerPosition = model.RallyPositions != null ?
-        model.RallyPositions.filter(rp => rp.side === 'Away').map(transformToPlayerPosition) : [];
-    const homePlayerPosition = model.RallyPositions != null ?
-        model.RallyPositions.filter(rp => rp.side === 'Home').map(transformToPlayerPosition) : [];
     return new Rally({
         id: model.rally_id,
         order: model.order,
-        servingTeam: transformToTeam(model.servingTeam),
-        awayPlayerPosition,
-        homePlayerPosition,
+        servingTeam: transformToTeam(model.ServingTeam),
         events
     });
 }
@@ -76,19 +51,12 @@ function transformToAPIObject(model) {
     const sets = model.Sets != null ? model.Sets.map(transformToAPISet) : [];
     const spikes = model.Spikes != null ? model.Spikes.map(transformToAPISpike) : [];
     const blocks = model.Blocks != null ? model.Blocks.map(transformToAPIBlock) : [];
-    const scores = model.Scores != null ? model.Scores.map(transformToAPIScore) : [];
-    const events = [...liberoReplacements, ...substitutions, ...serves, ...receptions, ...sets, ...spikes, ...blocks, ...scores]
+    const events = [...liberoReplacements, ...substitutions, ...serves, ...receptions, ...sets, ...spikes, ...blocks]
         .sort((e1, e2) => e1.order - e2.order);
-    const awayPlayerPosition = model.RallyPositions != null ?
-        model.RallyPositions.filter(rp => rp.side === 'Away').map(transformToPlayerPosition) : [];
-    const homePlayerPosition = model.RallyPositions != null ?
-        model.RallyPositions.filter(rp => rp.side === 'Home').map(transformToPlayerPosition) : [];
     return {
         id: model.rally_id,
         order: model.order,
         servingTeamId: model.serving_team,
-        awayPlayerPosition,
-        homePlayerPosition,
         events
     };
 }

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

@@ -1,4 +1,4 @@
-import { SeasonMatchAttributes } from '../models';
+import { CompetitionMatchAttributes } from '../models';
 import { Match } from '../../service';
-declare function transformToAttributes(seasonId: string, match: Match): SeasonMatchAttributes;
+declare function transformToAttributes(seasonId: string, match: Match, index: number): CompetitionMatchAttributes;
 export { transformToAttributes as transformFromSeasonMatch };

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

@@ -1,8 +1,12 @@
+import { Stage } from '../../service';
 import { transformFromMatch } from './match';
-function transformToAttributes(seasonId, match) {
+import { transformFromStage } from './stage';
+function transformToAttributes(seasonId, match, index) {
     return {
-        season_id: seasonId,
+        competition_id: seasonId,
         match_id: match.id,
+        index,
+        stage: transformFromStage(Stage.LEAGUE),
         match: transformFromMatch(match)
     };
 }

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

@@ -1,7 +1,7 @@
-import { SeasonAttributes, SeasonModel } from '../models';
+import { CompetitionAttributes, CompetitionModel } from '../models';
 import { Season } from '../../service';
 import { APISeason } from '../../api';
-declare function transformToAttributes(season: Season, leagueId: string): SeasonAttributes;
-declare function transformToObject(model: SeasonModel): Season;
-declare function transformToAPIObject(model: SeasonModel): APISeason;
+declare function transformToAttributes(season: Season, leagueId: string): CompetitionAttributes;
+declare function transformToObject(model: CompetitionModel): Season;
+declare function transformToAPIObject(model: CompetitionModel): APISeason;
 export { transformToObject as transformToSeason, transformToAPIObject as transformToAPISeason, transformToAttributes as transformFromSeason };

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

@@ -1,42 +1,49 @@
-import { transformFromSeasonMatch, transformFromTeam, transformToAPIMatch, transformToAPITeam, transformToIteration, transformToLeague, transformToMatch, transformToTeam } from '.';
+import { transformFromSeasonMatch, transformToAPIMatch, transformToAPITeam, transformToIteration, transformToLeague, transformToMatch, transformToTeam } from '.';
 import { Season } from '../../service';
 function transformToAttributes(season, leagueId) {
-    const seasonMatches = season.matches != null ?
-        season.matches.map(match => transformFromSeasonMatch(season.id, match)) : [];
-    const seasonTeams = season.teams.map(team => ({ season_id: season.id, team_id: team.id }));
+    const matches = season.matches != null ?
+        season.matches.map((match, index) => transformFromSeasonMatch(season.id, match, index)) : [];
+    const teams = season.teams.map(team => ({
+        competition_id: season.id,
+        team_id: team.id
+    }));
+    const champion = season.champion != null ? {
+        competition_id: season.id,
+        team_id: season.champion?.id
+    } : undefined;
     return {
-        season_id: season.id,
+        competition_id: season.id,
+        type: 'LEAGUE',
         iteration: season.iteration.id,
-        league_id: leagueId,
-        champion: season.champion != null ? season.champion.id : undefined,
-        seasonTeams: season.teams != null ? season.teams.map(transformFromTeam) : [],
-        SeasonMatches: seasonMatches,
-        SeasonTeams: seasonTeams
+        leagueSeason: { league_id: leagueId, competition_id: season.id },
+        champion,
+        matches,
+        teams
     };
 }
 function transformToObject(model) {
-    const matches = model.SeasonMatches != null ?
-        model.SeasonMatches.map(matches => transformToMatch(matches.match)) : [];
+    const matches = model.CompetitionMatches != null ?
+        model.CompetitionMatches.map(matches => transformToMatch(matches.Match)) : [];
     return new Season({
-        id: model.season_id,
+        id: model.competition_id,
         matches,
         iteration: transformToIteration(model.Iteration),
-        teams: model.seasonTeams != null ? model.seasonTeams.map(transformToTeam) : [],
-        champion: model.Champion != null ? transformToTeam(model.Champion) : undefined
+        teams: model.Teams != null ? model.Teams.map(transformToTeam) : [],
+        champion: model.CompetitionChampion != null ? transformToTeam(model.CompetitionChampion.team) : undefined
     });
 }
 function transformToAPIObject(model) {
     const season = transformToObject(model);
-    const matches = model.SeasonMatches != null ?
-        model.SeasonMatches.map(seasonMatch => transformToAPIMatch(seasonMatch.match)) : [];
+    const matches = model.CompetitionMatches != null ?
+        model.CompetitionMatches.map(matches => transformToAPIMatch(matches.Match, model)) : [];
     return {
-        id: model.season_id,
+        id: model.competition_id,
         matches: matches,
         iteration: model.iteration,
-        teams: model.seasonTeams != null ? model.seasonTeams.map(transformToAPITeam) : [],
-        league: transformToLeague(model.league),
+        teams: model.Teams != null ? model.Teams.map(transformToAPITeam) : [],
+        league: transformToLeague(model.LeagueSeason.league),
         standings: season.standings,
-        champion: model.Champion != null ? transformToAPITeam(model.Champion) : undefined
+        champion: model.CompetitionChampion != null ? transformToAPITeam(model.CompetitionChampion.team) : undefined
     };
 }
 export { transformToObject as transformToSeason, transformToAPIObject as transformToAPISeason, transformToAttributes as transformFromSeason };

package/dist/esm/src/data/transformers/set-position.d.ts

@@ -0,0 +1,5 @@
+import { PlayerPosition } from '../../service';
+import { SetPositionAttributes, SetPositionModel } from '../models';
+declare function transformToAttributes(playerPosition: PlayerPosition, side: 'Home' | 'Away', setId: string): SetPositionAttributes;
+declare function transformToObject(model: SetPositionModel): PlayerPosition;
+export { transformToObject as transformToPlayerPosition, transformToAttributes as transformFromPlayerPosition };

package/dist/esm/src/data/transformers/{rally-position.js → set-position.js}

@@ -1,7 +1,7 @@
 import { transformFromCourtPosition, transformToCourtPosition } from '.';
-function transformToAttributes(playerPosition, side, rallyId) {
+function transformToAttributes(playerPosition, side, setId) {
     return {
-        rally_id: rallyId,
+        match_set_id: setId,
         side,
         court_position: transformFromCourtPosition(playerPosition.position),
         player_id: playerPosition.playerId

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

@@ -1,5 +1,5 @@
 import { Stage } from '../../service';
-import { TournamentStage } from '../models';
-declare function transformToType(stage: Stage): TournamentStage;
-declare function transformFromType(s: TournamentStage): Stage;
+import { CompetitionStage } from '../models';
+declare function transformToType(stage: Stage): CompetitionStage;
+declare function transformFromType(s: CompetitionStage): Stage;
 export { transformToType as transformFromStage, transformFromType as transformToStage };

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

@@ -9,6 +9,8 @@ function transformToType(stage) {
             return 'SEMIFINALS';
         case Stage.FINAL:
             return 'FINAL';
+        case Stage.LEAGUE:
+            return 'LEAGUE';
         default:
             throw new Error('UNKNOWN_ROLE');
     }

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

@@ -5,9 +5,9 @@ function transformToAttributes(team) {
         team_id: team.id,
         name: team.name,
         short_name: team.shortName,
-        coach_id: team.coach != null ? team.coach.id : undefined,
-        country_id: team.country != null ? team.country.id : undefined,
-        league_id: team.league != null ? team.league.id : undefined,
+        coach_id: team.coach?.id,
+        country_id: team.country?.id,
+        league_id: team.league?.id,
         coach: team.coach != null ? transformFromCoach(team.coach) : undefined,
         rating: team.rating
     };
@@ -30,7 +30,8 @@ function transformToAPIObject(model) {
         shortName: model.short_name,
         country: model.country != null ? transformToCountry(model.country) : undefined,
         coach: model.coach != null ? transformToAPICoach(model.coach) : undefined,
-        roster: model.PlayerTeams != null ? model.PlayerTeams.map(pt => transformToAPIPlayer(pt.player, model.team_id, pt.jersey_number)) : []
+        roster: model.PlayerTeams != null ? model.PlayerTeams.map(pt => transformToAPIPlayer(pt.player, model.team_id, pt.jersey_number)) : [],
+        league: model.league != null ? model.league.name : undefined
     };
 }
 export { transformToObject as transformToTeam, transformToAPIObject as transformToAPITeam, transformToAttributes as transformFromTeam };

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

@@ -1,7 +1,7 @@
 import { TournamentMatch } from '../../service';
 import { APITournamentMatch } from '../../api';
-import { TournamentMatchAttributes, TournamentMatchModel } from '../models';
-declare function transformToAttributes(tournamentMatch: TournamentMatch, tournamentId: string): TournamentMatchAttributes;
-declare function transformToObject(model: TournamentMatchModel): TournamentMatch;
-declare function transformToAPIObject(model: TournamentMatchModel): APITournamentMatch;
+import { CompetitionMatchAttributes, CompetitionMatchModel } from '../models';
+declare function transformToAttributes(tournamentMatch: TournamentMatch, tournamentId: string): CompetitionMatchAttributes;
+declare function transformToObject(model: CompetitionMatchModel): TournamentMatch;
+declare function transformToAPIObject(model: CompetitionMatchModel): APITournamentMatch;
 export { transformToObject as transformToTournamentMatch, transformToAPIObject as transformToAPITournamentMatch, transformToAttributes as transformFromTournamentMatch };

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

@@ -2,7 +2,7 @@ import { TournamentMatch } from '../../service';
 import { transformFromMatch, transformFromStage, transformToAPIMatch, transformToMatch, transformToStage } from '.';
 function transformToAttributes(tournamentMatch, tournamentId) {
     return {
-        tournament_id: tournamentId,
+        competition_id: tournamentId,
         match_id: tournamentMatch.match.id,
         index: tournamentMatch.index,
         stage: transformFromStage(tournamentMatch.stage),
@@ -12,7 +12,7 @@ function transformToAttributes(tournamentMatch, tournamentId) {
 function transformToObject(model) {
     return new TournamentMatch({
         stage: transformToStage(model.stage),
-        match: transformToMatch(model.match),
+        match: transformToMatch(model.Match),
         index: model.index
     });
 }
@@ -20,7 +20,7 @@ function transformToAPIObject(model) {
     return {
         index: model.index,
         stage: transformToStage(model.stage),
-        match: transformToAPIMatch(model.match)
+        match: transformToAPIMatch(model.Match, model.Competition)
     };
 }
 export { transformToObject as transformToTournamentMatch, transformToAPIObject as transformToAPITournamentMatch, transformToAttributes as transformFromTournamentMatch };

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

@@ -1,7 +1,7 @@
-import { TournamentAttributes, TournamentModel } from '../models';
+import { CompetitionAttributes, CompetitionModel } from '../models';
 import { Tournament } from '../../service';
 import { APITournament } from '../../api';
-declare function transformToAttributes(tournament: Tournament): TournamentAttributes;
-declare function transformToObject(model: TournamentModel): Tournament;
-declare function transformToAPIObject(model: TournamentModel): APITournament;
+declare function transformToAttributes(tournament: Tournament): CompetitionAttributes;
+declare function transformToObject(model: CompetitionModel): Tournament;
+declare function transformToAPIObject(model: CompetitionModel): APITournament;
 export { transformToObject as transformToTournament, transformToAPIObject as transformToAPITournament, transformToAttributes as transformFromTournament };

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

@@ -1,36 +1,40 @@
-import { transformFromTeam, transformFromTournamentMatch, transformToAPITeam, transformToAPITournamentMatch, transformToIteration, transformToTeam, transformToTournamentMatch } from '.';
+import { transformFromTournamentMatch, transformToAPITeam, transformToAPITournamentMatch, transformToIteration, transformToTeam, transformToTournamentMatch } from '.';
 import { Tournament } from '../../service';
 function transformToAttributes(tournament) {
-    const tournamentMatches = tournament.matches.map(match => transformFromTournamentMatch(match, tournament.id));
-    const tournamentTeams = tournament.teams.map(team => ({
-        tournament_id: tournament.id,
+    const matches = tournament.matches.map(match => transformFromTournamentMatch(match, tournament.id));
+    const teams = tournament.teams.map(team => ({
+        competition_id: tournament.id,
         team_id: team.id
     }));
+    const champion = tournament.champion != null ? {
+        competition_id: tournament.id,
+        team_id: tournament.champion?.id
+    } : undefined;
     return {
-        tournament_id: tournament.id,
+        competition_id: tournament.id,
+        type: 'TOURNAMENT',
         iteration: tournament.iteration.id,
-        champion: tournament.champion != null ? tournament.champion.id : undefined,
-        tournamentTeams: tournament.teams != null ? tournament.teams.map(transformFromTeam) : [],
-        TournamentMatches: tournamentMatches,
-        TournamentTeams: tournamentTeams
+        champion,
+        matches,
+        teams
     };
 }
 function transformToObject(model) {
     return new Tournament({
-        id: model.tournament_id,
+        id: model.competition_id,
         iteration: transformToIteration(model.Iteration),
-        matches: model.TournamentMatches != null ? model.TournamentMatches.map(transformToTournamentMatch) : [],
-        teams: model.tournamentTeams != null ? model.tournamentTeams.map(transformToTeam) : [],
-        champion: model.Champion != null ? transformToTeam(model.Champion) : undefined
+        matches: model.CompetitionMatches != null ? model.CompetitionMatches.map(transformToTournamentMatch) : [],
+        teams: model.Teams != null ? model.Teams.map(transformToTeam) : [],
+        champion: model.CompetitionChampion != null ? transformToTeam(model.CompetitionChampion.team) : undefined
     });
 }
 function transformToAPIObject(model) {
     return {
-        id: model.tournament_id,
+        id: model.competition_id,
         iteration: model.iteration,
-        champion: model.Champion != null ? transformToAPITeam(model.Champion) : undefined,
-        matches: model.TournamentMatches != null ? model.TournamentMatches.map(transformToAPITournamentMatch) : [],
-        teams: model.tournamentTeams != null ? model.tournamentTeams.map(transformToAPITeam) : []
+        champion: model.CompetitionChampion != null ? transformToAPITeam(model.CompetitionChampion.team) : undefined,
+        matches: model.CompetitionMatches != null ? model.CompetitionMatches.map(transformToAPITournamentMatch) : [],
+        teams: model.Teams != null ? model.Teams.map(transformToAPITeam) : []
     };
 }
 export { transformToObject as transformToTournament, transformToAPIObject as transformToAPITournament, transformToAttributes as transformFromTournament };

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

@@ -2,7 +2,8 @@ export declare enum Stage {
     ROUND_OF_8 = 8,
     QUARTERFINALS = 4,
     SEMIFINALS = 2,
-    FINAL = 1
+    FINAL = 1,
+    LEAGUE = 0
 }
 export declare namespace Stage {
     function getStages(): Stage[];

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

@@ -4,10 +4,11 @@ export var Stage;
     Stage[Stage["QUARTERFINALS"] = 4] = "QUARTERFINALS";
     Stage[Stage["SEMIFINALS"] = 2] = "SEMIFINALS";
     Stage[Stage["FINAL"] = 1] = "FINAL";
+    Stage[Stage["LEAGUE"] = 0] = "LEAGUE";
 })(Stage || (Stage = {}));
 // eslint-disable-next-line @typescript-eslint/no-namespace
 (function (Stage) {
-    const STAGES = [Stage.ROUND_OF_8, Stage.QUARTERFINALS, Stage.SEMIFINALS, Stage.FINAL];
+    const STAGES = [Stage.ROUND_OF_8, Stage.QUARTERFINALS, Stage.SEMIFINALS, Stage.FINAL, Stage.LEAGUE];
     function getStages() {
         return [...STAGES];
     }

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

@@ -1,4 +1,3 @@
-export * from './score';
 export * from './set';
 export * from './block';
 export * from './serve';

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

@@ -1,4 +1,3 @@
-export * from './score';
 export * from './set';
 export * from './block';
 export * from './serve';

package/dist/esm/src/service/event/rally-event.d.ts

@@ -6,8 +6,7 @@ export declare enum EventTypeEnum {
     RECEPTION = 3,
     SET = 4,
     SPIKE = 5,
-    BLOCK = 6,
-    SCORE = 7
+    BLOCK = 6
 }
 export interface RallyEventOpts {
     readonly id: string;

package/dist/esm/src/service/event/rally-event.js

@@ -7,7 +7,6 @@ export var EventTypeEnum;
     EventTypeEnum[EventTypeEnum["SET"] = 4] = "SET";
     EventTypeEnum[EventTypeEnum["SPIKE"] = 5] = "SPIKE";
     EventTypeEnum[EventTypeEnum["BLOCK"] = 6] = "BLOCK";
-    EventTypeEnum[EventTypeEnum["SCORE"] = 7] = "SCORE";
 })(EventTypeEnum || (EventTypeEnum = {}));
 export class RallyEvent {
     constructor({ id, eventType, player, order }) {

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

@@ -1,12 +1,12 @@
-import { Rally } from './rally';
+import { PlayerPosition, Rally } from './rally';
 import { MatchTeam } from './match-team';
 import { Player } from '../player';
 interface MatchSetOpts {
     readonly id: string;
     readonly order: number;
     readonly isTieBreak: boolean;
-    readonly homeLibero: Player | undefined;
-    readonly awayLibero: Player | undefined;
+    readonly homePlayerPosition: PlayerPosition[];
+    readonly awayPlayerPosition: PlayerPosition[];
     readonly homeScore: number;
     readonly awayScore: number;
     readonly stats: SetStatistics[];
@@ -35,14 +35,14 @@ export declare class MatchSet {
     readonly id: string;
     readonly order: number;
     readonly isTieBreak: boolean;
-    readonly homeLibero: Player | undefined;
-    readonly awayLibero: Player | undefined;
+    readonly homePlayerPosition: PlayerPosition[];
+    readonly awayPlayerPosition: PlayerPosition[];
     readonly stats: SetStatistics[];
     readonly rallies: Rally[];
     private readonly scoreThreshold;
     private homeScore;
     private awayScore;
-    constructor({ id, order, isTieBreak, homeLibero, awayLibero, stats, rallies, homeScore, awayScore }: MatchSetOpts);
+    constructor({ id, order, isTieBreak, homePlayerPosition, awayPlayerPosition, stats, rallies, homeScore, awayScore }: MatchSetOpts);
     getHomeScore(): number;
     getAwayScore(): number;
     increaseScore(team: MatchTeam): void;

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

@@ -6,14 +6,14 @@ var ScoreThreshold;
     ScoreThreshold[ScoreThreshold["TIE_BREAK"] = 15] = "TIE_BREAK";
 })(ScoreThreshold || (ScoreThreshold = {}));
 export class MatchSet {
-    constructor({ id, order, isTieBreak, homeLibero, awayLibero, stats, rallies, homeScore, awayScore }) {
+    constructor({ id, order, isTieBreak, homePlayerPosition, awayPlayerPosition, stats, rallies, homeScore, awayScore }) {
         validateUUID(id);
         this.id = id;
         this.order = order;
         this.homeScore = homeScore;
         this.awayScore = awayScore;
-        this.homeLibero = homeLibero;
-        this.awayLibero = awayLibero;
+        this.homePlayerPosition = homePlayerPosition;
+        this.awayPlayerPosition = awayPlayerPosition;
         this.stats = stats;
         this.rallies = rallies;
         this.isTieBreak = isTieBreak;

package/dist/esm/src/service/match/rally.d.ts

@@ -1,13 +1,11 @@
 import { Team } from '../team';
 import { CourtPosition } from './court-position';
-import { RallyEvent, Score } from '../event';
+import { RallyEvent } from '../event';
 interface RallyOpts {
     readonly id: string;
     readonly order: number;
     readonly servingTeam: Team;
     readonly events: RallyEvent[];
-    readonly homePlayerPosition: PlayerPosition[];
-    readonly awayPlayerPosition: PlayerPosition[];
 }
 export interface PlayerPosition {
     position: CourtPosition;
@@ -17,11 +15,8 @@ export declare class Rally {
     readonly id: string;
     readonly servingTeam: Team;
     readonly events: RallyEvent[];
-    readonly homePlayerPosition: PlayerPosition[];
-    readonly awayPlayerPosition: PlayerPosition[];
     readonly order: number;
-    constructor({ id, order, servingTeam, homePlayerPosition, awayPlayerPosition, events }: RallyOpts);
-    get score(): Score | undefined;
+    constructor({ id, order, servingTeam, events }: RallyOpts);
     addEvent(event: RallyEvent): void;
 }
 export {};

package/dist/esm/src/service/match/rally.js

@@ -1,18 +1,12 @@
 import { validateUUID } from '../utils';
-import { EventTypeEnum } from '../event';
 export class Rally {
-    constructor({ id, order, servingTeam, homePlayerPosition, awayPlayerPosition, events }) {
+    constructor({ id, order, servingTeam, events }) {
         validateUUID(id);
         this.id = id;
         this.order = order;
         this.servingTeam = servingTeam;
-        this.homePlayerPosition = homePlayerPosition;
-        this.awayPlayerPosition = awayPlayerPosition;
         this.events = events;
     }
-    get score() {
-        return this.events.find(e => e.eventType === EventTypeEnum.SCORE);
-    }
     addEvent(event) {
         this.events.push(event);
     }