volleyballsimtypes 0.0.205 → 0.0.207

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

@@ -28,6 +28,7 @@ function initModels(sequelize) {
     const Rally = models_1.RallyModel.initModel(sequelize);
     const Team = models_1.TeamModel.initModel(sequelize);
     const User = models_1.UserModel.initModel(sequelize);
+    const VPER = models_1.VPERModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Competition.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     Competition.hasMany(CompetitionMatch, { as: 'CompetitionMatches', foreignKey: 'competition_id' });
@@ -73,6 +74,7 @@ function initModels(sequelize) {
         otherKey: 'team_id'
     });
     Match.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'match_id' });
+    Match.hasMany(VPER, { as: 'VPERs', foreignKey: 'match_id' });
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
     Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
@@ -107,6 +109,7 @@ function initModels(sequelize) {
         otherKey: 'team_id'
     });
     Player.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'player_id' });
+    Player.hasMany(VPER, { as: 'VPERs', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
@@ -114,6 +117,8 @@ function initModels(sequelize) {
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
+    VPER.belongsTo(Player, { as: 'Player', foreignKey: 'player_id' });
+    VPER.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
@@ -168,7 +173,8 @@ function initModels(sequelize) {
         Rally,
         Team,
         Tactics,
-        User
+        User,
+        VPER
     };
 }
 exports.initModels = initModels;

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

@@ -20,4 +20,5 @@ export * from './rally';
 export * from './team';
 export * from './user';
 export * from './tactics';
+export * from './vper';
 export * from './views';

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

@@ -36,4 +36,5 @@ __exportStar(require("./rally"), exports);
 __exportStar(require("./team"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./tactics"), exports);
+__exportStar(require("./vper"), exports);
 __exportStar(require("./views"), exports);

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
 import { Status } from '../common';
-import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
+import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -9,6 +9,7 @@ export interface MatchAttributes {
     scheduled_date: Date;
     status: Status;
     MatchSets?: MatchSetAttributes[];
+    VPERs?: VPERAttributes[];
 }
 export type MatchPk = 'match_id';
 export type MatchId = MatchModel[MatchPk];
@@ -38,6 +39,17 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     hasMatchRating: Sequelize.HasManyHasAssociationMixin<MatchRatingModel, MatchRatingId>;
     hasMatchRatings: Sequelize.HasManyHasAssociationsMixin<MatchRatingModel, MatchRatingId>;
     countMatchRatings: Sequelize.HasManyCountAssociationsMixin;
+    VPERs: VPERModel[];
+    getVPERs: Sequelize.HasManyGetAssociationsMixin<VPERModel>;
+    setVPERs: Sequelize.HasManySetAssociationsMixin<VPERModel, VPERId>;
+    addVPER: Sequelize.HasManyAddAssociationMixin<VPERModel, VPERId>;
+    addVPERs: Sequelize.HasManyAddAssociationsMixin<VPERModel, VPERId>;
+    createVPER: Sequelize.HasManyCreateAssociationMixin<VPERModel>;
+    removeVPER: Sequelize.HasManyRemoveAssociationMixin<VPERModel, VPERId>;
+    removeVPERs: Sequelize.HasManyRemoveAssociationsMixin<VPERModel, VPERId>;
+    hasVPER: Sequelize.HasManyHasAssociationMixin<VPERModel, VPERId>;
+    hasVPERs: Sequelize.HasManyHasAssociationsMixin<VPERModel, VPERId>;
+    countVPERs: Sequelize.HasManyCountAssociationsMixin;
     MatchSets: MatchSetModel[];
     getMatchSets: Sequelize.HasManyGetAssociationsMixin<MatchSetModel>;
     setMatchSets: Sequelize.HasManySetAssociationsMixin<MatchSetModel, MatchSetId>;

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel, VPERId, VPERModel } from '.';
 import { Rarity, Role, Trait } from '../../service';
 export interface PlayerAttributes {
     player_id: string;
@@ -58,6 +58,17 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     getPerformanceStat: Sequelize.HasOneGetAssociationMixin<PerformanceStatsModel>;
     setPerformanceStat: Sequelize.HasOneSetAssociationMixin<PerformanceStatsModel, PerformanceStatsId>;
     createPerformanceStat: Sequelize.HasOneCreateAssociationMixin<PerformanceStatsModel>;
+    VPERs: VPERModel[];
+    getVPERs: Sequelize.HasManyGetAssociationsMixin<VPERModel>;
+    setVPERs: Sequelize.HasManySetAssociationsMixin<VPERModel, VPERId>;
+    addVPER: Sequelize.HasManyAddAssociationMixin<VPERModel, VPERId>;
+    addVPERs: Sequelize.HasManyAddAssociationsMixin<VPERModel, VPERId>;
+    createVPER: Sequelize.HasManyCreateAssociationMixin<VPERModel>;
+    removeVPER: Sequelize.HasManyRemoveAssociationMixin<VPERModel, VPERId>;
+    removeVPERs: Sequelize.HasManyRemoveAssociationsMixin<VPERModel, VPERId>;
+    hasVPER: Sequelize.HasManyHasAssociationMixin<VPERModel, VPERId>;
+    hasVPERs: Sequelize.HasManyHasAssociationsMixin<VPERModel, VPERId>;
+    countVPERs: Sequelize.HasManyCountAssociationsMixin;
     PlayerTeams: PlayerTeamModel[];
     getPlayerTeams: Sequelize.HasManyGetAssociationsMixin<PlayerTeamModel>;
     setPlayerTeams: Sequelize.HasManySetAssociationsMixin<PlayerTeamModel, PlayerTeamId>;

package/dist/cjs/src/data/models/views/match-result.d.ts

@@ -3,8 +3,8 @@ import { Model } from 'sequelize';
 import { MatchId, MatchModel, TeamId, TeamModel } from '..';
 export interface MatchResultAttributes {
     match_id: string;
-    home_score: number;
-    away_score: number;
+    home_scores: number[];
+    away_scores: number[];
     winner_team_id: string | null;
 }
 export type MatchResultPk = 'match_id';
@@ -12,8 +12,8 @@ export type MatchResultId = MatchResultModel[MatchResultPk];
 export type MatchResultCreationAttributes = MatchResultAttributes;
 export declare class MatchResultModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
     match_id: string;
-    home_score: number;
-    away_score: number;
+    home_scores: number[];
+    away_scores: number[];
     winner_team_id: string | null;
     Match: MatchModel;
     getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;

package/dist/cjs/src/data/models/views/match-result.js

@@ -10,12 +10,12 @@ class MatchResultModel extends sequelize_1.Model {
                 allowNull: false,
                 primaryKey: true
             },
-            home_score: {
-                type: sequelize_1.DataTypes.INTEGER,
+            home_scores: {
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.INTEGER),
                 allowNull: false
             },
-            away_score: {
-                type: sequelize_1.DataTypes.INTEGER,
+            away_scores: {
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.INTEGER),
                 allowNull: false
             },
             winner_team_id: {

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

@@ -0,0 +1,25 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { MatchId, MatchModel, PlayerId, PlayerModel } from '.';
+export interface VPERAttributes {
+    player_id: string;
+    match_id: string;
+    value: number;
+}
+export type VPERPk = 'player_id' | 'match_id';
+export type VPERId = VPERModel[VPERPk];
+export type VPERCreationAttributes = VPERAttributes;
+export declare class VPERModel extends Model<VPERAttributes, VPERCreationAttributes> implements VPERAttributes {
+    player_id: string;
+    match_id: string;
+    value: number;
+    Player: PlayerModel;
+    getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
+    setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
+    createPlayer: Sequelize.BelongsToCreateAssociationMixin<PlayerModel>;
+    Match: MatchModel;
+    getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
+    setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
+    createMatch: Sequelize.BelongsToCreateAssociationMixin<MatchModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof VPERModel;
+}

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VPERModel = void 0;
+const sequelize_1 = require("sequelize");
+class VPERModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return VPERModel.init({
+            player_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Player',
+                    key: 'player_id'
+                }
+            },
+            match_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Match',
+                    key: 'match_id'
+                }
+            },
+            value: {
+                type: sequelize_1.DataTypes.REAL,
+                allowNull: false
+            }
+        }, {
+            sequelize,
+            tableName: 'VPER',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'VPER_pk',
+                    unique: true,
+                    fields: [
+                        { name: 'player_id' },
+                        { name: 'match_id' }
+                    ]
+                }]
+        });
+    }
+}
+exports.VPERModel = VPERModel;

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

@@ -20,3 +20,4 @@ export * from './player-team';
 export * from './match-rating';
 export * from './team';
 export * from './tactics';
+export * from './vper';

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

@@ -36,3 +36,4 @@ __exportStar(require("./player-team"), exports);
 __exportStar(require("./match-rating"), exports);
 __exportStar(require("./team"), exports);
 __exportStar(require("./tactics"), exports);
+__exportStar(require("./vper"), exports);

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

@@ -4,6 +4,7 @@ exports.transformFromMatch = exports.transformToMatch = void 0;
 const service_1 = require("../../service");
 const match_set_1 = require("./match-set");
 const team_1 = require("./team");
+const vper_1 = require("./vper");
 function transformToAttributes(match) {
     return {
         match_id: match.id,
@@ -17,6 +18,10 @@ exports.transformFromMatch = transformToAttributes;
 function transformToObject(model) {
     const sets = (model.MatchSets ?? []).map(match_set_1.transformToMatchSet)
         .sort((s1, s2) => s1.order - s2.order);
+    const homeScores = model.MatchResult?.home_scores ?? [];
+    const awayScores = model.MatchResult?.away_scores ?? [];
+    const sumScores = (scores) => scores.reduce((total, score) => total + score, 0);
+    const VPERs = (model.VPERs ?? []).map(vper_1.transformToVPER);
     return new service_1.Match({
         id: model.match_id,
         homeTeam: (0, team_1.transformToTeam)(model.HomeTeam),
@@ -24,8 +29,9 @@ function transformToObject(model) {
         scheduledDate: new Date(model.scheduled_date),
         sets,
         status: model.status,
-        homeScore: model.MatchResult?.home_score,
-        awayScore: model.MatchResult?.away_score,
+        VPERs,
+        homeScore: homeScores.length > 0 ? sumScores(homeScores) : undefined,
+        awayScore: awayScores.length > 0 ? sumScores(awayScores) : undefined,
         winner: model.MatchResult?.Winner != null ? (0, team_1.transformToTeam)(model.MatchResult.Winner) : undefined
     });
 }

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

@@ -9,7 +9,7 @@ function transformToAttributes(team) {
         name: team.name,
         short_name: team.shortName,
         country_id: team.country?.id,
-        tactics: (0, _1.transformFromTactics)(team.tactics, team.id),
+        tactics: team.tactics != null ? (0, _1.transformFromTactics)(team.tactics, team.id) : undefined,
         rating: team.rating,
         division_id: team.divisionId
     };
@@ -22,9 +22,9 @@ function transformToObject(model) {
         name: model.name,
         shortName: model.short_name,
         country: (0, _1.transformToCountry)(model.country),
-        tactics: (0, _1.transformToTactics)(model.tactics, roster),
-        roster,
         rating: model.rating,
+        tactics: roster != null && roster.length > 0 ? (0, _1.transformToTactics)(model.tactics, roster) : undefined,
+        roster,
         divisionId: model.division_id
     });
 }

package/dist/cjs/src/data/transformers/vper.d.ts

@@ -0,0 +1,5 @@
+import { VPERAttributes, VPERModel } from '../models';
+import { VPER } from '../../service';
+declare function transformToAttributes(vper: VPER): VPERAttributes;
+declare function transformToObject(model: VPERModel): VPER;
+export { transformToObject as transformToVPER, transformToAttributes as transformFromVPER };

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformFromVPER = exports.transformToVPER = void 0;
+const service_1 = require("../../service");
+function transformToAttributes(vper) {
+    return {
+        player_id: vper.playerId,
+        match_id: vper.matchId,
+        value: vper.value
+    };
+}
+exports.transformFromVPER = transformToAttributes;
+function transformToObject(model) {
+    return new service_1.VPER({
+        playerId: model.player_id,
+        matchId: model.match_id,
+        value: model.value
+    });
+}
+exports.transformToVPER = transformToObject;

package/dist/cjs/src/service/match/index.d.ts

@@ -5,3 +5,4 @@ export * from './match-set';
 export * from './rally';
 export * from './court-position';
 export * from './match-team';
+export * from './vper';

package/dist/cjs/src/service/match/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./match-set"), exports);
 __exportStar(require("./rally"), exports);
 __exportStar(require("./court-position"), exports);
 __exportStar(require("./match-team"), exports);
+__exportStar(require("./vper"), exports);

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

@@ -2,6 +2,7 @@ import { MatchSet } from './match-set';
 import { Team } from '../team';
 import { MatchTeam } from './match-team';
 import { StatusEnum } from '../../data';
+import { VPER } from './vper';
 interface MatchParams {
     readonly id: string;
     readonly homeTeam: Team;
@@ -9,6 +10,7 @@ interface MatchParams {
     readonly scheduledDate: Date;
     readonly sets: MatchSet[];
     readonly status: StatusEnum;
+    readonly VPERs: VPER[];
     homeScore?: number;
     awayScore?: number;
     winner?: Team;
@@ -21,11 +23,12 @@ export declare class Match {
     readonly awayTeam: Team;
     readonly sets: MatchSet[];
     readonly scheduledDate: Date;
+    readonly VPERs: VPER[];
     homeScore?: number;
     awayScore?: number;
     winner?: Team;
     status: StatusEnum;
-    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner }: MatchParams);
+    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner, VPERs }: MatchParams);
     addSet(set: MatchSet): void;
     getTeamSets(team: MatchTeam): SetScore;
     getScore(): MatchScore;

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

@@ -5,7 +5,7 @@ const utils_1 = require("../utils");
 const match_team_1 = require("./match-team");
 const data_1 = require("../../data");
 class Match {
-    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner }) {
+    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner, VPERs }) {
         (0, utils_1.validateUUID)(id);
         this.id = id;
         this.homeTeam = homeTeam;
@@ -16,6 +16,7 @@ class Match {
         this.homeScore = homeScore;
         this.awayScore = awayScore;
         this.winner = winner;
+        this.VPERs = VPERs;
     }
     addSet(set) {
         if (this.sets.length >= 5)

package/dist/cjs/src/service/match/vper.d.ts

@@ -0,0 +1,13 @@
+import { BoxScore } from './box-score';
+export interface VPERParams {
+    readonly playerId: string;
+    readonly matchId: string;
+    readonly value: number;
+}
+export declare class VPER {
+    readonly playerId: string;
+    readonly matchId: string;
+    readonly value: number;
+    constructor({ playerId, matchId, value }: VPERParams);
+    static computeVPERForMatch(boxScores: BoxScore[]): number;
+}

package/dist/cjs/src/service/match/vper.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VPER = void 0;
+const WEIGHTS = {
+    // terminal positive
+    ATTACK_KILL: 1.0,
+    SERVE_ACE: 1.0,
+    BLOCK_SOLO: 1.0,
+    BLOCK_ASSIST: 0.5,
+    // creation / continuation
+    SETTING_ASSIST: 0.7,
+    BLOCK_TOUCH: 0.2,
+    DEFENSE_DIG: 0.25,
+    SETTING_PASS: 0.15,
+    // reception quality
+    RECEPTION_PERFECT: 0.35,
+    RECEPTION_POSITIVE: 0.15,
+    RECEPTION_OVERPASS: -0.6,
+    // terminal errors (always point against)
+    TERMINAL_ERROR: -1.0
+};
+class VPER {
+    constructor({ playerId, matchId, value }) {
+        this.matchId = matchId;
+        this.playerId = playerId;
+        this.value = value;
+    }
+    static computeVPERForMatch(boxScores) {
+        let rawSum = 0;
+        let pointsPlayedSum = 0;
+        for (const box of boxScores) {
+            const w = WEIGHTS;
+            const positive = w.ATTACK_KILL * box.attack.kills +
+                w.SERVE_ACE * box.serve.aces +
+                w.BLOCK_SOLO * box.block.solo +
+                w.BLOCK_ASSIST * box.block.assists +
+                w.SETTING_ASSIST * box.setting.assists +
+                w.BLOCK_TOUCH * box.block.touches +
+                w.DEFENSE_DIG * box.defense.digs +
+                w.SETTING_PASS * box.setting.pass +
+                w.RECEPTION_PERFECT * box.reception.perfect +
+                w.RECEPTION_POSITIVE * box.reception.positive;
+            const negative = w.RECEPTION_OVERPASS * box.reception.overpasses +
+                w.TERMINAL_ERROR * (box.attack.errors +
+                    box.serve.errors +
+                    box.reception.errors +
+                    box.defense.errors +
+                    box.block.errors +
+                    box.setting.errors);
+            rawSum += positive + negative;
+            pointsPlayedSum += box.misc.pointsPlayed;
+        }
+        return 100 * rawSum / Math.max(1, pointsPlayedSum);
+    }
+}
+exports.VPER = VPER;

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

@@ -12,7 +12,7 @@ export interface StartingLineup {
 }
 export interface TacticsOpts {
     readonly lineup: StartingLineup;
-    readonly substitutionTolerance?: number;
+    readonly substitutionTolerance: number;
     readonly liberoReplacements: Player[];
     readonly pinchServerSubs: Map<Player, Player>;
 }

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

@@ -9,7 +9,7 @@ interface TeamParams {
     readonly divisionId: string;
     readonly roster: Player[];
     readonly country: Country;
-    readonly tactics: Tactics;
+    readonly tactics?: Tactics;
 }
 export declare class Team {
     readonly id: string;
@@ -17,7 +17,7 @@ export declare class Team {
     readonly name: string;
     readonly shortName: string;
     readonly divisionId: string;
-    readonly tactics: Tactics;
+    readonly tactics?: Tactics;
     readonly country: Country;
     private _rating;
     constructor({ id, rating, name, shortName, divisionId, country, roster, tactics }: TeamParams);

package/dist/cjs/src/service/utils/object-utils.d.ts

@@ -1 +1,4 @@
 export declare const getKeys: <T extends object>(obj: T) => (keyof T)[];
+export type DataProps<T> = {
+    [K in keyof T as T[K] extends (...args: any[]) => any ? never : K]: T[K];
+};

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

@@ -1,4 +1,4 @@
-import { BoxScoreModel, BoxScoreTotalsModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, HistoricStandingsModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, RallyModel, TacticsModel, TeamModel, UserModel } from './models';
+import { BoxScoreModel, BoxScoreTotalsModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, HistoricStandingsModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, RallyModel, TacticsModel, TeamModel, UserModel, VPERModel } from './models';
 export function initModels(sequelize) {
     const Tactics = TacticsModel.initModel(sequelize);
     const Country = CountryModel.initModel(sequelize);
@@ -25,6 +25,7 @@ export function initModels(sequelize) {
     const Rally = RallyModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
     const User = UserModel.initModel(sequelize);
+    const VPER = VPERModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Competition.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     Competition.hasMany(CompetitionMatch, { as: 'CompetitionMatches', foreignKey: 'competition_id' });
@@ -70,6 +71,7 @@ export function initModels(sequelize) {
         otherKey: 'team_id'
     });
     Match.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'match_id' });
+    Match.hasMany(VPER, { as: 'VPERs', foreignKey: 'match_id' });
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
     Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
@@ -104,6 +106,7 @@ export function initModels(sequelize) {
         otherKey: 'team_id'
     });
     Player.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'player_id' });
+    Player.hasMany(VPER, { as: 'VPERs', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
@@ -111,6 +114,8 @@ export function initModels(sequelize) {
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
+    VPER.belongsTo(Player, { as: 'Player', foreignKey: 'player_id' });
+    VPER.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
@@ -165,6 +170,7 @@ export function initModels(sequelize) {
         Rally,
         Team,
         Tactics,
-        User
+        User,
+        VPER
     };
 }

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

@@ -20,4 +20,5 @@ export * from './rally';
 export * from './team';
 export * from './user';
 export * from './tactics';
+export * from './vper';
 export * from './views';

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

@@ -20,4 +20,5 @@ export * from './rally';
 export * from './team';
 export * from './user';
 export * from './tactics';
+export * from './vper';
 export * from './views';

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
 import { Status } from '../common';
-import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
+import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -9,6 +9,7 @@ export interface MatchAttributes {
     scheduled_date: Date;
     status: Status;
     MatchSets?: MatchSetAttributes[];
+    VPERs?: VPERAttributes[];
 }
 export type MatchPk = 'match_id';
 export type MatchId = MatchModel[MatchPk];
@@ -38,6 +39,17 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     hasMatchRating: Sequelize.HasManyHasAssociationMixin<MatchRatingModel, MatchRatingId>;
     hasMatchRatings: Sequelize.HasManyHasAssociationsMixin<MatchRatingModel, MatchRatingId>;
     countMatchRatings: Sequelize.HasManyCountAssociationsMixin;
+    VPERs: VPERModel[];
+    getVPERs: Sequelize.HasManyGetAssociationsMixin<VPERModel>;
+    setVPERs: Sequelize.HasManySetAssociationsMixin<VPERModel, VPERId>;
+    addVPER: Sequelize.HasManyAddAssociationMixin<VPERModel, VPERId>;
+    addVPERs: Sequelize.HasManyAddAssociationsMixin<VPERModel, VPERId>;
+    createVPER: Sequelize.HasManyCreateAssociationMixin<VPERModel>;
+    removeVPER: Sequelize.HasManyRemoveAssociationMixin<VPERModel, VPERId>;
+    removeVPERs: Sequelize.HasManyRemoveAssociationsMixin<VPERModel, VPERId>;
+    hasVPER: Sequelize.HasManyHasAssociationMixin<VPERModel, VPERId>;
+    hasVPERs: Sequelize.HasManyHasAssociationsMixin<VPERModel, VPERId>;
+    countVPERs: Sequelize.HasManyCountAssociationsMixin;
     MatchSets: MatchSetModel[];
     getMatchSets: Sequelize.HasManyGetAssociationsMixin<MatchSetModel>;
     setMatchSets: Sequelize.HasManySetAssociationsMixin<MatchSetModel, MatchSetId>;

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel, VPERId, VPERModel } from '.';
 import { Rarity, Role, Trait } from '../../service';
 export interface PlayerAttributes {
     player_id: string;
@@ -58,6 +58,17 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     getPerformanceStat: Sequelize.HasOneGetAssociationMixin<PerformanceStatsModel>;
     setPerformanceStat: Sequelize.HasOneSetAssociationMixin<PerformanceStatsModel, PerformanceStatsId>;
     createPerformanceStat: Sequelize.HasOneCreateAssociationMixin<PerformanceStatsModel>;
+    VPERs: VPERModel[];
+    getVPERs: Sequelize.HasManyGetAssociationsMixin<VPERModel>;
+    setVPERs: Sequelize.HasManySetAssociationsMixin<VPERModel, VPERId>;
+    addVPER: Sequelize.HasManyAddAssociationMixin<VPERModel, VPERId>;
+    addVPERs: Sequelize.HasManyAddAssociationsMixin<VPERModel, VPERId>;
+    createVPER: Sequelize.HasManyCreateAssociationMixin<VPERModel>;
+    removeVPER: Sequelize.HasManyRemoveAssociationMixin<VPERModel, VPERId>;
+    removeVPERs: Sequelize.HasManyRemoveAssociationsMixin<VPERModel, VPERId>;
+    hasVPER: Sequelize.HasManyHasAssociationMixin<VPERModel, VPERId>;
+    hasVPERs: Sequelize.HasManyHasAssociationsMixin<VPERModel, VPERId>;
+    countVPERs: Sequelize.HasManyCountAssociationsMixin;
     PlayerTeams: PlayerTeamModel[];
     getPlayerTeams: Sequelize.HasManyGetAssociationsMixin<PlayerTeamModel>;
     setPlayerTeams: Sequelize.HasManySetAssociationsMixin<PlayerTeamModel, PlayerTeamId>;

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

@@ -3,8 +3,8 @@ import { Model } from 'sequelize';
 import { MatchId, MatchModel, TeamId, TeamModel } from '..';
 export interface MatchResultAttributes {
     match_id: string;
-    home_score: number;
-    away_score: number;
+    home_scores: number[];
+    away_scores: number[];
     winner_team_id: string | null;
 }
 export type MatchResultPk = 'match_id';
@@ -12,8 +12,8 @@ export type MatchResultId = MatchResultModel[MatchResultPk];
 export type MatchResultCreationAttributes = MatchResultAttributes;
 export declare class MatchResultModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
     match_id: string;
-    home_score: number;
-    away_score: number;
+    home_scores: number[];
+    away_scores: number[];
     winner_team_id: string | null;
     Match: MatchModel;
     getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;

package/dist/esm/src/data/models/views/match-result.js

@@ -7,12 +7,12 @@ export class MatchResultModel extends Model {
                 allowNull: false,
                 primaryKey: true
             },
-            home_score: {
-                type: DataTypes.INTEGER,
+            home_scores: {
+                type: DataTypes.ARRAY(DataTypes.INTEGER),
                 allowNull: false
             },
-            away_score: {
-                type: DataTypes.INTEGER,
+            away_scores: {
+                type: DataTypes.ARRAY(DataTypes.INTEGER),
                 allowNull: false
             },
             winner_team_id: {

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

@@ -0,0 +1,25 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { MatchId, MatchModel, PlayerId, PlayerModel } from '.';
+export interface VPERAttributes {
+    player_id: string;
+    match_id: string;
+    value: number;
+}
+export type VPERPk = 'player_id' | 'match_id';
+export type VPERId = VPERModel[VPERPk];
+export type VPERCreationAttributes = VPERAttributes;
+export declare class VPERModel extends Model<VPERAttributes, VPERCreationAttributes> implements VPERAttributes {
+    player_id: string;
+    match_id: string;
+    value: number;
+    Player: PlayerModel;
+    getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
+    setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
+    createPlayer: Sequelize.BelongsToCreateAssociationMixin<PlayerModel>;
+    Match: MatchModel;
+    getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
+    setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
+    createMatch: Sequelize.BelongsToCreateAssociationMixin<MatchModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof VPERModel;
+}

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

@@ -0,0 +1,42 @@
+import { DataTypes, Model } from 'sequelize';
+export class VPERModel extends Model {
+    static initModel(sequelize) {
+        return VPERModel.init({
+            player_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Player',
+                    key: 'player_id'
+                }
+            },
+            match_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Match',
+                    key: 'match_id'
+                }
+            },
+            value: {
+                type: DataTypes.REAL,
+                allowNull: false
+            }
+        }, {
+            sequelize,
+            tableName: 'VPER',
+            schema: 'public',
+            timestamps: false,
+            indexes: [{
+                    name: 'VPER_pk',
+                    unique: true,
+                    fields: [
+                        { name: 'player_id' },
+                        { name: 'match_id' }
+                    ]
+                }]
+        });
+    }
+}

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

@@ -20,3 +20,4 @@ export * from './player-team';
 export * from './match-rating';
 export * from './team';
 export * from './tactics';
+export * from './vper';

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

@@ -20,3 +20,4 @@ export * from './player-team';
 export * from './match-rating';
 export * from './team';
 export * from './tactics';
+export * from './vper';

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

@@ -1,6 +1,7 @@
 import { Match } from '../../service';
 import { transformToMatchSet } from './match-set';
 import { transformToTeam } from './team';
+import { transformToVPER } from './vper';
 function transformToAttributes(match) {
     return {
         match_id: match.id,
@@ -13,6 +14,10 @@ function transformToAttributes(match) {
 function transformToObject(model) {
     const sets = (model.MatchSets ?? []).map(transformToMatchSet)
         .sort((s1, s2) => s1.order - s2.order);
+    const homeScores = model.MatchResult?.home_scores ?? [];
+    const awayScores = model.MatchResult?.away_scores ?? [];
+    const sumScores = (scores) => scores.reduce((total, score) => total + score, 0);
+    const VPERs = (model.VPERs ?? []).map(transformToVPER);
     return new Match({
         id: model.match_id,
         homeTeam: transformToTeam(model.HomeTeam),
@@ -20,8 +25,9 @@ function transformToObject(model) {
         scheduledDate: new Date(model.scheduled_date),
         sets,
         status: model.status,
-        homeScore: model.MatchResult?.home_score,
-        awayScore: model.MatchResult?.away_score,
+        VPERs,
+        homeScore: homeScores.length > 0 ? sumScores(homeScores) : undefined,
+        awayScore: awayScores.length > 0 ? sumScores(awayScores) : undefined,
         winner: model.MatchResult?.Winner != null ? transformToTeam(model.MatchResult.Winner) : undefined
     });
 }

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

@@ -6,7 +6,7 @@ function transformToAttributes(team) {
         name: team.name,
         short_name: team.shortName,
         country_id: team.country?.id,
-        tactics: transformFromTactics(team.tactics, team.id),
+        tactics: team.tactics != null ? transformFromTactics(team.tactics, team.id) : undefined,
         rating: team.rating,
         division_id: team.divisionId
     };
@@ -18,9 +18,9 @@ function transformToObject(model) {
         name: model.name,
         shortName: model.short_name,
         country: transformToCountry(model.country),
-        tactics: transformToTactics(model.tactics, roster),
-        roster,
         rating: model.rating,
+        tactics: roster != null && roster.length > 0 ? transformToTactics(model.tactics, roster) : undefined,
+        roster,
         divisionId: model.division_id
     });
 }

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

@@ -0,0 +1,5 @@
+import { VPERAttributes, VPERModel } from '../models';
+import { VPER } from '../../service';
+declare function transformToAttributes(vper: VPER): VPERAttributes;
+declare function transformToObject(model: VPERModel): VPER;
+export { transformToObject as transformToVPER, transformToAttributes as transformFromVPER };

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

@@ -0,0 +1,16 @@
+import { VPER } from '../../service';
+function transformToAttributes(vper) {
+    return {
+        player_id: vper.playerId,
+        match_id: vper.matchId,
+        value: vper.value
+    };
+}
+function transformToObject(model) {
+    return new VPER({
+        playerId: model.player_id,
+        matchId: model.match_id,
+        value: model.value
+    });
+}
+export { transformToObject as transformToVPER, transformToAttributes as transformFromVPER };

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

@@ -5,3 +5,4 @@ export * from './match-set';
 export * from './rally';
 export * from './court-position';
 export * from './match-team';
+export * from './vper';

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

@@ -5,3 +5,4 @@ export * from './match-set';
 export * from './rally';
 export * from './court-position';
 export * from './match-team';
+export * from './vper';

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

@@ -2,6 +2,7 @@ import { MatchSet } from './match-set';
 import { Team } from '../team';
 import { MatchTeam } from './match-team';
 import { StatusEnum } from '../../data';
+import { VPER } from './vper';
 interface MatchParams {
     readonly id: string;
     readonly homeTeam: Team;
@@ -9,6 +10,7 @@ interface MatchParams {
     readonly scheduledDate: Date;
     readonly sets: MatchSet[];
     readonly status: StatusEnum;
+    readonly VPERs: VPER[];
     homeScore?: number;
     awayScore?: number;
     winner?: Team;
@@ -21,11 +23,12 @@ export declare class Match {
     readonly awayTeam: Team;
     readonly sets: MatchSet[];
     readonly scheduledDate: Date;
+    readonly VPERs: VPER[];
     homeScore?: number;
     awayScore?: number;
     winner?: Team;
     status: StatusEnum;
-    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner }: MatchParams);
+    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner, VPERs }: MatchParams);
     addSet(set: MatchSet): void;
     getTeamSets(team: MatchTeam): SetScore;
     getScore(): MatchScore;

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

@@ -2,7 +2,7 @@ import { validateUUID } from '../utils';
 import { MatchTeam } from './match-team';
 import { StatusEnum } from '../../data';
 export class Match {
-    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner }) {
+    constructor({ id, homeTeam, awayTeam, scheduledDate, sets, status, homeScore, awayScore, winner, VPERs }) {
         validateUUID(id);
         this.id = id;
         this.homeTeam = homeTeam;
@@ -13,6 +13,7 @@ export class Match {
         this.homeScore = homeScore;
         this.awayScore = awayScore;
         this.winner = winner;
+        this.VPERs = VPERs;
     }
     addSet(set) {
         if (this.sets.length >= 5)

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

@@ -0,0 +1,13 @@
+import { BoxScore } from './box-score';
+export interface VPERParams {
+    readonly playerId: string;
+    readonly matchId: string;
+    readonly value: number;
+}
+export declare class VPER {
+    readonly playerId: string;
+    readonly matchId: string;
+    readonly value: number;
+    constructor({ playerId, matchId, value }: VPERParams);
+    static computeVPERForMatch(boxScores: BoxScore[]): number;
+}

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

@@ -0,0 +1,52 @@
+const WEIGHTS = {
+    // terminal positive
+    ATTACK_KILL: 1.0,
+    SERVE_ACE: 1.0,
+    BLOCK_SOLO: 1.0,
+    BLOCK_ASSIST: 0.5,
+    // creation / continuation
+    SETTING_ASSIST: 0.7,
+    BLOCK_TOUCH: 0.2,
+    DEFENSE_DIG: 0.25,
+    SETTING_PASS: 0.15,
+    // reception quality
+    RECEPTION_PERFECT: 0.35,
+    RECEPTION_POSITIVE: 0.15,
+    RECEPTION_OVERPASS: -0.6,
+    // terminal errors (always point against)
+    TERMINAL_ERROR: -1.0
+};
+export class VPER {
+    constructor({ playerId, matchId, value }) {
+        this.matchId = matchId;
+        this.playerId = playerId;
+        this.value = value;
+    }
+    static computeVPERForMatch(boxScores) {
+        let rawSum = 0;
+        let pointsPlayedSum = 0;
+        for (const box of boxScores) {
+            const w = WEIGHTS;
+            const positive = w.ATTACK_KILL * box.attack.kills +
+                w.SERVE_ACE * box.serve.aces +
+                w.BLOCK_SOLO * box.block.solo +
+                w.BLOCK_ASSIST * box.block.assists +
+                w.SETTING_ASSIST * box.setting.assists +
+                w.BLOCK_TOUCH * box.block.touches +
+                w.DEFENSE_DIG * box.defense.digs +
+                w.SETTING_PASS * box.setting.pass +
+                w.RECEPTION_PERFECT * box.reception.perfect +
+                w.RECEPTION_POSITIVE * box.reception.positive;
+            const negative = w.RECEPTION_OVERPASS * box.reception.overpasses +
+                w.TERMINAL_ERROR * (box.attack.errors +
+                    box.serve.errors +
+                    box.reception.errors +
+                    box.defense.errors +
+                    box.block.errors +
+                    box.setting.errors);
+            rawSum += positive + negative;
+            pointsPlayedSum += box.misc.pointsPlayed;
+        }
+        return 100 * rawSum / Math.max(1, pointsPlayedSum);
+    }
+}

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

@@ -12,7 +12,7 @@ export interface StartingLineup {
 }
 export interface TacticsOpts {
     readonly lineup: StartingLineup;
-    readonly substitutionTolerance?: number;
+    readonly substitutionTolerance: number;
     readonly liberoReplacements: Player[];
     readonly pinchServerSubs: Map<Player, Player>;
 }

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

@@ -9,7 +9,7 @@ interface TeamParams {
     readonly divisionId: string;
     readonly roster: Player[];
     readonly country: Country;
-    readonly tactics: Tactics;
+    readonly tactics?: Tactics;
 }
 export declare class Team {
     readonly id: string;
@@ -17,7 +17,7 @@ export declare class Team {
     readonly name: string;
     readonly shortName: string;
     readonly divisionId: string;
-    readonly tactics: Tactics;
+    readonly tactics?: Tactics;
     readonly country: Country;
     private _rating;
     constructor({ id, rating, name, shortName, divisionId, country, roster, tactics }: TeamParams);

package/dist/esm/src/service/utils/object-utils.d.ts

@@ -1 +1,4 @@
 export declare const getKeys: <T extends object>(obj: T) => (keyof T)[];
+export type DataProps<T> = {
+    [K in keyof T as T[K] extends (...args: any[]) => any ? never : K]: T[K];
+};

package/package.json

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