volleyballsimtypes 0.0.65 → 0.0.67

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

@@ -89,7 +89,6 @@ function initModels(sequelize) {
     MatchSetStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PerformanceStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Player.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
-    Player.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Player.hasMany(Block, { as: 'Blocks', foreignKey: 'player_id' });
     Player.hasMany(Block, { as: 'blocker_1_Blocks', foreignKey: 'blocker_1' });
     Player.hasMany(Block, { as: 'blocker_2_Blocks', foreignKey: 'blocker_2' });
@@ -179,7 +178,6 @@ function initModels(sequelize) {
     Team.belongsTo(League, { as: 'league', foreignKey: 'league_id' });
     Team.hasMany(Match, { as: 'Matches', foreignKey: 'home_team' });
     Team.hasMany(Match, { as: 'away_team_Matches', foreignKey: 'away_team' });
-    Team.hasMany(Player, { as: 'Players', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(Score, { as: 'Scores', foreignKey: 'team_id' });
     Team.hasMany(Season, { as: 'season_titles', foreignKey: 'champion' });

package/dist/cjs/src/data/transformers/match-rating.d.ts

@@ -1,4 +1,4 @@
 import { MatchRatingAttributes } from '../models';
-import { Match, MatchRating } from '../../service';
-declare function transformToAttributes(match: Match, teamId: string, rating: MatchRating): MatchRatingAttributes;
+import { MatchRating, MatchTeam } from '../../service';
+declare function transformToAttributes(team: MatchTeam, rating: MatchRating): MatchRatingAttributes;
 export { transformToAttributes as transformFromMatchRating };

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

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromMatchRating = void 0;
 const service_1 = require("../../service");
-function transformToAttributes(match, teamId, rating) {
-    const team = match.homeTeam.id === teamId ? service_1.MatchTeam.HOME :
-        match.awayTeam.id === teamId ? service_1.MatchTeam.AWAY : undefined;
+function transformToAttributes(team, rating) {
+    const teamId = team === service_1.MatchTeam.HOME ? rating.home.id : rating.away.id;
     if (team == null)
         throw new Error(`INVALID_TEAM: ${teamId}`);
     return {
-        match_id: match.id,
+        match_id: rating.match.id,
         team_id: teamId,
         p: rating.getWinProbability(team),
-        dR: rating.getRatingChange(team, match)
+        dR: rating.getRatingChange(team)
     };
 }
 exports.transformFromMatchRating = transformToAttributes;

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

@@ -1,14 +1,17 @@
 import { Match, MatchTeam } from '.';
+import { Team } from '../team';
 interface MatchRatingOpts {
-    readonly homeRating: number;
-    readonly awayRating: number;
+    readonly home: Team;
+    readonly away: Team;
+    readonly match: Match;
 }
 export declare class MatchRating {
     static K: number;
-    readonly homeRating: number;
-    readonly awayRating: number;
-    constructor({ homeRating, awayRating }: MatchRatingOpts);
+    readonly home: Team;
+    readonly away: Team;
+    readonly match: Match;
+    constructor({ home, away, match }: MatchRatingOpts);
     getWinProbability(team: MatchTeam): number;
-    getRatingChange(team: MatchTeam, match: Match): number;
+    getRatingChange(team: MatchTeam): number;
 }
 export {};

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

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchRating = void 0;
 const _1 = require(".");
 class MatchRating {
-    constructor({ homeRating, awayRating }) {
-        this.homeRating = homeRating;
-        this.awayRating = awayRating;
+    constructor({ home, away, match }) {
+        this.home = home;
+        this.away = away;
+        this.match = match;
     }
     getWinProbability(team) {
         let rA;
         let rB;
         if (team === _1.MatchTeam.HOME) {
-            rA = this.homeRating;
-            rB = this.awayRating;
+            rA = this.home.rating;
+            rB = this.away.rating;
         }
         else {
-            rA = this.awayRating;
-            rB = this.homeRating;
+            rA = this.away.rating;
+            rB = this.home.rating;
         }
         return 1 / (1 + Math.pow(10, ((rB - rA) / 400)));
     }
-    getRatingChange(team, match) {
-        const t = match[team === _1.MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
-        const score = match.getWinner().id === t.id ? 1 : 0;
+    getRatingChange(team) {
+        const t = this.match[team === _1.MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
+        const score = this.match.getWinner().id === t.id ? 1 : 0;
         return MatchRating.K * (score - this.getWinProbability(team));
     }
 }

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

@@ -86,7 +86,6 @@ export function initModels(sequelize) {
     MatchSetStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PerformanceStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Player.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
-    Player.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Player.hasMany(Block, { as: 'Blocks', foreignKey: 'player_id' });
     Player.hasMany(Block, { as: 'blocker_1_Blocks', foreignKey: 'blocker_1' });
     Player.hasMany(Block, { as: 'blocker_2_Blocks', foreignKey: 'blocker_2' });
@@ -176,7 +175,6 @@ export function initModels(sequelize) {
     Team.belongsTo(League, { as: 'league', foreignKey: 'league_id' });
     Team.hasMany(Match, { as: 'Matches', foreignKey: 'home_team' });
     Team.hasMany(Match, { as: 'away_team_Matches', foreignKey: 'away_team' });
-    Team.hasMany(Player, { as: 'Players', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(Score, { as: 'Scores', foreignKey: 'team_id' });
     Team.hasMany(Season, { as: 'season_titles', foreignKey: 'champion' });

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

@@ -1,4 +1,4 @@
 import { MatchRatingAttributes } from '../models';
-import { Match, MatchRating } from '../../service';
-declare function transformToAttributes(match: Match, teamId: string, rating: MatchRating): MatchRatingAttributes;
+import { MatchRating, MatchTeam } from '../../service';
+declare function transformToAttributes(team: MatchTeam, rating: MatchRating): MatchRatingAttributes;
 export { transformToAttributes as transformFromMatchRating };

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

@@ -1,14 +1,13 @@
 import { MatchTeam } from '../../service';
-function transformToAttributes(match, teamId, rating) {
-    const team = match.homeTeam.id === teamId ? MatchTeam.HOME :
-        match.awayTeam.id === teamId ? MatchTeam.AWAY : undefined;
+function transformToAttributes(team, rating) {
+    const teamId = team === MatchTeam.HOME ? rating.home.id : rating.away.id;
     if (team == null)
         throw new Error(`INVALID_TEAM: ${teamId}`);
     return {
-        match_id: match.id,
+        match_id: rating.match.id,
         team_id: teamId,
         p: rating.getWinProbability(team),
-        dR: rating.getRatingChange(team, match)
+        dR: rating.getRatingChange(team)
     };
 }
 export { transformToAttributes as transformFromMatchRating };

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

@@ -1,14 +1,17 @@
 import { Match, MatchTeam } from '.';
+import { Team } from '../team';
 interface MatchRatingOpts {
-    readonly homeRating: number;
-    readonly awayRating: number;
+    readonly home: Team;
+    readonly away: Team;
+    readonly match: Match;
 }
 export declare class MatchRating {
     static K: number;
-    readonly homeRating: number;
-    readonly awayRating: number;
-    constructor({ homeRating, awayRating }: MatchRatingOpts);
+    readonly home: Team;
+    readonly away: Team;
+    readonly match: Match;
+    constructor({ home, away, match }: MatchRatingOpts);
     getWinProbability(team: MatchTeam): number;
-    getRatingChange(team: MatchTeam, match: Match): number;
+    getRatingChange(team: MatchTeam): number;
 }
 export {};

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

@@ -1,25 +1,26 @@
 import { MatchTeam } from '.';
 export class MatchRating {
-    constructor({ homeRating, awayRating }) {
-        this.homeRating = homeRating;
-        this.awayRating = awayRating;
+    constructor({ home, away, match }) {
+        this.home = home;
+        this.away = away;
+        this.match = match;
     }
     getWinProbability(team) {
         let rA;
         let rB;
         if (team === MatchTeam.HOME) {
-            rA = this.homeRating;
-            rB = this.awayRating;
+            rA = this.home.rating;
+            rB = this.away.rating;
         }
         else {
-            rA = this.awayRating;
-            rB = this.homeRating;
+            rA = this.away.rating;
+            rB = this.home.rating;
         }
         return 1 / (1 + Math.pow(10, ((rB - rA) / 400)));
     }
-    getRatingChange(team, match) {
-        const t = match[team === MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
-        const score = match.getWinner().id === t.id ? 1 : 0;
+    getRatingChange(team) {
+        const t = this.match[team === MatchTeam.HOME ? 'homeTeam' : 'awayTeam'];
+        const score = this.match.getWinner().id === t.id ? 1 : 0;
         return MatchRating.K * (score - this.getWinProbability(team));
     }
 }

package/package.json

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