volleyballsimtypes 0.0.199 → 0.0.201

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompetitionModel = void 0;
 const sequelize_1 = require("sequelize");
+const _1 = require(".");
 const common_1 = require("../common");
 class CompetitionModel extends sequelize_1.Model {
     static initModel(sequelize) {
@@ -33,6 +34,12 @@ class CompetitionModel extends sequelize_1.Model {
             tableName: 'Competition',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [{
+                        model: _1.IterationModel,
+                        as: 'Iteration'
+                    }]
+            },
             indexes: [{
                     name: 'competition_pk',
                     unique: true,

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

@@ -1,20 +1,35 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { TeamId, TeamModel } from '.';
+import { PlayerId, TeamId, TeamModel } from '.';
+import { CourtPosition } from '../../service';
+export interface TacticsLineupAttributes {
+    [CourtPosition.LIBERO_ZONE]?: PlayerId;
+    [CourtPosition.LEFT_BACK]: PlayerId;
+    [CourtPosition.LEFT_FRONT]: PlayerId;
+    [CourtPosition.MIDDLE_BACK]: PlayerId;
+    [CourtPosition.MIDDLE_FRONT]: PlayerId;
+    [CourtPosition.RIGHT_BACK]: PlayerId;
+    [CourtPosition.RIGHT_FRONT]: PlayerId;
+    bench: PlayerId[];
+}
+export type PinchServerSubsAttributes = Record<PlayerId, PlayerId>;
 export interface TacticsAttributes {
     team_id: string;
-    formation: FormationType;
     substitution_tolerance: number;
+    lineup: TacticsLineupAttributes;
+    libero_replacements: PlayerId[];
+    pinch_server_subs: PinchServerSubsAttributes;
 }
-export type FormationType = '4-2' | '5-1' | '6-2';
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'substitution_tolerance';
+export type TacticsOptionalAttributes = 'substitution_tolerance' | 'lineup' | 'libero_replacements' | 'pinch_server_subs';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
-    formation: FormationType;
     substitution_tolerance: number;
+    lineup: TacticsLineupAttributes;
+    libero_replacements: PlayerId[];
+    pinch_server_subs: PinchServerSubsAttributes;
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TacticsModel = void 0;
 const sequelize_1 = require("sequelize");
+const service_1 = require("../../service");
 class TacticsModel extends sequelize_1.Model {
     static initModel(sequelize) {
         return TacticsModel.init({
@@ -14,14 +15,25 @@ class TacticsModel extends sequelize_1.Model {
                     key: 'team_id'
                 }
             },
-            formation: {
-                type: sequelize_1.DataTypes.ENUM('4-2', '5-1', '6-2'),
-                allowNull: false
-            },
             substitution_tolerance: {
                 type: sequelize_1.DataTypes.REAL,
                 allowNull: false,
                 defaultValue: 0
+            },
+            lineup: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
+            },
+            libero_replacements: {
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.UUID),
+                allowNull: false,
+                defaultValue: []
+            },
+            pinch_server_subs: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { TacticsAttributes, TacticsId, TacticsModel, CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DraftPickId, DraftPickModel, DivisionAttributes, DivisionId, DivisionModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel } from '.';
+import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, DraftPickId, DraftPickModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
 export interface TeamAttributes {
     team_id: string;
     name: string;

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

@@ -45,12 +45,7 @@ class TeamModel extends sequelize_1.Model {
             tableName: 'Team',
             schema: 'public',
             timestamps: false,
-            defaultScope: {
-                include: [
-                    { model: _1.CountryModel, as: 'country' },
-                    { model: _1.TacticsModel, as: 'tactics' }
-                ]
-            },
+            defaultScope: { include: [{ model: _1.CountryModel, as: 'country' }] },
             indexes: [{
                     name: 'Team_pk',
                     unique: true,

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

@@ -1,6 +1,5 @@
 export * from './country';
 export * from './court-position';
-export * from './formation';
 export * from './iteration';
 export * from './draft';
 export * from './draft-pick';

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

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./country"), exports);
 __exportStar(require("./court-position"), exports);
-__exportStar(require("./formation"), exports);
 __exportStar(require("./iteration"), exports);
 __exportStar(require("./draft"), exports);
 __exportStar(require("./draft-pick"), exports);

package/dist/cjs/src/data/transformers/performance-stats.d.ts

@@ -1,5 +1,5 @@
 import { PerformanceStatsAttributes, PerformanceStatsModel } from '../models';
-import { PerformanceStats, Player } from '../../service';
-declare function transformToAttributes(player: Player): PerformanceStatsAttributes;
+import { PerformanceStats } from '../../service';
+declare function transformToAttributes(stats: PerformanceStats, playerId: string): PerformanceStatsAttributes;
 declare function transformToObject(model: PerformanceStatsModel): PerformanceStats;
 export { transformToObject as transformToPerformanceStats, transformToAttributes as transformFromPerformanceStats };

package/dist/cjs/src/data/transformers/performance-stats.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromPerformanceStats = exports.transformToPerformanceStats = void 0;
 const service_1 = require("../../service");
-function transformToAttributes(player) {
+function transformToAttributes(stats, playerId) {
     return {
-        player_id: player.id,
-        back_attack: player.stats.backAttack,
-        block: player.stats.block,
-        read: player.stats.read,
-        commit: player.stats.commit,
-        focus: player.stats.focus,
-        awareness: player.stats.awareness,
-        defense: player.stats.defense,
-        quick: player.stats.quick,
-        power: player.stats.power,
-        attack: player.stats.attack,
-        serve: player.stats.serve,
-        reception: player.stats.reception,
-        overhand: player.stats.overhand,
-        bump: player.stats.bump,
-        setting: player.stats.setting,
-        spike: player.stats.spike,
-        stamina: player.stats.stamina,
-        reflex: player.stats.reflex
+        player_id: playerId,
+        back_attack: stats.backAttack,
+        block: stats.block,
+        read: stats.read,
+        commit: stats.commit,
+        focus: stats.focus,
+        awareness: stats.awareness,
+        defense: stats.defense,
+        quick: stats.quick,
+        power: stats.power,
+        attack: stats.attack,
+        serve: stats.serve,
+        reception: stats.reception,
+        overhand: stats.overhand,
+        bump: stats.bump,
+        setting: stats.setting,
+        spike: stats.spike,
+        stamina: stats.stamina,
+        reflex: stats.reflex
     };
 }
 exports.transformFromPerformanceStats = transformToAttributes;

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

@@ -11,7 +11,7 @@ function transformToAttributes(player) {
         last_name: player.name.last,
         roles: player.roles,
         traits: player.traits,
-        PerformanceStat: (0, _1.transformFromPerformanceStats)(player),
+        PerformanceStat: (0, _1.transformFromPerformanceStats)(player.stats, player.id),
         rarity: player.rarity
     };
 }

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

@@ -1,5 +1,5 @@
 import { TacticsAttributes, TacticsModel } from '../models';
-import { Tactics, Team } from '../../service';
-declare function transformToAttributes(team: Team): TacticsAttributes;
-declare function transformToObject(model: TacticsModel): Tactics;
+import { Player, Tactics } from '../../service';
+declare function transformToAttributes(tactics: Tactics, teamId: string): TacticsAttributes;
+declare function transformToObject(model: TacticsModel, roster: Player[]): Tactics;
 export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };

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

@@ -1,20 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromTactics = exports.transformToTactics = void 0;
-const _1 = require(".");
 const service_1 = require("../../service");
-function transformToAttributes(team) {
+function findPlayer(id, roster) {
+    const player = roster.find((p) => p.id === id);
+    if (player == null)
+        throw new Error(`PLAYER_NOT_FOUND: ${id}`);
+    return player;
+}
+function transformFromLineup(lineup) {
+    return {
+        [service_1.CourtPosition.LIBERO_ZONE]: lineup[service_1.CourtPosition.LIBERO_ZONE] != null ? lineup[service_1.CourtPosition.LIBERO_ZONE].id : undefined,
+        [service_1.CourtPosition.LEFT_BACK]: lineup[service_1.CourtPosition.LEFT_BACK].id,
+        [service_1.CourtPosition.LEFT_FRONT]: lineup[service_1.CourtPosition.LEFT_FRONT].id,
+        [service_1.CourtPosition.MIDDLE_BACK]: lineup[service_1.CourtPosition.MIDDLE_BACK].id,
+        [service_1.CourtPosition.MIDDLE_FRONT]: lineup[service_1.CourtPosition.MIDDLE_FRONT].id,
+        [service_1.CourtPosition.RIGHT_BACK]: lineup[service_1.CourtPosition.RIGHT_BACK].id,
+        [service_1.CourtPosition.RIGHT_FRONT]: lineup[service_1.CourtPosition.RIGHT_FRONT].id,
+        bench: lineup.bench.map((b) => b.id)
+    };
+}
+function transformToLineup(lineup, roster) {
     return {
-        team_id: team.id,
-        substitution_tolerance: team.tactics.substitutionTolerance ?? 0,
-        formation: (0, _1.transformFromFormation)(team.tactics.formation)
+        [service_1.CourtPosition.LIBERO_ZONE]: roster.find((p) => p.id === lineup[service_1.CourtPosition.LIBERO_ZONE]),
+        [service_1.CourtPosition.LEFT_BACK]: findPlayer(lineup[service_1.CourtPosition.LEFT_BACK], roster),
+        [service_1.CourtPosition.LEFT_FRONT]: findPlayer(lineup[service_1.CourtPosition.LEFT_FRONT], roster),
+        [service_1.CourtPosition.MIDDLE_BACK]: findPlayer(lineup[service_1.CourtPosition.MIDDLE_BACK], roster),
+        [service_1.CourtPosition.MIDDLE_FRONT]: findPlayer(lineup[service_1.CourtPosition.MIDDLE_FRONT], roster),
+        [service_1.CourtPosition.RIGHT_BACK]: findPlayer(lineup[service_1.CourtPosition.RIGHT_BACK], roster),
+        [service_1.CourtPosition.RIGHT_FRONT]: findPlayer(lineup[service_1.CourtPosition.RIGHT_FRONT], roster),
+        bench: lineup.bench.map((b) => findPlayer(b, roster))
+    };
+}
+function transformToAttributes(tactics, teamId) {
+    return {
+        team_id: teamId,
+        substitution_tolerance: tactics.substitutionTolerance ?? 0,
+        lineup: transformFromLineup(tactics.lineup),
+        libero_replacements: tactics.liberoReplacements.map((lr) => lr.id),
+        pinch_server_subs: Object.fromEntries([...tactics.pinchServerSubs].map(([k, v]) => [k.id, v.id]))
     };
 }
 exports.transformFromTactics = transformToAttributes;
-function transformToObject(model) {
+function buildPinchServerSubs(pinchServerSubs, roster) {
+    const map = new Map();
+    for (const [key, value] of Object.entries(pinchServerSubs)) {
+        map.set(findPlayer(key, roster), findPlayer(value, roster));
+    }
+    return map;
+}
+function transformToObject(model, roster) {
     return new service_1.Tactics({
         substitutionTolerance: model.substitution_tolerance,
-        formation: (0, _1.transformToFormation)(model.formation)
+        lineup: transformToLineup(model.lineup, roster),
+        liberoReplacements: model.libero_replacements.map((lr) => findPlayer(lr, roster)),
+        pinchServerSubs: buildPinchServerSubs(model.pinch_server_subs, roster)
     });
 }
 exports.transformToTactics = transformToObject;

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

@@ -9,20 +9,21 @@ function transformToAttributes(team) {
         name: team.name,
         short_name: team.shortName,
         country_id: team.country?.id,
-        tactics: (0, _1.transformFromTactics)(team),
+        tactics: (0, _1.transformFromTactics)(team.tactics, team.id),
         rating: team.rating,
         division_id: team.divisionId
     };
 }
 exports.transformFromTeam = transformToAttributes;
 function transformToObject(model) {
+    const roster = (model.PlayerTeams ?? []).map((pt) => (0, _1.transformToPlayer)(pt.player));
     return new service_1.Team({
         id: model.team_id,
         name: model.name,
         shortName: model.short_name,
         country: (0, _1.transformToCountry)(model.country),
-        tactics: (0, _1.transformToTactics)(model.tactics),
-        roster: (model.PlayerTeams ?? []).map((pt) => (0, _1.transformToPlayer)(pt.player)),
+        tactics: (0, _1.transformToTactics)(model.tactics, roster),
+        roster,
         rating: model.rating,
         divisionId: model.division_id
     });

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

@@ -1,11 +1,25 @@
-import { Formation } from './formation';
-interface TacticsOpts {
-    readonly formation: Formation;
+import { CourtPosition } from '../match';
+import { Player } from '../player';
+export interface StartingLineup {
+    readonly [CourtPosition.LEFT_FRONT]: Player;
+    readonly [CourtPosition.MIDDLE_FRONT]: Player;
+    readonly [CourtPosition.RIGHT_FRONT]: Player;
+    readonly [CourtPosition.LEFT_BACK]: Player;
+    readonly [CourtPosition.MIDDLE_BACK]: Player;
+    readonly [CourtPosition.RIGHT_BACK]: Player;
+    readonly [CourtPosition.LIBERO_ZONE]?: Player;
+    readonly bench: Player[];
+}
+export interface TacticsOpts {
+    readonly lineup: StartingLineup;
     readonly substitutionTolerance?: number;
+    readonly liberoReplacements: Player[];
+    readonly pinchServerSubs: Map<Player, Player>;
 }
 export declare class Tactics {
-    readonly formation: Formation;
+    readonly lineup: StartingLineup;
     readonly substitutionTolerance: number;
-    constructor({ formation, substitutionTolerance }: TacticsOpts);
+    readonly liberoReplacements: Player[];
+    readonly pinchServerSubs: Map<Player, Player>;
+    constructor({ lineup, pinchServerSubs, liberoReplacements, substitutionTolerance }: TacticsOpts);
 }
-export {};

package/dist/cjs/src/service/team/tactics.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tactics = void 0;
+const match_1 = require("../match");
 class Tactics {
-    constructor({ formation, substitutionTolerance = 0 }) {
-        this.formation = formation;
+    constructor({ lineup, pinchServerSubs, liberoReplacements, substitutionTolerance = 1 }) {
+        this.lineup = lineup;
         this.substitutionTolerance = substitutionTolerance;
+        this.pinchServerSubs = pinchServerSubs;
+        this.liberoReplacements = liberoReplacements;
     }
 }
 exports.Tactics = Tactics;

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

@@ -1,4 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
+import { IterationModel } from '.';
 import { StatusDataType } from '../common';
 export class CompetitionModel extends Model {
     static initModel(sequelize) {
@@ -30,6 +31,12 @@ export class CompetitionModel extends Model {
             tableName: 'Competition',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [{
+                        model: IterationModel,
+                        as: 'Iteration'
+                    }]
+            },
             indexes: [{
                     name: 'competition_pk',
                     unique: true,

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

@@ -1,20 +1,35 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { TeamId, TeamModel } from '.';
+import { PlayerId, TeamId, TeamModel } from '.';
+import { CourtPosition } from '../../service';
+export interface TacticsLineupAttributes {
+    [CourtPosition.LIBERO_ZONE]?: PlayerId;
+    [CourtPosition.LEFT_BACK]: PlayerId;
+    [CourtPosition.LEFT_FRONT]: PlayerId;
+    [CourtPosition.MIDDLE_BACK]: PlayerId;
+    [CourtPosition.MIDDLE_FRONT]: PlayerId;
+    [CourtPosition.RIGHT_BACK]: PlayerId;
+    [CourtPosition.RIGHT_FRONT]: PlayerId;
+    bench: PlayerId[];
+}
+export type PinchServerSubsAttributes = Record<PlayerId, PlayerId>;
 export interface TacticsAttributes {
     team_id: string;
-    formation: FormationType;
     substitution_tolerance: number;
+    lineup: TacticsLineupAttributes;
+    libero_replacements: PlayerId[];
+    pinch_server_subs: PinchServerSubsAttributes;
 }
-export type FormationType = '4-2' | '5-1' | '6-2';
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'substitution_tolerance';
+export type TacticsOptionalAttributes = 'substitution_tolerance' | 'lineup' | 'libero_replacements' | 'pinch_server_subs';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
-    formation: FormationType;
     substitution_tolerance: number;
+    lineup: TacticsLineupAttributes;
+    libero_replacements: PlayerId[];
+    pinch_server_subs: PinchServerSubsAttributes;
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

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

@@ -1,4 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
+import { CourtPosition } from '../../service';
 export class TacticsModel extends Model {
     static initModel(sequelize) {
         return TacticsModel.init({
@@ -11,14 +12,25 @@ export class TacticsModel extends Model {
                     key: 'team_id'
                 }
             },
-            formation: {
-                type: DataTypes.ENUM('4-2', '5-1', '6-2'),
-                allowNull: false
-            },
             substitution_tolerance: {
                 type: DataTypes.REAL,
                 allowNull: false,
                 defaultValue: 0
+            },
+            lineup: {
+                type: DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
+            },
+            libero_replacements: {
+                type: DataTypes.ARRAY(DataTypes.UUID),
+                allowNull: false,
+                defaultValue: []
+            },
+            pinch_server_subs: {
+                type: DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: {}
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { TacticsAttributes, TacticsId, TacticsModel, CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DraftPickId, DraftPickModel, DivisionAttributes, DivisionId, DivisionModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel } from '.';
+import { CompetitionChampionId, CompetitionChampionModel, CompetitionId, CompetitionModel, CompetitionTeamsId, CompetitionTeamsModel, CountryId, CountryModel, DivisionAttributes, DivisionId, DivisionModel, DraftPickId, DraftPickModel, MatchId, MatchModel, MatchRatingId, MatchRatingModel, PlayerAttributes, PlayerId, PlayerModel, PlayerTeamId, PlayerTeamModel, RallyId, RallyModel, TacticsAttributes, TacticsId, TacticsModel } from '.';
 export interface TeamAttributes {
     team_id: string;
     name: string;

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

@@ -1,5 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
-import { TacticsModel, CountryModel } from '.';
+import { CountryModel } from '.';
 export class TeamModel extends Model {
     static initModel(sequelize) {
         return TeamModel.init({
@@ -42,12 +42,7 @@ export class TeamModel extends Model {
             tableName: 'Team',
             schema: 'public',
             timestamps: false,
-            defaultScope: {
-                include: [
-                    { model: CountryModel, as: 'country' },
-                    { model: TacticsModel, as: 'tactics' }
-                ]
-            },
+            defaultScope: { include: [{ model: CountryModel, as: 'country' }] },
             indexes: [{
                     name: 'Team_pk',
                     unique: true,

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

@@ -1,6 +1,5 @@
 export * from './country';
 export * from './court-position';
-export * from './formation';
 export * from './iteration';
 export * from './draft';
 export * from './draft-pick';

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

@@ -1,6 +1,5 @@
 export * from './country';
 export * from './court-position';
-export * from './formation';
 export * from './iteration';
 export * from './draft';
 export * from './draft-pick';

package/dist/esm/src/data/transformers/performance-stats.d.ts

@@ -1,5 +1,5 @@
 import { PerformanceStatsAttributes, PerformanceStatsModel } from '../models';
-import { PerformanceStats, Player } from '../../service';
-declare function transformToAttributes(player: Player): PerformanceStatsAttributes;
+import { PerformanceStats } from '../../service';
+declare function transformToAttributes(stats: PerformanceStats, playerId: string): PerformanceStatsAttributes;
 declare function transformToObject(model: PerformanceStatsModel): PerformanceStats;
 export { transformToObject as transformToPerformanceStats, transformToAttributes as transformFromPerformanceStats };

package/dist/esm/src/data/transformers/performance-stats.js

@@ -1,25 +1,25 @@
 import { PerformanceStats } from '../../service';
-function transformToAttributes(player) {
+function transformToAttributes(stats, playerId) {
     return {
-        player_id: player.id,
-        back_attack: player.stats.backAttack,
-        block: player.stats.block,
-        read: player.stats.read,
-        commit: player.stats.commit,
-        focus: player.stats.focus,
-        awareness: player.stats.awareness,
-        defense: player.stats.defense,
-        quick: player.stats.quick,
-        power: player.stats.power,
-        attack: player.stats.attack,
-        serve: player.stats.serve,
-        reception: player.stats.reception,
-        overhand: player.stats.overhand,
-        bump: player.stats.bump,
-        setting: player.stats.setting,
-        spike: player.stats.spike,
-        stamina: player.stats.stamina,
-        reflex: player.stats.reflex
+        player_id: playerId,
+        back_attack: stats.backAttack,
+        block: stats.block,
+        read: stats.read,
+        commit: stats.commit,
+        focus: stats.focus,
+        awareness: stats.awareness,
+        defense: stats.defense,
+        quick: stats.quick,
+        power: stats.power,
+        attack: stats.attack,
+        serve: stats.serve,
+        reception: stats.reception,
+        overhand: stats.overhand,
+        bump: stats.bump,
+        setting: stats.setting,
+        spike: stats.spike,
+        stamina: stats.stamina,
+        reflex: stats.reflex
     };
 }
 function transformToObject(model) {

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

@@ -8,7 +8,7 @@ function transformToAttributes(player) {
         last_name: player.name.last,
         roles: player.roles,
         traits: player.traits,
-        PerformanceStat: transformFromPerformanceStats(player),
+        PerformanceStat: transformFromPerformanceStats(player.stats, player.id),
         rarity: player.rarity
     };
 }

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

@@ -1,5 +1,5 @@
 import { TacticsAttributes, TacticsModel } from '../models';
-import { Tactics, Team } from '../../service';
-declare function transformToAttributes(team: Team): TacticsAttributes;
-declare function transformToObject(model: TacticsModel): Tactics;
+import { Player, Tactics } from '../../service';
+declare function transformToAttributes(tactics: Tactics, teamId: string): TacticsAttributes;
+declare function transformToObject(model: TacticsModel, roster: Player[]): Tactics;
 export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };

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

@@ -1,16 +1,56 @@
-import { transformFromFormation, transformToFormation } from '.';
-import { Tactics } from '../../service';
-function transformToAttributes(team) {
+import { CourtPosition, Tactics } from '../../service';
+function findPlayer(id, roster) {
+    const player = roster.find((p) => p.id === id);
+    if (player == null)
+        throw new Error(`PLAYER_NOT_FOUND: ${id}`);
+    return player;
+}
+function transformFromLineup(lineup) {
+    return {
+        [CourtPosition.LIBERO_ZONE]: lineup[CourtPosition.LIBERO_ZONE] != null ? lineup[CourtPosition.LIBERO_ZONE].id : undefined,
+        [CourtPosition.LEFT_BACK]: lineup[CourtPosition.LEFT_BACK].id,
+        [CourtPosition.LEFT_FRONT]: lineup[CourtPosition.LEFT_FRONT].id,
+        [CourtPosition.MIDDLE_BACK]: lineup[CourtPosition.MIDDLE_BACK].id,
+        [CourtPosition.MIDDLE_FRONT]: lineup[CourtPosition.MIDDLE_FRONT].id,
+        [CourtPosition.RIGHT_BACK]: lineup[CourtPosition.RIGHT_BACK].id,
+        [CourtPosition.RIGHT_FRONT]: lineup[CourtPosition.RIGHT_FRONT].id,
+        bench: lineup.bench.map((b) => b.id)
+    };
+}
+function transformToLineup(lineup, roster) {
     return {
-        team_id: team.id,
-        substitution_tolerance: team.tactics.substitutionTolerance ?? 0,
-        formation: transformFromFormation(team.tactics.formation)
+        [CourtPosition.LIBERO_ZONE]: roster.find((p) => p.id === lineup[CourtPosition.LIBERO_ZONE]),
+        [CourtPosition.LEFT_BACK]: findPlayer(lineup[CourtPosition.LEFT_BACK], roster),
+        [CourtPosition.LEFT_FRONT]: findPlayer(lineup[CourtPosition.LEFT_FRONT], roster),
+        [CourtPosition.MIDDLE_BACK]: findPlayer(lineup[CourtPosition.MIDDLE_BACK], roster),
+        [CourtPosition.MIDDLE_FRONT]: findPlayer(lineup[CourtPosition.MIDDLE_FRONT], roster),
+        [CourtPosition.RIGHT_BACK]: findPlayer(lineup[CourtPosition.RIGHT_BACK], roster),
+        [CourtPosition.RIGHT_FRONT]: findPlayer(lineup[CourtPosition.RIGHT_FRONT], roster),
+        bench: lineup.bench.map((b) => findPlayer(b, roster))
     };
 }
-function transformToObject(model) {
+function transformToAttributes(tactics, teamId) {
+    return {
+        team_id: teamId,
+        substitution_tolerance: tactics.substitutionTolerance ?? 0,
+        lineup: transformFromLineup(tactics.lineup),
+        libero_replacements: tactics.liberoReplacements.map((lr) => lr.id),
+        pinch_server_subs: Object.fromEntries([...tactics.pinchServerSubs].map(([k, v]) => [k.id, v.id]))
+    };
+}
+function buildPinchServerSubs(pinchServerSubs, roster) {
+    const map = new Map();
+    for (const [key, value] of Object.entries(pinchServerSubs)) {
+        map.set(findPlayer(key, roster), findPlayer(value, roster));
+    }
+    return map;
+}
+function transformToObject(model, roster) {
     return new Tactics({
         substitutionTolerance: model.substitution_tolerance,
-        formation: transformToFormation(model.formation)
+        lineup: transformToLineup(model.lineup, roster),
+        liberoReplacements: model.libero_replacements.map((lr) => findPlayer(lr, roster)),
+        pinchServerSubs: buildPinchServerSubs(model.pinch_server_subs, roster)
     });
 }
 export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };

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

@@ -6,19 +6,20 @@ function transformToAttributes(team) {
         name: team.name,
         short_name: team.shortName,
         country_id: team.country?.id,
-        tactics: transformFromTactics(team),
+        tactics: transformFromTactics(team.tactics, team.id),
         rating: team.rating,
         division_id: team.divisionId
     };
 }
 function transformToObject(model) {
+    const roster = (model.PlayerTeams ?? []).map((pt) => transformToPlayer(pt.player));
     return new Team({
         id: model.team_id,
         name: model.name,
         shortName: model.short_name,
         country: transformToCountry(model.country),
-        tactics: transformToTactics(model.tactics),
-        roster: (model.PlayerTeams ?? []).map((pt) => transformToPlayer(pt.player)),
+        tactics: transformToTactics(model.tactics, roster),
+        roster,
         rating: model.rating,
         divisionId: model.division_id
     });

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

@@ -1,11 +1,25 @@
-import { Formation } from './formation';
-interface TacticsOpts {
-    readonly formation: Formation;
+import { CourtPosition } from '../match';
+import { Player } from '../player';
+export interface StartingLineup {
+    readonly [CourtPosition.LEFT_FRONT]: Player;
+    readonly [CourtPosition.MIDDLE_FRONT]: Player;
+    readonly [CourtPosition.RIGHT_FRONT]: Player;
+    readonly [CourtPosition.LEFT_BACK]: Player;
+    readonly [CourtPosition.MIDDLE_BACK]: Player;
+    readonly [CourtPosition.RIGHT_BACK]: Player;
+    readonly [CourtPosition.LIBERO_ZONE]?: Player;
+    readonly bench: Player[];
+}
+export interface TacticsOpts {
+    readonly lineup: StartingLineup;
     readonly substitutionTolerance?: number;
+    readonly liberoReplacements: Player[];
+    readonly pinchServerSubs: Map<Player, Player>;
 }
 export declare class Tactics {
-    readonly formation: Formation;
+    readonly lineup: StartingLineup;
     readonly substitutionTolerance: number;
-    constructor({ formation, substitutionTolerance }: TacticsOpts);
+    readonly liberoReplacements: Player[];
+    readonly pinchServerSubs: Map<Player, Player>;
+    constructor({ lineup, pinchServerSubs, liberoReplacements, substitutionTolerance }: TacticsOpts);
 }
-export {};

package/dist/esm/src/service/team/tactics.js

@@ -1,6 +1,9 @@
+import { CourtPosition } from '../match';
 export class Tactics {
-    constructor({ formation, substitutionTolerance = 0 }) {
-        this.formation = formation;
+    constructor({ lineup, pinchServerSubs, liberoReplacements, substitutionTolerance = 1 }) {
+        this.lineup = lineup;
         this.substitutionTolerance = substitutionTolerance;
+        this.pinchServerSubs = pinchServerSubs;
+        this.liberoReplacements = liberoReplacements;
     }
 }

package/package.json

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

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

@@ -1,5 +0,0 @@
-import { Formation } from '../../service';
-import { FormationType } from '../models';
-declare function transformToType(_formation: Formation): FormationType;
-declare function transformFromType(_formation: FormationType): Formation;
-export { transformToType as transformFromFormation, transformFromType as transformToFormation };

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

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformToFormation = exports.transformFromFormation = void 0;
-const service_1 = require("../../service");
-function transformToType(_formation) {
-    return _formation.name;
-}
-exports.transformFromFormation = transformToType;
-function transformFromType(_formation) {
-    return service_1.Formation[_formation];
-}
-exports.transformToFormation = transformFromType;

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

@@ -1,5 +0,0 @@
-import { Formation } from '../../service';
-import { FormationType } from '../models';
-declare function transformToType(_formation: Formation): FormationType;
-declare function transformFromType(_formation: FormationType): Formation;
-export { transformToType as transformFromFormation, transformFromType as transformToFormation };

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

@@ -1,8 +0,0 @@
-import { Formation } from '../../service';
-function transformToType(_formation) {
-    return _formation.name;
-}
-function transformFromType(_formation) {
-    return Formation[_formation];
-}
-export { transformToType as transformFromFormation, transformFromType as transformToFormation };