volleyballsimtypes 0.0.436 → 0.0.438

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

@@ -2,6 +2,7 @@ import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
 import { Status } from '../common';
 import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
+import { MatchRallyAggregates } from '../../service';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -11,6 +12,7 @@ export interface MatchAttributes {
     created_at?: Date;
     in_progress_at?: Date;
     complete_at?: Date;
+    rally_aggregates?: MatchRallyAggregates | null;
     MatchSets?: MatchSetAttributes[];
     VPERs?: VPERAttributes[];
 }
@@ -26,6 +28,7 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     created_at?: Date;
     in_progress_at?: Date;
     complete_at?: Date;
+    rally_aggregates?: MatchRallyAggregates | null;
     CompetitionMatch: CompetitionMatchModel;
     getCompetitionMatch: Sequelize.HasOneGetAssociationMixin<CompetitionMatchModel>;
     setCompetitionMatch: Sequelize.HasOneSetAssociationMixin<CompetitionMatchModel, CompetitionMatchId>;

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

@@ -47,6 +47,10 @@ class MatchModel extends sequelize_1.Model {
             complete_at: {
                 type: sequelize_1.DataTypes.DATE,
                 allowNull: true
+            },
+            rally_aggregates: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/cjs/src/service/match/point-breakdown.d.ts

@@ -1,3 +1,40 @@
+import { RallyMetrics } from './rally-metrics';
+export interface MatchRallyAggregates {
+    rallyMetrics: RallyMetrics;
+    breakdown: PointBreakdown;
+}
+export interface MatchRallyAggregatesInput {
+    readonly sets: ReadonlyArray<{
+        readonly rallies: ReadonlyArray<{
+            readonly servingTeamId: string;
+            readonly events: ReadonlyArray<{
+                readonly eventType: number;
+                readonly failure?: number;
+                readonly playerId: string;
+            }>;
+        }>;
+        readonly homePoints: number;
+        readonly awayPoints: number;
+        readonly homePlayerPosition?: ReadonlyArray<{
+            readonly playerId: string;
+            readonly position: number;
+        }>;
+        readonly awayPlayerPosition?: ReadonlyArray<{
+            readonly playerId: string;
+            readonly position: number;
+        }>;
+    }>;
+    readonly homeTeamId: string;
+    readonly awayTeamId: string;
+    readonly homeSetterId: string | null;
+    readonly awaySetterId: string | null;
+    readonly teamOf: (playerId: string) => string | null;
+    readonly homeKills: number;
+    readonly awayKills: number;
+    readonly homeAces: number;
+    readonly awayAces: number;
+}
+export declare function computeMatchRallyAggregates(input: MatchRallyAggregatesInput): MatchRallyAggregates;
 export interface RallyEventLike {
     readonly eventType: number;
     readonly playerId: string;

package/dist/cjs/src/service/match/point-breakdown.js

@@ -1,8 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeMatchRallyAggregates = computeMatchRallyAggregates;
 exports.tallyBlockPoints = tallyBlockPoints;
 exports.computePointBreakdown = computePointBreakdown;
 const event_1 = require("../event");
+const rally_metrics_1 = require("./rally-metrics");
+function computeMatchRallyAggregates(input) {
+    const setterZoneOf = (positions, setterId) => {
+        if (setterId == null)
+            return null;
+        const pos = positions?.find(p => p.playerId === setterId)?.position;
+        return pos != null && pos >= 1 && pos <= 6 ? pos : null;
+    };
+    const rallyMetrics = (0, rally_metrics_1.computeRallyMetrics)(input.sets.map(s => ({
+        rallies: s.rallies,
+        homePoints: s.homePoints,
+        awayPoints: s.awayPoints,
+        homeSetterStartZone: setterZoneOf(s.homePlayerPosition, input.homeSetterId),
+        awaySetterStartZone: setterZoneOf(s.awayPlayerPosition, input.awaySetterId)
+    })), input.homeTeamId, input.awayTeamId);
+    const homeTotalPoints = input.sets.reduce((a, s) => a + s.homePoints, 0);
+    const awayTotalPoints = input.sets.reduce((a, s) => a + s.awayPoints, 0);
+    const breakdown = computePointBreakdown({
+        rallies: input.sets.flatMap(s => s.rallies),
+        homeTeamId: input.homeTeamId,
+        awayTeamId: input.awayTeamId,
+        teamOf: input.teamOf,
+        homeKills: input.homeKills,
+        awayKills: input.awayKills,
+        homeAces: input.homeAces,
+        awayAces: input.awayAces,
+        homeTotalPoints,
+        awayTotalPoints
+    });
+    return { rallyMetrics, breakdown };
+}
 // A block scores a point in exactly ONE place in the sim (reception-simulator: a dig of a block fails
 // and the block landed in-court, i.e. target >= 7). Each such rally is ONE block point regardless of how
 // many blockers were on it; the box score records it as one `block_assists` per blocker (or one

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

@@ -2,6 +2,7 @@ import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
 import { Status } from '../common';
 import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
+import { MatchRallyAggregates } from '../../service';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -11,6 +12,7 @@ export interface MatchAttributes {
     created_at?: Date;
     in_progress_at?: Date;
     complete_at?: Date;
+    rally_aggregates?: MatchRallyAggregates | null;
     MatchSets?: MatchSetAttributes[];
     VPERs?: VPERAttributes[];
 }
@@ -26,6 +28,7 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     created_at?: Date;
     in_progress_at?: Date;
     complete_at?: Date;
+    rally_aggregates?: MatchRallyAggregates | null;
     CompetitionMatch: CompetitionMatchModel;
     getCompetitionMatch: Sequelize.HasOneGetAssociationMixin<CompetitionMatchModel>;
     setCompetitionMatch: Sequelize.HasOneSetAssociationMixin<CompetitionMatchModel, CompetitionMatchId>;

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

@@ -44,6 +44,10 @@ export class MatchModel extends Model {
             complete_at: {
                 type: DataTypes.DATE,
                 allowNull: true
+            },
+            rally_aggregates: {
+                type: DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/esm/src/service/match/point-breakdown.d.ts

@@ -1,3 +1,40 @@
+import { RallyMetrics } from './rally-metrics';
+export interface MatchRallyAggregates {
+    rallyMetrics: RallyMetrics;
+    breakdown: PointBreakdown;
+}
+export interface MatchRallyAggregatesInput {
+    readonly sets: ReadonlyArray<{
+        readonly rallies: ReadonlyArray<{
+            readonly servingTeamId: string;
+            readonly events: ReadonlyArray<{
+                readonly eventType: number;
+                readonly failure?: number;
+                readonly playerId: string;
+            }>;
+        }>;
+        readonly homePoints: number;
+        readonly awayPoints: number;
+        readonly homePlayerPosition?: ReadonlyArray<{
+            readonly playerId: string;
+            readonly position: number;
+        }>;
+        readonly awayPlayerPosition?: ReadonlyArray<{
+            readonly playerId: string;
+            readonly position: number;
+        }>;
+    }>;
+    readonly homeTeamId: string;
+    readonly awayTeamId: string;
+    readonly homeSetterId: string | null;
+    readonly awaySetterId: string | null;
+    readonly teamOf: (playerId: string) => string | null;
+    readonly homeKills: number;
+    readonly awayKills: number;
+    readonly homeAces: number;
+    readonly awayAces: number;
+}
+export declare function computeMatchRallyAggregates(input: MatchRallyAggregatesInput): MatchRallyAggregates;
 export interface RallyEventLike {
     readonly eventType: number;
     readonly playerId: string;

package/dist/esm/src/service/match/point-breakdown.js

@@ -1,4 +1,35 @@
 import { EventTypeEnum } from '../event';
+import { computeRallyMetrics } from './rally-metrics';
+export function computeMatchRallyAggregates(input) {
+    const setterZoneOf = (positions, setterId) => {
+        if (setterId == null)
+            return null;
+        const pos = positions?.find(p => p.playerId === setterId)?.position;
+        return pos != null && pos >= 1 && pos <= 6 ? pos : null;
+    };
+    const rallyMetrics = computeRallyMetrics(input.sets.map(s => ({
+        rallies: s.rallies,
+        homePoints: s.homePoints,
+        awayPoints: s.awayPoints,
+        homeSetterStartZone: setterZoneOf(s.homePlayerPosition, input.homeSetterId),
+        awaySetterStartZone: setterZoneOf(s.awayPlayerPosition, input.awaySetterId)
+    })), input.homeTeamId, input.awayTeamId);
+    const homeTotalPoints = input.sets.reduce((a, s) => a + s.homePoints, 0);
+    const awayTotalPoints = input.sets.reduce((a, s) => a + s.awayPoints, 0);
+    const breakdown = computePointBreakdown({
+        rallies: input.sets.flatMap(s => s.rallies),
+        homeTeamId: input.homeTeamId,
+        awayTeamId: input.awayTeamId,
+        teamOf: input.teamOf,
+        homeKills: input.homeKills,
+        awayKills: input.awayKills,
+        homeAces: input.homeAces,
+        awayAces: input.awayAces,
+        homeTotalPoints,
+        awayTotalPoints
+    });
+    return { rallyMetrics, breakdown };
+}
 // A block scores a point in exactly ONE place in the sim (reception-simulator: a dig of a block fails
 // and the block landed in-court, i.e. target >= 7). Each such rally is ONE block point regardless of how
 // many blockers were on it; the box score records it as one `block_assists` per blocker (or one

package/package.json

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