tods-competition-factory 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/tods-competition-factory.development.cjs.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.0.0-beta.3';
+    return '2.0.0-beta.5';
 }
 
 /******************************************************************************
@@ -2604,9 +2604,7 @@ function createMap(objectArray, attribute) {
         .filter(Boolean)), false));
 }
 // e.g. result.find(hav({ attr: value })) -or- result.filter(hav({ attr: value }))
-var hasAttributeValues = function (a) { return function (o) {
-    return Object.keys(a).every(function (key) { return o[key] === a[key]; });
-}; };
+var hasAttributeValues = function (a) { return function (o) { return Object.keys(a).every(function (key) { return o[key] === a[key]; }); }; };
 // extracts targeted attributes
 // e.g. const byeAssignments = positionAssignments.filter(xa('bye')).map(xa('drawPosition'));
 // supports xa('string'), xa(['string', 'string']), xa({ attr1: true, attr2: true })
@@ -2632,6 +2630,7 @@ var extractAttributes = function (accessor) { return function (element) {
                 })) ||
             ((_a = (typeof accessor === 'string' && getAccessorValue({ element: element, accessor: accessor }))) === null || _a === void 0 ? void 0 : _a.value);
 }; };
+var xa = extractAttributes;
 // useful in notifications where back end does not recognize undefined for updates
 function undefinedToNull(obj, shallow) {
     if (obj === undefined)
@@ -3794,7 +3793,7 @@ function getAllPositionedParticipantIds(_a) {
         if (!stagePositionedParticipantIds[stage])
             stagePositionedParticipantIds[stage] = [];
         var positionAssignments = getPositionAssignments$1({ structure: structure }).positionAssignments;
-        var particiapntIds = (_b = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.map(extractAttributes('participantId')).filter(Boolean)) !== null && _b !== void 0 ? _b : [];
+        var particiapntIds = (_b = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.map(xa('participantId')).filter(Boolean)) !== null && _b !== void 0 ? _b : [];
         (_a = stagePositionedParticipantIds[stage]).push.apply(_a, __spreadArray([], __read(particiapntIds), false));
         return particiapntIds;
     })
@@ -7243,35 +7242,23 @@ function getTeamLineUp(_a) {
     return { lineUp: lineUp };
 }
 
-function getDrawPositionCollectionAssignment(_a) {
+function getCollectionAssignment(_a) {
     var tournamentParticipants = _a.tournamentParticipants, positionAssignments = _a.positionAssignments, collectionPosition = _a.collectionPosition, _b = _a.drawPositions, drawPositions = _b === void 0 ? [] : _b, participantMap = _a.participantMap, drawDefinition = _a.drawDefinition, collectionId = _a.collectionId, sideLineUps = _a.sideLineUps, matchUpType = _a.matchUpType;
     if (!collectionId || !collectionPosition)
-        return;
-    var drawPositionCollectionAssignment = (drawPositions === null || drawPositions === void 0 ? void 0 : drawPositions.map(function (drawPosition) {
-        var _a, _b, _c;
-        var _d, _e, _f, _g, _h, _j;
-        var teamParticipantId = (_d = positionAssignments.find(function (assignment) { return assignment.drawPosition === drawPosition; })) === null || _d === void 0 ? void 0 : _d.participantId;
-        var side = sideLineUps === null || sideLineUps === void 0 ? void 0 : sideLineUps.find(function (lineUp) { return (lineUp === null || lineUp === void 0 ? void 0 : lineUp.drawPosition) === drawPosition; });
-        var teamParticipant = (side === null || side === void 0 ? void 0 : side.teamParticipant) ||
-            (teamParticipantId && ((_e = participantMap === null || participantMap === void 0 ? void 0 : participantMap[teamParticipantId]) === null || _e === void 0 ? void 0 : _e.participant)) ||
-            (tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.find(function (_a) {
-                var participantId = _a.participantId;
-                return participantId === teamParticipantId;
-            }));
-        var lineUp = (side === null || side === void 0 ? void 0 : side.lineUp) ||
-            ((_f = getTeamLineUp({
-                participantId: teamParticipantId,
-                drawDefinition: drawDefinition,
-            })) === null || _f === void 0 ? void 0 : _f.lineUp);
-        var _k = getCollectionPositionAssignments({
+        return {};
+    var getAssignment = function (_a) {
+        var _b, _c, _d;
+        var _e, _f, _g;
+        var attribute = _a.attribute, lineUp = _a.lineUp, teamParticipant = _a.teamParticipant;
+        var _h = getCollectionPositionAssignments({
             collectionPosition: collectionPosition,
             collectionId: collectionId,
             lineUp: lineUp,
-        }), assignedParticipantIds = _k.assignedParticipantIds, substitutions = _k.substitutions;
+        }), assignedParticipantIds = _h.assignedParticipantIds, substitutions = _h.substitutions;
         if (matchUpType === DOUBLES) {
             if ((assignedParticipantIds === null || assignedParticipantIds === void 0 ? void 0 : assignedParticipantIds.length) <= 2) {
-                var pairedParticipantId = (_h = (_g = participantMap === null || participantMap === void 0 ? void 0 : participantMap[assignedParticipantIds[0]]) === null || _g === void 0 ? void 0 : _g.pairIdMap) === null || _h === void 0 ? void 0 : _h[assignedParticipantIds[1]];
-                var pairedParticipant = pairedParticipantId && ((_j = participantMap[pairedParticipantId]) === null || _j === void 0 ? void 0 : _j.participant);
+                var pairedParticipantId = (_f = (_e = participantMap === null || participantMap === void 0 ? void 0 : participantMap[assignedParticipantIds[0]]) === null || _e === void 0 ? void 0 : _e.pairIdMap) === null || _f === void 0 ? void 0 : _f[assignedParticipantIds[1]];
+                var pairedParticipant = pairedParticipantId && ((_g = participantMap[pairedParticipantId]) === null || _g === void 0 ? void 0 : _g.participant);
                 var participant = pairedParticipant ||
                     // resort to brute force
                     getPairedParticipant({
@@ -7279,23 +7266,49 @@ function getDrawPositionCollectionAssignment(_a) {
                         tournamentParticipants: tournamentParticipants,
                     }).participant;
                 var participantId = participant === null || participant === void 0 ? void 0 : participant.participantId;
-                return _a = {},
-                    _a[drawPosition] = { participantId: participantId, teamParticipant: teamParticipant, substitutions: substitutions },
-                    _a;
+                return _b = {},
+                    _b[attribute] = { participantId: participantId, teamParticipant: teamParticipant, substitutions: substitutions },
+                    _b;
             }
             else if ((assignedParticipantIds === null || assignedParticipantIds === void 0 ? void 0 : assignedParticipantIds.length) > 2) {
-                return _b = {}, _b[drawPosition] = { teamParticipant: teamParticipant, substitutions: substitutions }, _b;
+                return _c = {}, _c[attribute] = { teamParticipant: teamParticipant, substitutions: substitutions }, _c;
             }
         }
         else {
             var participantId = assignedParticipantIds === null || assignedParticipantIds === void 0 ? void 0 : assignedParticipantIds[0];
-            return (participantId && (_c = {},
-                _c[drawPosition] = { participantId: participantId, teamParticipant: teamParticipant, substitutions: substitutions },
-                _c));
+            return (participantId && (_d = {},
+                _d[attribute] = { participantId: participantId, teamParticipant: teamParticipant, substitutions: substitutions },
+                _d));
         }
         return undefined;
+    };
+    if (!(drawPositions === null || drawPositions === void 0 ? void 0 : drawPositions.length)) {
+        var sideNumberCollectionAssignment = (sideLineUps === null || sideLineUps === void 0 ? void 0 : sideLineUps.map(function (side) {
+            var _a;
+            var teamParticipant = side.teamParticipant, sideNumber = side.sideNumber;
+            var lineUp = side.lineUp || ((_a = getTeamLineUp({ participantId: teamParticipant.teamParticipantId, drawDefinition: drawDefinition })) === null || _a === void 0 ? void 0 : _a.lineUp);
+            return getAssignment({ attribute: sideNumber, lineUp: lineUp, teamParticipant: teamParticipant });
+        }).filter(Boolean)) || {};
+        return { sideNumberCollectionAssignment: Object.assign.apply(Object, __spreadArray([{}], __read(sideNumberCollectionAssignment), false)) };
+    }
+    var drawPositionCollectionAssignment = (drawPositions === null || drawPositions === void 0 ? void 0 : drawPositions.map(function (drawPosition) {
+        var _a, _b, _c;
+        var teamParticipantId = (_a = positionAssignments.find(function (assignment) { return assignment.drawPosition === drawPosition; })) === null || _a === void 0 ? void 0 : _a.participantId;
+        var side = sideLineUps === null || sideLineUps === void 0 ? void 0 : sideLineUps.find(function (lineUp) { return (lineUp === null || lineUp === void 0 ? void 0 : lineUp.drawPosition) === drawPosition; });
+        var teamParticipant = (side === null || side === void 0 ? void 0 : side.teamParticipant) ||
+            (teamParticipantId && ((_b = participantMap === null || participantMap === void 0 ? void 0 : participantMap[teamParticipantId]) === null || _b === void 0 ? void 0 : _b.participant)) ||
+            (tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.find(function (_a) {
+                var participantId = _a.participantId;
+                return participantId === teamParticipantId;
+            }));
+        var lineUp = (side === null || side === void 0 ? void 0 : side.lineUp) ||
+            ((_c = getTeamLineUp({
+                participantId: teamParticipantId,
+                drawDefinition: drawDefinition,
+            })) === null || _c === void 0 ? void 0 : _c.lineUp);
+        return getAssignment({ attribute: drawPosition, lineUp: lineUp, teamParticipant: teamParticipant });
     }).filter(Boolean)) || {};
-    return Object.assign.apply(Object, __spreadArray([{}], __read(drawPositionCollectionAssignment), false));
+    return { drawPositionCollectionAssignment: Object.assign.apply(Object, __spreadArray([{}], __read(drawPositionCollectionAssignment), false)) };
 }
 
 function modifyEntryProfile(_a) {
@@ -9779,25 +9792,13 @@ function filterMatchUps(params) {
     });
 }
 
-/**
- *
- * @param {object} drawPositionCollectionAssignment - mapping of drawPositions to participantIds derived from collectionAssignments
- * @param {object[]} positionAssignments - mapping of drawPositions to participantIds (in TIES this is TEAM participantId)
- * @param {number} displaySideNumber - accounts for both top and bottom feed arm positioning
- * @param {object[]} seedAssignments - mapping of participantIds to seedNumber and seedValue
- * @param {number} drawPosition -
- * @param {boolean} isFeedRound - whether a round includes fed drawPositions
- * @param {number} sideNumber - 1 or 2
- */
 function getSide(_a) {
     var _b, _c, _d, _e;
-    var drawPositionCollectionAssignment = _a.drawPositionCollectionAssignment, positionAssignments = _a.positionAssignments, displaySideNumber = _a.displaySideNumber, seedAssignments = _a.seedAssignments, drawPosition = _a.drawPosition, isFeedRound = _a.isFeedRound, sideNumber = _a.sideNumber;
-    var assignment = positionAssignments.find(function (assignment) {
-        return assignment.drawPosition && assignment.drawPosition === drawPosition;
-    });
-    var participantId = drawPositionCollectionAssignment
-        ? (_b = drawPositionCollectionAssignment[drawPosition]) === null || _b === void 0 ? void 0 : _b.participantId
-        : assignment === null || assignment === void 0 ? void 0 : assignment.participantId;
+    var drawPositionCollectionAssignment = _a.drawPositionCollectionAssignment, sideNumberCollectionAssignment = _a.sideNumberCollectionAssignment, positionAssignments = _a.positionAssignments, displaySideNumber = _a.displaySideNumber, seedAssignments = _a.seedAssignments, drawPosition = _a.drawPosition, isFeedRound = _a.isFeedRound, sideNumber = _a.sideNumber;
+    var assignment = positionAssignments.find(function (assignment) { return assignment.drawPosition && assignment.drawPosition === drawPosition; });
+    var dpc = drawPosition && drawPositionCollectionAssignment;
+    var snc = sideNumber && sideNumberCollectionAssignment;
+    var participantId = dpc ? (_b = dpc[drawPosition]) === null || _b === void 0 ? void 0 : _b.participantId : assignment === null || assignment === void 0 ? void 0 : assignment.participantId;
     var sideValue = assignment
         ? getSideValue$1({
             displaySideNumber: displaySideNumber,
@@ -9806,7 +9807,7 @@ function getSide(_a) {
             assignment: assignment,
             sideNumber: sideNumber,
         })
-        : {};
+        : __assign({}, snc === null || snc === void 0 ? void 0 : snc[sideNumber]);
     if (isFeedRound) {
         if (sideNumber === 1) {
             Object.assign(sideValue, { participantFed: true });
@@ -9815,15 +9816,17 @@ function getSide(_a) {
             Object.assign(sideValue, { participantAdvanced: true });
         }
     }
-    var teamParticipant = (_c = drawPositionCollectionAssignment === null || drawPositionCollectionAssignment === void 0 ? void 0 : drawPositionCollectionAssignment[drawPosition]) === null || _c === void 0 ? void 0 : _c.teamParticipant;
-    var participant = (_d = drawPositionCollectionAssignment === null || drawPositionCollectionAssignment === void 0 ? void 0 : drawPositionCollectionAssignment[drawPosition]) === null || _d === void 0 ? void 0 : _d.participant;
-    var substitutions = (_e = drawPositionCollectionAssignment === null || drawPositionCollectionAssignment === void 0 ? void 0 : drawPositionCollectionAssignment[drawPosition]) === null || _e === void 0 ? void 0 : _e.substitutions;
-    if (participant)
-        Object.assign(sideValue, { participant: participant });
-    if (substitutions)
-        Object.assign(sideValue, { substitutions: substitutions });
-    if (teamParticipant)
-        Object.assign(sideValue, { teamParticipant: teamParticipant });
+    if (drawPosition && dpc) {
+        var teamParticipant = (_c = dpc[drawPosition]) === null || _c === void 0 ? void 0 : _c.teamParticipant;
+        var participant = (_d = dpc[drawPosition]) === null || _d === void 0 ? void 0 : _d.participant;
+        var substitutions = (_e = dpc[drawPosition]) === null || _e === void 0 ? void 0 : _e.substitutions;
+        if (participant)
+            sideValue.participant = participant;
+        if (substitutions)
+            sideValue.substitutions = substitutions;
+        if (teamParticipant)
+            sideValue.teamParticipant = teamParticipant;
+    }
     return sideValue;
 }
 function getSideValue$1(_a) {
@@ -9847,9 +9850,7 @@ function getSideValue$1(_a) {
 }
 function getSeeding(_a) {
     var seedAssignments = _a.seedAssignments, participantId = _a.participantId;
-    return seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.find(function (assignment) {
-        return !assignment.seedProxy && assignment.participantId === participantId;
-    });
+    return seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.find(function (assignment) { return !assignment.seedProxy && assignment.participantId === participantId; });
 }
 
 var ANY = 'ANY';
@@ -10069,8 +10070,8 @@ function getAllStructureMatchUps(_a) {
         var drawPositions = (_f = tieDrawPositions !== null && tieDrawPositions !== void 0 ? tieDrawPositions : matchUp.drawPositions) !== null && _f !== void 0 ? _f : [];
         var collectionPosition = matchUp.collectionPosition, collectionId = matchUp.collectionId, roundPosition = matchUp.roundPosition;
         var roundNumber = (_g = matchUp.roundNumber) !== null && _g !== void 0 ? _g : additionalContext.roundNumber;
-        var drawPositionCollectionAssignment = collectionId
-            ? getDrawPositionCollectionAssignment({
+        var collectionAssignmentDetail = collectionId
+            ? getCollectionAssignment({
                 tournamentParticipants: tournamentParticipants,
                 positionAssignments: positionAssignments,
                 collectionPosition: collectionPosition,
@@ -10170,15 +10171,7 @@ function getAllStructureMatchUps(_a) {
                 var _a;
                 var sideNumber = index + 1;
                 var displaySideNumber = reversedDisplayOrder_1 ? 3 - sideNumber : sideNumber;
-                var side = getSide({
-                    drawPositionCollectionAssignment: drawPositionCollectionAssignment,
-                    positionAssignments: positionAssignments,
-                    displaySideNumber: displaySideNumber,
-                    seedAssignments: seedAssignments,
-                    drawPosition: drawPosition,
-                    isFeedRound: isFeedRound_1,
-                    sideNumber: sideNumber,
-                });
+                var side = getSide(__assign(__assign({}, collectionAssignmentDetail), { positionAssignments: positionAssignments, displaySideNumber: displaySideNumber, seedAssignments: seedAssignments, drawPosition: drawPosition, isFeedRound: isFeedRound_1, sideNumber: sideNumber }));
                 var existingSide = (_a = matchUp.sides) === null || _a === void 0 ? void 0 : _a.find(function (existing) { return existing.sideNumber === sideNumber; });
                 // drawPositions for consolation structures are offset by the number of fed positions in subsequent rounds
                 // columnPosition gives an ordered position value relative to a single column
@@ -11369,10 +11362,8 @@ function addFinishingRounds(_a) {
     // for qualifying, offset the final round so that qualifyinground is finishingRound
     var finishingRoundOffset = roundLimit ? roundsCount - roundLimit : 0;
     // for QUALIFYING draws the best finishingPosition is equal to the number of matchUps in the final round of the structure
-    var minQualifyingPosition = finishingRoundOffset &&
-        ((_b = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundsCount - finishingRoundOffset]) === null || _b === void 0 ? void 0 : _b.matchUpsCount);
-    var roundMatchUpsCountArray = roundProfile &&
-        Object.values(roundProfile).map(extractAttributes('matchUpsCount'));
+    var minQualifyingPosition = finishingRoundOffset && ((_b = roundProfile === null || roundProfile === void 0 ? void 0 : roundProfile[roundsCount - finishingRoundOffset]) === null || _b === void 0 ? void 0 : _b.matchUpsCount);
+    var roundMatchUpsCountArray = roundProfile && Object.values(roundProfile).map(xa('matchUpsCount'));
     // returns a range for array of possible finishing drawPositions
     var finishingRange = function (positionRange, winner) {
         var minFinishingPosition = Math.min.apply(Math, __spreadArray([], __read(positionRange), false));
@@ -11399,9 +11390,7 @@ function addFinishingRounds(_a) {
         var fmlcException = fmlc && roundNumber !== 1;
         var rangeOffset = 1 + finishingPositionOffset + (fmlcException ? positionsFed !== null && positionsFed !== void 0 ? positionsFed : 0 : 0);
         var finalPosition = 1;
-        var positionRange = generateRange(rangeOffset, lucky
-            ? rangeOffset + matchUpsCount * 2
-            : upcomingMatchUps + rangeOffset + finalPosition);
+        var positionRange = generateRange(rangeOffset, lucky ? rangeOffset + matchUpsCount * 2 : upcomingMatchUps + rangeOffset + finalPosition);
         var slicer = upcomingMatchUps + finalPosition - matchUpsCount;
         var loser = finishingRange(positionRange.slice(slicer));
         var winner = finishingRange(positionRange.slice(0, slicer), true);
@@ -12945,17 +12934,13 @@ function getAssignedParticipantIds(_a) {
     var drawDefinition = _a.drawDefinition, stages = _a.stages;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
-    var stageStructures = ((_b = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) !== null && _b !== void 0 ? _b : []).filter(function (structure) {
-        return !(stages === null || stages === void 0 ? void 0 : stages.length) || (structure.stage && stages.includes(structure.stage));
-    });
+    var stageStructures = ((_b = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.structures) !== null && _b !== void 0 ? _b : []).filter(function (structure) { return !(stages === null || stages === void 0 ? void 0 : stages.length) || (structure.stage && stages.includes(structure.stage)); });
     var assignedParticipantIds = unique(stageStructures
         .map(function (structure) {
         var positionAssignments = getPositionAssignments$1({
             structure: structure,
         }).positionAssignments;
-        return positionAssignments
-            ? positionAssignments.map(extractAttributes('participantId'))
-            : [];
+        return positionAssignments ? positionAssignments.map(xa('participantId')) : [];
     })
         .flat()
         .filter(Boolean));
@@ -13917,12 +13902,13 @@ function getParticipantEntries(params) {
     var getRanking = function (_a) {
         var _b, _c, _d, _e;
         var eventType = _a.eventType, scaleNames = _a.scaleNames, participantId = _a.participantId;
-        return (_e = (_d = (_c = (_b = participantMap[participantId].participant) === null || _b === void 0 ? void 0 : _b.rankings) === null || _c === void 0 ? void 0 : _c[eventType]) === null || _d === void 0 ? void 0 : _d.find(function (ranking) { return scaleNames.includes(ranking.scaleName); })) === null || _e === void 0 ? void 0 : _e.scaleValue;
+        return (_e = (_d = (_c = (_b = participantMap[participantId].participant) === null || _b === void 0 ? void 0 : _b.rankings) === null || _c === void 0 ? void 0 : _c[eventType]) === null || _d === void 0 ? void 0 : _d.find(function (ranking) {
+            return scaleNames.includes(ranking.scaleName);
+        })) === null || _e === void 0 ? void 0 : _e.scaleValue;
     };
     var _loop_1 = function (event_1) {
         var e_3, _o, e_4, _p, e_5, _q;
-        if ((participantFilters === null || participantFilters === void 0 ? void 0 : participantFilters.eventIds) &&
-            !participantFilters.eventIds.includes(event_1.eventId))
+        if ((participantFilters === null || participantFilters === void 0 ? void 0 : participantFilters.eventIds) && !participantFilters.eventIds.includes(event_1.eventId))
             return "continue";
         var _r = event_1.drawDefinitions, drawDefinitions = _r === void 0 ? [] : _r, _s = event_1.extensions, extensions = _s === void 0 ? [] : _s, eventType = event_1.eventType, eventName = event_1.eventName, category = event_1.category, entries = event_1.entries, eventId = event_1.eventId, gender = event_1.gender;
         var flightProfile = getFlightProfile({ event: event_1 }).flightProfile;
@@ -13932,13 +13918,9 @@ function getParticipantEntries(params) {
             eventsPublishStatuses[eventId] = publishStatuses;
         var publishedSeeding = publishStatuses === null || publishStatuses === void 0 ? void 0 : publishStatuses.publishedSeeding;
         if (withEvents || withSeeding || withRankingProfile) {
-            var extensionConversions = convertExtensions
-                ? Object.assign.apply(Object, __spreadArray([{}], __read(extensionsToAttributes(extensions)), false)) : {};
+            var extensionConversions = convertExtensions ? Object.assign.apply(Object, __spreadArray([{}], __read(extensionsToAttributes(extensions)), false)) : {};
             derivedEventInfo[eventId] = __assign(__assign({}, extensionConversions), { eventName: eventName, eventType: eventType, category: category, eventId: eventId, gender: gender });
-            var scaleNames = [
-                category === null || category === void 0 ? void 0 : category.categoryName,
-                category === null || category === void 0 ? void 0 : category.ageCategoryCode,
-            ].filter(Boolean);
+            var scaleNames = [category === null || category === void 0 ? void 0 : category.categoryName, category === null || category === void 0 ? void 0 : category.ageCategoryCode].filter(Boolean);
             var _loop_3 = function (entry) {
                 var _t;
                 var participantId = entry.participantId;
@@ -13978,8 +13960,7 @@ function getParticipantEntries(params) {
                 };
                 addEventEntry(participantId);
                 // add details for individualParticipantIds for TEAM/PAIR events
-                var individualParticipantIds = participantMap[participantId].participant.individualParticipantIds ||
-                    [];
+                var individualParticipantIds = participantMap[participantId].participant.individualParticipantIds || [];
                 individualParticipantIds.forEach(addEventEntry);
             };
             try {
@@ -14008,7 +13989,7 @@ function getParticipantEntries(params) {
                             _b);
                     })), false)) : undefined;
             };
-            var drawIds = unique(__spreadArray(__spreadArray([], __read(drawDefinitions.map(extractAttributes('drawId'))), false), __read(flights.map(extractAttributes('drawId'))), false));
+            var drawIds = unique(__spreadArray(__spreadArray([], __read(drawDefinitions.map(xa('drawId'))), false), __read(flights.map(xa('drawId'))), false));
             var _loop_4 = function (drawId) {
                 var e_6, _u;
                 var drawDefinition = drawDefinitions.find(function (drawDefinition) { return drawDefinition.drawId === drawId; });
@@ -14016,10 +13997,7 @@ function getParticipantEntries(params) {
                 var entries_2 = (drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) || (flight === null || flight === void 0 ? void 0 : flight.drawEntries);
                 var _v = drawDefinition !== null && drawDefinition !== void 0 ? drawDefinition : {}, _w = _v.structures, structures = _w === void 0 ? [] : _w, drawOrder = _v.drawOrder, drawName = _v.drawName, drawType = _v.drawType;
                 var flightNumber = flight === null || flight === void 0 ? void 0 : flight.flightNumber;
-                var scaleNames = [
-                    category === null || category === void 0 ? void 0 : category.categoryName,
-                    category === null || category === void 0 ? void 0 : category.ageCategoryCode,
-                ].filter(Boolean);
+                var scaleNames = [category === null || category === void 0 ? void 0 : category.categoryName, category === null || category === void 0 ? void 0 : category.ageCategoryCode].filter(Boolean);
                 // used in rankings pipeline.
                 // the structures in which a particpant particpates are ordered
                 // to enable differentiation for Points-per-round and points-per-win
@@ -14027,9 +14005,7 @@ function getParticipantEntries(params) {
                     .sort(function (a, b) { return structureSort(a, b); })
                     .map(function (_a) {
                     var structureId = _a.structureId, structures = _a.structures;
-                    return __spreadArray([
-                        structureId
-                    ], __read((structures || []).map(function (_a) {
+                    return __spreadArray([structureId], __read((structures || []).map(function (_a) {
                         var structureId = _a.structureId;
                         return structureId;
                     })), false);
@@ -14075,8 +14051,7 @@ function getParticipantEntries(params) {
                     });
                 var seedingPublished = !usePublishState ||
                     ((eventPublishedSeeding === null || eventPublishedSeeding === void 0 ? void 0 : eventPublishedSeeding.published) &&
-                        (((_e = eventPublishedSeeding === null || eventPublishedSeeding === void 0 ? void 0 : eventPublishedSeeding.drawIds) === null || _e === void 0 ? void 0 : _e.length) === 0 ||
-                            ((_f = eventPublishedSeeding === null || eventPublishedSeeding === void 0 ? void 0 : eventPublishedSeeding.drawIds) === null || _f === void 0 ? void 0 : _f.includes(drawId))));
+                        (((_e = eventPublishedSeeding === null || eventPublishedSeeding === void 0 ? void 0 : eventPublishedSeeding.drawIds) === null || _e === void 0 ? void 0 : _e.length) === 0 || ((_f = eventPublishedSeeding === null || eventPublishedSeeding === void 0 ? void 0 : eventPublishedSeeding.drawIds) === null || _f === void 0 ? void 0 : _f.includes(drawId))));
                 var _loop_6 = function (entry) {
                     var entryStatus = entry.entryStatus, entryStage = entry.entryStage, entryPosition = entry.entryPosition, participantId = entry.participantId;
                     // get event ranking
@@ -14095,19 +14070,13 @@ function getParticipantEntries(params) {
                         var includeSeeding = withSeeding && seedingPublished;
                         var seedAssignments = includeSeeding ? {} : undefined;
                         var mainSeeding = includeSeeding
-                            ? ((_b = mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId]) === null || _b === void 0 ? void 0 : _b.seedValue) ||
-                                ((_c = mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId]) === null || _c === void 0 ? void 0 : _c.seedNumber)
-                            : undefined;
-                        var mainSeedingAssignments = mainSeeding
-                            ? mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId]
+                            ? ((_b = mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId]) === null || _b === void 0 ? void 0 : _b.seedValue) || ((_c = mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId]) === null || _c === void 0 ? void 0 : _c.seedNumber)
                             : undefined;
+                        var mainSeedingAssignments = mainSeeding ? mainSeedingMap === null || mainSeedingMap === void 0 ? void 0 : mainSeedingMap[participantId] : undefined;
                         var qualifyingSeeding = includeSeeding
-                            ? ((_d = qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId]) === null || _d === void 0 ? void 0 : _d.seedValue) ||
-                                ((_e = qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId]) === null || _e === void 0 ? void 0 : _e.seedNumber)
-                            : undefined;
-                        var qualifyingSeedingAssignments = qualifyingSeeding
-                            ? qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId]
+                            ? ((_d = qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId]) === null || _d === void 0 ? void 0 : _d.seedValue) || ((_e = qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId]) === null || _e === void 0 ? void 0 : _e.seedNumber)
                             : undefined;
+                        var qualifyingSeedingAssignments = qualifyingSeeding ? qualifyingSeedingMap === null || qualifyingSeedingMap === void 0 ? void 0 : qualifyingSeedingMap[participantId] : undefined;
                         if (seedAssignments && mainSeeding)
                             seedAssignments[MAIN] = mainSeedingAssignments;
                         if (seedAssignments && qualifyingSeeding)
@@ -14125,10 +14094,7 @@ function getParticipantEntries(params) {
                             if (seedAssignments) {
                                 if (!participantMap[id].events[eventId].seedAssignments)
                                     participantMap[id].events[eventId].seedAssignments = {};
-                                Object.keys(seedAssignments).forEach(function (stage) {
-                                    return (participantMap[id].events[eventId].seedAssignments[stage] =
-                                        seedAssignments[stage]);
-                                });
+                                Object.keys(seedAssignments).forEach(function (stage) { return (participantMap[id].events[eventId].seedAssignments[stage] = seedAssignments[stage]); });
                             }
                         }
                         if (withDraws || withRankingProfile) {
@@ -14146,8 +14112,7 @@ function getParticipantEntries(params) {
                     };
                     if (![UNGROUPED, UNPAIRED].includes(entryStatus)) {
                         addDrawEntry(participantId);
-                        var individualParticipantIds = participantMap[participantId].participant
-                            .individualParticipantIds || [];
+                        var individualParticipantIds = participantMap[participantId].participant.individualParticipantIds || [];
                         // add for individualParticipantIds when participantType is TEAM/PAIR
                         individualParticipantIds === null || individualParticipantIds === void 0 ? void 0 : individualParticipantIds.forEach(addDrawEntry);
                     }
@@ -14255,12 +14220,8 @@ function getParticipantEntries(params) {
                     }
                     finally { if (e_7) throw e_7.error; }
                 }
-                if (Array.isArray(potentialParticipants) &&
-                    (nextMatchUps || !!scheduleAnalysis || withScheduleItems)) {
-                    var potentialParticipantIds = potentialParticipants
-                        .flat()
-                        .map(extractAttributes('participantId'))
-                        .filter(Boolean);
+                if (Array.isArray(potentialParticipants) && (nextMatchUps || !!scheduleAnalysis || withScheduleItems)) {
+                    var potentialParticipantIds = potentialParticipants.flat().map(xa('participantId')).filter(Boolean);
                     potentialParticipantIds === null || potentialParticipantIds === void 0 ? void 0 : potentialParticipantIds.forEach(function (participantId) {
                         var relevantParticipantIds = getRelevantParticipantIds(participantId);
                         relevantParticipantIds === null || relevantParticipantIds === void 0 ? void 0 : relevantParticipantIds.forEach(function (relevantParticipantId) {
@@ -14350,8 +14311,7 @@ function getParticipantEntries(params) {
                 };
                 var _loop_7 = function (drawId) {
                     var _11 = derivedDrawInfo[drawId] || {}, _12 = _11.orderedStructureIds, orderedStructureIds = _12 === void 0 ? [] : _12, flightNumber = _11.flightNumber;
-                    if (participantAggregator.structureParticipation &&
-                        orderedStructureIds.length) {
+                    if (participantAggregator.structureParticipation && orderedStructureIds.length) {
                         var finishingPositionRange_1;
                         var nonQualifyingOrder_1 = 0;
                         // structures in which a participant participants/exits
@@ -14361,26 +14321,19 @@ function getParticipantEntries(params) {
                             if (!participation)
                                 return;
                             if (!finishingPositionRange_1)
-                                finishingPositionRange_1 =
-                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
-                            if (diff_1(finishingPositionRange_1) >
-                                diff_1(participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange))
-                                finishingPositionRange_1 =
-                                    participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
+                                finishingPositionRange_1 = participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
+                            if (diff_1(finishingPositionRange_1) > diff_1(participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange))
+                                finishingPositionRange_1 = participation === null || participation === void 0 ? void 0 : participation.finishingPositionRange;
                             var notQualifying = participation.stage !== QUALIFYING;
                             if (notQualifying)
                                 nonQualifyingOrder_1 += 1;
-                            var participationOrder = notQualifying
-                                ? nonQualifyingOrder_1
-                                : undefined;
+                            var participationOrder = notQualifying ? nonQualifyingOrder_1 : undefined;
                             return definedAttributes(__assign(__assign({}, participation), { participationOrder: participationOrder, flightNumber: flightNumber }));
                         })
                             .filter(Boolean);
                         if (participantAggregator.draws[drawId]) {
-                            participantAggregator.draws[drawId].finishingPositionRange =
-                                finishingPositionRange_1;
-                            participantAggregator.draws[drawId].structureParticipation =
-                                orderedParticipation;
+                            participantAggregator.draws[drawId].finishingPositionRange = finishingPositionRange_1;
+                            participantAggregator.draws[drawId].structureParticipation = orderedParticipation;
                         }
                     }
                 };
@@ -14399,9 +14352,7 @@ function getParticipantEntries(params) {
                 }
             }
             if (scheduleAnalysis) {
-                var scheduledMinutesDifference = isObject(scheduleAnalysis)
-                    ? scheduleAnalysis.scheduledMinutesDifference
-                    : 0;
+                var scheduledMinutesDifference = isObject(scheduleAnalysis) ? scheduleAnalysis.scheduledMinutesDifference : 0;
                 // iterate through participantAggregator.scheduleItems
                 var scheduleItems = participantAggregator.scheduleItems || [];
                 var potentialMatchUps = participantAggregator.potentialMatchUps || {};
@@ -14425,19 +14376,15 @@ function getParticipantEntries(params) {
                             for (var scheduleItemsToConsider_1 = (e_10 = void 0, __values(scheduleItemsToConsider)), scheduleItemsToConsider_1_1 = scheduleItemsToConsider_1.next(); !scheduleItemsToConsider_1_1.done; scheduleItemsToConsider_1_1 = scheduleItemsToConsider_1.next()) {
                                 var consideredItem = scheduleItemsToConsider_1_1.value;
                                 var ignoreItem = consideredItem.matchUpId === scheduleItem.matchUpId ||
-                                    ([WALKOVER$2, DEFAULTED].includes(consideredItem.matchUpStatus) &&
-                                        !consideredItem.checkScoreHasValue);
+                                    ([WALKOVER$2, DEFAULTED].includes(consideredItem.matchUpStatus) && !consideredItem.checkScoreHasValue);
                                 if (ignoreItem)
                                     continue;
                                 // if there is a matchType change (SINGLES => DOUBLES or vice versa) then there is potentially a different timeAfterRecovery
                                 var typeChange = scheduleItem.matchUpType !== consideredItem.matchUpType;
-                                var notBeforeTime = typeChange
-                                    ? typeChangeTimeAfterRecovery || timeAfterRecovery
-                                    : timeAfterRecovery;
+                                var notBeforeTime = typeChange ? typeChangeTimeAfterRecovery || timeAfterRecovery : timeAfterRecovery;
                                 // if two matchUps are both potentials and both part of the same draw they cannot be considered in conflict
                                 var sameDraw = scheduleItem.drawId === consideredItem.drawId;
-                                var bothPotential = potentialMatchUps[scheduleItem.matchUpId] &&
-                                    potentialMatchUps[consideredItem.matchUpId];
+                                var bothPotential = potentialMatchUps[scheduleItem.matchUpId] && potentialMatchUps[consideredItem.matchUpId];
                                 var consideredMinutes = timeStringMinutes(consideredItem.scheduledTime);
                                 var minutesDifference = Math.abs(consideredMinutes - scheduledMinutes);
                                 var itemIsPrior = consideredMinutes >= scheduledMinutes;
@@ -14446,14 +14393,10 @@ function getParticipantEntries(params) {
                                 // 2. A scheduledTime occurring before a prior matchUps notBeforeTime (timeAfterRecovery)
                                 var timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference)
                                     ? minutesDifference <= scheduledMinutesDifference
-                                    : itemIsPrior &&
-                                        timeStringMinutes(consideredItem.scheduledTime) <
-                                            timeStringMinutes(notBeforeTime);
+                                    : itemIsPrior && timeStringMinutes(consideredItem.scheduledTime) < timeStringMinutes(notBeforeTime);
                                 // if there is a time overlap capture both the prior matchUpId and the conflicted matchUpId
                                 if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
-                                    var key = [scheduleItem.matchUpId, consideredItem.matchUpId]
-                                        .sort(stringSort)
-                                        .join('|');
+                                    var key = [scheduleItem.matchUpId, consideredItem.matchUpId].sort(stringSort).join('|');
                                     participantAggregator.scheduleConflicts[key] = {
                                         priorScheduledMatchUpId: scheduleItem.matchUpId,
                                         matchUpIdWithConflict: consideredItem.matchUpId,
@@ -14481,8 +14424,7 @@ function getParticipantEntries(params) {
                 if (Object.keys(participantAggregator.scheduleConflicts).length) {
                     participantIdsWithConflicts.push(pid);
                 }
-                participantMap[pid].scheduleConflicts =
-                    participantAggregator.scheduleConflicts;
+                participantMap[pid].scheduleConflicts = participantAggregator.scheduleConflicts;
             }
         };
         try {
@@ -15200,28 +15142,23 @@ function removeEventEntries(_a) {
     var stack = 'removeEventEntries';
     if (!(event === null || event === void 0 ? void 0 : event.eventId))
         return { error: MISSING_EVENT };
-    if (!Array.isArray(participantIds) ||
-        participantIds.some(function (participantId) { return !isString(participantId); })) {
+    if (!Array.isArray(participantIds) || participantIds.some(function (participantId) { return !isString(participantId); })) {
         return decorateResult({ result: { error: INVALID_PARTICIPANT_ID }, stack: stack });
     }
     // do not filter by stages; must kmow all participantIds assigned to any stage!
     var assignedParticipantIds = ((_b = event.drawDefinitions) !== null && _b !== void 0 ? _b : []).flatMap(function (drawDefinition) { var _a; return (_a = getAssignedParticipantIds({ drawDefinition: drawDefinition }).assignedParticipantIds) !== null && _a !== void 0 ? _a : []; });
     var statusParticipantIds = (((entryStatuses === null || entryStatuses === void 0 ? void 0 : entryStatuses.length) &&
-        ((_c = event.entries) === null || _c === void 0 ? void 0 : _c.filter(function (entry) {
-            return entry.entryStatus && entryStatuses.includes(entry.entryStatus);
-        }))) ||
+        ((_c = event.entries) === null || _c === void 0 ? void 0 : _c.filter(function (entry) { return entry.entryStatus && entryStatuses.includes(entry.entryStatus); }))) ||
         [])
-        .map(extractAttributes('participantId'))
+        .map(xa('participantId'))
         .filter(function (participantId) { return !assignedParticipantIds.includes(participantId); });
-    var stageParticipantIds = ((stage &&
-        ((_d = event.entries) === null || _d === void 0 ? void 0 : _d.filter(function (entry) { return entry.entryStage && entry.entryStage === stage; }))) ||
+    var stageParticipantIds = ((stage && ((_d = event.entries) === null || _d === void 0 ? void 0 : _d.filter(function (entry) { return entry.entryStage && entry.entryStage === stage; }))) ||
         [])
-        .map(extractAttributes('participantId'))
+        .map(xa('participantId'))
         .filter(function (participantId) { return !assignedParticipantIds.includes(participantId); });
     if (participantIds.length) {
         participantIds = participantIds.filter(function (participantId) {
-            return (!(entryStatuses === null || entryStatuses === void 0 ? void 0 : entryStatuses.length) ||
-                statusParticipantIds.includes(participantId)) &&
+            return (!(entryStatuses === null || entryStatuses === void 0 ? void 0 : entryStatuses.length) || statusParticipantIds.includes(participantId)) &&
                 (!stage || stageParticipantIds.includes(participantId));
         });
     }
@@ -15235,9 +15172,7 @@ function removeEventEntries(_a) {
         participantIds = stageParticipantIds;
     }
     if ((participantIds === null || participantIds === void 0 ? void 0 : participantIds.length) &&
-        assignedParticipantIds.some(function (participantId) {
-            return participantIds.includes(participantId);
-        })) {
+        assignedParticipantIds.some(function (participantId) { return participantIds.includes(participantId); })) {
         return decorateResult({
             result: { error: EXISTING_PARTICIPANT_DRAW_POSITION_ASSIGNMENT },
             stack: stack,
@@ -17114,8 +17049,7 @@ function getDrawData(params) {
             var structureId = structure === null || structure === void 0 ? void 0 : structure.structureId;
             var seedAssignments = [];
             // pass seedAssignments from { stageSequence: 1 } to other stages
-            if (structure.stage &&
-                [MAIN, CONSOLATION, PLAY_OFF].includes(structure.stage)) {
+            if (structure.stage && [MAIN, CONSOLATION, PLAY_OFF].includes(structure.stage)) {
                 seedAssignments = mainStageSeedAssignments;
             }
             if ((structure === null || structure === void 0 ? void 0 : structure.stage) === QUALIFYING) {
@@ -17123,9 +17057,7 @@ function getDrawData(params) {
             }
             var _b = getAllStructureMatchUps({
                 // only propagate seedAssignments where none are present
-                seedAssignments: !((_a = structure === null || structure === void 0 ? void 0 : structure.seedAssignments) === null || _a === void 0 ? void 0 : _a.length)
-                    ? seedAssignments
-                    : undefined,
+                seedAssignments: !((_a = structure === null || structure === void 0 ? void 0 : structure.seedAssignments) === null || _a === void 0 ? void 0 : _a.length) ? seedAssignments : undefined,
                 context: __assign({ drawId: drawInfo.drawId }, context),
                 tournamentParticipants: tournamentParticipants,
                 policyDefinitions: policyDefinitions,
@@ -17140,7 +17072,7 @@ function getDrawData(params) {
             var positionAssignments = getPositionAssignments$1({
                 structure: structure,
             }).positionAssignments;
-            var participantResults = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.filter(extractAttributes(PARTICIPANT_ID)).map(function (assignment) {
+            var participantResults = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.filter(xa(PARTICIPANT_ID)).map(function (assignment) {
                 participantPlacements = true;
                 var drawPosition = assignment.drawPosition, participantId = assignment.participantId;
                 var extension = findExtension({
@@ -17180,14 +17112,10 @@ function getDrawData(params) {
                     DOUBLE_DEFAULT,
                     DOUBLE_WALKOVER,
                 ].includes(matchUp.matchUpStatus);
-                return (active ||
-                    activeMatchUpStatus ||
-                    !!matchUp.winningSide ||
-                    !!((_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.scoreStringSide1));
+                return active || activeMatchUpStatus || !!matchUp.winningSide || !!((_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.scoreStringSide1);
             }, false);
             var structureCompleted = matchUps.reduce(function (completed, matchUp) {
-                return (completed &&
-                    [BYE, COMPLETED$1, RETIRED$1, WALKOVER$2, DEFAULTED, ABANDONED$1].includes(matchUp.matchUpStatus));
+                return completed && [BYE, COMPLETED$1, RETIRED$1, WALKOVER$2, DEFAULTED, ABANDONED$1].includes(matchUp.matchUpStatus);
             }, !!matchUps.length);
             structureInfo.structureCompleted = structureCompleted;
             completedStructures[structureId] = structureCompleted;
@@ -18301,17 +18229,6 @@ function assignMatchUpDrawPosition(_a) {
     }
 }
 
-function getNumericSeedValue(seedValue) {
-    if (!seedValue)
-        return Infinity;
-    if (isConvertableInteger(seedValue))
-        return ensureInt(seedValue);
-    var firstValue = seedValue.split('-')[0];
-    if (isConvertableInteger(firstValue))
-        return ensureInt(firstValue);
-    return Infinity;
-}
-
 function getRoundRobinGroupMatchUps(_a) {
     var drawPositions = _a.drawPositions;
     var positionMatchUps = function (position) {
@@ -18664,6 +18581,17 @@ function getSeedingThresholds(_a) {
     return __assign(__assign({}, SUCCESS), { seedingThresholds: seedingThresholds });
 }
 
+function getNumericSeedValue(seedValue) {
+    if (!seedValue)
+        return Infinity;
+    if (isConvertableInteger(seedValue))
+        return ensureInt(seedValue);
+    var firstValue = seedValue.split('-')[0];
+    if (isConvertableInteger(firstValue))
+        return ensureInt(firstValue);
+    return Infinity;
+}
+
 function getDivisions(_a) {
     var size = _a.size;
     var divisions = [size];
@@ -18713,7 +18641,7 @@ function generateBlockPattern(_a) {
     var firstMember = function (arr) { return arr[0]; };
     var lastMember = function (arr) { return arr[arr.length - 1]; };
     var getMember = function (arr, i) {
-        return (positioning === CLUSTER && i % 2 ? lastMember(arr) : firstMember(arr)) ||
+        return (positioning && [CLUSTER, WATERFALL].includes(positioning) && i % 2 ? lastMember(arr) : firstMember(arr)) ||
             firstMember(arr);
     };
     var noneSelected = function (chunk, i) {
@@ -18828,9 +18756,7 @@ function getValidSeedBlocks(_a) {
     var firstRoundSeedsCount = isLuckyStructure
         ? 0
         : (!isFeedIn && countLimit) ||
-            (countLimit &&
-                fedSeedBlockPositions.length < countLimit &&
-                countLimit - fedSeedBlockPositions.length) ||
+            (countLimit && fedSeedBlockPositions.length < countLimit && countLimit - fedSeedBlockPositions.length) ||
             0;
     if (qualifyingBlocks) {
         var seedingBlocksCount = (structure === null || structure === void 0 ? void 0 : structure.matchUps)
@@ -18955,9 +18881,7 @@ function getSeedBlockPattern(_a) {
             var block = drawPositionBlocks[blockIndex].slice();
             var consideredDrawPositions = block.filter(function (drawPosition, i) { return relativePositions.includes(i + 1) && drawPosition; });
             if (positioning !== WATERFALL) {
-                consideredDrawPositions = nonRandom
-                    ? consideredDrawPositions
-                    : shuffleArray(consideredDrawPositions);
+                consideredDrawPositions = nonRandom ? consideredDrawPositions : shuffleArray(consideredDrawPositions);
             }
             else if (i % 2) {
                 consideredDrawPositions.reverse();
@@ -18966,8 +18890,8 @@ function getSeedBlockPattern(_a) {
             if (drawPosition) {
                 assignedPositions.push(drawPosition);
                 validSeedBlocks.push({
-                    seedNumbers: [seedNumber],
                     drawPositions: [drawPosition],
+                    seedNumbers: [seedNumber],
                 });
             }
         });
@@ -19026,9 +18950,7 @@ function isValidSeedPosition(_a) {
     if ((_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.seeding) === null || _c === void 0 ? void 0 : _c.validSeedPositions) === null || _d === void 0 ? void 0 : _d.ignore)
         return true;
     if ((_f = (_e = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.seeding) === null || _e === void 0 ? void 0 : _e.validSeedPositions) === null || _f === void 0 ? void 0 : _f.strict) {
-        var targetSeedBlock = validSeedBlocks.find(function (seedBlock) {
-            return seedBlock.seedNumbers.includes(seedNumber);
-        });
+        var targetSeedBlock = validSeedBlocks.find(function (seedBlock) { return seedBlock.seedNumbers.includes(seedNumber); });
         var validSeedPositions_1 = (targetSeedBlock === null || targetSeedBlock === void 0 ? void 0 : targetSeedBlock.drawPositions) || [];
         return validSeedPositions_1.includes(drawPosition);
     }
@@ -19087,16 +19009,12 @@ function getNextSeedBlock(params) {
         return participantId;
     })
         .filter(Boolean);
-    var placedSeedNumbers = seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.filter(function (assignment) {
-        return placedSeedParticipantIds === null || placedSeedParticipantIds === void 0 ? void 0 : placedSeedParticipantIds.includes(assignment.participantId);
-    }).map(function (assignment) { return assignment.seedNumber; });
+    var placedSeedNumbers = seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.filter(function (assignment) { return placedSeedParticipantIds === null || placedSeedParticipantIds === void 0 ? void 0 : placedSeedParticipantIds.includes(assignment.participantId); }).map(function (assignment) { return assignment.seedNumber; });
     var blockSeedNumbers = (nextSeedBlock === null || nextSeedBlock === void 0 ? void 0 : nextSeedBlock.seedNumbers) || [];
     // unplacedSeedNumbers and unplacedSeedNumberIds will only be used
     // when policy specifies that seedNumbers/seedValues must be unique
     var unplacedSeedNumbers = blockSeedNumbers.filter(function (seedNumber) { return !(placedSeedNumbers === null || placedSeedNumbers === void 0 ? void 0 : placedSeedNumbers.includes(seedNumber)); });
-    var unplacedSeedNumberIds = seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.filter(function (assignment) {
-        return unplacedSeedNumbers.includes(assignment.seedNumber);
-    }).map(function (assignment) { return assignment.participantId; });
+    var unplacedSeedNumberIds = seedAssignments === null || seedAssignments === void 0 ? void 0 : seedAssignments.filter(function (assignment) { return unplacedSeedNumbers.includes(assignment.seedNumber); }).map(function (assignment) { return assignment.participantId; });
     var duplicateSeedNumbers = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.seeding) === null || _c === void 0 ? void 0 : _c.duplicateSeedNumbers;
     var allowsDuplicateSeedNumbers = duplicateSeedNumbers !== undefined ? duplicateSeedNumbers : true;
     var unplacedSeedParticipantIds = allowsDuplicateSeedNumbers
@@ -19111,12 +19029,8 @@ function getNextSeedBlock(params) {
     };
     function randomlySelectLowestSeedValue(assignments, selectedParticipantIds) {
         var filteredAssignments = assignments.filter(function (assignment) { return !selectedParticipantIds.includes(assignment.participantId); });
-        var lowestSeedValue = Math.min.apply(Math, __spreadArray([], __read(filteredAssignments.map(function (assignment) {
-            return getNumericSeedValue(assignment.seedValue);
-        })), false));
-        var assignmentsWithLowestSeedValue = filteredAssignments.filter(function (assignment) {
-            return getNumericSeedValue(assignment.seedValue) === lowestSeedValue;
-        });
+        var lowestSeedValue = Math.min.apply(Math, __spreadArray([], __read(filteredAssignments.map(function (assignment) { return getNumericSeedValue(assignment.seedValue); })), false));
+        var assignmentsWithLowestSeedValue = filteredAssignments.filter(function (assignment) { return getNumericSeedValue(assignment.seedValue) === lowestSeedValue; });
         var randomizedAssignments = shuffleArray(assignmentsWithLowestSeedValue);
         return randomizedAssignments.pop();
     }
@@ -19150,9 +19064,7 @@ function assignSeed(_a) {
             context: { participantId: participantId },
             stack: stack,
         });
-    var flightsCount = event
-        ? (_c = (_b = getFlightProfile({ event: event }).flightProfile) === null || _b === void 0 ? void 0 : _b.flights) === null || _c === void 0 ? void 0 : _c.length
-        : 0;
+    var flightsCount = event ? (_c = (_b = getFlightProfile({ event: event }).flightProfile) === null || _b === void 0 ? void 0 : _b.flights) === null || _c === void 0 ? void 0 : _c.length : 0;
     var flighted = flightsCount && flightsCount > 1;
     var relevantAssignment = positionAssignments === null || positionAssignments === void 0 ? void 0 : positionAssignments.find(function (assignment) { return assignment.participantId === participantId; });
     var assignedDrawPosition = relevantAssignment === null || relevantAssignment === void 0 ? void 0 : relevantAssignment.drawPosition;
@@ -19178,8 +19090,7 @@ function assignSeed(_a) {
     var success;
     seedAssignments.forEach(function (assignment) {
         // ensure that this participantId is not assigned to any other seedNumber
-        if (assignment.participantId === participantId &&
-            assignment.seedNumber !== seedNumber) {
+        if (assignment.participantId === participantId && assignment.seedNumber !== seedNumber) {
             assignment.participantId = undefined;
         }
         // assign participantId to target seedNumber
@@ -20128,8 +20039,8 @@ function getTieMatchUpContext(_a) {
         drawDefinition: drawDefinition,
         matchUpsMap: matchUpsMap,
     }).matchUp;
-    var sideParticipantIds = (_c = (_b = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _b === void 0 ? void 0 : _b.map(extractAttributes('participantId'))) !== null && _c !== void 0 ? _c : [];
-    var assignedParticipantIds = (_d = relevantAssignments === null || relevantAssignments === void 0 ? void 0 : relevantAssignments.map(extractAttributes('participantId'))) !== null && _d !== void 0 ? _d : [];
+    var sideParticipantIds = (_c = (_b = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _b === void 0 ? void 0 : _b.map(xa('participantId'))) !== null && _c !== void 0 ? _c : [];
+    var assignedParticipantIds = (_d = relevantAssignments === null || relevantAssignments === void 0 ? void 0 : relevantAssignments.map(xa('participantId'))) !== null && _d !== void 0 ? _d : [];
     var participantIds = __spreadArray(__spreadArray([], __read(sideParticipantIds), false), __read(assignedParticipantIds), false);
     var teamParticipants = getParticipants({
         tournamentRecord: tournamentRecord,
@@ -20935,12 +20846,7 @@ function assignTieMatchUpParticipantId(params) {
         return decorateResult({ result: { error: INVALID_SIDE_NUMBER }, stack: stack });
     }
     var inContextDualMatchUp = matchUpContext.inContextDualMatchUp, inContextTieMatchUp = matchUpContext.inContextTieMatchUp, relevantAssignments = matchUpContext.relevantAssignments, collectionPosition = matchUpContext.collectionPosition, teamParticipants = matchUpContext.teamParticipants, collectionId = matchUpContext.collectionId, matchUpType = matchUpContext.matchUpType, dualMatchUp = matchUpContext.dualMatchUp, tieFormat = matchUpContext.tieFormat;
-    var allTieIndividualParticipantIds = (_b = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _b === void 0 ? void 0 : _b.flatMap(function (side) {
-        var _a, _b;
-        return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipantIds) ||
-            ((_b = side.participant) === null || _b === void 0 ? void 0 : _b.participantId) ||
-            [];
-    });
+    var allTieIndividualParticipantIds = (_b = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _b === void 0 ? void 0 : _b.flatMap(function (side) { var _a, _b; return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipantIds) || ((_b = side.participant) === null || _b === void 0 ? void 0 : _b.participantId) || []; });
     if (allTieIndividualParticipantIds === null || allTieIndividualParticipantIds === void 0 ? void 0 : allTieIndividualParticipantIds.includes(participantId)) {
         return decorateResult({ result: __assign({}, SUCCESS), stack: stack });
     }
@@ -20973,11 +20879,10 @@ function assignTieMatchUpParticipantId(params) {
         return { error: INVALID_PARTICIPANT_TYPE };
     }
     var relevantParticipantIds = participantType === INDIVIDUAL ? [participantId] : individualParticipantIds;
-    var participantTeam = (teamParticipantId &&
-        (teamParticipants === null || teamParticipants === void 0 ? void 0 : teamParticipants.find(function (_a) {
-            var participantId = _a.participantId;
-            return participantId === teamParticipantId;
-        }))) ||
+    var participantTeam = (teamParticipantId && (teamParticipants === null || teamParticipants === void 0 ? void 0 : teamParticipants.find(function (_a) {
+        var participantId = _a.participantId;
+        return participantId === teamParticipantId;
+    }))) ||
         (teamParticipants === null || teamParticipants === void 0 ? void 0 : teamParticipants.find(function (_a) {
             var individualParticipantIds = _a.individualParticipantIds;
             return overlap(relevantParticipantIds, individualParticipantIds);
@@ -20991,7 +20896,7 @@ function assignTieMatchUpParticipantId(params) {
     var teamAssignment = relevantAssignments === null || relevantAssignments === void 0 ? void 0 : relevantAssignments.find(function (assignment) { return assignment.participantId === (participantTeam === null || participantTeam === void 0 ? void 0 : participantTeam.participantId); });
     var teamDrawPosition = teamAssignment === null || teamAssignment === void 0 ? void 0 : teamAssignment.drawPosition;
     var teamSide = (_o = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _o === void 0 ? void 0 : _o.find(function (side) { return side.drawPosition === teamDrawPosition; });
-    var sideNumber = (_p = params.sideNumber) !== null && _p !== void 0 ? _p : teamSide === null || teamSide === void 0 ? void 0 : teamSide.sideNumber;
+    var sideNumber = (_p = teamSide === null || teamSide === void 0 ? void 0 : teamSide.sideNumber) !== null && _p !== void 0 ? _p : params.sideNumber;
     if (!tieFormat) {
         return { error: MISSING_TIE_FORMAT };
     }
@@ -21022,9 +20927,7 @@ function assignTieMatchUpParticipantId(params) {
     var assignedParticipantIds = targetAssignments === null || targetAssignments === void 0 ? void 0 : targetAssignments.map(function (assignment) { return assignment === null || assignment === void 0 ? void 0 : assignment.participantId; });
     // participantIds is an array of ids for individual team participants whose assignments should be modified
     var participantIds = ((assignedParticipantIds === null || assignedParticipantIds === void 0 ? void 0 : assignedParticipantIds.length) > 1 && assignedParticipantIds) ||
-        (participantType === PAIR
-            ? participantToAssign.individualParticipantIds
-            : [participantId]);
+        (participantType === PAIR ? participantToAssign.individualParticipantIds : [participantId]);
     // first filter out any collectionAssignment with equivalent collectionId/collectionPosition/participantId
     var removeResult = removeCollectionAssignments({
         collectionPosition: collectionPosition,
@@ -21228,8 +21131,7 @@ function removeTieMatchUpParticipantId(params) {
     if (!side)
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
     if (!((_g = side.substitutions) === null || _g === void 0 ? void 0 : _g.length) &&
-        (checkScoreHasValue({ score: inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.score }) ||
-            (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.winningSide)))
+        (checkScoreHasValue({ score: inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.score }) || (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.winningSide)))
         return decorateResult({ result: { error: EXISTING_OUTCOME }, stack: stack });
     var teamParticipantId = (_j = (_h = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _h === void 0 ? void 0 : _h.find(function (_a) {
         var sideNumber = _a.sideNumber;
@@ -21247,9 +21149,7 @@ function removeTieMatchUpParticipantId(params) {
     if (matchUpType === SINGLES && participantToRemove.participantType === PAIR) {
         return decorateResult({ result: { error: INVALID_PARTICIPANT }, stack: stack });
     }
-    var participantIds = participantToRemove.participantType === INDIVIDUAL
-        ? [participantId]
-        : participantToRemove.individualParticipantIds;
+    var participantIds = participantToRemove.participantType === INDIVIDUAL ? [participantId] : participantToRemove.individualParticipantIds;
     ensureSideLineUps({
         tournamentId: tournamentRecord.tournamentId,
         eventId: event.eventId,
@@ -21261,11 +21161,10 @@ function removeTieMatchUpParticipantId(params) {
         var sideNumber = _a.sideNumber;
         return sideNumber === side.sideNumber;
     });
-    if (!dualMatchUpSide &&
-        (((_o = dualMatchUp.sides) === null || _o === void 0 ? void 0 : _o.filter(function (_a) {
-            var lineUp = _a.lineUp;
-            return !lineUp;
-        }).length) || 0) < 2) {
+    if (!dualMatchUpSide && (((_o = dualMatchUp.sides) === null || _o === void 0 ? void 0 : _o.filter(function (_a) {
+        var lineUp = _a.lineUp;
+        return !lineUp;
+    }).length) || 0) < 2) {
         var drawPositionMap_1 = teamParticipants === null || teamParticipants === void 0 ? void 0 : teamParticipants.map(function (_a) {
             var _b;
             var teamParticipantId = _a.participantId;
@@ -21279,7 +21178,8 @@ function removeTieMatchUpParticipantId(params) {
             return ((_a = drawPositionMap_1 === null || drawPositionMap_1 === void 0 ? void 0 : drawPositionMap_1.find(function (_a) {
                 var drawPosition = _a.drawPosition;
                 return drawPosition === side.drawPosition;
-            })) === null || _a === void 0 ? void 0 : _a.teamParticipantId) === teamParticipantId;
+            })) === null || _a === void 0 ? void 0 : _a.teamParticipantId) ===
+                teamParticipantId;
         });
     }
     if (!dualMatchUpSide) {
@@ -21306,8 +21206,7 @@ function removeTieMatchUpParticipantId(params) {
         });
     // if an INDIVIDUAL participant is being removed from a DOUBLES matchUp
     // ...then the PAIR participant may need to be modified
-    if (matchUpType === DOUBLES &&
-        participantToRemove.participantType === INDIVIDUAL) {
+    if (matchUpType === DOUBLES && participantToRemove.participantType === INDIVIDUAL) {
         var tieMatchUpSide = (_q = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _q === void 0 ? void 0 : _q.find(function (side) { return side.sideNumber === (dualMatchUpSide === null || dualMatchUpSide === void 0 ? void 0 : dualMatchUpSide.sideNumber); });
         var pairParticipantId = (tieMatchUpSide !== null && tieMatchUpSide !== void 0 ? tieMatchUpSide : {}).participantId;
         var pairParticipant = pairParticipantId &&
@@ -22734,7 +22633,7 @@ function updateTieFormat(_a) {
             if (change.countChange > 0) {
                 var collectionPositionOffset = Math.max.apply(Math, __spreadArray([0], __read(matchUp.tieMatchUps
                     .filter(function (tieMatchUp) { return tieMatchUp.collectionId === change.collectionId; })
-                    .map(extractAttributes('collectionPosition'))), false));
+                    .map(xa('collectionPosition'))), false));
                 var collectionDefinition = tieFormat.collectionDefinitions.find(function (def) { return def.collectionId === change.collectionId; });
                 var newMatchUps = generateCollectionMatchUps({
                     matchUpsLimit: change.countChange,
@@ -22783,7 +22682,7 @@ function getMatchUpChangesArePossible(_a) {
         var collectionId = _a.collectionId, countChange = _a.countChange;
         var toBePlayedTieMatchUpIds = matchUp.tieMatchUps
             .filter(function (tieMatchUp) { return tieMatchUp.collectionId === collectionId && tieMatchUp.matchUpStatus === TO_BE_PLAYED; })
-            .map(extractAttributes('matchUpId'));
+            .map(xa('matchUpId'));
         var possibleToChange = toBePlayedTieMatchUpIds.length + countChange >= 0 || countChange > 0;
         if (!possibleToChange && countChange < 0)
             cannotChangeReaon = 'Insufficient TO_BE_PLAYED matchUps';
@@ -24940,7 +24839,9 @@ function getUnseededByePositions(_a) {
     var relevantMatchUps = structure.structureType === CONTAINER ? matchUps : firstRoundMatchUps;
     var relevantDrawPositions = unique([].concat.apply([], __spreadArray([], __read(relevantMatchUps.map(function (matchUp) { return matchUp.drawPositions; })), false)));
     var drawPositionOffset = Math.min.apply(Math, __spreadArray([], __read(relevantDrawPositions), false)) - 1;
-    var filledRelevantDrawPositions = filledDrawPositions === null || filledDrawPositions === void 0 ? void 0 : filledDrawPositions.filter(function (drawPosition) { return relevantDrawPositions.includes(drawPosition); });
+    var filledRelevantDrawPositions = filledDrawPositions === null || filledDrawPositions === void 0 ? void 0 : filledDrawPositions.filter(function (drawPosition) {
+        return relevantDrawPositions.includes(drawPosition);
+    });
     var getHalves = function (chunk) {
         var halfLength = Math.ceil(chunk.length / 2);
         var halves = [chunk.slice(0, halfLength), chunk.slice(halfLength)];
@@ -24960,25 +24861,15 @@ function getUnseededByePositions(_a) {
         var _b = getHalves(greaterHalf), greaterQuarter = _b.greaterHalf, lesserQuarter = _b.lesserHalf;
         var shuffledQuarter = shuffleArray(greaterQuarter.flat(Infinity));
         var drawPosition = shuffledQuarter.pop();
-        var diminishedQuarter = greaterQuarter
-            .flat()
-            .filter(function (position) { return position !== drawPosition; });
-        var newlyFilteredChunks = __spreadArray(__spreadArray(__spreadArray([], __read(lesserHalf), false), __read(lesserQuarter), false), [
-            diminishedQuarter,
-        ], false);
+        var diminishedQuarter = greaterQuarter.flat().filter(function (position) { return position !== drawPosition; });
+        var newlyFilteredChunks = __spreadArray(__spreadArray(__spreadArray([], __read(lesserHalf), false), __read(lesserQuarter), false), [diminishedQuarter], false);
         return { newlyFilteredChunks: newlyFilteredChunks, drawPosition: drawPosition };
     };
-    var notSeedByePosition = function (drawPosition) {
-        return !seedOrderByePositions.includes(drawPosition);
-    };
-    var unfilledDrawPosition = function (drawPosition) {
-        return !(filledRelevantDrawPositions === null || filledRelevantDrawPositions === void 0 ? void 0 : filledRelevantDrawPositions.includes(drawPosition));
-    };
+    var notSeedByePosition = function (drawPosition) { return !seedOrderByePositions.includes(drawPosition); };
+    var unfilledDrawPosition = function (drawPosition) { return !(filledRelevantDrawPositions === null || filledRelevantDrawPositions === void 0 ? void 0 : filledRelevantDrawPositions.includes(drawPosition)); };
     var quarterSeparateBlock = function (block) {
         var sortedChunked = chunkArray(block.sort(numericSort), Math.ceil(block.length / 4));
-        var filteredChunks = sortedChunked.map(function (chunk) {
-            return chunk.filter(unfilledDrawPosition);
-        });
+        var filteredChunks = sortedChunked.map(function (chunk) { return chunk.filter(unfilledDrawPosition); });
         var drawPositionCount = [].concat.apply([], __spreadArray([], __read(filteredChunks.flat(Infinity)), false)).length;
         var orderedDrawPositions = [];
         for (var i = 0; i < drawPositionCount; i++) {
@@ -24998,10 +24889,7 @@ function getUnseededByePositions(_a) {
         drawDefinition: drawDefinition,
         structure: structure,
     }).validSeedBlocks;
-    var validBlockDrawPositions = validSeedBlocks === null || validSeedBlocks === void 0 ? void 0 : validSeedBlocks.map(function (block) {
-        var _a;
-        return (_a = block.drawPositions) === null || _a === void 0 ? void 0 : _a.map(function (drawPosition) { return drawPosition + drawPositionOffset; });
-    });
+    var validBlockDrawPositions = validSeedBlocks === null || validSeedBlocks === void 0 ? void 0 : validSeedBlocks.map(function (block) { var _a; return (_a = block.drawPositions) === null || _a === void 0 ? void 0 : _a.map(function (drawPosition) { return drawPosition + drawPositionOffset; }); });
     var unfilledSeedBlocks;
     if (isFeedIn) {
         // FEED_IN structures calculate seedDrawPositions uniquely
@@ -25014,15 +24902,10 @@ function getUnseededByePositions(_a) {
         var blockDrawPositions = seedBlocks.map(function (seedBlock) {
             return seedBlock.map(function (drawPosition) { return drawPosition + drawPositionOffset; });
         });
-        unfilledSeedBlocks = blockDrawPositions
-            .map(quarterSeparateBlock)
-            .filter(function (block) { return block.length; });
+        unfilledSeedBlocks = blockDrawPositions.map(quarterSeparateBlock).filter(function (block) { return block.length; });
     }
     else if (isQualifying) {
-        // if qualifying don't quarter/halve separate because seeding is WATERFALL
-        unfilledSeedBlocks = validBlockDrawPositions === null || validBlockDrawPositions === void 0 ? void 0 : validBlockDrawPositions.map(function (block) {
-            return block.filter(unfilledDrawPosition);
-        });
+        unfilledSeedBlocks = validBlockDrawPositions === null || validBlockDrawPositions === void 0 ? void 0 : validBlockDrawPositions.map(function (block) { return block.filter(unfilledDrawPosition); });
     }
     else {
         unfilledSeedBlocks = validBlockDrawPositions === null || validBlockDrawPositions === void 0 ? void 0 : validBlockDrawPositions.map(quarterSeparateBlock).filter(function (block) { return block.length; });
@@ -27320,7 +27203,7 @@ function findTournamentId(_a) {
 function createSubOrderMap(_a) {
     var positionAssignments = _a.positionAssignments;
     var subOrderArray = (positionAssignments || [])
-        .filter(extractAttributes(PARTICIPANT_ID))
+        .filter(xa(PARTICIPANT_ID))
         .map(function (assignment) {
         var extension = findExtension({
             element: assignment,
@@ -31154,16 +31037,14 @@ function removeStructure(_a) {
         return stage === MAIN && stageSequence === 1;
     });
     var isMainStageSequence1 = structureId === (mainStageSequence1 === null || mainStageSequence1 === void 0 ? void 0 : mainStageSequence1.structureId);
-    var qualifyingStructureIds = structures
-        .filter(function (_a) {
+    var qualifyingStructureIds = structures.filter(function (_a) {
         var stage = _a.stage;
         return stage === QUALIFYING;
-    })
-        .map(extractAttributes('structureId'));
+    }).map(xa('structureId'));
     if (isMainStageSequence1 && !qualifyingStructureIds.length) {
         return { error: CANNOT_REMOVE_MAIN_STRUCTURE };
     }
-    var structureIds = structures.map(extractAttributes('structureId'));
+    var structureIds = structures.map(xa('structureId'));
     var removedMatchUpIds = [];
     var getTargetedStructureIds = function (structureId) {
         var _a, _b;
@@ -31188,9 +31069,7 @@ function removeStructure(_a) {
             ? getQualifyingSourceStructureIds(id)
             : getTargetedStructureIds(id));
     });
-    var idsToRemove = isMainStageSequence1
-        ? relatedStructureIdsMap.get(structureId)
-        : [structureId];
+    var idsToRemove = isMainStageSequence1 ? relatedStructureIdsMap.get(structureId) : [structureId];
     var _loop_1 = function () {
         var idBeingRemoved = idsToRemove.pop();
         var structure_1 = findStructure({
@@ -31201,10 +31080,7 @@ function removeStructure(_a) {
         var matchUpIds = getMatchUpIds(matchUps_1);
         removedMatchUpIds.push.apply(removedMatchUpIds, __spreadArray([], __read(matchUpIds), false));
         drawDefinition.links =
-            (_g = (_f = drawDefinition.links) === null || _f === void 0 ? void 0 : _f.filter(function (link) {
-                return link.source.structureId !== idBeingRemoved &&
-                    link.target.structureId !== idBeingRemoved;
-            })) !== null && _g !== void 0 ? _g : [];
+            (_g = (_f = drawDefinition.links) === null || _f === void 0 ? void 0 : _f.filter(function (link) { return link.source.structureId !== idBeingRemoved && link.target.structureId !== idBeingRemoved; })) !== null && _g !== void 0 ? _g : [];
         if (!isMainStageSequence1 ||
             (isMainStageSequence1 && qualifyingStructureIds.length) ||
             idBeingRemoved !== structureId) {
@@ -31217,8 +31093,7 @@ function removeStructure(_a) {
         var targetedStructureIds = idBeingRemoved &&
             ((_j = relatedStructureIdsMap.get(idBeingRemoved)) === null || _j === void 0 ? void 0 : _j.filter(function (id) {
                 // IMPORTANT: only delete MAIN stageSequence: 1 if specified to protect against DOUBLE_ELIMINATION scenario
-                return id !== (mainStageSequence1 === null || mainStageSequence1 === void 0 ? void 0 : mainStageSequence1.structureId) ||
-                    structureId === mainStageSequence1.structureId;
+                return id !== (mainStageSequence1 === null || mainStageSequence1 === void 0 ? void 0 : mainStageSequence1.structureId) || structureId === mainStageSequence1.structureId;
             }));
         if (targetedStructureIds === null || targetedStructureIds === void 0 ? void 0 : targetedStructureIds.length)
             idsToRemove.push.apply(idsToRemove, __spreadArray([], __read(targetedStructureIds), false));
@@ -31229,18 +31104,16 @@ function removeStructure(_a) {
     // now get all remaining matchUps in the draw
     var matchUps = getAllDrawMatchUps({ drawDefinition: drawDefinition }).matchUps;
     matchUps === null || matchUps === void 0 ? void 0 : matchUps.forEach(function (matchUp) {
-        if (matchUp.winnerMatchUpId &&
-            removedMatchUpIds.includes(matchUp.winnerMatchUpId)) {
+        if (matchUp.winnerMatchUpId && removedMatchUpIds.includes(matchUp.winnerMatchUpId)) {
             delete matchUp.winnerMatchUpId;
         }
-        if (matchUp.loserMatchUpId &&
-            removedMatchUpIds.includes(matchUp.loserMatchUpId)) {
+        if (matchUp.loserMatchUpId && removedMatchUpIds.includes(matchUp.loserMatchUpId)) {
             delete matchUp.loserMatchUpId;
         }
     });
     // if this is MAIN stageSequence: 1 there must be qualifying, return to empty state
     if (isMainStageSequence1) {
-        var mainStageSequence1MatchUpIds = (_l = ((_k = mainStageSequence1.matchUps) !== null && _k !== void 0 ? _k : [])) === null || _l === void 0 ? void 0 : _l.map(extractAttributes('matchUpId'));
+        var mainStageSequence1MatchUpIds = (_l = ((_k = mainStageSequence1.matchUps) !== null && _k !== void 0 ? _k : [])) === null || _l === void 0 ? void 0 : _l.map(xa('matchUpId'));
         removedMatchUpIds.push.apply(removedMatchUpIds, __spreadArray([], __read(mainStageSequence1MatchUpIds), false));
         mainStageSequence1.positionAssignments = [];
         mainStageSequence1.seedAssignments = [];
@@ -34354,9 +34227,7 @@ function attachStructures(_a) {
     if (newStructures.length)
         (_b = drawDefinition.structures).push.apply(_b, __spreadArray([], __read(newStructures), false));
     addGoesTo({ drawDefinition: drawDefinition });
-    var matchUps = structures
-        .map(function (structure) { var _a; return ((_a = getAllStructureMatchUps({ structure: structure })) === null || _a === void 0 ? void 0 : _a.matchUps) || []; })
-        .flat();
+    var matchUps = structures.map(function (structure) { var _a; return ((_a = getAllStructureMatchUps({ structure: structure })) === null || _a === void 0 ? void 0 : _a.matchUps) || []; }).flat();
     addMatchUpsNotice({
         tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
         eventId: event === null || event === void 0 ? void 0 : event.eventId,
@@ -34388,13 +34259,8 @@ function attachStructures(_a) {
                     Object.assign(matchUp, attribs);
                     if (tieMatchUps === null || tieMatchUps === void 0 ? void 0 : tieMatchUps.length) {
                         var modifiedTieMatchUpsMap_1 = {};
-                        tieMatchUps.forEach(function (modifiedTieMatchUp) {
-                            return (modifiedMatchUpMap_1[modifiedTieMatchUp.matchUpId] =
-                                modifiedTieMatchUp);
-                        });
-                        matchUp.tieMatchUps.forEach(function (tm) {
-                            return Object.assign(tm, modifiedTieMatchUpsMap_1[tm.matchUpId]);
-                        });
+                        tieMatchUps.forEach(function (modifiedTieMatchUp) { return (modifiedMatchUpMap_1[modifiedTieMatchUp.matchUpId] = modifiedTieMatchUp); });
+                        matchUp.tieMatchUps.forEach(function (tm) { return Object.assign(tm, modifiedTieMatchUpsMap_1[tm.matchUpId]); });
                     }
                     modifiedMatchUpMap_1[matchUp.matchUpId].matchUp = matchUp;
                     modifyMatchUpNotice(modifiedMatchUpMap_1[matchUp.matchUpId]);
@@ -34426,7 +34292,7 @@ function attachStructures(_a) {
             }
         });
     }
-    var addedStructureIds = newStructures.map(extractAttributes('structureId'));
+    var addedStructureIds = newStructures.map(xa('structureId'));
     if (tournamentRecord) {
         var itemValue = { structureIds: structureIds, drawId: drawDefinition.drawId };
         var timeItem = {
@@ -35721,9 +35587,7 @@ function deleteAdHocMatchUps(_a) {
         return { error: STRUCTURE_NOT_FOUND };
     var existingMatchUps = structure === null || structure === void 0 ? void 0 : structure.matchUps;
     var structureHasRoundPositions = existingMatchUps === null || existingMatchUps === void 0 ? void 0 : existingMatchUps.find(function (matchUp) { return !!matchUp.roundPosition; });
-    if (structure.structures ||
-        structureHasRoundPositions ||
-        structure.finishingPosition === ROUND_OUTCOME) {
+    if (structure.structures || structureHasRoundPositions || structure.finishingPosition === ROUND_OUTCOME) {
         return { error: INVALID_STRUCTURE };
     }
     var matchUpIdsWithScoreValue = [];
@@ -35733,7 +35597,7 @@ function deleteAdHocMatchUps(_a) {
             matchUpIdsWithScoreValue.push(matchUpId);
         return matchUpIds.includes(matchUpId);
     })) !== null && _d !== void 0 ? _d : [];
-    var matchUpIdsToDelete = matchUpsToDelete.map(extractAttributes('matchUpId'));
+    var matchUpIdsToDelete = matchUpsToDelete.map(xa('matchUpId'));
     if (matchUpIdsToDelete.length) {
         structure.matchUps = ((_e = structure.matchUps) !== null && _e !== void 0 ? _e : []).filter(function (_a) {
             var matchUpId = _a.matchUpId;
@@ -35746,7 +35610,7 @@ function deleteAdHocMatchUps(_a) {
             eventId: event === null || event === void 0 ? void 0 : event.eventId,
             drawDefinition: drawDefinition,
         });
-        var roundNumbers = unique(structure.matchUps.map(extractAttributes('roundNumber')));
+        var roundNumbers = unique(structure.matchUps.map(xa('roundNumber')));
         var missingRoundNumbers = getMissingSequenceNumbers(roundNumbers);
         if (missingRoundNumbers.length) {
             missingRoundNumbers.reverse();
@@ -35897,7 +35761,7 @@ function modifyTieFormat(_a) {
         var collectionId = _a.collectionId;
         return !existingCollectionIds.includes(collectionId);
     });
-    var addedCollectionIds = addedCollectionDefinitions.map(extractAttributes('collectionId'));
+    var addedCollectionIds = addedCollectionDefinitions.map(xa('collectionId'));
     var modifications = [];
     var processedTieFormat;
     var tieFormatName = modifiedTieFormat.tieFormatName;
@@ -35987,19 +35851,13 @@ function modifyTieFormat(_a) {
         processedTieFormat.tieFormatName = tieFormatName;
         modifications.push({ tieFormatName: tieFormatName });
     }
-    else if (modifications.length ||
-        addedCollectionIds.length ||
-        removedCollectionIds.length) {
+    else if (modifications.length || addedCollectionIds.length || removedCollectionIds.length) {
         delete processedTieFormat.tieFormatName;
         modifications.push('tieFormatName removed: modifications without new tieFormatName');
     }
-    processedTieFormat.collectionDefinitions =
-        processedTieFormat.collectionDefinitions
-            .sort(function (a, b) {
-            return numericSortValue(a.collectionOrder) -
-                numericSortValue(b.collectionOrder);
-        })
-            .map(function (def, i) { return (__assign(__assign({}, def), { collectionOrder: i + 1 })); });
+    processedTieFormat.collectionDefinitions = processedTieFormat.collectionDefinitions
+        .sort(function (a, b) { return numericSortValue(a.collectionOrder) - numericSortValue(b.collectionOrder); })
+        .map(function (def, i) { return (__assign(__assign({}, def), { collectionOrder: i + 1 })); });
     return __assign({ processedTieFormat: copyTieFormat(processedTieFormat), modifications: modifications }, SUCCESS);
 }
 
@@ -37252,7 +37110,7 @@ function getEncounters(_a) {
     try {
         for (var matchUps_1 = __values(matchUps), matchUps_1_1 = matchUps_1.next(); !matchUps_1_1.done; matchUps_1_1 = matchUps_1.next()) {
             var matchUp = matchUps_1_1.value;
-            var participantIds = matchUp.sides.map(extractAttributes('participantId'));
+            var participantIds = matchUp.sides.map(xa('participantId'));
             if (participantIds.length === 2) {
                 var _c = __read(participantIds, 2), p1 = _c[0], p2 = _c[1];
                 var pairing = pairingHash(p1, p2);
@@ -38760,10 +38618,9 @@ function addFlight(_a) {
         return decorateResult({ result: { error: MISSING_VALUE }, stack: stack });
     if (drawEntries === null || drawEntries === void 0 ? void 0 : drawEntries.length) {
         // check that all drawEntries are in event.entries
-        var enteredParticipantIds = ((_b = event.entries) !== null && _b !== void 0 ? _b : []).map(extractAttributes('participantId'));
-        var flightParticipantIds = drawEntries.map(extractAttributes('participantId'));
-        if (intersection(flightParticipantIds, enteredParticipantIds).length !==
-            flightParticipantIds.length) {
+        var enteredParticipantIds = ((_b = event.entries) !== null && _b !== void 0 ? _b : []).map(xa('participantId'));
+        var flightParticipantIds = drawEntries.map(xa('participantId'));
+        if (intersection(flightParticipantIds, enteredParticipantIds).length !== flightParticipantIds.length) {
             return decorateResult({ result: { error: INVALID_VALUES }, stack: stack });
         }
     }
@@ -42337,7 +42194,7 @@ function generateDrawDefinition(params) {
                 var entryStage = _a.entryStage, entryStatus = _a.entryStatus;
                 return (!entryStage || entryStage === MAIN) && entryStatus && STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
             });
-            var participantIds_1 = entries_2 === null || entries_2 === void 0 ? void 0 : entries_2.map(extractAttributes('participantId'));
+            var participantIds_1 = entries_2 === null || entries_2 === void 0 ? void 0 : entries_2.map(xa('participantId'));
             var matchUpsCount_1 = entries_2 ? Math.floor(entries_2.length / 2) : 0;
             generateRange(1, params.roundsCount + 1).forEach(function () {
                 var _a, _b, _c;
@@ -45467,8 +45324,7 @@ function generateScheduleTimes(_a) {
     if (tournamentRecord && !tournamentRecords) {
         tournamentRecords = (_b = {}, _b[tournamentRecord.tournamentId] = tournamentRecord, _b);
     }
-    if (typeof tournamentRecords !== 'object' ||
-        !Object.keys(tournamentRecords).length)
+    if (typeof tournamentRecords !== 'object' || !Object.keys(tournamentRecords).length)
         return { error: MISSING_TOURNAMENT_RECORDS };
     periodLength =
         periodLength !== null && periodLength !== void 0 ? periodLength : calculatePeriodLength({
@@ -45481,10 +45337,8 @@ function generateScheduleTimes(_a) {
         tournamentRecords: tournamentRecords,
     }), allCourts = _e.courts, venues = _e.venues;
     var courts = (_c = allCourts === null || allCourts === void 0 ? void 0 : allCourts.filter(function (court) { return !venueIds || venueIds.includes(court.venueId); })) !== null && _c !== void 0 ? _c : [];
-    startTime =
-        startTime !== null && startTime !== void 0 ? startTime : getDateTimeBoundary({ courts: courts, scheduleDate: scheduleDate, startTime: true });
-    endTime =
-        endTime !== null && endTime !== void 0 ? endTime : getDateTimeBoundary({ courts: courts, scheduleDate: scheduleDate, endTime: true });
+    startTime = startTime !== null && startTime !== void 0 ? startTime : getDateTimeBoundary({ courts: courts, scheduleDate: scheduleDate, startTime: true });
+    endTime = endTime !== null && endTime !== void 0 ? endTime : getDateTimeBoundary({ courts: courts, scheduleDate: scheduleDate, endTime: true });
     var _f = generateBookings({
         defaultRecoveryMinutes: defaultRecoveryMinutes,
         averageMatchUpMinutes: averageMatchUpMinutes,
@@ -45508,10 +45362,8 @@ function generateScheduleTimes(_a) {
     };
     var scheduleTimes = getScheduleTimes(timingParameters).scheduleTimes;
     // if a single venue specified, or only one venue available, return venueId
-    var venueId = ((venueIds === null || venueIds === void 0 ? void 0 : venueIds.length) === 1 && venueIds[0]) ||
-        ((venues === null || venues === void 0 ? void 0 : venues.length) === 1 && venues[0].venueId) ||
-        undefined;
-    var dateScheduledMatchUpIds = dateScheduledMatchUps === null || dateScheduledMatchUps === void 0 ? void 0 : dateScheduledMatchUps.map(extractAttributes('matchUpId'));
+    var venueId = ((venueIds === null || venueIds === void 0 ? void 0 : venueIds.length) === 1 && venueIds[0]) || ((venues === null || venues === void 0 ? void 0 : venues.length) === 1 && venues[0].venueId) || undefined;
+    var dateScheduledMatchUpIds = dateScheduledMatchUps === null || dateScheduledMatchUps === void 0 ? void 0 : dateScheduledMatchUps.map(xa('matchUpId'));
     return {
         dateScheduledMatchUpIds: dateScheduledMatchUpIds,
         dateScheduledMatchUps: dateScheduledMatchUps,
@@ -49331,13 +49183,9 @@ function generateFlightDrawDefinitions(_a) {
             var drawProfile = drawProfiles[index];
             var _k = drawProfile || {}, seedsCount = _k.seedsCount, _l = _k.generate, generate = _l === void 0 ? true : _l;
             if (generate) {
-                var drawParticipantIds_1 = drawEntries
-                    .filter(extractAttributes(PARTICIPANT_ID))
-                    .map(extractAttributes(PARTICIPANT_ID));
+                var drawParticipantIds_1 = drawEntries.filter(xa(PARTICIPANT_ID)).map(xa(PARTICIPANT_ID));
                 var seedingScaleName_1 = categoryName || eventName;
-                if (tournamentRecord &&
-                    seedsCount &&
-                    seedsCount <= drawParticipantIds_1.length) {
+                if (tournamentRecord && seedsCount && seedsCount <= drawParticipantIds_1.length) {
                     var scaleValues = generateRange(1, seedsCount + 1);
                     scaleValues.forEach(function (scaleValue, index) {
                         var scaleItem = {
@@ -49367,9 +49215,7 @@ function generateFlightDrawDefinitions(_a) {
                 if (Array.isArray(drawExtensions)) {
                     drawExtensions
                         .filter(isValidExtension)
-                        .forEach(function (extension) {
-                        return addExtension({ element: drawDefinition_1, extension: extension });
-                    });
+                        .forEach(function (extension) { return addExtension({ element: drawDefinition_1, extension: extension }); });
                 }
                 result = addDrawDefinition({
                     suppressNotifications: true,
@@ -49415,14 +49261,10 @@ function generateFlightDrawDefinitions(_a) {
                         });
                         if (result_3.error)
                             return { value: { error: result_3.error, drawIds: [] } };
-                        var playoffCompletionGoal = completionGoal
-                            ? completionGoal - (completedCount !== null && completedCount !== void 0 ? completedCount : 0)
-                            : undefined;
+                        var playoffCompletionGoal = completionGoal ? completionGoal - (completedCount !== null && completedCount !== void 0 ? completedCount : 0) : undefined;
                         result_3 = completeDrawMatchUps({
                             completeAllMatchUps: !completionGoal && completeAllMatchUps,
-                            completionGoal: completionGoal
-                                ? playoffCompletionGoal
-                                : undefined,
+                            completionGoal: completionGoal ? playoffCompletionGoal : undefined,
                             matchUpStatusProfile: matchUpStatusProfile,
                             randomWinningSide: randomWinningSide,
                             tournamentRecord: tournamentRecord,
@@ -49693,7 +49535,7 @@ function generateEventWithFlights(params) {
         drawIds = drawDefinitionResult.drawIds;
     }
     else if ((_d = eventProfile === null || eventProfile === void 0 ? void 0 : eventProfile.participantsProfile) === null || _d === void 0 ? void 0 : _d.participantsCount) {
-        var eventParticipantIds = uniqueDrawParticipants.map(extractAttributes('participantId'));
+        var eventParticipantIds = uniqueDrawParticipants.map(xa('participantId'));
         if (eventParticipantIds.length) {
             var result = addEventEntries({
                 participantIds: eventParticipantIds,
@@ -51548,7 +51390,7 @@ function mergeParticipants(_a) {
     if (!tournamentRecord.participants)
         tournamentRecord.participants = [];
     var mappedParticipants = incomingParticipants
-        .filter(extractAttributes(PARTICIPANT_ID))
+        .filter(xa(PARTICIPANT_ID))
         .map(function (p) {
         var _a;
         return (_a = {}, _a[p.participantId] = p, _a);
@@ -51564,7 +51406,7 @@ function mergeParticipants(_a) {
         }
         return participant;
     });
-    var existingParticipantIds = tournamentRecord.participants.map(extractAttributes(PARTICIPANT_ID)) || [];
+    var existingParticipantIds = tournamentRecord.participants.map(xa(PARTICIPANT_ID)) || [];
     var newParticipants = incomingParticipants.filter(function (_a) {
         var participantId = _a.participantId;
         return !existingParticipantIds.includes(participantId);
@@ -51605,7 +51447,7 @@ function addPenalty(params) {
             var participants = (_e = getParticipants({
                 tournamentRecord: tournamentRecord_1,
             }).participants) !== null && _e !== void 0 ? _e : [];
-            var tournamentParticipantIds = participants === null || participants === void 0 ? void 0 : participants.map(extractAttributes('participantId')).filter(function (participantId) { return participantIds.includes(participantId); });
+            var tournamentParticipantIds = participants === null || participants === void 0 ? void 0 : participants.map(xa('participantId')).filter(function (participantId) { return participantIds.includes(participantId); });
             if (tournamentParticipantIds.length) {
                 var result = penaltyAdd(__assign(__assign({}, params), { penaltyId: (_f = params.penaltyId) !== null && _f !== void 0 ? _f : penaltyId, tournamentRecord: tournamentRecord_1, participantIds: tournamentParticipantIds }));
                 penaltyId = result.penaltyId;
@@ -51619,8 +51461,7 @@ function addPenalty(params) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return penaltyId
-        ? __assign(__assign({}, SUCCESS), { penaltyId: penaltyId }) : { error: PARTICIPANT_NOT_FOUND };
+    return penaltyId ? __assign(__assign({}, SUCCESS), { penaltyId: penaltyId }) : { error: PARTICIPANT_NOT_FOUND };
 }
 function penaltyAdd(_a) {
     var _b;
@@ -51633,9 +51474,7 @@ function penaltyAdd(_a) {
         return { error: MISSING_PENALTY_TYPE };
     // TODO: add penalty timeItem to matchUp.timeItems[]
     var participants = (_b = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) !== null && _b !== void 0 ? _b : [];
-    var relevantParticipants = participants.filter(function (participant) {
-        return participantIds.includes(participant.participantId);
-    });
+    var relevantParticipants = participants.filter(function (participant) { return participantIds.includes(participant.participantId); });
     if (!relevantParticipants.length)
         return { error: PARTICIPANT_NOT_FOUND };
     var createdAt = new Date().toISOString();
@@ -51649,9 +51488,7 @@ function penaltyAdd(_a) {
         createdAt: createdAt,
     });
     if (Array.isArray(extensions)) {
-        extensions.forEach(function (extension) {
-            return addExtension({ element: penaltyItem, extension: extension });
-        });
+        extensions.forEach(function (extension) { return addExtension({ element: penaltyItem, extension: extension }); });
     }
     relevantParticipants.forEach(function (participant) {
         if (!participant.penalties)
@@ -54045,11 +53882,7 @@ function getValidLuckyLosersAction(_a) {
                 drawPosition: drawPosition,
                 matchUps: matchUps,
             }).initialRoundNumber;
-            var relevantLink_1 = (_g = drawDefinition.links) === null || _g === void 0 ? void 0 : _g.find(function (link) {
-                var _a;
-                return ((_a = link.target) === null || _a === void 0 ? void 0 : _a.structureId) === (structure === null || structure === void 0 ? void 0 : structure.structureId) &&
-                    link.target.roundNumber === initialRoundNumber_1;
-            });
+            var relevantLink_1 = (_g = drawDefinition.links) === null || _g === void 0 ? void 0 : _g.find(function (link) { var _a; return ((_a = link.target) === null || _a === void 0 ? void 0 : _a.structureId) === (structure === null || structure === void 0 ? void 0 : structure.structureId) && link.target.roundNumber === initialRoundNumber_1; });
             var sourceRoundNumber = (_h = relevantLink_1 === null || relevantLink_1 === void 0 ? void 0 : relevantLink_1.source) === null || _h === void 0 ? void 0 : _h.roundNumber;
             matchUpFilters.roundNumbers = [sourceRoundNumber];
         }
@@ -54059,18 +53892,14 @@ function getValidLuckyLosersAction(_a) {
             matchUpFilters: matchUpFilters,
             drawDefinition: drawDefinition,
         }).completedMatchUps;
-        var assignedParticipantIds = positionAssignments
-            .map(function (assignment) { return assignment.participantId; })
-            .filter(Boolean);
+        var assignedParticipantIds = positionAssignments.map(function (assignment) { return assignment.participantId; }).filter(Boolean);
         var availableParticipantIds = completedMatchUps === null || completedMatchUps === void 0 ? void 0 : completedMatchUps.filter(function (_a) {
             var matchUpType = _a.matchUpType, winningSide = _a.winningSide;
             return winningSide && ((event === null || event === void 0 ? void 0 : event.eventType) !== TEAM$2 || matchUpType === TEAM$2);
         }).map(function (_a) {
             var winningSide = _a.winningSide, sides = _a.sides;
             return winningSide && (sides === null || sides === void 0 ? void 0 : sides[1 - (winningSide - 1)]);
-        }).map(extractAttributes('participantId')).filter(function (participantId) {
-            return participantId && !assignedParticipantIds.includes(participantId);
-        });
+        }).map(xa('participantId')).filter(function (participantId) { return participantId && !assignedParticipantIds.includes(participantId); });
         availableParticipantIds === null || availableParticipantIds === void 0 ? void 0 : availableParticipantIds.forEach(function (participantId) {
             // ensure if 'restrictBySourceRound' is false and there are multiple links that participants aren't added multiple times
             if (!availableLuckyLoserParticipantIds.includes(participantId))
@@ -54090,9 +53919,7 @@ function getValidLuckyLosersAction(_a) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    var availableLuckyLosers = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) {
-        return availableLuckyLoserParticipantIds === null || availableLuckyLoserParticipantIds === void 0 ? void 0 : availableLuckyLoserParticipantIds.includes(participant.participantId);
-    });
+    var availableLuckyLosers = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) { return availableLuckyLoserParticipantIds === null || availableLuckyLoserParticipantIds === void 0 ? void 0 : availableLuckyLoserParticipantIds.includes(participant.participantId); });
     availableLuckyLosers === null || availableLuckyLosers === void 0 ? void 0 : availableLuckyLosers.forEach(function (luckyLoser) {
         var _a;
         var entry = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).find(function (entry) { return entry.participantId === luckyLoser.participantId; });
@@ -54248,9 +54075,7 @@ function getValidAssignmentActions(_a) {
     // if there are no unfilledPositions for available seeds then return all unfilled positions
     if (!(unfilledPositions === null || unfilledPositions === void 0 ? void 0 : unfilledPositions.length)) {
         unfilledPositions = positionAssignments
-            .filter(function (assignment) {
-            return !assignment.participantId && !assignment.bye && !assignment.qualifier;
-        })
+            .filter(function (assignment) { return !assignment.participantId && !assignment.bye && !assignment.qualifier; })
             .map(function (assignment) { return assignment.drawPosition; });
     }
     if (!isByePosition) {
@@ -54262,9 +54087,7 @@ function getValidAssignmentActions(_a) {
         });
     }
     if (isWinRatioFedStructure && ignoreSeedPositions) {
-        var assignedParticipantIds_1 = positionAssignments
-            .map(function (assignment) { return assignment.participantId; })
-            .filter(Boolean);
+        var assignedParticipantIds_1 = positionAssignments.map(function (assignment) { return assignment.participantId; }).filter(Boolean);
         var matchUpFilters = { structureIds: positionSourceStructureIds };
         var completedMatchUps = getDrawMatchUps({
             inContext: true,
@@ -54278,14 +54101,10 @@ function getValidAssignmentActions(_a) {
             return (event === null || event === void 0 ? void 0 : event.eventType) !== TEAM$2 || matchUpType === TEAM$2;
         })) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
             var sides = _a.sides;
-            return sides === null || sides === void 0 ? void 0 : sides.map(extractAttributes('participantId'));
-        }).flat().filter(function (participantId) {
-            return participantId && !assignedParticipantIds_1.includes(participantId);
-        }));
+            return sides === null || sides === void 0 ? void 0 : sides.map(xa('participantId'));
+        }).flat().filter(function (participantId) { return participantId && !assignedParticipantIds_1.includes(participantId); }));
         var participantsAvailable = returnParticipants
-            ? tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) {
-                return availableParticipantIds_1 === null || availableParticipantIds_1 === void 0 ? void 0 : availableParticipantIds_1.includes(participant.participantId);
-            }).map(function (participant) { return makeDeepCopy(participant, undefined, true); })
+            ? tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) { return availableParticipantIds_1 === null || availableParticipantIds_1 === void 0 ? void 0 : availableParticipantIds_1.includes(participant.participantId); }).map(function (participant) { return makeDeepCopy(participant, undefined, true); })
             : undefined;
         participantsAvailable === null || participantsAvailable === void 0 ? void 0 : participantsAvailable.forEach(function (participant) {
             var _a;
@@ -54309,9 +54128,7 @@ function getValidAssignmentActions(_a) {
         var availableParticipantIds_2;
         if (unplacedSeedAssignments === null || unplacedSeedAssignments === void 0 ? void 0 : unplacedSeedAssignments.length) {
             // return any valid seedAssignments
-            var validToAssign = unplacedSeedAssignments.filter(function (seedAssignment) {
-                return unplacedSeedParticipantIds === null || unplacedSeedParticipantIds === void 0 ? void 0 : unplacedSeedParticipantIds.includes(seedAssignment.participantId);
-            });
+            var validToAssign = unplacedSeedAssignments.filter(function (seedAssignment) { return unplacedSeedParticipantIds === null || unplacedSeedParticipantIds === void 0 ? void 0 : unplacedSeedParticipantIds.includes(seedAssignment.participantId); });
             validToAssign.sort(validAssignmentsSort);
             availableParticipantIds_2 = validToAssign.map(function (assignment) { return assignment.participantId; });
         }
@@ -54321,9 +54138,7 @@ function getValidAssignmentActions(_a) {
         }
         // add structureId and drawPosition to the payload so the client doesn't need to discover
         var participantsAvailable = returnParticipants
-            ? tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) {
-                return availableParticipantIds_2.includes(participant.participantId);
-            }).map(function (participant) { return makeDeepCopy(participant, undefined, true); })
+            ? tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) { return availableParticipantIds_2.includes(participant.participantId); }).map(function (participant) { return makeDeepCopy(participant, undefined, true); })
             : undefined;
         if (participantsAvailable === null || participantsAvailable === void 0 ? void 0 : participantsAvailable.length) {
             validAssignmentActions.push(definedAttributes({
@@ -54341,8 +54156,7 @@ function getValidAssignmentActions(_a) {
 function validAssignmentsSort(a, b) {
     if (a.bye)
         return -1;
-    if (getNumericSeedValue(a.seedValue) < getNumericSeedValue(b.seedValue) ||
-        (a.seedValue && !b.seedValue))
+    if (getNumericSeedValue(a.seedValue) < getNumericSeedValue(b.seedValue) || (a.seedValue && !b.seedValue))
         return -1;
     return (a.seedNumber || 0) - (b.seedNumber || 0);
 }
@@ -54778,16 +54592,260 @@ var matchUpActionConstants = {
     END: END,
 };
 
+function collectionMatchUpActions(_a) {
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var specifiedPolicyDefinitions = _a.specifiedPolicyDefinitions, inContextDrawMatchUps = _a.inContextDrawMatchUps, matchUpParticipantIds = _a.matchUpParticipantIds, matchUpActionsPolicy = _a.matchUpActionsPolicy, inContextMatchUp = _a.inContextMatchUp, policyActions = _a.policyActions, enforceGender = _a.enforceGender, participantId = _a.participantId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, matchUp = _a.matchUp, drawId = _a.drawId, side = _a.side;
+    var validActions = [];
+    var firstFoundSide = (_b = inContextMatchUp.sides) === null || _b === void 0 ? void 0 : _b.find(function (side) { return side.participant; });
+    var assignedGender = inContextMatchUp.gender === MIXED &&
+        inContextMatchUp.sideNumber &&
+        ((_c = inContextMatchUp.sides) === null || _c === void 0 ? void 0 : _c.filter(function (side) { return side.particiapntId; }).length) === 1 &&
+        ((_e = (_d = firstFoundSide === null || firstFoundSide === void 0 ? void 0 : firstFoundSide.participant) === null || _d === void 0 ? void 0 : _d.person) === null || _e === void 0 ? void 0 : _e.sex);
+    var matchUpType = inContextMatchUp.matchUpType;
+    var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_f = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _f === void 0 ? void 0 : _f.enforceGender) !== false;
+    var gender = genderEnforced ? inContextMatchUp.gender : undefined;
+    var allParticipants = (_g = inContextMatchUp.sides) === null || _g === void 0 ? void 0 : _g.flatMap(function (side) { var _a; return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants) || side.participant; }).filter(Boolean);
+    var allParticipantIds = allParticipants === null || allParticipants === void 0 ? void 0 : allParticipants.map(xa('participantId'));
+    var existingParticipants = (_h = inContextMatchUp.sides) === null || _h === void 0 ? void 0 : _h.filter(function (side) { return !sideNumber || side.sideNumber === sideNumber; }).flatMap(function (side) { var _a; return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants) || side.participant; }).filter(Boolean);
+    var existingParticipantIds = existingParticipants === null || existingParticipants === void 0 ? void 0 : existingParticipants.map(xa('participantId'));
+    var inContextDualMatchUp = inContextDrawMatchUps === null || inContextDrawMatchUps === void 0 ? void 0 : inContextDrawMatchUps.find(function (drawMatchUp) { return drawMatchUp.matchUpId === inContextMatchUp.matchUpTieId; });
+    var availableIndividualParticipants = (_j = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _j === void 0 ? void 0 : _j.map(function (side) {
+        var _a;
+        return (_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants.filter(function (_a) {
+            var participantId = _a.participantId, person = _a.person;
+            return !(existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.includes(participantId)) &&
+                (!gender ||
+                    gender === ANY ||
+                    person.sex === gender ||
+                    // case where one gendered member has been assigned
+                    (gender === MIXED && !assignedGender) ||
+                    (assignedGender && person.sex !== assignedGender));
+        });
+    });
+    // if no sideNumber is provided, segregate available by sideNumber and specify sideNumber
+    var availableParticipants = sideNumber
+        ? availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants[sideNumber - 1]
+        : availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants.map(function (available, i) { return ({
+            participants: available,
+            sideNumber: i + 1,
+        }); });
+    var availableParticipantIds = sideNumber
+        ? (_k = availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants[sideNumber - 1]) === null || _k === void 0 ? void 0 : _k.map(getParticipantId)
+        : availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants.map(function (available, i) { return ({
+            participants: available === null || available === void 0 ? void 0 : available.map(getParticipantId),
+            sideNumber: i + 1,
+        }); });
+    var assignmentAvailable = (sideNumber &&
+        ((matchUpType === SINGLES_MATCHUP && !(existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length)) ||
+            (matchUpType === DOUBLES_MATCHUP && ((_l = existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length) !== null && _l !== void 0 ? _l : 0) < 2))) ||
+        (!sideNumber &&
+            ((matchUpType === SINGLES_MATCHUP && ((_m = existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length) !== null && _m !== void 0 ? _m : 0) < 2) ||
+                (matchUpType === DOUBLES_MATCHUP && ((_o = existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length) !== null && _o !== void 0 ? _o : 0) < 4)));
+    // extra step to avoid edge case where individual participant is part of both teams
+    var availableIds = availableParticipantIds === null || availableParticipantIds === void 0 ? void 0 : availableParticipantIds.filter(function (id) { return !(allParticipantIds === null || allParticipantIds === void 0 ? void 0 : allParticipantIds.includes(id)); });
+    var available = availableParticipants === null || availableParticipants === void 0 ? void 0 : availableParticipants.filter(function (_a) {
+        var participantId = _a.participantId;
+        return availableIds.includes(participantId);
+    });
+    if (assignmentAvailable && (availableIds === null || availableIds === void 0 ? void 0 : availableIds.length)) {
+        validActions.push({
+            availableParticipantIds: availableIds,
+            method: ASSIGN_TEAM_POSITION_METHOD,
+            availableParticipants: available,
+            type: ASSIGN_PARTICIPANT,
+            payload: {
+                participantId: undefined,
+                tieMatchUpId: matchUpId,
+                sideNumber: sideNumber,
+                drawId: drawId,
+            },
+        });
+    }
+    if ((existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length) && (!checkScoreHasValue(matchUp) || ((_p = side === null || side === void 0 ? void 0 : side.substitutions) === null || _p === void 0 ? void 0 : _p.length))) {
+        validActions.push({
+            method: REMOVE_TEAM_POSITION_METHOD,
+            type: REMOVE_PARTICIPANT,
+            existingParticipantIds: existingParticipantIds,
+            payload: {
+                participantId: undefined,
+                tieMatchUpId: matchUpId,
+                drawId: drawId,
+            },
+        });
+    }
+    if ((available === null || available === void 0 ? void 0 : available.length) && ((!sideNumber && (existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length)) || (sideNumber && (side === null || side === void 0 ? void 0 : side.participant)))) {
+        validActions.push({
+            availableParticipantIds: availableIds,
+            method: REPLACE_TEAM_POSITION_METHOD,
+            availableParticipants: available,
+            type: REPLACE_PARTICIPANT,
+            existingParticipantIds: existingParticipantIds,
+            payload: {
+                existingParticipantId: undefined,
+                participantId: undefined,
+                tieMatchUpId: matchUpId,
+                drawId: drawId,
+            },
+        });
+    }
+    if (isAvailableAction({ policyActions: policyActions, action: REMOVE_SUBSTITUTION }) && ((_q = side === null || side === void 0 ? void 0 : side.substitutions) === null || _q === void 0 ? void 0 : _q.length)) {
+        var sideIndividualParticipantIds_1 = (((_r = side.participant) === null || _r === void 0 ? void 0 : _r.participantType) === INDIVIDUAL && [side.participantId]) ||
+            (((_s = side.participant) === null || _s === void 0 ? void 0 : _s.participantType) === PAIR && side.participant.individualParticipantIds) ||
+            [];
+        var substitutedParticipantIds = side.substitutions
+            .map(function (sub) { return sub.participantId; })
+            .filter(function (id) { return sideIndividualParticipantIds_1.includes(id); });
+        if (!participantId || substitutedParticipantIds.includes(participantId)) {
+            validActions.push({
+                method: REMOVE_TEAM_POSITION_METHOD,
+                type: REMOVE_SUBSTITUTION,
+                substitutedParticipantIds: substitutedParticipantIds,
+                payload: {
+                    participantId: undefined,
+                    tieMatchUpId: matchUpId,
+                    drawId: drawId,
+                },
+            });
+        }
+    }
+    var matchUpActionPolicy = specifiedPolicyDefinitions === null || specifiedPolicyDefinitions === void 0 ? void 0 : specifiedPolicyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS];
+    var substituteWithoutScore = matchUpActionPolicy === null || matchUpActionPolicy === void 0 ? void 0 : matchUpActionPolicy.substituteWithoutScore;
+    var substituteAfterCompleted = matchUpActionPolicy === null || matchUpActionPolicy === void 0 ? void 0 : matchUpActionPolicy.substituteAfterCompleted;
+    // SUBSTITUTION
+    // substitution is only possible when both sides are present; otherwise => nonsensical
+    if (isAvailableAction({ policyActions: policyActions, action: SUBSTITUTION }) &&
+        matchUpParticipantIds.length === 2 &&
+        ((!sideNumber && (existingParticipantIds === null || existingParticipantIds === void 0 ? void 0 : existingParticipantIds.length)) || (sideNumber && (side === null || side === void 0 ? void 0 : side.participant))) &&
+        (substituteWithoutScore || checkScoreHasValue(matchUp)) &&
+        (substituteAfterCompleted ||
+            (matchUp.matchUpStatus && !completedMatchUpStatuses.includes(matchUp.matchUpStatus))) &&
+        (existingParticipants === null || existingParticipants === void 0 ? void 0 : existingParticipants.length) &&
+        availableParticipants.length) {
+        // action is not valid if there are no existing assignments or no available substitutions
+        var existingParticipantIds_1 = existingParticipants.map(getParticipantId);
+        validActions.push({
+            info: 'list of team players available for substitution',
+            method: SUBSTITUTION_METHOD,
+            availableParticipantIds: availableParticipantIds,
+            existingParticipantIds: existingParticipantIds_1,
+            availableParticipants: availableParticipants,
+            existingParticipants: existingParticipants,
+            type: SUBSTITUTION,
+            payload: {
+                substituteParticipantId: undefined,
+                existingParticipantId: undefined,
+                sideNumber: sideNumber,
+                matchUpId: matchUpId,
+                drawId: drawId,
+            },
+        });
+    }
+    return validActions;
+}
+
+function getEventAlternateParticipantIds(_a) {
+    var eventEntries = _a.eventEntries, structure = _a.structure;
+    var eligibleAlternate = function (entry) { return entry.entryStatus === ALTERNATE && eligibleEntryStage({ structure: structure, entry: entry }); };
+    var entryPositionSort = function (a, b) { return (a.entryPosition || Infinity) - (b.entryPosition || Infinity); };
+    return eventEntries.filter(eligibleAlternate).sort(entryPositionSort).map(xa('participantId'));
+}
+
+function adHocMatchUpActions(_a) {
+    var _b, _c, _d, _e, _f, _g;
+    var restrictAdHocRoundParticipants = _a.restrictAdHocRoundParticipants, tournamentParticipants = _a.tournamentParticipants, matchUpParticipantIds = _a.matchUpParticipantIds, otherFlightEntries = _a.otherFlightEntries, drawDefinition = _a.drawDefinition, structureId = _a.structureId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, structure = _a.structure, matchUp = _a.matchUp, drawId = _a.drawId, event = _a.event;
+    var validActions = [];
+    var roundMatchUps = ((_b = structure === null || structure === void 0 ? void 0 : structure.matchUps) !== null && _b !== void 0 ? _b : []).filter(function (_a) {
+        var roundNumber = _a.roundNumber;
+        return roundNumber === matchUp.roundNumber;
+    });
+    var enteredParticipantIds = (_d = (_c = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _c === void 0 ? void 0 : _c.filter(function (_a) {
+        var entryStatus = _a.entryStatus;
+        return entryStatus && DIRECT_ENTRY_STATUSES.includes(entryStatus);
+    }).map(xa('participantId'))) !== null && _d !== void 0 ? _d : [];
+    var roundAssignedParticipantIds = roundMatchUps
+        .map(function (matchUp) { var _a; return ((_a = matchUp.sides) !== null && _a !== void 0 ? _a : []).flatMap(xa('participantId')); })
+        .flat()
+        .filter(Boolean);
+    var availableParticipantIds = enteredParticipantIds.filter(function (participantId) {
+        return !matchUpParticipantIds.includes(participantId) &&
+            (!restrictAdHocRoundParticipants || !roundAssignedParticipantIds.includes(participantId));
+    });
+    var participantsAvailable = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) { return availableParticipantIds === null || availableParticipantIds === void 0 ? void 0 : availableParticipantIds.includes(participant.participantId); }).map(function (participant) { return makeDeepCopy(participant, undefined, true); });
+    participantsAvailable === null || participantsAvailable === void 0 ? void 0 : participantsAvailable.forEach(function (participant) {
+        var _a;
+        var entry = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).find(function (entry) { return entry.participantId === participant.participantId; });
+        // used to sort available participants
+        participant.entryPosition = entry === null || entry === void 0 ? void 0 : entry.entryPosition;
+    });
+    if (availableParticipantIds.length) {
+        validActions.push({
+            payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
+            method: ASSIGN_SIDE_METHOD,
+            type: ASSIGN_PARTICIPANT,
+            availableParticipantIds: availableParticipantIds,
+            participantsAvailable: participantsAvailable,
+        });
+    }
+    var eventEntries = (_e = event === null || event === void 0 ? void 0 : event.entries) !== null && _e !== void 0 ? _e : [];
+    var availableEventAlternatesParticipantIds = getEventAlternateParticipantIds({ eventEntries: eventEntries, structure: structure });
+    var availableAlternatesParticipantIds = unique(enteredParticipantIds.concat(availableEventAlternatesParticipantIds));
+    if (otherFlightEntries) {
+        var flightProfile = event ? getFlightProfile({ event: event }) : undefined;
+        var otherFlightEnteredParticipantIds = (_f = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _f === void 0 ? void 0 : _f.filter(function (flight) { return flight.drawId !== drawId; }).flatMap(function (flight) {
+            return flight.drawEntries
+                .filter(function (entry) { return entry.participantId && ![WITHDRAWN, UNGROUPED, UNPAIRED].includes(entry.entryStatus); })
+                .map(function (_a) {
+                var participantId = _a.participantId;
+                return participantId;
+            });
+        }).filter(Boolean);
+        if (otherFlightEnteredParticipantIds === null || otherFlightEnteredParticipantIds === void 0 ? void 0 : otherFlightEnteredParticipantIds.length) {
+            // include direct acceptance participants from other flights
+            availableAlternatesParticipantIds.push.apply(availableAlternatesParticipantIds, __spreadArray([], __read(otherFlightEnteredParticipantIds), false));
+        }
+    }
+    availableAlternatesParticipantIds = availableAlternatesParticipantIds.filter(function (participantId) {
+        return !matchUpParticipantIds.includes(participantId) &&
+            !availableParticipantIds.includes(participantId) &&
+            (!restrictAdHocRoundParticipants || !roundAssignedParticipantIds.includes(participantId));
+    });
+    var availableAlternates = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) { return availableAlternatesParticipantIds.includes(participant.participantId); }).map(function (participant) { return makeDeepCopy(participant, undefined, true); });
+    availableAlternates === null || availableAlternates === void 0 ? void 0 : availableAlternates.forEach(function (alternate) {
+        var _a;
+        var entry = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).find(function (entry) { return entry.participantId === alternate.participantId; });
+        alternate.entryPosition = entry === null || entry === void 0 ? void 0 : entry.entryPosition;
+    });
+    availableAlternates === null || availableAlternates === void 0 ? void 0 : availableAlternates.sort(function (a, b) { return (a.entryPosition || Infinity) - (b.entryPosition || Infinity); });
+    if (availableAlternatesParticipantIds.length) {
+        validActions.push({
+            payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
+            availableParticipantIds: availableAlternatesParticipantIds,
+            participantsAvailable: availableAlternates,
+            method: ASSIGN_SIDE_METHOD,
+            type: ALTERNATE,
+        });
+    }
+    if (!checkScoreHasValue(matchUp) && sideNumber) {
+        var side = (_g = matchUp.sides) === null || _g === void 0 ? void 0 : _g.find(function (side) { return side.sideNumber === sideNumber; });
+        if (side === null || side === void 0 ? void 0 : side.participantId) {
+            validActions.push({
+                payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
+                method: REMOVE_SIDE_METHOD,
+                type: REMOVE_PARTICIPANT,
+            });
+        }
+    }
+    return validActions;
+}
+
 function matchUpActions(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     if (!params)
         return { error: INVALID_VALUES };
     var drawDefinition, event;
-    var _16 = params.restrictAdHocRoundParticipants, restrictAdHocRoundParticipants = _16 === void 0 ? true : _16, // disallow the same participant being in the same round multiple times
+    var _u = params.restrictAdHocRoundParticipants, restrictAdHocRoundParticipants = _u === void 0 ? true : _u, // disallow the same participant being in the same round multiple times
     specifiedPolicyDefinitions = params.policyDefinitions, enforceGender = params.enforceGender, participantId = params.participantId, sideNumber = params.sideNumber, matchUpId = params.matchUpId;
-    var tournamentRecord = (_a = params.tournamentRecord) !== null && _a !== void 0 ? _a : (params.tournamentId &&
-        isString(params.tournamentId) &&
-        ((_b = params.tournamentRecords) === null || _b === void 0 ? void 0 : _b[params.tournamentId]));
+    var tournamentRecord = (_a = params.tournamentRecord) !== null && _a !== void 0 ? _a : (params.tournamentId && isString(params.tournamentId) && ((_b = params.tournamentRecords) === null || _b === void 0 ? void 0 : _b[params.tournamentId]));
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!matchUpId || !isString(matchUpId))
@@ -54811,11 +54869,11 @@ function matchUpActions(params) {
         withIndividualParticipants: true,
     }).participants;
     var drawId = drawDefinition.drawId;
-    var _17 = findDrawMatchUp({
+    var _v = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
-    }), matchUp = _17.matchUp, structure = _17.structure;
+    }), matchUp = _v.matchUp, structure = _v.structure;
     if (!matchUp)
         return { error: MATCHUP_NOT_FOUND };
     var appliedPolicies = (_f = getAppliedPolicies({
@@ -54827,7 +54885,6 @@ function matchUpActions(params) {
     Object.assign(appliedPolicies, specifiedPolicyDefinitions !== null && specifiedPolicyDefinitions !== void 0 ? specifiedPolicyDefinitions : {});
     var otherFlightEntries = (_g = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_POSITION_ACTIONS]) === null || _g === void 0 ? void 0 : _g.otherFlightEntries;
     var matchUpActionsPolicy = (_h = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _h !== void 0 ? _h : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
-    var isAdHocMatchUp = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
     var enabledStructures = getEnabledStructures({
         actionType: MATCHUP_ACTION,
         appliedPolicies: appliedPolicies,
@@ -54848,108 +54905,31 @@ function matchUpActions(params) {
         event: event,
     }).matchUps;
     var inContextMatchUp = inContextDrawMatchUps === null || inContextDrawMatchUps === void 0 ? void 0 : inContextDrawMatchUps.find(function (drawMatchUp) { return drawMatchUp.matchUpId === matchUpId; });
-    var side = sideNumber &&
-        ((_l = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.sides) === null || _l === void 0 ? void 0 : _l.find(function (side) { return side.sideNumber === sideNumber; }));
+    var side = sideNumber && ((_l = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.sides) === null || _l === void 0 ? void 0 : _l.find(function (side) { return side.sideNumber === sideNumber; }));
     var matchUpParticipantIds = (_o = (_m = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.sides) === null || _m === void 0 ? void 0 : _m.map(function (side) { var _a; return side.participantId || ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.participantid); }).filter(Boolean)) !== null && _o !== void 0 ? _o : [];
-    var _18 = structureAssignedDrawPositions({ structure: structure }), assignedPositions = _18.assignedPositions, allPositionsAssigned = _18.allPositionsAssigned;
+    var _w = structureAssignedDrawPositions({ structure: structure }), assignedPositions = _w.assignedPositions, allPositionsAssigned = _w.allPositionsAssigned;
     var structureId = (structure !== null && structure !== void 0 ? structure : {}).structureId;
     var validActions = [];
     if (!structureId)
         return { validActions: validActions };
-    if (isAdHocMatchUp) {
-        var roundMatchUps = ((_p = structure === null || structure === void 0 ? void 0 : structure.matchUps) !== null && _p !== void 0 ? _p : []).filter(function (_a) {
-            var roundNumber = _a.roundNumber;
-            return roundNumber === matchUp.roundNumber;
-        });
-        var enteredParticipantIds = (_r = (_q = drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.entries) === null || _q === void 0 ? void 0 : _q.filter(function (_a) {
-            var entryStatus = _a.entryStatus;
-            return entryStatus && DIRECT_ENTRY_STATUSES.includes(entryStatus);
-        }).map(getParticipantId)) !== null && _r !== void 0 ? _r : [];
-        var roundAssignedParticipantIds_1 = roundMatchUps
-            .map(function (matchUp) { var _a; return ((_a = matchUp.sides) !== null && _a !== void 0 ? _a : []).flatMap(getParticipantId); })
-            .flat()
-            .filter(Boolean);
-        var availableParticipantIds_1 = enteredParticipantIds.filter(function (participantId) {
-            return !matchUpParticipantIds.includes(participantId) &&
-                (!restrictAdHocRoundParticipants ||
-                    !roundAssignedParticipantIds_1.includes(participantId));
-        });
-        var participantsAvailable = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) {
-            return availableParticipantIds_1 === null || availableParticipantIds_1 === void 0 ? void 0 : availableParticipantIds_1.includes(participant.participantId);
-        }).map(function (participant) { return makeDeepCopy(participant, undefined, true); });
-        participantsAvailable === null || participantsAvailable === void 0 ? void 0 : participantsAvailable.forEach(function (participant) {
-            var _a;
-            var entry = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).find(function (entry) { return entry.participantId === participant.participantId; });
-            // used to sort available participants
-            participant.entryPosition = entry === null || entry === void 0 ? void 0 : entry.entryPosition;
-        });
-        if (availableParticipantIds_1.length) {
-            validActions.push({
-                payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
-                method: ASSIGN_SIDE_METHOD,
-                type: ASSIGN_PARTICIPANT,
-                availableParticipantIds: availableParticipantIds_1,
-                participantsAvailable: participantsAvailable,
-            });
-        }
-        var eventEntries = (_s = event === null || event === void 0 ? void 0 : event.entries) !== null && _s !== void 0 ? _s : [];
-        var availableEventAlternatesParticipantIds = getEventAlternateParticipantIds({ eventEntries: eventEntries, structure: structure });
-        var availableAlternatesParticipantIds_1 = unique(enteredParticipantIds.concat(availableEventAlternatesParticipantIds));
-        if (otherFlightEntries) {
-            var flightProfile = event
-                ? getFlightProfile({ event: event })
-                : undefined;
-            var otherFlightEnteredParticipantIds = (_t = flightProfile === null || flightProfile === void 0 ? void 0 : flightProfile.flights) === null || _t === void 0 ? void 0 : _t.filter(function (flight) { return flight.drawId !== drawId; }).flatMap(function (flight) {
-                return flight.drawEntries
-                    .filter(function (entry) {
-                    return entry.participantId &&
-                        ![WITHDRAWN, UNGROUPED, UNPAIRED].includes(entry.entryStatus);
-                })
-                    .map(function (_a) {
-                    var participantId = _a.participantId;
-                    return participantId;
-                });
-            }).filter(Boolean);
-            if (otherFlightEnteredParticipantIds === null || otherFlightEnteredParticipantIds === void 0 ? void 0 : otherFlightEnteredParticipantIds.length) {
-                // include direct acceptance participants from other flights
-                availableAlternatesParticipantIds_1.push.apply(availableAlternatesParticipantIds_1, __spreadArray([], __read(otherFlightEnteredParticipantIds), false));
-            }
-        }
-        availableAlternatesParticipantIds_1 =
-            availableAlternatesParticipantIds_1.filter(function (participantId) {
-                return !matchUpParticipantIds.includes(participantId) &&
-                    !availableParticipantIds_1.includes(participantId) &&
-                    (!restrictAdHocRoundParticipants ||
-                        !roundAssignedParticipantIds_1.includes(participantId));
-            });
-        var availableAlternates = tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.filter(function (participant) {
-            return availableAlternatesParticipantIds_1.includes(participant.participantId);
-        }).map(function (participant) { return makeDeepCopy(participant, undefined, true); });
-        availableAlternates === null || availableAlternates === void 0 ? void 0 : availableAlternates.forEach(function (alternate) {
-            var _a;
-            var entry = ((_a = drawDefinition.entries) !== null && _a !== void 0 ? _a : []).find(function (entry) { return entry.participantId === alternate.participantId; });
-            alternate.entryPosition = entry === null || entry === void 0 ? void 0 : entry.entryPosition;
+    var isAdHocMatchUp = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
+    var isCollectionMatchUp = matchUp.collectionId;
+    if (isAdHocMatchUp && !isCollectionMatchUp) {
+        var adHocValidActions = adHocMatchUpActions({
+            restrictAdHocRoundParticipants: restrictAdHocRoundParticipants,
+            tournamentParticipants: tournamentParticipants,
+            matchUpParticipantIds: matchUpParticipantIds,
+            otherFlightEntries: otherFlightEntries,
+            drawDefinition: drawDefinition,
+            structureId: structureId,
+            sideNumber: sideNumber,
+            matchUpId: matchUpId,
+            structure: structure,
+            matchUp: matchUp,
+            drawId: drawId,
+            event: event,
         });
-        availableAlternates === null || availableAlternates === void 0 ? void 0 : availableAlternates.sort(function (a, b) { return (a.entryPosition || Infinity) - (b.entryPosition || Infinity); });
-        if (availableAlternatesParticipantIds_1.length) {
-            validActions.push({
-                payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
-                availableParticipantIds: availableAlternatesParticipantIds_1,
-                participantsAvailable: availableAlternates,
-                method: ASSIGN_SIDE_METHOD,
-                type: ALTERNATE,
-            });
-        }
-        if (!checkScoreHasValue(matchUp) && sideNumber) {
-            var side_1 = (_u = matchUp.sides) === null || _u === void 0 ? void 0 : _u.find(function (side) { return side.sideNumber === sideNumber; });
-            if (side_1 === null || side_1 === void 0 ? void 0 : side_1.participantId) {
-                validActions.push({
-                    payload: { drawId: drawId, matchUpId: matchUpId, structureId: structureId, sideNumber: sideNumber },
-                    method: REMOVE_SIDE_METHOD,
-                    type: REMOVE_PARTICIPANT,
-                });
-            }
-        }
+        validActions.push.apply(validActions, __spreadArray([], __read(adHocValidActions), false));
     }
     var structureIsComplete = isCompletedStructure({
         drawDefinition: drawDefinition,
@@ -54957,10 +54937,9 @@ function matchUpActions(params) {
     });
     var participantAssignedDrawPositions = assignedPositions === null || assignedPositions === void 0 ? void 0 : assignedPositions.filter(function (assignment) { return assignment.participantId; }).map(function (assignment) { return assignment.drawPosition; });
     var byeAssignedDrawPositions = assignedPositions === null || assignedPositions === void 0 ? void 0 : assignedPositions.filter(function (assignment) { return assignment.bye; }).map(function (assignment) { return assignment.drawPosition; });
-    var isCollectionMatchUp = matchUp.collectionId;
     var isByeMatchUp = matchUp.matchUpStatus === BYE ||
         (!isCollectionMatchUp &&
-            ((_v = matchUp.drawPositions) === null || _v === void 0 ? void 0 : _v.reduce(function (isByeMatchUp, drawPosition) {
+            ((_p = matchUp.drawPositions) === null || _p === void 0 ? void 0 : _p.reduce(function (isByeMatchUp, drawPosition) {
                 return (byeAssignedDrawPositions === null || byeAssignedDrawPositions === void 0 ? void 0 : byeAssignedDrawPositions.includes(drawPosition)) || isByeMatchUp;
             }, false)));
     if (isByeMatchUp)
@@ -54972,21 +54951,17 @@ function matchUpActions(params) {
     var isInComplete = !isDirectingMatchUpStatus({
         matchUpStatus: matchUp.matchUpStatus,
     });
-    var structureScoringPolicies = (_w = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.scoring) === null || _w === void 0 ? void 0 : _w.structures;
-    var stageSpecificPolicies = (structure === null || structure === void 0 ? void 0 : structure.stage) &&
-        (structureScoringPolicies === null || structureScoringPolicies === void 0 ? void 0 : structureScoringPolicies.stage) &&
-        (structureScoringPolicies === null || structureScoringPolicies === void 0 ? void 0 : structureScoringPolicies.stage[structure.stage]);
+    var structureScoringPolicies = (_q = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.scoring) === null || _q === void 0 ? void 0 : _q.structures;
+    var stageSpecificPolicies = (structure === null || structure === void 0 ? void 0 : structure.stage) && (structureScoringPolicies === null || structureScoringPolicies === void 0 ? void 0 : structureScoringPolicies.stage) && (structureScoringPolicies === null || structureScoringPolicies === void 0 ? void 0 : structureScoringPolicies.stage[structure.stage]);
     var sequenceSpecificPolicies = (structure === null || structure === void 0 ? void 0 : structure.stageSequence) &&
         (stageSpecificPolicies === null || stageSpecificPolicies === void 0 ? void 0 : stageSpecificPolicies.stageSequence) &&
         stageSpecificPolicies.stageSequence[structure.stageSequence];
-    var requireAllPositionsAssigned = ((_x = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.scoring) === null || _x === void 0 ? void 0 : _x.requireAllPositionsAssigned) ||
+    var requireAllPositionsAssigned = ((_r = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.scoring) === null || _r === void 0 ? void 0 : _r.requireAllPositionsAssigned) ||
         (stageSpecificPolicies === null || stageSpecificPolicies === void 0 ? void 0 : stageSpecificPolicies.requireAllPositionsAssigned) ||
         (sequenceSpecificPolicies === null || sequenceSpecificPolicies === void 0 ? void 0 : sequenceSpecificPolicies.requireAllPositionsAssigned);
     var scoringActive = !requireAllPositionsAssigned || allPositionsAssigned;
-    var hasParticipants = matchUp.sides &&
-        matchUp.sides.filter(function (side) { return side === null || side === void 0 ? void 0 : side.participantId; }).length === 2;
-    var isDoubleExit = matchUp.matchUpStatus &&
-        [DOUBLE_WALKOVER, DOUBLE_DEFAULT].includes(matchUp.matchUpStatus);
+    var hasParticipants = matchUp.sides && matchUp.sides.filter(function (side) { return side === null || side === void 0 ? void 0 : side.participantId; }).length === 2;
+    var isDoubleExit = matchUp.matchUpStatus && [DOUBLE_WALKOVER, DOUBLE_DEFAULT].includes(matchUp.matchUpStatus);
     var targetData = positionTargets({
         inContextDrawMatchUps: inContextDrawMatchUps,
         drawDefinition: drawDefinition,
@@ -54997,15 +54972,14 @@ function matchUpActions(params) {
         drawDefinition: drawDefinition,
         targetData: targetData,
     });
-    var matchUpDrawPositionsAreAssigned = ((_y = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.drawPositions) === null || _y === void 0 ? void 0 : _y.length) === 2 &&
+    var matchUpDrawPositionsAreAssigned = ((_s = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.drawPositions) === null || _s === void 0 ? void 0 : _s.length) === 2 &&
         inContextMatchUp.drawPositions.every(function (drawPosition) { return participantAssignedDrawPositions === null || participantAssignedDrawPositions === void 0 ? void 0 : participantAssignedDrawPositions.includes(drawPosition); }) &&
-        ((_z = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.sides) === null || _z === void 0 ? void 0 : _z.length) === 2 &&
+        ((_t = inContextMatchUp === null || inContextMatchUp === void 0 ? void 0 : inContextMatchUp.sides) === null || _t === void 0 ? void 0 : _t.length) === 2 &&
         inContextMatchUp.sides.every(function (_a) {
             var participantId = _a.participantId;
             return participantId;
         });
-    var readyToScore = (matchUpDrawPositionsAreAssigned || hasParticipants) &&
-        !(isDoubleExit && activeDownstream);
+    var readyToScore = (matchUpDrawPositionsAreAssigned || hasParticipants) && !(isDoubleExit && activeDownstream);
     var addPenaltyAction = {
         method: ADD_PENALTY_METHOD,
         type: ADD_PENALTY,
@@ -55058,162 +55032,22 @@ function matchUpActions(params) {
         }
     }
     if (isCollectionMatchUp && inContextMatchUp) {
-        var firstFoundSide = (_0 = inContextMatchUp.sides) === null || _0 === void 0 ? void 0 : _0.find(function (side) { return side.participant; });
-        var assignedGender_1 = inContextMatchUp.gender === MIXED &&
-            inContextMatchUp.sideNumber &&
-            ((_1 = inContextMatchUp.sides) === null || _1 === void 0 ? void 0 : _1.filter(function (side) { return side.particiapntId; }).length) === 1 &&
-            ((_3 = (_2 = firstFoundSide === null || firstFoundSide === void 0 ? void 0 : firstFoundSide.participant) === null || _2 === void 0 ? void 0 : _2.person) === null || _3 === void 0 ? void 0 : _3.sex);
-        var matchUpType = inContextMatchUp.matchUpType;
-        var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_4 = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _4 === void 0 ? void 0 : _4.enforceGender) !==
-            false;
-        var gender_1 = genderEnforced ? inContextMatchUp.gender : undefined;
-        var allParticipants = (_5 = inContextMatchUp.sides) === null || _5 === void 0 ? void 0 : _5.flatMap(function (side) { var _a; return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants) || side.participant; }).filter(Boolean);
-        var allParticipantIds_1 = allParticipants === null || allParticipants === void 0 ? void 0 : allParticipants.map(getParticipantId);
-        var existingParticipants = (_6 = inContextMatchUp.sides) === null || _6 === void 0 ? void 0 : _6.filter(function (side) { return !sideNumber || side.sideNumber === sideNumber; }).flatMap(function (side) { var _a; return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants) || side.participant; }).filter(Boolean);
-        var existingParticipantIds_1 = existingParticipants === null || existingParticipants === void 0 ? void 0 : existingParticipants.map(getParticipantId);
-        var inContextDualMatchUp = inContextDrawMatchUps === null || inContextDrawMatchUps === void 0 ? void 0 : inContextDrawMatchUps.find(function (drawMatchUp) { return drawMatchUp.matchUpId === inContextMatchUp.matchUpTieId; });
-        var availableIndividualParticipants = (_7 = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _7 === void 0 ? void 0 : _7.map(function (side) {
-            var _a;
-            return (_a = side.participant) === null || _a === void 0 ? void 0 : _a.individualParticipants.filter(function (_a) {
-                var participantId = _a.participantId, person = _a.person;
-                return !(existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.includes(participantId)) &&
-                    (!gender_1 ||
-                        gender_1 === ANY ||
-                        person.sex === gender_1 ||
-                        // case where one gendered member has been assigned
-                        (gender_1 === MIXED && !assignedGender_1) ||
-                        (assignedGender_1 && person.sex !== assignedGender_1));
-            });
-        });
-        // if no sideNumber is provided, segregate available by sideNumber and specify sideNumber
-        var availableParticipants = sideNumber
-            ? availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants[sideNumber - 1]
-            : availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants.map(function (available, i) { return ({
-                participants: available,
-                sideNumber: i + 1,
-            }); });
-        var availableParticipantIds = sideNumber
-            ? (_8 = availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants[sideNumber - 1]) === null || _8 === void 0 ? void 0 : _8.map(getParticipantId)
-            : availableIndividualParticipants === null || availableIndividualParticipants === void 0 ? void 0 : availableIndividualParticipants.map(function (available, i) { return ({
-                participants: available === null || available === void 0 ? void 0 : available.map(getParticipantId),
-                sideNumber: i + 1,
-            }); });
-        var assignmentAvailable = (sideNumber &&
-            ((matchUpType === SINGLES_MATCHUP && !(existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length)) ||
-                (matchUpType === DOUBLES_MATCHUP &&
-                    ((_9 = existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length) !== null && _9 !== void 0 ? _9 : 0) < 2))) ||
-            (!sideNumber &&
-                ((matchUpType === SINGLES_MATCHUP &&
-                    ((_10 = existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length) !== null && _10 !== void 0 ? _10 : 0) < 2) ||
-                    (matchUpType === DOUBLES_MATCHUP &&
-                        ((_11 = existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length) !== null && _11 !== void 0 ? _11 : 0) < 4)));
-        // extra step to avoid edge case where individual participant is part of both teams
-        var availableIds_1 = availableParticipantIds === null || availableParticipantIds === void 0 ? void 0 : availableParticipantIds.filter(function (id) { return !(allParticipantIds_1 === null || allParticipantIds_1 === void 0 ? void 0 : allParticipantIds_1.includes(id)); });
-        var available = availableParticipants === null || availableParticipants === void 0 ? void 0 : availableParticipants.filter(function (_a) {
-            var participantId = _a.participantId;
-            return availableIds_1.includes(participantId);
+        var collectionValidActions = collectionMatchUpActions({
+            specifiedPolicyDefinitions: specifiedPolicyDefinitions,
+            inContextDrawMatchUps: inContextDrawMatchUps,
+            matchUpParticipantIds: matchUpParticipantIds,
+            matchUpActionsPolicy: matchUpActionsPolicy,
+            inContextMatchUp: inContextMatchUp,
+            policyActions: policyActions,
+            enforceGender: enforceGender,
+            participantId: participantId,
+            sideNumber: sideNumber,
+            matchUpId: matchUpId,
+            matchUp: matchUp,
+            drawId: drawId,
+            side: side,
         });
-        if (assignmentAvailable && (availableIds_1 === null || availableIds_1 === void 0 ? void 0 : availableIds_1.length)) {
-            validActions.push({
-                availableParticipantIds: availableIds_1,
-                method: ASSIGN_TEAM_POSITION_METHOD,
-                availableParticipants: available,
-                type: ASSIGN_PARTICIPANT,
-                payload: {
-                    participantId: undefined,
-                    tieMatchUpId: matchUpId,
-                    drawId: drawId,
-                },
-            });
-        }
-        if ((existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length) &&
-            (!checkScoreHasValue(matchUp) || ((_12 = side === null || side === void 0 ? void 0 : side.substitutions) === null || _12 === void 0 ? void 0 : _12.length))) {
-            validActions.push({
-                method: REMOVE_TEAM_POSITION_METHOD,
-                type: REMOVE_PARTICIPANT,
-                existingParticipantIds: existingParticipantIds_1,
-                payload: {
-                    participantId: undefined,
-                    tieMatchUpId: matchUpId,
-                    drawId: drawId,
-                },
-            });
-        }
-        if ((available === null || available === void 0 ? void 0 : available.length) &&
-            ((!sideNumber && (existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length)) ||
-                (sideNumber && (side === null || side === void 0 ? void 0 : side.participant)))) {
-            validActions.push({
-                availableParticipantIds: availableIds_1,
-                method: REPLACE_TEAM_POSITION_METHOD,
-                availableParticipants: available,
-                type: REPLACE_PARTICIPANT,
-                existingParticipantIds: existingParticipantIds_1,
-                payload: {
-                    existingParticipantId: undefined,
-                    participantId: undefined,
-                    tieMatchUpId: matchUpId,
-                    drawId: drawId,
-                },
-            });
-        }
-        if (isAvailableAction({ policyActions: policyActions, action: REMOVE_SUBSTITUTION }) &&
-            ((_13 = side === null || side === void 0 ? void 0 : side.substitutions) === null || _13 === void 0 ? void 0 : _13.length)) {
-            var sideIndividualParticipantIds_1 = (((_14 = side.participant) === null || _14 === void 0 ? void 0 : _14.participantType) === INDIVIDUAL && [
-                side.participantId,
-            ]) ||
-                (((_15 = side.participant) === null || _15 === void 0 ? void 0 : _15.participantType) === PAIR &&
-                    side.participant.individualParticipantIds) ||
-                [];
-            var substitutedParticipantIds = side.substitutions
-                .map(function (sub) { return sub.participantId; })
-                .filter(function (id) { return sideIndividualParticipantIds_1.includes(id); });
-            if (!participantId || substitutedParticipantIds.includes(participantId)) {
-                validActions.push({
-                    method: REMOVE_TEAM_POSITION_METHOD,
-                    type: REMOVE_SUBSTITUTION,
-                    substitutedParticipantIds: substitutedParticipantIds,
-                    payload: {
-                        participantId: undefined,
-                        tieMatchUpId: matchUpId,
-                        drawId: drawId,
-                    },
-                });
-            }
-        }
-        var matchUpActionPolicy = specifiedPolicyDefinitions === null || specifiedPolicyDefinitions === void 0 ? void 0 : specifiedPolicyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS];
-        var substituteWithoutScore = matchUpActionPolicy === null || matchUpActionPolicy === void 0 ? void 0 : matchUpActionPolicy.substituteWithoutScore;
-        var substituteAfterCompleted = matchUpActionPolicy === null || matchUpActionPolicy === void 0 ? void 0 : matchUpActionPolicy.substituteAfterCompleted;
-        // SUBSTITUTION
-        // substitution is only possible when both sides are present; otherwise => nonsensical
-        if (isAvailableAction({ policyActions: policyActions, action: SUBSTITUTION }) &&
-            matchUpParticipantIds.length === 2 &&
-            ((!sideNumber && (existingParticipantIds_1 === null || existingParticipantIds_1 === void 0 ? void 0 : existingParticipantIds_1.length)) ||
-                (sideNumber && (side === null || side === void 0 ? void 0 : side.participant))) &&
-            (substituteWithoutScore || checkScoreHasValue(matchUp)) &&
-            (substituteAfterCompleted ||
-                (matchUp.matchUpStatus &&
-                    !completedMatchUpStatuses.includes(matchUp.matchUpStatus))) &&
-            (existingParticipants === null || existingParticipants === void 0 ? void 0 : existingParticipants.length) &&
-            availableParticipants.length) {
-            // action is not valid if there are no existing assignments or no available substitutions
-            var existingParticipantIds_2 = existingParticipants.map(getParticipantId);
-            validActions.push({
-                info: 'list of team players available for substitution',
-                method: SUBSTITUTION_METHOD,
-                availableParticipantIds: availableParticipantIds,
-                existingParticipantIds: existingParticipantIds_2,
-                availableParticipants: availableParticipants,
-                existingParticipants: existingParticipants,
-                type: SUBSTITUTION,
-                payload: {
-                    substituteParticipantId: undefined,
-                    existingParticipantId: undefined,
-                    sideNumber: sideNumber,
-                    matchUpId: matchUpId,
-                    drawId: drawId,
-                },
-            });
-        }
+        validActions.push.apply(validActions, __spreadArray([], __read(collectionValidActions), false));
     }
     return {
         structureIsComplete: structureIsComplete,
@@ -55221,19 +55055,6 @@ function matchUpActions(params) {
         isDoubleExit: isDoubleExit,
     };
 }
-function getEventAlternateParticipantIds(_a) {
-    var eventEntries = _a.eventEntries, structure = _a.structure;
-    var eligibleAlternate = function (entry) {
-        return entry.entryStatus === ALTERNATE && eligibleEntryStage({ structure: structure, entry: entry });
-    };
-    var entryPositionSort = function (a, b) {
-        return (a.entryPosition || Infinity) - (b.entryPosition || Infinity);
-    };
-    return eventEntries
-        .filter(eligibleAlternate)
-        .sort(entryPositionSort)
-        .map(getParticipantId);
-}
 
 /**
  * Calculates the valid actions for a draw position based on the provided parameters.
@@ -55319,8 +55140,7 @@ function positionActions(params) {
         drawDefinition: drawDefinition,
         structure: structure,
     }).policyActions;
-    var possiblyDisablingAction = ![QUALIFYING, MAIN].includes(structure.stage) ||
-        structure.stageSequence !== 1;
+    var possiblyDisablingAction = ![QUALIFYING, MAIN].includes(structure.stage) || structure.stageSequence !== 1;
     var drawId = drawDefinition.drawId;
     var validActions = [];
     var _j = structureAssignedDrawPositions({ structure: structure }), assignedPositions = _j.assignedPositions, positionAssignments = _j.positionAssignments;
@@ -55398,11 +55218,9 @@ function positionActions(params) {
         validAssignmentActions === null || validAssignmentActions === void 0 ? void 0 : validAssignmentActions.forEach(function (action) { return validActions.push(action); });
     }
     var participantId = (positionAssignment || {}).participantId;
-    var participant = participantId &&
-        tournamentParticipants.find(function (participant) { return participant.participantId === participantId; });
+    var participant = participantId && tournamentParticipants.find(function (participant) { return participant.participantId === participantId; });
     if (positionAssignment) {
-        if (isAvailableAction({ policyActions: policyActions, action: REMOVE_ASSIGNMENT }) &&
-            !isActiveDrawPosition) {
+        if (isAvailableAction({ policyActions: policyActions, action: REMOVE_ASSIGNMENT }) && !isActiveDrawPosition) {
             validActions.push({
                 type: REMOVE_ASSIGNMENT,
                 method: REMOVE_ASSIGNMENT_METHOD,
@@ -55419,8 +55237,7 @@ function positionActions(params) {
             }
             // in this case the ASSIGN_BYE_METHOD is called after removing assigned participant
             // option should not be available if exising assignment is a bye
-            if (isAvailableAction({ policyActions: policyActions, action: ASSIGN_BYE }) &&
-                !isByePosition) {
+            if (isAvailableAction({ policyActions: policyActions, action: ASSIGN_BYE }) && !isByePosition) {
                 validActions.push({
                     type: ASSIGN_BYE,
                     method: REMOVE_ASSIGNMENT_METHOD,
@@ -55429,8 +55246,7 @@ function positionActions(params) {
                 });
             }
         }
-        var validToAssignSeed = structure.stage === QUALIFYING ||
-            (structure.stage === MAIN && structure.stageSequence === 1);
+        var validToAssignSeed = structure.stage === QUALIFYING || (structure.stage === MAIN && structure.stageSequence === 1);
         if (!isByePosition &&
             // if any drawPositions are active, action is disabled unless override in policy
             activePositionsCheck({
@@ -55537,8 +55353,7 @@ function positionActions(params) {
                 validActions.push(validSwapAction);
         }
     }
-    if (isAvailableAction({ policyActions: policyActions, action: ALTERNATE_PARTICIPANT }) &&
-        !disablePlacementActions) {
+    if (isAvailableAction({ policyActions: policyActions, action: ALTERNATE_PARTICIPANT }) && !disablePlacementActions) {
         var validAlternatesAction = getValidAlternatesAction({
             possiblyDisablingAction: possiblyDisablingAction,
             tournamentParticipants: tournamentParticipants,
@@ -55576,8 +55391,7 @@ function positionActions(params) {
         if (validLuckyLosersAction)
             validActions.push(validLuckyLosersAction);
     }
-    if ((participant === null || participant === void 0 ? void 0 : participant.participantType) === PAIR &&
-        isAvailableAction({ policyActions: policyActions, action: MODIFY_PAIR_ASSIGNMENT })) {
+    if ((participant === null || participant === void 0 ? void 0 : participant.participantType) === PAIR && isAvailableAction({ policyActions: policyActions, action: MODIFY_PAIR_ASSIGNMENT })) {
         var validModifyAssignedPairAction = getValidModifyAssignedPairAction({
             tournamentParticipants: tournamentParticipants,
             returnParticipants: returnParticipants,
@@ -56908,7 +56722,7 @@ function getEvents(_a) {
     })
         .map(function (event) {
         var _a;
-        var eventDrawIds = (_a = event.drawDefinitions) === null || _a === void 0 ? void 0 : _a.map(extractAttributes('drawId'));
+        var eventDrawIds = (_a = event.drawDefinitions) === null || _a === void 0 ? void 0 : _a.map(xa('drawId'));
         if ((drawIds === null || drawIds === void 0 ? void 0 : drawIds.length) && !intersection(drawIds, eventDrawIds).length)
             return;
         var eventCopy = makeDeepCopy(event);
@@ -56925,9 +56739,7 @@ function getEvents(_a) {
             withScaleValues: true,
             tournamentRecord: tournamentRecord,
         }).participantMap;
-        var sum = function (values) {
-            return values.reduce(function (total, value) { return total + parseFloat(value); }, 0);
-        };
+        var sum = function (values) { return values.reduce(function (total, value) { return total + parseFloat(value); }, 0); };
         var _loop_1 = function (event_1) {
             var e_2, _o, e_3, _p, e_4, _q, e_5, _r, e_6, _s, e_7, _t, e_8, _u;
             var eventType = scaleEventType !== null && scaleEventType !== void 0 ? scaleEventType : event_1.eventType;
@@ -56943,7 +56755,7 @@ function getEvents(_a) {
                 var entryStatus = _a.entryStatus;
                 return STRUCTURE_SELECTED_STATUSES.includes(entryStatus);
             });
-            var participantIds = selectedEntries.map(extractAttributes(PARTICIPANT_ID));
+            var participantIds = selectedEntries.map(xa(PARTICIPANT_ID));
             var processParticipant = function (participant) {
                 var e_9, _a, e_10, _b;
                 var _c, _d, _e, _f, _g, _h, _j, _k;
@@ -57052,8 +56864,7 @@ function getEvents(_a) {
                 var processParticipant = function (participant) {
                     var e_13, _a, e_14, _b;
                     var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-                    if (((_c = eventsMap[eventId].draws) === null || _c === void 0 ? void 0 : _c[drawId]) &&
-                        ((_d = participant === null || participant === void 0 ? void 0 : participant.ratings) === null || _d === void 0 ? void 0 : _d[eventType])) {
+                    if (((_c = eventsMap[eventId].draws) === null || _c === void 0 ? void 0 : _c[drawId]) && ((_d = participant === null || participant === void 0 ? void 0 : participant.ratings) === null || _d === void 0 ? void 0 : _d[eventType])) {
                         try {
                             for (var _q = (e_13 = void 0, __values((_f = (_e = participant === null || participant === void 0 ? void 0 : participant.ratings) === null || _e === void 0 ? void 0 : _e[eventType]) !== null && _f !== void 0 ? _f : [])), _r = _q.next(); !_r.done; _r = _q.next()) {
                                 var rating = _r.value;
@@ -57077,8 +56888,7 @@ function getEvents(_a) {
                             finally { if (e_13) throw e_13.error; }
                         }
                     }
-                    if (((_k = eventsMap[eventId].draws) === null || _k === void 0 ? void 0 : _k[drawId]) &&
-                        ((_l = participant === null || participant === void 0 ? void 0 : participant.rankings) === null || _l === void 0 ? void 0 : _l[eventType])) {
+                    if (((_k = eventsMap[eventId].draws) === null || _k === void 0 ? void 0 : _k[drawId]) && ((_l = participant === null || participant === void 0 ? void 0 : participant.rankings) === null || _l === void 0 ? void 0 : _l[eventType])) {
                         try {
                             for (var _s = (e_14 = void 0, __values((_o = (_m = participant === null || participant === void 0 ? void 0 : participant.rankings) === null || _m === void 0 ? void 0 : _m[eventType]) !== null && _o !== void 0 ? _o : [])), _t = _s.next(); !_t.done; _t = _s.next()) {
                                 var ranking = _t.value;
@@ -57135,8 +56945,7 @@ function getEvents(_a) {
             };
             var processedDrawIds = [];
             var ignoreDrawId = function (drawId) {
-                return ((drawIds === null || drawIds === void 0 ? void 0 : drawIds.length) && drawIds.includes(drawId)) ||
-                    processedDrawIds.includes(drawId);
+                return ((drawIds === null || drawIds === void 0 ? void 0 : drawIds.length) && drawIds.includes(drawId)) || processedDrawIds.includes(drawId);
             };
             try {
                 for (var _z = (e_5 = void 0, __values((_j = event_1.drawDefinitions) !== null && _j !== void 0 ? _j : [])), _0 = _z.next(); !_0.done; _0 = _z.next()) {
@@ -57171,7 +56980,7 @@ function getEvents(_a) {
                     var drawId = flight.drawId;
                     if (ignoreDrawId(drawId))
                         continue;
-                    var participantIds_3 = flight.drawEntries.map(extractAttributes(PARTICIPANT_ID));
+                    var participantIds_3 = flight.drawEntries.map(xa(PARTICIPANT_ID));
                     processFlight(drawId, participantIds_3);
                 }
             }
@@ -57610,8 +57419,7 @@ function getParticipantStats(_a) {
     if (matchUps && !Array.isArray(matchUps))
         return { error: INVALID_MATCHUP };
     var participantsProfile = withScaleValues ? { withScaleValues: withScaleValues } : undefined;
-    matchUps =
-        matchUps !== null && matchUps !== void 0 ? matchUps : allTournamentMatchUps({ tournamentRecord: tournamentRecord, participantsProfile: participantsProfile }).matchUps;
+    matchUps = matchUps !== null && matchUps !== void 0 ? matchUps : allTournamentMatchUps({ tournamentRecord: tournamentRecord, participantsProfile: participantsProfile }).matchUps;
     if (!(matchUps === null || matchUps === void 0 ? void 0 : matchUps.length))
         return { error: MISSING_MATCHUPS };
     var teamParticipantIds = [];
@@ -57630,7 +57438,7 @@ function getParticipantStats(_a) {
         return { error: INVALID_PARTICIPANT_IDS };
     }
     if (!teamParticipantIds.length)
-        teamParticipantIds.push.apply(teamParticipantIds, __spreadArray([], __read(teamParticipants.map(extractAttributes('participantId'))), false));
+        teamParticipantIds.push.apply(teamParticipantIds, __spreadArray([], __read(teamParticipants.map(xa('participantId'))), false));
     var participantDetails = new Map();
     var participantStats = new Map();
     var participating = new Map();
@@ -57707,13 +57515,13 @@ function getParticipantStats(_a) {
             var _b, _c, _d, _e, _f;
             var side = _a.side, individualParticipantIds = _a.individualParticipantIds;
             return ((side.participantId &&
-                (!(individualParticipantIds === null || individualParticipantIds === void 0 ? void 0 : individualParticipantIds.length) ||
-                    individualParticipantIds.includes(side.participantId)) && [
+                (!(individualParticipantIds === null || individualParticipantIds === void 0 ? void 0 : individualParticipantIds.length) || individualParticipantIds.includes(side.participantId)) && [
                 side.participantId,
             ]) ||
                 (((_c = (_b = side.participant) === null || _b === void 0 ? void 0 : _b.individualParticipantIds) === null || _c === void 0 ? void 0 : _c.length) &&
                     (!(individualParticipantIds === null || individualParticipantIds === void 0 ? void 0 : individualParticipantIds.length) ||
-                        intersection(individualParticipantIds, (_d = side.participant) === null || _d === void 0 ? void 0 : _d.individualParticipantIds).length === ((_f = (_e = side.participant) === null || _e === void 0 ? void 0 : _e.individualParticipantIds) === null || _f === void 0 ? void 0 : _f.length)) &&
+                        intersection(individualParticipantIds, (_d = side.participant) === null || _d === void 0 ? void 0 : _d.individualParticipantIds).length ===
+                            ((_f = (_e = side.participant) === null || _e === void 0 ? void 0 : _e.individualParticipantIds) === null || _f === void 0 ? void 0 : _f.length)) &&
                     side.participant.individualParticipantIds));
         };
         if (teamMap.size) {
@@ -57826,17 +57634,12 @@ function getParticipantStats(_a) {
         if (!isObject(matchUp))
             return { value: { error: INVALID_MATCHUP } };
         var matchUpStatus = matchUp.matchUpStatus, matchUpFormat = matchUp.matchUpFormat, matchUpType = matchUp.matchUpType, winningSide = matchUp.winningSide, score = matchUp.score, sides = matchUp.sides;
-        if (!sides ||
-            !score ||
-            matchUpType === TEAM_MATCHUP ||
-            matchUpStatus === BYE)
+        if (!sides || !score || matchUpType === TEAM_MATCHUP || matchUpStatus === BYE)
             return "continue";
         var sideParticipantIds = getSideParticipantIds(sides);
         if (!sideParticipantIds.filter(Boolean).length)
             return "continue";
-        var competitiveness = withCompetitiveProfiles &&
-            winningSide &&
-            ((_k = getMatchUpCompetitiveProfile({ matchUp: matchUp })) === null || _k === void 0 ? void 0 : _k.competitiveness);
+        var competitiveness = withCompetitiveProfiles && winningSide && ((_k = getMatchUpCompetitiveProfile({ matchUp: matchUp })) === null || _k === void 0 ? void 0 : _k.competitiveness);
         relevantMatchUps.push(matchUp);
         var setsTally = countSets({
             matchUpStatus: matchUpStatus,
@@ -57863,12 +57666,8 @@ function getParticipantStats(_a) {
                 var participantName = (_b = participantDetails.get(id)) === null || _b === void 0 ? void 0 : _b.participantName;
                 var stats = initStats(id, participantName);
                 if (stats) {
-                    var teamSumTally = function (stat, tally) {
-                        return tally.forEach(function (t, i) { return (stats[stat][i] += t); });
-                    };
-                    var tiebreaks = index
-                        ? __spreadArray([], __read(tiebreaksTally), false).reverse()
-                        : tiebreaksTally;
+                    var teamSumTally = function (stat, tally) { return tally.forEach(function (t, i) { return (stats[stat][i] += t); }); };
+                    var tiebreaks = index ? __spreadArray([], __read(tiebreaksTally), false).reverse() : tiebreaksTally;
                     var points = index ? __spreadArray([], __read(pointsTally), false).reverse() : pointsTally;
                     var games = index ? __spreadArray([], __read(gamesTally), false).reverse() : gamesTally;
                     var sets = index ? __spreadArray([], __read(setsTally), false).reverse() : setsTally;
@@ -57993,8 +57792,7 @@ function getParticipantStats(_a) {
                         // now rank each team by their ratio on each attribute
                         var accessor = "".concat(attr, "Ratio");
                         if (typeof stats[accessor] === 'number') {
-                            var index = (_p = ratio
-                                .get(accessor)) === null || _p === void 0 ? void 0 : _p.sort(highLowSort).indexOf(stats[accessor]);
+                            var index = (_p = ratio.get(accessor)) === null || _p === void 0 ? void 0 : _p.sort(highLowSort).indexOf(stats[accessor]);
                             if (typeof index === 'number' && index >= 0) {
                                 var rankAccessor = "".concat(attr, "Rank");
                                 stats[rankAccessor] = index + 1;
@@ -65187,11 +64985,15 @@ function venueModify(_a) {
     var venue = result.venue;
     // not valid to modify a venueId
     var validAttributes = Object.keys(venueTemplate()).filter(function (attribute) { return attribute !== 'venueId'; });
-    var validModificationAttributes = Object.keys(modifications).filter(function (attribute) { return validAttributes.includes(attribute); });
+    var validModificationAttributes = Object.keys(modifications).filter(function (attribute) {
+        return validAttributes.includes(attribute);
+    });
     if (!validModificationAttributes.length)
         return { error: NO_VALID_ATTRIBUTES };
     var validReplacements = validAttributes.filter(function (attribute) { return !['courts', 'onlineResources'].includes(attribute); });
-    var validReplacementAttributes = Object.keys(modifications).filter(function (attribute) { return validReplacements.includes(attribute); });
+    var validReplacementAttributes = Object.keys(modifications).filter(function (attribute) {
+        return validReplacements.includes(attribute);
+    });
     venue &&
         validReplacementAttributes.forEach(function (attribute) {
             var _a;
@@ -65199,12 +65001,10 @@ function venueModify(_a) {
         });
     var existingCourtIds = (_g = (_f = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _f === void 0 ? void 0 : _f.map(function (court) { return court.courtId; })) !== null && _g !== void 0 ? _g : [];
     var courtIdsToModify = ((_h = modifications.courts) === null || _h === void 0 ? void 0 : _h.map(function (court) { return court.courtId; })) || [];
-    var courtIdsToDelete = existingCourtIds.filter(function (courtId) { return !courtIdsToModify.includes(courtId); });
+    var courtIdsToDelete = courtIdsToModify.length && existingCourtIds.filter(function (courtId) { return !courtIdsToModify.includes(courtId); });
     var matchUpsWithCourtId = [];
     if (courtIdsToDelete.length) {
-        var courtsToDelete = (_j = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _j === void 0 ? void 0 : _j.filter(function (court) {
-            return courtIdsToDelete.includes(court.courtId);
-        });
+        var courtsToDelete = (_j = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _j === void 0 ? void 0 : _j.filter(function (court) { return courtIdsToDelete.includes(court.courtId); });
         var scheduleDeletionsCount = courtsToDelete === null || courtsToDelete === void 0 ? void 0 : courtsToDelete.map(function (court) {
             var e_3, _a;
             var _b, _c, _d;
@@ -65232,11 +65032,9 @@ function venueModify(_a) {
             }
             return (_d = (_c = result.matchUps) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
         }).reduce(function (a, b) { return a + b; });
-        if (venue &&
-            (!scheduleDeletionsCount || allowModificationWhenMatchUpsScheduled)) {
-            venue.courts = (_k = venue.courts) === null || _k === void 0 ? void 0 : _k.filter(function (court) {
-                return courtIdsToModify.includes(court.courtId);
-            });
+        console.log({ scheduleDeletionsCount: scheduleDeletionsCount });
+        if (venue && (!scheduleDeletionsCount || allowModificationWhenMatchUpsScheduled)) {
+            venue.courts = (_k = venue.courts) === null || _k === void 0 ? void 0 : _k.filter(function (court) { return courtIdsToModify.includes(court.courtId); });
             bulkScheduleTournamentMatchUps({
                 schedule: { courtId: '', scheduledDate: '' },
                 matchUpDetails: matchUpsWithCourtId,