tods-competition-factory 1.8.18 → 1.8.20

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

@@ -2905,7 +2905,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.18';
+    return '1.8.20';
 }
 
 function getObjectTieFormat(obj) {
@@ -3164,10 +3164,50 @@ function getCategoryAgeDetails(params) {
     return result;
 }
 
+function decorateResult(_a) {
+    var context = _a.context, result = _a.result, stack = _a.stack, info = _a.info;
+    if (result && !Array.isArray(result === null || result === void 0 ? void 0 : result.stack))
+        result.stack = [];
+    if (result && Array.isArray(result === null || result === void 0 ? void 0 : result.stack) && typeof stack === 'string') {
+        result.stack.push(stack);
+    }
+    if (result && info) {
+        result.info = info;
+    }
+    if (result && typeof context === 'object' && Object.keys(context).length) {
+        Object.assign(result, definedAttributes(context));
+    }
+    if (result && !(result === null || result === void 0 ? void 0 : result.error) && !(result === null || result === void 0 ? void 0 : result.success)) {
+        Object.assign(result, __assign({}, SUCCESS));
+    }
+    return result !== null && result !== void 0 ? result : { success: true };
+}
+
+function validateCategory(_a) {
+    var category = _a.category;
+    if (!isObject(category))
+        return { error: INVALID_VALUES };
+    var categoryDetails = getCategoryAgeDetails({ category: category });
+    if (categoryDetails.error)
+        return { error: categoryDetails };
+    var ratingMax = category.ratingMax, ratingMin = category.ratingMin;
+    if (ratingMax && !isNumeric(ratingMax))
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { ratingMax: ratingMax },
+        });
+    if (ratingMin && !isNumeric(ratingMin))
+        return decorateResult({
+            result: { error: INVALID_VALUES },
+            context: { ratingMin: ratingMin },
+        });
+    return __assign({}, categoryDetails);
+}
+
 function categoryCanContain(_a) {
     var childCategory = _a.childCategory, withDetails = _a.withDetails, category = _a.category;
-    var categoryDetails = getCategoryAgeDetails({ category: category });
-    var childCategoryDetails = getCategoryAgeDetails({
+    var categoryDetails = validateCategory({ category: category });
+    var childCategoryDetails = validateCategory({
         category: childCategory,
     });
     var invalidAgeMin = childCategoryDetails.ageMin &&
@@ -3188,17 +3228,40 @@ function categoryCanContain(_a) {
         categoryDetails.ageMinDate &&
         new Date(childCategoryDetails.ageMaxDate) <
             new Date(categoryDetails.ageMinDate);
-    var valid = !invalidAgeMax &&
-        !invalidAgeMin &&
+    var ratingComparison = category.ratingType &&
+        childCategory.ratingType &&
+        category.ratingType === childCategory.ratingType;
+    var invalidRatingRange = ratingComparison &&
+        ((category.ratingMin &&
+            childCategory.ratingMin &&
+            childCategory.ratingMin < category.ratingMin) ||
+            (category.ratingMax &&
+                childCategory.ratingMax &&
+                childCategory.ratingMax > category.ratingMax) ||
+            (category.ratingMin &&
+                childCategory.ratingMax &&
+                childCategory.ratingMax < category.ratingMin) ||
+            (category.ratingMax &&
+                childCategory.ratingMin &&
+                childCategory.ratingMin > category.ratingMax));
+    var invalidBallType = category.ballType &&
+        childCategory.ballType &&
+        category.ballType !== childCategory.ballType;
+    var valid = !invalidRatingRange &&
         !invalidAgeMinDate &&
-        !invalidAgeMaxDate;
+        !invalidAgeMaxDate &&
+        !invalidBallType &&
+        !invalidAgeMax &&
+        !invalidAgeMin;
     var ignoreFalse = true;
     var result = definedAttributes({
-        valid: valid,
-        invalidAgeMax: invalidAgeMax,
-        invalidAgeMin: invalidAgeMin,
+        invalidRatingRange: invalidRatingRange,
         invalidAgeMinDate: invalidAgeMinDate,
         invalidAgeMaxDate: invalidAgeMaxDate,
+        invalidBallType: invalidBallType,
+        invalidAgeMax: invalidAgeMax,
+        invalidAgeMin: invalidAgeMin,
+        valid: valid,
     }, ignoreFalse);
     if (withDetails) {
         Object.assign(result, { categoryDetails: categoryDetails, childCategoryDetails: childCategoryDetails });
@@ -3210,25 +3273,6 @@ function mustBeAnArray(value) {
     return "".concat(value, " must be an array");
 }
 
-function decorateResult(_a) {
-    var context = _a.context, result = _a.result, stack = _a.stack, info = _a.info;
-    if (result && !Array.isArray(result === null || result === void 0 ? void 0 : result.stack))
-        result.stack = [];
-    if (result && Array.isArray(result === null || result === void 0 ? void 0 : result.stack) && typeof stack === 'string') {
-        result.stack.push(stack);
-    }
-    if (result && info) {
-        result.info = info;
-    }
-    if (result && typeof context === 'object' && Object.keys(context).length) {
-        Object.assign(result, definedAttributes(context));
-    }
-    if (result && !(result === null || result === void 0 ? void 0 : result.error) && !(result === null || result === void 0 ? void 0 : result.success)) {
-        Object.assign(result, __assign({}, SUCCESS));
-    }
-    return result !== null && result !== void 0 ? result : { success: true };
-}
-
 var DrawTypeEnum;
 (function (DrawTypeEnum) {
     DrawTypeEnum["AdHoc"] = "AD_HOC";
@@ -3930,8 +3974,8 @@ function validateCollectionDefinition(_a) {
         referenceGender !== gender) {
         errors.push("Invalid gender: ".concat(gender));
         return decorateResult({
+            result: { error: INVALID_GENDER, errors: errors },
             context: { referenceGender: referenceGender, gender: gender },
-            result: { error: INVALID_GENDER },
             stack: stack,
         });
     }
@@ -5359,142 +5403,6 @@ function tallyParticipantResults(_a) {
     return result;
 }
 
-function evaluateCollectionResult(_a) {
-    var collectionDefinition = _a.collectionDefinition, groupValueNumbers = _a.groupValueNumbers, groupValueGroups = _a.groupValueGroups, sideTieValues = _a.sideTieValues, tieMatchUps = _a.tieMatchUps;
-    var collectionMatchUps = tieMatchUps.filter(function (matchUp) { return matchUp.collectionId === collectionDefinition.collectionId; });
-    // keep track of the values derived from matchUps
-    var sideMatchUpValues = [0, 0];
-    // will be equivalent to sideMatchUpValues unless there is a collectionValue,
-    // in which case the sideMatchUpValues are used in comparision with winCriteria
-    var sideCollectionValues = [0, 0];
-    var allCollectionMatchUpsCompleted = collectionMatchUps.every(function (matchUp) {
-        return completedMatchUpStatuses.includes(matchUp.matchUpStatus);
-    });
-    var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, matchUpValue = collectionDefinition.matchUpValue, winCriteria = collectionDefinition.winCriteria, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
-    var belongsToValueGroup = collectionGroupNumber && groupValueNumbers.includes(collectionGroupNumber);
-    var sideWins = [0, 0];
-    collectionMatchUps.forEach(function (matchUp) {
-        if (matchUp.winningSide)
-            sideWins[matchUp.winningSide - 1] += 1;
-    });
-    if (isConvertableInteger(matchUpValue)) {
-        // if tiebreak set count as set value and game value
-        collectionMatchUps.forEach(function (matchUp) {
-            if (matchUp.winningSide) {
-                sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
-            }
-        });
-    }
-    else if (isConvertableInteger(setValue)) {
-        collectionMatchUps.forEach(function (matchUp) {
-            var _a, _b;
-            (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
-                if (set.winningSide)
-                    sideMatchUpValues[set.winningSide - 1] += setValue;
-            });
-        });
-    }
-    else if (isConvertableInteger(scoreValue)) {
-        collectionMatchUps.forEach(function (matchUp) {
-            var _a, _b;
-            (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
-                var _a = set.side1TiebreakScore, side1TiebreakScore = _a === void 0 ? 0 : _a, _b = set.side2TiebreakScore, side2TiebreakScore = _b === void 0 ? 0 : _b, _c = set.side1Score, side1Score = _c === void 0 ? 0 : _c, _d = set.side2Score, side2Score = _d === void 0 ? 0 : _d;
-                if (matchUp.matchUpStatus === COMPLETED$1 ||
-                    matchUp.winningSide ||
-                    set.winningSide) {
-                    if (side1Score || side2Score) {
-                        sideMatchUpValues[0] += side1Score;
-                        sideMatchUpValues[1] += side2Score;
-                    }
-                    else if ((side1TiebreakScore || side2TiebreakScore) &&
-                        set.winningSide) {
-                        sideMatchUpValues[set.winningSide - 1] += 1;
-                    }
-                }
-            });
-        });
-    }
-    else if (Array.isArray(collectionValueProfiles)) {
-        // this must come last because it will be true for []
-        collectionMatchUps.forEach(function (matchUp) {
-            if (matchUp.winningSide) {
-                var collectionPosition = matchUp.collectionPosition;
-                var matchUpValue_1 = getCollectionPositionValue({
-                    collectionDefinition: collectionDefinition,
-                    collectionPosition: collectionPosition,
-                });
-                if (isConvertableInteger(matchUpValue_1)) {
-                    sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
-                }
-            }
-        });
-    }
-    // processed separately so that setValue, scoreValue and collecitonValueProfile can be used in conjunction with collectionValue
-    if (isConvertableInteger(collectionValue)) {
-        var collectionWinningSide = void 0;
-        if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.aggregateValue) {
-            if (allCollectionMatchUpsCompleted) {
-                if (isConvertableInteger(matchUpValue || setValue || scoreValue) &&
-                    sideMatchUpValues[0] !== sideMatchUpValues[1]) {
-                    collectionWinningSide =
-                        sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
-                }
-                else if (sideWins[0] !== sideWins[1]) {
-                    collectionWinningSide = sideWins[0] > sideWins[1] ? 1 : 2;
-                }
-            }
-        }
-        else if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.valueGoal) {
-            collectionWinningSide = sideMatchUpValues.reduce(function (winningSide, side, i) {
-                return side >= winCriteria.valueGoal ? i + 1 : winningSide;
-            }, 0);
-        }
-        else {
-            var winGoal_1 = Math.floor(collectionDefinition.matchUpCount / 2) + 1;
-            collectionWinningSide = sideWins.reduce(function (winningSide, side, i) {
-                return side >= winGoal_1 ? i + 1 : winningSide;
-            }, 0);
-        }
-        if (collectionWinningSide) {
-            if (belongsToValueGroup) {
-                groupValueGroups[collectionGroupNumber].values[collectionWinningSide - 1] += collectionValue;
-            }
-            else {
-                sideCollectionValues[collectionWinningSide - 1] += collectionValue;
-            }
-        }
-    }
-    else {
-        if (belongsToValueGroup) {
-            groupValueGroups[collectionGroupNumber].values[0] +=
-                sideMatchUpValues[0] || 0;
-            groupValueGroups[collectionGroupNumber].values[1] +=
-                sideMatchUpValues[1] || 0;
-        }
-        else {
-            sideCollectionValues = sideMatchUpValues;
-        }
-    }
-    if (!belongsToValueGroup) {
-        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue || 0); });
-    }
-    else {
-        groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
-        groupValueGroups[collectionGroupNumber].sideWins[1] += sideWins[1] || 0;
-        groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted =
-            groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted &&
-                allCollectionMatchUpsCompleted;
-        groupValueGroups[collectionGroupNumber].matchUpsCount +=
-            collectionMatchUps.length;
-    }
-}
-function getCollectionPositionValue(_a) {
-    var collectionDefinition = _a.collectionDefinition, collectionPosition = _a.collectionPosition;
-    var collectionValueProfiles = collectionDefinition.collectionValueProfiles || [];
-    var profile = collectionValueProfiles === null || collectionValueProfiles === void 0 ? void 0 : collectionValueProfiles.find(function (profile) { return profile.collectionPosition === collectionPosition; });
-    return profile === null || profile === void 0 ? void 0 : profile.matchUpValue;
-}
-
 var APPLIED_POLICIES = 'appliedPolicies';
 var AUDIT_POSITION_ACTIONS = 'positionActions';
 var CONTEXT = 'context';
@@ -10007,11 +9915,13 @@ function getAllStructureMatchUps(_a) {
 /*
   public version of findMatchUp
 */
-function publicFindMatchUp$1(params) {
+function publicFindDrawMatchUp(params) {
     Object.assign(params, { inContext: true });
-    return { matchUp: makeDeepCopy(findMatchUp$1(params).matchUp, false, true) };
+    return {
+        matchUp: makeDeepCopy(findDrawMatchUp(params).matchUp, false, true),
+    };
 }
-function findMatchUp$1(_a) {
+function findDrawMatchUp(_a) {
     var e_1, _b;
     var tournamentParticipants = _a.tournamentParticipants, afterRecoveryTimes = _a.afterRecoveryTimes, contextContent = _a.contextContent, contextProfile = _a.contextProfile, drawDefinition = _a.drawDefinition, matchUpsMap = _a.matchUpsMap, matchUpId = _a.matchUpId, inContext = _a.inContext, context = _a.context, event = _a.event;
     if (!drawDefinition)
@@ -10053,6 +9963,142 @@ function findMatchUp$1(_a) {
     return { error: MATCHUP_NOT_FOUND };
 }
 
+function evaluateCollectionResult(_a) {
+    var collectionDefinition = _a.collectionDefinition, groupValueNumbers = _a.groupValueNumbers, groupValueGroups = _a.groupValueGroups, sideTieValues = _a.sideTieValues, tieMatchUps = _a.tieMatchUps;
+    var collectionMatchUps = tieMatchUps.filter(function (matchUp) { return matchUp.collectionId === collectionDefinition.collectionId; });
+    // keep track of the values derived from matchUps
+    var sideMatchUpValues = [0, 0];
+    // will be equivalent to sideMatchUpValues unless there is a collectionValue,
+    // in which case the sideMatchUpValues are used in comparision with winCriteria
+    var sideCollectionValues = [0, 0];
+    var allCollectionMatchUpsCompleted = collectionMatchUps.every(function (matchUp) {
+        return completedMatchUpStatuses.includes(matchUp.matchUpStatus);
+    });
+    var collectionValueProfiles = collectionDefinition.collectionValueProfiles, collectionGroupNumber = collectionDefinition.collectionGroupNumber, collectionValue = collectionDefinition.collectionValue, matchUpValue = collectionDefinition.matchUpValue, winCriteria = collectionDefinition.winCriteria, scoreValue = collectionDefinition.scoreValue, setValue = collectionDefinition.setValue;
+    var belongsToValueGroup = collectionGroupNumber && groupValueNumbers.includes(collectionGroupNumber);
+    var sideWins = [0, 0];
+    collectionMatchUps.forEach(function (matchUp) {
+        if (matchUp.winningSide)
+            sideWins[matchUp.winningSide - 1] += 1;
+    });
+    if (isConvertableInteger(matchUpValue)) {
+        // if tiebreak set count as set value and game value
+        collectionMatchUps.forEach(function (matchUp) {
+            if (matchUp.winningSide) {
+                sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
+            }
+        });
+    }
+    else if (isConvertableInteger(setValue)) {
+        collectionMatchUps.forEach(function (matchUp) {
+            var _a, _b;
+            (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
+                if (set.winningSide)
+                    sideMatchUpValues[set.winningSide - 1] += setValue;
+            });
+        });
+    }
+    else if (isConvertableInteger(scoreValue)) {
+        collectionMatchUps.forEach(function (matchUp) {
+            var _a, _b;
+            (_b = (_a = matchUp.score) === null || _a === void 0 ? void 0 : _a.sets) === null || _b === void 0 ? void 0 : _b.forEach(function (set) {
+                var _a = set.side1TiebreakScore, side1TiebreakScore = _a === void 0 ? 0 : _a, _b = set.side2TiebreakScore, side2TiebreakScore = _b === void 0 ? 0 : _b, _c = set.side1Score, side1Score = _c === void 0 ? 0 : _c, _d = set.side2Score, side2Score = _d === void 0 ? 0 : _d;
+                if (matchUp.matchUpStatus === COMPLETED$1 ||
+                    matchUp.winningSide ||
+                    set.winningSide) {
+                    if (side1Score || side2Score) {
+                        sideMatchUpValues[0] += side1Score;
+                        sideMatchUpValues[1] += side2Score;
+                    }
+                    else if ((side1TiebreakScore || side2TiebreakScore) &&
+                        set.winningSide) {
+                        sideMatchUpValues[set.winningSide - 1] += 1;
+                    }
+                }
+            });
+        });
+    }
+    else if (Array.isArray(collectionValueProfiles)) {
+        // this must come last because it will be true for []
+        collectionMatchUps.forEach(function (matchUp) {
+            if (matchUp.winningSide) {
+                var collectionPosition = matchUp.collectionPosition;
+                var matchUpValue_1 = getCollectionPositionValue({
+                    collectionDefinition: collectionDefinition,
+                    collectionPosition: collectionPosition,
+                });
+                if (isConvertableInteger(matchUpValue_1)) {
+                    sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue_1;
+                }
+            }
+        });
+    }
+    // processed separately so that setValue, scoreValue and collecitonValueProfile can be used in conjunction with collectionValue
+    if (isConvertableInteger(collectionValue)) {
+        var collectionWinningSide = void 0;
+        if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.aggregateValue) {
+            if (allCollectionMatchUpsCompleted) {
+                if (isConvertableInteger(matchUpValue || setValue || scoreValue) &&
+                    sideMatchUpValues[0] !== sideMatchUpValues[1]) {
+                    collectionWinningSide =
+                        sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
+                }
+                else if (sideWins[0] !== sideWins[1]) {
+                    collectionWinningSide = sideWins[0] > sideWins[1] ? 1 : 2;
+                }
+            }
+        }
+        else if (winCriteria === null || winCriteria === void 0 ? void 0 : winCriteria.valueGoal) {
+            collectionWinningSide = sideMatchUpValues.reduce(function (winningSide, side, i) {
+                return side >= winCriteria.valueGoal ? i + 1 : winningSide;
+            }, 0);
+        }
+        else {
+            var winGoal_1 = Math.floor(collectionDefinition.matchUpCount / 2) + 1;
+            collectionWinningSide = sideWins.reduce(function (winningSide, side, i) {
+                return side >= winGoal_1 ? i + 1 : winningSide;
+            }, 0);
+        }
+        if (collectionWinningSide) {
+            if (belongsToValueGroup) {
+                groupValueGroups[collectionGroupNumber].values[collectionWinningSide - 1] += collectionValue;
+            }
+            else {
+                sideCollectionValues[collectionWinningSide - 1] += collectionValue;
+            }
+        }
+    }
+    else {
+        if (belongsToValueGroup) {
+            groupValueGroups[collectionGroupNumber].values[0] +=
+                sideMatchUpValues[0] || 0;
+            groupValueGroups[collectionGroupNumber].values[1] +=
+                sideMatchUpValues[1] || 0;
+        }
+        else {
+            sideCollectionValues = sideMatchUpValues;
+        }
+    }
+    if (!belongsToValueGroup) {
+        sideCollectionValues.forEach(function (sideCollectionValue, i) { return (sideTieValues[i] += sideCollectionValue || 0); });
+    }
+    else {
+        groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
+        groupValueGroups[collectionGroupNumber].sideWins[1] += sideWins[1] || 0;
+        groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted =
+            groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted &&
+                allCollectionMatchUpsCompleted;
+        groupValueGroups[collectionGroupNumber].matchUpsCount +=
+            collectionMatchUps.length;
+    }
+}
+function getCollectionPositionValue(_a) {
+    var collectionDefinition = _a.collectionDefinition, collectionPosition = _a.collectionPosition;
+    var collectionValueProfiles = collectionDefinition.collectionValueProfiles || [];
+    var profile = collectionValueProfiles === null || collectionValueProfiles === void 0 ? void 0 : collectionValueProfiles.find(function (profile) { return profile.collectionPosition === collectionPosition; });
+    return profile === null || profile === void 0 ? void 0 : profile.matchUpValue;
+}
+
 function getGroupValueGroups(_a) {
     var _b = _a.collectionGroups, collectionGroups = _b === void 0 ? [] : _b;
     // set up to handle groupValue
@@ -10190,7 +10236,7 @@ function generateTieMatchUpScore(params) {
                 ? matchUp
                 : ((_d = matchUpsMap === null || matchUpsMap === void 0 ? void 0 : matchUpsMap.drawMatchUps) === null || _d === void 0 ? void 0 : _d[matchUpId]) ||
                     (drawDefinition &&
-                        ((_e = findMatchUp$1({
+                        ((_e = findDrawMatchUp({
                             inContext: true,
                             drawDefinition: drawDefinition,
                             matchUpId: matchUpId,
@@ -10219,83 +10265,6 @@ function generateTieMatchUpScore(params) {
     };
 }
 
-function copyTieFormat(tieFormat) {
-    if (!tieFormat)
-        return undefined;
-    return makeDeepCopy(tieFormat, false, true);
-}
-
-function scoreHasValue(params) {
-    var _a, _b;
-    var matchUp = params === null || params === void 0 ? void 0 : params.matchUp;
-    var score = (params === null || params === void 0 ? void 0 : params.score) || (matchUp === null || matchUp === void 0 ? void 0 : matchUp.score);
-    var firstSet = (_a = score === null || score === void 0 ? void 0 : score.sets) === null || _a === void 0 ? void 0 : _a[0];
-    var _c = firstSet || {}, side1Score = _c.side1Score, side2Score = _c.side2Score, side1TiebreakScore = _c.side1TiebreakScore, side2TiebreakScore = _c.side2TiebreakScore, side1PointScore = _c.side1PointScore, side2PointScore = _c.side2PointScore;
-    var firstSetScore = side1Score ||
-        side2Score ||
-        side1TiebreakScore ||
-        side2TiebreakScore ||
-        side1PointScore ||
-        side2PointScore;
-    var hasValue = ((_b = score === null || score === void 0 ? void 0 : score.sets) === null || _b === void 0 ? void 0 : _b.length) > 1 || firstSetScore;
-    return !!hasValue;
-}
-
-function isDirectingMatchUpStatus(_a) {
-    var matchUpStatus = _a.matchUpStatus;
-    return directingMatchUpStatuses.includes(matchUpStatus);
-}
-function isActiveMatchUpStatus(_a) {
-    var matchUpStatus = _a.matchUpStatus;
-    return activeMatchUpStatuses.includes(matchUpStatus);
-}
-function isNonDirectingMatchUpStatus(_a) {
-    var matchUpStatus = _a.matchUpStatus;
-    return nonDirectingMatchUpStatuses.includes(matchUpStatus);
-}
-
-function isActiveMatchUp(_a) {
-    var _b;
-    var matchUpStatus = _a.matchUpStatus, winningSide = _a.winningSide, tieMatchUps = _a.tieMatchUps, sides = _a.sides, score = _a.score;
-    var participantAssigned = sides === null || sides === void 0 ? void 0 : sides.find(function (_a) {
-        var participantId = _a.participantId;
-        return participantId;
-    });
-    var activeTieMatchUps = (_b = tieMatchUps === null || tieMatchUps === void 0 ? void 0 : tieMatchUps.filter(isActiveMatchUp)) === null || _b === void 0 ? void 0 : _b.length;
-    var scoreExists = scoreHasValue({ score: score });
-    return (scoreExists ||
-        activeTieMatchUps ||
-        (winningSide && participantAssigned) || // if winningSide and no participant assigned => "produced" WALKOVER
-        // must exclude IN_PROGRESS as this is automatically set by updateTieMatchUpScore
-        // must exclude WALKOVER and DEFAULTED as "produced" scenarios do not imply a winningSide
-        (matchUpStatus &&
-            isActiveMatchUpStatus({ matchUpStatus: matchUpStatus }) &&
-            ![DEFAULTED, WALKOVER$2, IN_PROGRESS$1].includes(matchUpStatus)));
-}
-
-function addNotes(params) {
-    var _a;
-    if (typeof params !== 'object')
-        return { error: MISSING_VALUE };
-    if (typeof params.element !== 'object')
-        return { error: INVALID_VALUES };
-    if (!params.notes)
-        return { error: MISSING_VALUE };
-    if (typeof params.notes !== 'string' && !((_a = params.notes) === null || _a === void 0 ? void 0 : _a.testing))
-        return { error: INVALID_VALUES };
-    Object.assign(params.element, { notes: params.notes });
-    return __assign({}, SUCCESS);
-}
-function removeNotes(params) {
-    if (typeof params !== 'object')
-        return { error: MISSING_VALUE };
-    if (typeof params.element !== 'object')
-        return { error: INVALID_VALUES };
-    if (params.element.notes)
-        delete params.element.notes;
-    return __assign({}, SUCCESS);
-}
-
 function drawUpdatedAt(drawDefinition, structureIds) {
     var _a;
     if (!drawDefinition)
@@ -10382,8 +10351,8 @@ function updateInContextMatchUp(_a) {
         return { error: MISSING_MATCHUP };
     }
     addNotice({
-        topic: UPDATE_INCONTEXT_MATCHUP,
         payload: { inContextMatchUp: inContextMatchUp, tournamentId: tournamentId },
+        topic: UPDATE_INCONTEXT_MATCHUP,
         key: inContextMatchUp.matchUpId,
     });
     return __assign({}, SUCCESS);
@@ -10477,6 +10446,117 @@ function modifyPositionAssignmentsNotice(_a) {
     return __assign({}, SUCCESS);
 }
 
+function ensureSideLineUps(_a) {
+    var _b, _c, _d;
+    var inContextDualMatchUp = _a.inContextDualMatchUp, drawDefinition = _a.drawDefinition, tournamentId = _a.tournamentId, dualMatchUp = _a.dualMatchUp, eventId = _a.eventId;
+    if (dualMatchUp && !((_b = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (!inContextDualMatchUp) {
+            inContextDualMatchUp = (_c = findDrawMatchUp({
+                matchUpId: dualMatchUp.matchUpId,
+                inContext: true,
+                drawDefinition: drawDefinition,
+            })) === null || _c === void 0 ? void 0 : _c.matchUp;
+        }
+        var extension = findExtension$2({
+            element: drawDefinition,
+            name: LINEUPS,
+        }).extension;
+        var lineUps_1 = makeDeepCopy((extension === null || extension === void 0 ? void 0 : extension.value) || {}, false, true);
+        var extractSideDetail_1 = function (_a) {
+            var displaySideNumber = _a.displaySideNumber, drawPosition = _a.drawPosition, sideNumber = _a.sideNumber;
+            return ({ drawPosition: drawPosition, sideNumber: sideNumber, displaySideNumber: displaySideNumber });
+        };
+        dualMatchUp.sides = (_d = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _d === void 0 ? void 0 : _d.map(function (side) {
+            var participantId = side.participantId;
+            return __assign(__assign({}, extractSideDetail_1(side)), { lineUp: (participantId && lineUps_1[participantId]) || [] });
+        });
+        modifyMatchUpNotice({
+            context: 'ensureSidLineUps',
+            matchUp: dualMatchUp,
+            drawDefinition: drawDefinition,
+            tournamentId: tournamentId,
+            eventId: eventId,
+        });
+    }
+}
+
+function copyTieFormat(tieFormat) {
+    if (!tieFormat)
+        return undefined;
+    return makeDeepCopy(tieFormat, false, true);
+}
+
+function scoreHasValue(params) {
+    var _a, _b;
+    var matchUp = params === null || params === void 0 ? void 0 : params.matchUp;
+    var score = (params === null || params === void 0 ? void 0 : params.score) || (matchUp === null || matchUp === void 0 ? void 0 : matchUp.score);
+    var firstSet = (_a = score === null || score === void 0 ? void 0 : score.sets) === null || _a === void 0 ? void 0 : _a[0];
+    var _c = firstSet || {}, side1Score = _c.side1Score, side2Score = _c.side2Score, side1TiebreakScore = _c.side1TiebreakScore, side2TiebreakScore = _c.side2TiebreakScore, side1PointScore = _c.side1PointScore, side2PointScore = _c.side2PointScore;
+    var firstSetScore = side1Score ||
+        side2Score ||
+        side1TiebreakScore ||
+        side2TiebreakScore ||
+        side1PointScore ||
+        side2PointScore;
+    var hasValue = ((_b = score === null || score === void 0 ? void 0 : score.sets) === null || _b === void 0 ? void 0 : _b.length) > 1 || firstSetScore;
+    return !!hasValue;
+}
+
+function isDirectingMatchUpStatus(_a) {
+    var matchUpStatus = _a.matchUpStatus;
+    return directingMatchUpStatuses.includes(matchUpStatus);
+}
+function isActiveMatchUpStatus(_a) {
+    var matchUpStatus = _a.matchUpStatus;
+    return activeMatchUpStatuses.includes(matchUpStatus);
+}
+function isNonDirectingMatchUpStatus(_a) {
+    var matchUpStatus = _a.matchUpStatus;
+    return nonDirectingMatchUpStatuses.includes(matchUpStatus);
+}
+
+function isActiveMatchUp(_a) {
+    var _b;
+    var matchUpStatus = _a.matchUpStatus, winningSide = _a.winningSide, tieMatchUps = _a.tieMatchUps, sides = _a.sides, score = _a.score;
+    var participantAssigned = sides === null || sides === void 0 ? void 0 : sides.find(function (_a) {
+        var participantId = _a.participantId;
+        return participantId;
+    });
+    var activeTieMatchUps = (_b = tieMatchUps === null || tieMatchUps === void 0 ? void 0 : tieMatchUps.filter(isActiveMatchUp)) === null || _b === void 0 ? void 0 : _b.length;
+    var scoreExists = scoreHasValue({ score: score });
+    return (scoreExists ||
+        activeTieMatchUps ||
+        (winningSide && participantAssigned) || // if winningSide and no participant assigned => "produced" WALKOVER
+        // must exclude IN_PROGRESS as this is automatically set by updateTieMatchUpScore
+        // must exclude WALKOVER and DEFAULTED as "produced" scenarios do not imply a winningSide
+        (matchUpStatus &&
+            isActiveMatchUpStatus({ matchUpStatus: matchUpStatus }) &&
+            ![DEFAULTED, WALKOVER$2, IN_PROGRESS$1].includes(matchUpStatus)));
+}
+
+function addNotes(params) {
+    var _a;
+    if (typeof params !== 'object')
+        return { error: MISSING_VALUE };
+    if (typeof params.element !== 'object')
+        return { error: INVALID_VALUES };
+    if (!params.notes)
+        return { error: MISSING_VALUE };
+    if (typeof params.notes !== 'string' && !((_a = params.notes) === null || _a === void 0 ? void 0 : _a.testing))
+        return { error: INVALID_VALUES };
+    Object.assign(params.element, { notes: params.notes });
+    return __assign({}, SUCCESS);
+}
+function removeNotes(params) {
+    if (typeof params !== 'object')
+        return { error: MISSING_VALUE };
+    if (typeof params.element !== 'object')
+        return { error: INVALID_VALUES };
+    if (params.element.notes)
+        delete params.element.notes;
+    return __assign({}, SUCCESS);
+}
+
 var hasParticipantId = function (o) { return o === null || o === void 0 ? void 0 : o.participantId; };
 
 function createSubOrderMap(_a) {
@@ -11433,7 +11513,7 @@ function modifyMatchUpScore(_a) {
     if (isDualMatchUp && drawDefinition) {
         if (matchUpId && matchUp.matchUpId !== matchUpId) {
             // the modification is to be applied to a tieMatchUp
-            var findResult = findMatchUp$1({
+            var findResult = findDrawMatchUp({
                 drawDefinition: drawDefinition,
                 matchUpId: matchUpId,
                 event: event,
@@ -11467,7 +11547,7 @@ function modifyMatchUpScore(_a) {
     if (removeWinningSide)
         matchUp.winningSide = undefined;
     if (!structure && drawDefinition) {
-        (structure = findMatchUp$1({
+        (structure = findDrawMatchUp({
             drawDefinition: drawDefinition,
             matchUpId: matchUpId,
             event: event,
@@ -11606,7 +11686,7 @@ function modifyMatchUpScore(_a) {
 function updateTieMatchUpScore$1(_a) {
     var _b, _c;
     var tournamentRecord = _a.tournamentRecord, exitWhenNoValues = _a.exitWhenNoValues, drawDefinition = _a.drawDefinition, matchUpStatus = _a.matchUpStatus, removeScore = _a.removeScore, matchUpsMap = _a.matchUpsMap, matchUpId = _a.matchUpId, event = _a.event;
-    var result = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
+    var result = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
     if (result.error)
         return result;
     if (!result.matchUp)
@@ -11614,6 +11694,12 @@ function updateTieMatchUpScore$1(_a) {
     var matchUp = result.matchUp, structure = result.structure;
     if (!matchUp.tieMatchUps)
         return { error: INVALID_MATCHUP };
+    ensureSideLineUps({
+        tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
+        eventId: event === null || event === void 0 ? void 0 : event.eventId,
+        dualMatchUp: matchUp,
+        drawDefinition: drawDefinition,
+    });
     var extension = findExtension({
         name: DISABLE_AUTO_CALC,
         element: matchUp,
@@ -21744,7 +21830,7 @@ function addEventTimeItem(params) {
 
 function addMatchUpTimeItem(_a) {
     var removePriorValues = _a.removePriorValues, tournamentRecord = _a.tournamentRecord, duplicateValues = _a.duplicateValues, drawDefinition = _a.drawDefinition, disableNotice = _a.disableNotice, matchUpId = _a.matchUpId, timeItem = _a.timeItem, event = _a.event;
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     if (!matchUp)
         return { error: MATCHUP_NOT_FOUND };
     var result = addTimeItem({
@@ -21766,7 +21852,7 @@ function addMatchUpTimeItem(_a) {
 }
 function resetMatchUpTimeItems(_a) {
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, event = _a.event;
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     if (!matchUp)
         return { error: MATCHUP_NOT_FOUND };
     matchUp.timeItems = [];
@@ -21788,7 +21874,7 @@ function allocateTeamMatchUpCourts$1(_a) {
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!matchUpId)
         return { error: MISSING_MATCHUP_ID };
-    var result = findMatchUp$1({
+    var result = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
     });
@@ -21931,7 +22017,7 @@ function addMatchUpScheduledTime$2(params) {
     if (!validTimeValue(scheduledTime))
         return decorateResult({ result: { error: INVALID_TIME }, stack: stack });
     if (!matchUp) {
-        var result = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId });
+        var result = findDrawMatchUp({ drawDefinition: drawDefinition, matchUpId: matchUpId });
         if (result.error)
             return decorateResult({ result: result, stack: stack });
         matchUp = result.matchUp;
@@ -21982,7 +22068,7 @@ function addMatchUpTimeModifiers(_a) {
             stack: stack,
         });
     if (!matchUp) {
-        var result = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId });
+        var result = findDrawMatchUp({ drawDefinition: drawDefinition, matchUpId: matchUpId });
         if (result.error)
             return decorateResult({ result: result, stack: stack });
         matchUp = result.matchUp;
@@ -22047,7 +22133,7 @@ function addMatchUpScheduleItems$2(_a) {
     var stack = 'drawEngine.addMatchUpScheduleItems';
     var matchUp, warning;
     if (!drawMatchUps) {
-        var result = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
+        var result = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
         if (result.error)
             return result;
         matchUp = result.matchUp;
@@ -22313,7 +22399,7 @@ function addMatchUpStartTime$2(_a) {
         return { error: MISSING_MATCHUP_ID };
     if (!validTimeValue(startTime))
         return { error: INVALID_TIME };
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
     var timeItems = (_b = matchUp === null || matchUp === void 0 ? void 0 : matchUp.timeItems) !== null && _b !== void 0 ? _b : [];
     var earliestRelevantTimeValue = timeItems
@@ -22354,7 +22440,7 @@ function addMatchUpEndTime$2(_a) {
         return { error: MISSING_MATCHUP_ID };
     if (!validTimeValue(endTime))
         return { error: INVALID_TIME };
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
     var timeItems = (_b = matchUp === null || matchUp === void 0 ? void 0 : matchUp.timeItems) !== null && _b !== void 0 ? _b : [];
     var latestRelevantTimeValue = timeItems
@@ -22397,7 +22483,7 @@ function addMatchUpStopTime$2(_a) {
         return { error: MISSING_MATCHUP_ID };
     if (!validTimeValue(stopTime))
         return { error: INVALID_TIME };
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
     var timeItems = (_b = matchUp === null || matchUp === void 0 ? void 0 : matchUp.timeItems) !== null && _b !== void 0 ? _b : [];
     // can't add a STOP_TIME if the matchUp is not STARTED or RESUMED, or has START_TIME
@@ -22458,7 +22544,7 @@ function addMatchUpResumeTime$2(_a) {
         return { error: MISSING_MATCHUP_ID };
     if (!validTimeValue(resumeTime))
         return { error: INVALID_TIME };
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     var scheduledDate = scheduledMatchUpDate({ matchUp: matchUp }).scheduledDate;
     var timeItems = (_b = matchUp === null || matchUp === void 0 ? void 0 : matchUp.timeItems) !== null && _b !== void 0 ? _b : [];
     // can't add a RESUME_TIME if the matchUp is not STOPPED, or if it has ENDED
@@ -24293,8 +24379,8 @@ function updateSideLineUp(_a) {
         element: drawDefinition,
         name: LINEUPS,
     }).extension;
-    var value = (existingExtension === null || existingExtension === void 0 ? void 0 : existingExtension.value) || {};
-    var lineUp = value[teamParticipantId];
+    var lineUps = (existingExtension === null || existingExtension === void 0 ? void 0 : existingExtension.value) || {};
+    var lineUp = makeDeepCopy(lineUps[teamParticipantId], false, true);
     if (sideExists) {
         (_e = matchUp === null || matchUp === void 0 ? void 0 : matchUp.sides) === null || _e === void 0 ? void 0 : _e.forEach(function (side) {
             if (side.sideNumber === drawPositionSideNumber) {
@@ -24309,13 +24395,12 @@ function updateSideLineUp(_a) {
             return __assign(__assign({}, existingSide), { sideNumber: sideNumber });
         });
         var targetSide = matchUp.sides.find(function (side) { return side.sideNumber === drawPositionSideNumber; });
-        if (targetSide) {
+        if (targetSide)
             targetSide.lineUp = lineUp;
-        }
     }
     modifyMatchUpNotice({
         tournamentId: tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.tournamentId,
-        context: 'updateSidLineUps',
+        context: 'updateSidLineUp',
         eventId: event === null || event === void 0 ? void 0 : event.eventId,
         drawDefinition: drawDefinition,
         matchUp: matchUp,
@@ -25290,13 +25375,15 @@ function removeLineUpSubstitutions(_a) {
     if (!Array.isArray(lineUp))
         return;
     var participantAssignments = {};
-    var permutations = unique(lineUp.flatMap(function (_a) {
+    var permutations = unique(lineUp
+        .flatMap(function (_a) {
         var collectionAssignments = _a.collectionAssignments;
-        return collectionAssignments.map(function (_a) {
+        return collectionAssignments === null || collectionAssignments === void 0 ? void 0 : collectionAssignments.map(function (_a) {
             var collectionId = _a.collectionId, collectionPosition = _a.collectionPosition;
             return [collectionId, collectionPosition].join('|');
         });
-    }));
+    })
+        .filter(Boolean));
     permutations.forEach(function (permutation) {
         var _a = __read(permutation.split('|'), 2), collectionId = _a[0], position = _a[1];
         var collectionPosition = parseInt(position);
@@ -27925,7 +28012,7 @@ function setMatchUpStatus$2(params) {
         matchUp: matchUp,
     });
     if (matchUpTieId) {
-        var dualMatchUp = findMatchUp$1({
+        var dualMatchUp = findDrawMatchUp({
             matchUpId: matchUpTieId,
             inContext: true,
             drawDefinition: drawDefinition,
@@ -28089,7 +28176,7 @@ function setMatchUpFormat$1(params) {
         return { error: UNRECOGNIZED_MATCHUP_FORMAT };
     var stack = 'setMatchUpFormat';
     if (matchUpId) {
-        var result = findMatchUp$1({
+        var result = findDrawMatchUp({
             drawDefinition: drawDefinition,
             matchUpId: matchUpId,
             event: event,
@@ -30722,7 +30809,7 @@ function getTieFormat$1(_a) {
     else if (matchUpId) {
         // if matchUpId is present, structure and drawDefinition are always required
         if (drawDefinition && (!matchUp || !structure)) {
-            var result = findMatchUp$1({
+            var result = findDrawMatchUp({
                 drawDefinition: drawDefinition,
                 matchUpId: matchUpId,
             });
@@ -31460,7 +31547,7 @@ function orderCollectionDefinitions$1(_a) {
     }
     else if (matchUpId) {
         var result = drawDefinition &&
-            findMatchUp$1({
+            findDrawMatchUp({
                 drawDefinition: drawDefinition,
                 matchUpId: matchUpId,
             });
@@ -31765,7 +31852,7 @@ function removeCollectionDefinition$1(_a) {
                 });
                 if (result_1.error)
                     return result_1;
-                result_1 = findMatchUp$1({
+                result_1 = findDrawMatchUp({
                     drawDefinition: drawDefinition,
                     matchUpId: matchUpId,
                 });
@@ -31898,23 +31985,22 @@ function removeCollectionDefinition(params) {
 
 function addCollectionDefinition$1(_a) {
     var e_1, _b, e_2, _c, _d, e_3, _e;
-    var _f, _g, _h, _j, _k, _l, _m, _o;
-    var _p = _a.updateInProgressMatchUps, updateInProgressMatchUps = _p === void 0 ? true : _p, collectionDefinition = _a.collectionDefinition, referenceCategory = _a.referenceCategory, tournamentRecord = _a.tournamentRecord, enforceCategory = _a.enforceCategory, referenceGender = _a.referenceGender, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, enforceGender = _a.enforceGender, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
+    var _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _q = _a.updateInProgressMatchUps, updateInProgressMatchUps = _q === void 0 ? true : _q, collectionDefinition = _a.collectionDefinition, referenceCategory = _a.referenceCategory, tournamentRecord = _a.tournamentRecord, policyDefinitions = _a.policyDefinitions, enforceCategory = _a.enforceCategory, referenceGender = _a.referenceGender, drawDefinition = _a.drawDefinition, tieFormatName = _a.tieFormatName, enforceGender = _a.enforceGender, structureId = _a.structureId, matchUpId = _a.matchUpId, matchUp = _a.matchUp, eventId = _a.eventId, uuids = _a.uuids, event = _a.event;
     var stack = 'addCollectionDefinition';
     var appliedPolicies = (_f = getAppliedPolicies({
         tournamentRecord: tournamentRecord,
         drawDefinition: drawDefinition,
         event: event,
     }).appliedPolicies) !== null && _f !== void 0 ? _f : {};
-    var matchUpActionsPolicy = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS];
+    var matchUpActionsPolicy = (_g = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _g !== void 0 ? _g : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS];
     enforceCategory =
-        enforceCategory !== null && enforceCategory !== void 0 ? enforceCategory : (_g = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _g === void 0 ? void 0 : _g.enforceCategory;
-    enforceGender =
-        enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_h = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _h === void 0 ? void 0 : _h.enforceGender;
+        enforceCategory !== null && enforceCategory !== void 0 ? enforceCategory : (_h = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _h === void 0 ? void 0 : _h.enforceCategory;
+    var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_j = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _j === void 0 ? void 0 : _j.enforceGender) !==
+        false;
     var checkCategory = !!((referenceCategory !== null && referenceCategory !== void 0 ? referenceCategory : event === null || event === void 0 ? void 0 : event.category) &&
         enforceCategory !== false);
-    var checkGender = !!((referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender) &&
-        enforceGender !== false);
+    var checkGender = !!((referenceGender !== null && referenceGender !== void 0 ? referenceGender : event === null || event === void 0 ? void 0 : event.gender) && genderEnforced);
     var validationResult = validateCollectionDefinition({
         referenceCategory: referenceCategory !== null && referenceCategory !== void 0 ? referenceCategory : event === null || event === void 0 ? void 0 : event.category,
         collectionDefinition: collectionDefinition,
@@ -31939,7 +32025,7 @@ function addCollectionDefinition$1(_a) {
         return decorateResult({ result: { error: result.error }, stack: stack });
     var structure = result === null || result === void 0 ? void 0 : result.structure;
     matchUp = matchUp !== null && matchUp !== void 0 ? matchUp : result === null || result === void 0 ? void 0 : result.matchUp;
-    var existingTieFormat = (_j = matchUp === null || matchUp === void 0 ? void 0 : matchUp.tieFormat) !== null && _j !== void 0 ? _j : result === null || result === void 0 ? void 0 : result.tieFormat;
+    var existingTieFormat = (_k = matchUp === null || matchUp === void 0 ? void 0 : matchUp.tieFormat) !== null && _k !== void 0 ? _k : result === null || result === void 0 ? void 0 : result.tieFormat;
     var tieFormat = copyTieFormat(existingTieFormat);
     result = validateTieFormat({ tieFormat: tieFormat });
     if (result === null || result === void 0 ? void 0 : result.error) {
@@ -31967,7 +32053,7 @@ function addCollectionDefinition$1(_a) {
     });
     // calculate new winCriteria for tieFormat
     // if existing winCriteria is aggregateValue, retain
-    var _q = calculateWinCriteria(tieFormat), aggregateValue = _q.aggregateValue, valueGoal = _q.valueGoal;
+    var _r = calculateWinCriteria(tieFormat), aggregateValue = _r.aggregateValue, valueGoal = _r.valueGoal;
     tieFormat.winCriteria = definedAttributes({ aggregateValue: aggregateValue, valueGoal: valueGoal });
     // if valueGoal has changed, force renaming of the tieFormat
     var originalValueGoal = existingTieFormat === null || existingTieFormat === void 0 ? void 0 : existingTieFormat.winCriteria.valueGoal;
@@ -31993,13 +32079,13 @@ function addCollectionDefinition$1(_a) {
         event.tieFormat = prunedTieFormat;
         try {
             // all team matchUps in the event which do not have tieFormats and where draws/strucures do not have tieFormats should have matchUps added
-            for (var _r = __values((_k = event.drawDefinitions) !== null && _k !== void 0 ? _k : []), _s = _r.next(); !_s.done; _s = _r.next()) {
-                var drawDefinition_1 = _s.value;
+            for (var _s = __values((_l = event.drawDefinitions) !== null && _l !== void 0 ? _l : []), _t = _s.next(); !_t.done; _t = _s.next()) {
+                var drawDefinition_1 = _t.value;
                 if (drawDefinition_1.tieFormat)
                     continue;
                 try {
-                    for (var _t = (e_2 = void 0, __values((_l = drawDefinition_1.structures) !== null && _l !== void 0 ? _l : [])), _u = _t.next(); !_u.done; _u = _t.next()) {
-                        var structure_1 = _u.value;
+                    for (var _u = (e_2 = void 0, __values((_m = drawDefinition_1.structures) !== null && _m !== void 0 ? _m : [])), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var structure_1 = _v.value;
                         if (structure_1.tieFormat)
                             continue;
                         var result_1 = updateStructureMatchUps({
@@ -32016,7 +32102,7 @@ function addCollectionDefinition$1(_a) {
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_u && !_u.done && (_c = _t.return)) _c.call(_t);
+                        if (_v && !_v.done && (_c = _u.return)) _c.call(_u);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -32025,7 +32111,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
+                if (_t && !_t.done && (_b = _s.return)) _b.call(_s);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -32088,8 +32174,8 @@ function addCollectionDefinition$1(_a) {
         // all team matchUps in the drawDefinition which do not have tieFormats and where strucures do not have tieFormats should have matchUps added
         drawDefinition.tieFormat = prunedTieFormat;
         try {
-            for (var _v = __values((_m = drawDefinition.structures) !== null && _m !== void 0 ? _m : []), _w = _v.next(); !_w.done; _w = _v.next()) {
-                var structure_2 = _w.value;
+            for (var _w = __values((_o = drawDefinition.structures) !== null && _o !== void 0 ? _o : []), _x = _w.next(); !_x.done; _x = _w.next()) {
+                var structure_2 = _x.value;
                 var result_3 = updateStructureMatchUps({
                     updateInProgressMatchUps: updateInProgressMatchUps,
                     collectionDefinition: collectionDefinition,
@@ -32104,7 +32190,7 @@ function addCollectionDefinition$1(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_w && !_w.done && (_e = _v.return)) _e.call(_v);
+                if (_x && !_x.done && (_e = _w.return)) _e.call(_w);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -32120,7 +32206,7 @@ function addCollectionDefinition$1(_a) {
     else {
         return { error: MISSING_DRAW_DEFINITION };
     }
-    if ((_o = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _o === void 0 ? void 0 : _o[TIE_FORMAT_MODIFICATIONS]) {
+    if ((_p = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies.audit) === null || _p === void 0 ? void 0 : _p[TIE_FORMAT_MODIFICATIONS]) {
         var auditData = definedAttributes({
             drawId: drawDefinition === null || drawDefinition === void 0 ? void 0 : drawDefinition.drawId,
             collectionDefinition: collectionDefinition,
@@ -32705,7 +32791,7 @@ function findMatchUp(_a) {
         contextProfile: contextProfile,
         inContext: inContext,
     }).participants, tournamentParticipants = _g === void 0 ? [] : _g;
-    var _h = findMatchUp$1({
+    var _h = findDrawMatchUp({
         context: inContext ? additionalContext : undefined,
         tournamentParticipants: tournamentParticipants,
         afterRecoveryTimes: afterRecoveryTimes,
@@ -36813,7 +36899,7 @@ function checkInParticipant$1(_a) {
         tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants;
     if (tournamentParticipants === null || tournamentParticipants === void 0 ? void 0 : tournamentParticipants.length) {
         if (!matchUp && drawDefinition) {
-            var result_1 = findMatchUp$1({
+            var result_1 = findDrawMatchUp({
                 tournamentParticipants: tournamentParticipants,
                 inContext: true,
                 drawDefinition: drawDefinition,
@@ -36856,7 +36942,7 @@ function checkOutParticipant$1(_a) {
     tournamentParticipants =
         tournamentParticipants !== null && tournamentParticipants !== void 0 ? tournamentParticipants : tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants;
     if (!matchUp) {
-        var result = findMatchUp$1({
+        var result = findDrawMatchUp({
             tournamentParticipants: tournamentParticipants,
             inContext: true,
             drawDefinition: drawDefinition,
@@ -36975,7 +37061,7 @@ function removeMatchUpCourtAssignment$1(params) {
     }), drawDefinition = _c.drawDefinition, event = _c.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
-    var result = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
+    var result = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId });
     if (result.error)
         return result;
     if (((_a = result === null || result === void 0 ? void 0 : result.matchUp) === null || _a === void 0 ? void 0 : _a.matchUpType) === TEAM_MATCHUP) {
@@ -39174,7 +39260,7 @@ var matchUpActionConstants = {
 function matchUpActions$2(_a) {
     var _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;
     var _10 = _a.restrictAdHocRoundParticipants, restrictAdHocRoundParticipants = _10 === void 0 ? true : _10, // disallow the same participant being in the same round multiple times
-    specifiedPolicyDefinitions = _a.policyDefinitions, _11 = _a.tournamentParticipants, tournamentParticipants = _11 === void 0 ? [] : _11, inContextDrawMatchUps = _a.inContextDrawMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, participantId = _a.participantId, matchUpsMap = _a.matchUpsMap, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, event = _a.event;
+    specifiedPolicyDefinitions = _a.policyDefinitions, _11 = _a.tournamentParticipants, tournamentParticipants = _11 === void 0 ? [] : _11, inContextDrawMatchUps = _a.inContextDrawMatchUps, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, enforceGender = _a.enforceGender, participantId = _a.participantId, matchUpsMap = _a.matchUpsMap, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, event = _a.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     if (!matchUpId)
@@ -39186,7 +39272,7 @@ function matchUpActions$2(_a) {
         });
     var otherFlightEntries = (_b = specifiedPolicyDefinitions === null || specifiedPolicyDefinitions === void 0 ? void 0 : specifiedPolicyDefinitions[POLICY_TYPE_POSITION_ACTIONS]) === null || _b === void 0 ? void 0 : _b.otherFlightEntries;
     var drawId = drawDefinition.drawId;
-    var _12 = findMatchUp$1({
+    var _12 = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -39200,8 +39286,8 @@ function matchUpActions$2(_a) {
         event: event,
     }).appliedPolicies) !== null && _c !== void 0 ? _c : {};
     Object.assign(appliedPolicies, specifiedPolicyDefinitions !== null && specifiedPolicyDefinitions !== void 0 ? specifiedPolicyDefinitions : {});
-    var isAdHocMatchUp = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
     var matchUpActionsPolicy = (_d = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _d !== void 0 ? _d : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var isAdHocMatchUp = isAdHoc({ drawDefinition: drawDefinition, structure: structure });
     var enabledStructures = getEnabledStructures({
         actionType: MATCHUP_ACTION,
         appliedPolicies: appliedPolicies,
@@ -39440,9 +39526,9 @@ function matchUpActions$2(_a) {
             ((_v = inContextMatchUp.sides) === null || _v === void 0 ? void 0 : _v.filter(function (side) { return side.particiapntId; }).length) === 1 &&
             ((_x = (_w = firstFoundSide === null || firstFoundSide === void 0 ? void 0 : firstFoundSide.participant) === null || _w === void 0 ? void 0 : _w.person) === null || _x === void 0 ? void 0 : _x.sex);
         var matchUpType = inContextMatchUp.matchUpType;
-        var gender_1 = ((_y = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _y === void 0 ? void 0 : _y.enforceGender)
-            ? inContextMatchUp.gender
-            : undefined;
+        var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_y = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _y === void 0 ? void 0 : _y.enforceGender) !==
+            false;
+        var gender_1 = genderEnforced ? inContextMatchUp.gender : undefined;
         var allParticipants = (_z = inContextMatchUp.sides) === null || _z === void 0 ? void 0 : _z.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 = (_0 = inContextMatchUp.sides) === null || _0 === void 0 ? void 0 : _0.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);
@@ -39611,7 +39697,7 @@ function getEventAlternateParticipantIds(_a) {
 }
 
 function matchUpActions$1(_a) {
-    var policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, participantId = _a.participantId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, drawId = _a.drawId, event = _a.event;
+    var policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, enforceGender = _a.enforceGender, participantId = _a.participantId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, drawId = _a.drawId, event = _a.event;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!drawId) {
@@ -39640,6 +39726,7 @@ function matchUpActions$1(_a) {
             tournamentParticipants: tournamentRecord.participants,
             policyDefinitions: policyDefinitions,
             drawDefinition: drawDefinition,
+            enforceGender: enforceGender,
             participantId: participantId,
             sideNumber: sideNumber,
             matchUpId: matchUpId,
@@ -39652,7 +39739,7 @@ function matchUpActions$1(_a) {
 }
 
 function matchUpActions(params) {
-    var _a = params !== null && params !== void 0 ? params : {}, tournamentRecords = _a.tournamentRecords, participantId = _a.participantId, tournamentId = _a.tournamentId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, eventId = _a.eventId, drawId = _a.drawId;
+    var _a = params !== null && params !== void 0 ? params : {}, tournamentRecords = _a.tournamentRecords, policyDefinitions = _a.policyDefinitions, enforceGender = _a.enforceGender, participantId = _a.participantId, tournamentId = _a.tournamentId, sideNumber = _a.sideNumber, matchUpId = _a.matchUpId, eventId = _a.eventId, drawId = _a.drawId;
     if (typeof tournamentRecords !== 'object' ||
         typeof tournamentId !== 'string' ||
         typeof matchUpId !== 'string' ||
@@ -39670,7 +39757,9 @@ function matchUpActions(params) {
         return result;
     return matchUpActions$1({
         drawDefinition: result.drawDefinition,
+        policyDefinitions: policyDefinitions,
         tournamentRecord: tournamentRecord,
+        enforceGender: enforceGender,
         participantId: participantId,
         sideNumber: sideNumber,
         matchUpId: matchUpId,
@@ -40076,7 +40165,7 @@ function removeCourtAssignment(_a) {
         (drawDefinition = findEvent({ tournamentRecord: tournamentRecord, drawId: drawId }).drawDefinition);
     }
     if (drawDefinition) {
-        (matchUp = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId }).matchUp);
+        (matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, matchUpId: matchUpId }).matchUp);
     }
     else {
         if (!tournamentRecord)
@@ -48980,20 +49069,11 @@ function removeEventEntries(_a) {
 }
 
 /**
- *
  * Add entries into an event; optionally add to specified drawDefinition/flightProfile, if possible.
- *
- * @param {object} tournamentRecord - passed in automatically by tournamentEngine
- * @param {string} eventId - tournamentEngine automatically retrieves event
- * @param {string} drawId - optional - also add to drawDefinition.entries & flightProfile.drawEntries (if possible)
- * @param {string[]} participantIds - ids of all participants to add to event
- * @param {string} enryStatus - entryStatus enum
- * @param {string} entryStage - entryStage enum
- *
  */
 function addEventEntries(params) {
-    var _a;
-    var _b = params.entryStatus, entryStatus = _b === void 0 ? DIRECT_ACCEPTANCE : _b, _c = params.autoEntryPositions, autoEntryPositions = _c === void 0 ? true : _c, _d = params.participantIds, participantIds = _d === void 0 ? [] : _d, entryStageSequence = params.entryStageSequence, ignoreEventGender = params.ignoreEventGender, _e = params.entryStage, entryStage = _e === void 0 ? MAIN : _e, tournamentRecord = params.tournamentRecord, ignoreStageSpace = params.ignoreStageSpace, drawDefinition = params.drawDefinition, roundTarget = params.roundTarget, extensions = params.extensions, extension = params.extension, drawId = params.drawId, event = params.event;
+    var _a, _b, _c, _d, _e;
+    var _f = params.entryStatus, entryStatus = _f === void 0 ? DIRECT_ACCEPTANCE : _f, _g = params.autoEntryPositions, autoEntryPositions = _g === void 0 ? true : _g, _h = params.enforceGender, enforceGender = _h === void 0 ? true : _h, _j = params.participantIds, participantIds = _j === void 0 ? [] : _j, entryStageSequence = params.entryStageSequence, policyDefinitions = params.policyDefinitions, _k = params.entryStage, entryStage = _k === void 0 ? MAIN : _k, tournamentRecord = params.tournamentRecord, ignoreStageSpace = params.ignoreStageSpace, drawDefinition = params.drawDefinition, roundTarget = params.roundTarget, extensions = params.extensions, extension = params.extension, drawId = params.drawId, event = params.event;
     var stack = 'addEventEntries';
     if (!event)
         return { error: MISSING_EVENT };
@@ -49005,6 +49085,10 @@ function addEventEntries(params) {
     }
     if (!(event === null || event === void 0 ? void 0 : event.eventId))
         return { error: EVENT_NOT_FOUND };
+    var appliedPolicies = (_a = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies) !== null && _a !== void 0 ? _a : {};
+    var matchUpActionsPolicy = (_c = (_b = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _b !== void 0 ? _b : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _c !== void 0 ? _c : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_d = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _d === void 0 ? void 0 : _d.enforceGender) !==
+        false;
     var addedParticipantIdEntries = [];
     var removedEntries = [];
     if ((extensions &&
@@ -49018,9 +49102,9 @@ function addEventEntries(params) {
         });
     }
     var checkTypedParticipants = !!tournamentRecord;
-    var misMatchedGender = [];
+    var mismatchedGender = [];
     var info;
-    var typedParticipantIds = ((_a = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) === null || _a === void 0 ? void 0 : _a.filter(function (participant) {
+    var typedParticipantIds = ((_e = tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants) === null || _e === void 0 ? void 0 : _e.filter(function (participant) {
         var _a, _b, _c;
         if (!participantIds.includes(participant.participantId))
             return false;
@@ -49030,7 +49114,7 @@ function addEventEntries(params) {
         var validDoubles = event.eventType === DOUBLES$1 && participant.participantType === PAIR;
         if (validSingles &&
             (!event.gender ||
-                ignoreEventGender ||
+                !genderEnforced ||
                 [MIXED, ANY].includes(event.gender) ||
                 event.gender === ((_a = participant.person) === null || _a === void 0 ? void 0 : _a.sex))) {
             return true;
@@ -49045,10 +49129,10 @@ function addEventEntries(params) {
         }
         if (validSingles &&
             event.gender &&
-            !ignoreEventGender &&
+            genderEnforced &&
             ![MIXED, ANY].includes(event.gender) &&
             event.gender !== ((_b = participant.person) === null || _b === void 0 ? void 0 : _b.sex)) {
-            misMatchedGender.push({
+            mismatchedGender.push({
                 participantId: participant.participantId,
                 sex: (_c = participant.person) === null || _c === void 0 ? void 0 : _c.sex,
             });
@@ -49137,7 +49221,7 @@ function addEventEntries(params) {
     var invalidParticipantIds = validParticipantIds.length !== participantIds.length;
     if (invalidParticipantIds)
         return decorateResult({
-            context: { misMatchedGender: misMatchedGender, gender: event.gender },
+            context: { mismatchedGender: mismatchedGender, gender: event.gender },
             result: { error: INVALID_PARTICIPANT_IDS },
             stack: stack,
         });
@@ -50099,13 +50183,13 @@ function resetMatchUpLineUps$1(_a) {
     var _d = _a.inheritance, inheritance = _d === void 0 ? true : _d, tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, event = _a.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
-    var matchUp = (_b = findMatchUp$1({
+    var matchUp = (_b = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
     })) === null || _b === void 0 ? void 0 : _b.matchUp;
     if (!(matchUp === null || matchUp === void 0 ? void 0 : matchUp.tieMatchUps))
         return { error: INVALID_MATCHUP };
-    var inContextMatchUp = (_c = findMatchUp$1({
+    var inContextMatchUp = (_c = findDrawMatchUp({
         inContext: true,
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
@@ -50215,7 +50299,7 @@ function removeDelegatedOutcome$1(_a) {
         return { error: MISSING_DRAW_DEFINITION };
     if (!matchUpId)
         return { error: MISSING_MATCHUP_ID };
-    var matchUp = findMatchUp$1({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
+    var matchUp = findDrawMatchUp({ drawDefinition: drawDefinition, event: event, matchUpId: matchUpId }).matchUp;
     if (!matchUp)
         return { error: MATCHUP_NOT_FOUND };
     return removeExtension$1({
@@ -50785,7 +50869,7 @@ function setDelegatedOutcome$1(_a) {
     if (!matchUp && !matchUpId)
         return { error: MISSING_MATCHUP };
     if (!matchUp) {
-        var result = findMatchUp$1({
+        var result = findDrawMatchUp({
             drawDefinition: drawDefinition,
             matchUpId: matchUpId,
         });
@@ -50838,7 +50922,7 @@ function disableTieAutoCalc$1(_a) {
     var drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, event = _a.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
-    var matchUp = findMatchUp$1({
+    var matchUp = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -50853,7 +50937,7 @@ function enableTieAutoCalc$1(_a) {
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, matchUpId = _a.matchUpId, event = _a.event;
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
-    var matchUp = findMatchUp$1({
+    var matchUp = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -51034,7 +51118,7 @@ var matchUpGovernor = {
     removeDelegatedOutcome: removeDelegatedOutcome$1,
     drawMatic: drawMatic$1,
     addMatchUpOfficial: addMatchUpOfficial$2,
-    findMatchUp: publicFindMatchUp$1,
+    findMatchUp: publicFindDrawMatchUp,
     getRoundMatchUps: getRoundMatchUps$1,
     validDrawPositions: validDrawPositions,
     validateScore: validateScore,
@@ -57112,14 +57196,14 @@ function getTieMatchUpContext(_a) {
         return { error: EVENT_NOT_FOUND };
     var matchUpsMap = getMatchUpsMap({ drawDefinition: drawDefinition });
     // tieMatchUp is matchUpType: SINGLES or DOUBLES
-    var tieMatchUp = findMatchUp$1({
+    var tieMatchUp = findDrawMatchUp({
         matchUpId: tieMatchUpId,
         drawDefinition: drawDefinition,
         matchUpsMap: matchUpsMap,
     }).matchUp;
     if (!tieMatchUp)
         return { error: MATCHUP_NOT_FOUND };
-    var _c = findMatchUp$1({
+    var _c = findDrawMatchUp({
         tournamentParticipants: tournamentRecord.participants,
         matchUpId: tieMatchUpId,
         inContext: true,
@@ -57142,12 +57226,12 @@ function getTieMatchUpContext(_a) {
             participantIds: participantIds,
         },
     }).participants;
-    var dualMatchUp = findMatchUp$1({
+    var dualMatchUp = findDrawMatchUp({
         matchUpId: matchUpTieId,
         drawDefinition: drawDefinition,
         matchUpsMap: matchUpsMap,
     }).matchUp;
-    var inContextDualMatchUp = findMatchUp$1({
+    var inContextDualMatchUp = findDrawMatchUp({
         matchUpId: matchUpTieId,
         inContext: true,
         drawDefinition: drawDefinition,
@@ -57164,7 +57248,7 @@ function getTieMatchUpContext(_a) {
 
 function assignTieMatchUpParticipantId(params) {
     var e_1, _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     var matchUpContext = getTieMatchUpContext(params);
     if (matchUpContext.error)
         return matchUpContext;
@@ -57188,9 +57272,9 @@ function assignTieMatchUpParticipantId(params) {
         return decorateResult({ result: __assign({}, SUCCESS), stack: stack });
     }
     teamParticipantId =
-        teamParticipantId ||
-            (params.sideNumber &&
-                ((_d = (_c = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _c === void 0 ? void 0 : _c.find(function (side) { return side.sideNumber === params.sideNumber; })) === null || _d === void 0 ? void 0 : _d.participantId));
+        teamParticipantId !== null && teamParticipantId !== void 0 ? teamParticipantId : (params.sideNumber
+            ? (_d = (_c = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _c === void 0 ? void 0 : _c.find(function (side) { return side.sideNumber === params.sideNumber; })) === null || _d === void 0 ? void 0 : _d.participantId
+            : undefined);
     var participantToAssign = (_f = (_e = getParticipants$1({
         participantFilters: { participantIds: [participantId] },
         tournamentRecord: tournamentRecord,
@@ -57203,12 +57287,11 @@ function assignTieMatchUpParticipantId(params) {
         drawDefinition: drawDefinition,
         event: event,
     }).appliedPolicies;
-    var matchUpActionsPolicy = ((_g = params.policyDefinitions) === null || _g === void 0 ? void 0 : _g[POLICY_TYPE_MATCHUP_ACTIONS]) ||
-        (appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) ||
-        POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
-    if (((_h = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _h === void 0 ? void 0 : _h.enforceGender) &&
+    var matchUpActionsPolicy = (_j = (_h = (_g = params.policyDefinitions) === null || _g === void 0 ? void 0 : _g[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _h !== void 0 ? _h : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _j !== void 0 ? _j : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var genderEnforced = ((_k = params.enforceGender) !== null && _k !== void 0 ? _k : (_l = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _l === void 0 ? void 0 : _l.enforceGender) !== false;
+    if (genderEnforced &&
         [MALE, FEMALE].includes(inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) &&
-        (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) !== ((_j = participantToAssign.person) === null || _j === void 0 ? void 0 : _j.sex)) {
+        (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) !== ((_m = participantToAssign.person) === null || _m === void 0 ? void 0 : _m.sex)) {
         return { error: INVALID_PARTICIPANT, info: 'Gender mismatch' };
     }
     var individualParticipantIds = participantToAssign.individualParticipantIds, participantType = participantToAssign.participantType;
@@ -57235,37 +57318,27 @@ function assignTieMatchUpParticipantId(params) {
         return { error: PARTICIPANT_NOT_FOUND };
     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 = (_k = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _k === void 0 ? void 0 : _k.find(function (side) { return side.drawPosition === teamDrawPosition; });
-    var sideNumber = params.sideNumber || (teamSide === null || teamSide === void 0 ? void 0 : teamSide.sideNumber);
+    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;
     if (!tieFormat) {
         return { error: MISSING_TIE_FORMAT };
     }
-    var collectionDefinition = (_l = tieFormat.collectionDefinitions) === null || _l === void 0 ? void 0 : _l.find(function (collectionDefinition) { return collectionDefinition.collectionId === collectionId; });
+    var collectionDefinition = (_q = tieFormat.collectionDefinitions) === null || _q === void 0 ? void 0 : _q.find(function (collectionDefinition) { return collectionDefinition.collectionId === collectionId; });
     if (!collectionDefinition)
         return { error: MISSING_COLLECTION_DEFINITION };
-    if (!((_m = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _m === void 0 ? void 0 : _m.length)) {
-        var extension = findExtension$2({
-            element: drawDefinition,
-            name: LINEUPS,
-        }).extension;
-        var lineUps_1 = makeDeepCopy((extension === null || extension === void 0 ? void 0 : extension.value) || {}, false, true);
-        var extractSideDetail_1 = function (_a) {
-            var displaySideNumber = _a.displaySideNumber, drawPosition = _a.drawPosition, sideNumber = _a.sideNumber;
-            return ({ drawPosition: drawPosition, sideNumber: sideNumber, displaySideNumber: displaySideNumber });
-        };
-        if (dualMatchUp) {
-            dualMatchUp.sides = (_o = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _o === void 0 ? void 0 : _o.map(function (side) {
-                var participantId = side.participantId;
-                return __assign(__assign({}, extractSideDetail_1(side)), { lineUp: (participantId && lineUps_1[participantId]) || [] });
-            });
-        }
-    }
-    var dualMatchUpSide = (_p = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _p === void 0 ? void 0 : _p.find(function (side) { return side.sideNumber === sideNumber; });
-    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 === sideNumber; });
-    var lineUp = (_r = dualMatchUpSide === null || dualMatchUpSide === void 0 ? void 0 : dualMatchUpSide.lineUp) !== null && _r !== void 0 ? _r : (_s = getTeamLineUp({
+    ensureSideLineUps({
+        tournamentId: tournamentRecord.tournamentId,
+        eventId: event.eventId,
+        inContextDualMatchUp: inContextDualMatchUp,
+        drawDefinition: drawDefinition,
+        dualMatchUp: dualMatchUp,
+    });
+    var dualMatchUpSide = (_r = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _r === void 0 ? void 0 : _r.find(function (side) { return side.sideNumber === sideNumber; });
+    var tieMatchUpSide = (_s = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _s === void 0 ? void 0 : _s.find(function (side) { return side.sideNumber === sideNumber; });
+    var lineUp = (_t = dualMatchUpSide === null || dualMatchUpSide === void 0 ? void 0 : dualMatchUpSide.lineUp) !== null && _t !== void 0 ? _t : (_u = getTeamLineUp({
         participantId: teamParticipantId,
         drawDefinition: drawDefinition,
-    })) === null || _s === void 0 ? void 0 : _s.lineUp;
+    })) === null || _u === void 0 ? void 0 : _u.lineUp;
     var targetAssignments = lineUp === null || lineUp === void 0 ? void 0 : lineUp.filter(function (participantAssignment) {
         var _a;
         return (_a = participantAssignment.collectionAssignments) === null || _a === void 0 ? void 0 : _a.find(function (assignment) {
@@ -57292,7 +57365,7 @@ function assignTieMatchUpParticipantId(params) {
     if (removeResult.error)
         return decorateResult({ result: removeResult, stack: stack });
     var modifiedLineUp = removeResult.modifiedLineUp;
-    var deleteParticipantId;
+    var deletedParticipantId;
     if (matchUpType === DOUBLES$1) {
         if (participantType !== PAIR) {
             var result = updateLineUp({
@@ -57311,7 +57384,7 @@ function assignTieMatchUpParticipantId(params) {
             });
             if (result.error)
                 return result;
-            deleteParticipantId = result.deleteParticipantId;
+            deletedParticipantId = result.deletedParticipantId;
             if (dualMatchUpSide)
                 dualMatchUpSide.lineUp = modifiedLineUp;
             if (dualMatchUp) {
@@ -57369,9 +57442,9 @@ function assignTieMatchUpParticipantId(params) {
             context: stack,
             drawDefinition: drawDefinition,
         });
-    if (deleteParticipantId) {
+    if (deletedParticipantId) {
         var error = deleteParticipants({
-            participantIds: [deleteParticipantId],
+            participantIds: [deletedParticipantId],
             tournamentRecord: tournamentRecord,
         }).error;
         if (error)
@@ -57380,7 +57453,7 @@ function assignTieMatchUpParticipantId(params) {
     return __assign(__assign({}, SUCCESS), { modifiedLineUp: modifiedLineUp });
     function addParticipantId2Pair(_a) {
         var side = _a.side;
-        var deleteParticipantId;
+        var deletedParticipantId;
         if (!side.participant) {
             var newPairParticipant = {
                 individualParticipantIds: [participantId],
@@ -57421,11 +57494,11 @@ function assignTieMatchUpParticipantId(params) {
                 else {
                     // check if there is a pairParticipant that includes both individualParticipantIds
                     // if there is, use that and delete the PAIR participant with only one [individualParticipantId]
-                    deleteParticipantId = participant === null || participant === void 0 ? void 0 : participant.participantId;
+                    deletedParticipantId = participant === null || participant === void 0 ? void 0 : participant.participantId;
                 }
             }
         }
-        return __assign(__assign({}, SUCCESS), { deleteParticipantId: deleteParticipantId });
+        return __assign(__assign({}, SUCCESS), { deletedParticipantId: deletedParticipantId });
     }
 }
 function updateLineUp(_a) {
@@ -58028,14 +58101,15 @@ function completeDrawMatchUps(params) {
                             });
                             if (teamParticipant) {
                                 var individualParticipantId = (_a = teamParticipant.individualParticipantIds) === null || _a === void 0 ? void 0 : _a[i];
-                                assignTieMatchUpParticipantId({
-                                    teamParticipantId: teamParticipant.participantId,
-                                    participantId: individualParticipantId,
-                                    tournamentRecord: tournamentRecord,
-                                    drawDefinition: drawDefinition,
-                                    tieMatchUpId: tieMatchUpId,
-                                    event: event,
-                                });
+                                individualParticipantId &&
+                                    assignTieMatchUpParticipantId({
+                                        teamParticipantId: teamParticipant.participantId,
+                                        participantId: individualParticipantId,
+                                        tournamentRecord: tournamentRecord,
+                                        drawDefinition: drawDefinition,
+                                        tieMatchUpId: tieMatchUpId,
+                                        event: event,
+                                    });
                             }
                         });
                     });
@@ -59936,8 +60010,10 @@ function assignMatchUpSideParticipant(_a) {
     if (noSideNumberProvided)
         sideNumber = 1;
     if (![1, 2].includes(sideNumber))
-        return { error: INVALID_VALUES, sideNumber: sideNumber };
-    var _e = findMatchUp$1({
+        return decorateResult({
+            result: { error: INVALID_VALUES, context: { sideNumber: sideNumber } },
+        });
+    var _e = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -60011,7 +60087,7 @@ function removeMatchUpSideParticipant(_a) {
     // TODO: move to drawEngine and passthrough
     if (![1, 2].includes(sideNumber))
         return { error: INVALID_VALUES, sideNumber: sideNumber };
-    var _d = findMatchUp$1({
+    var _d = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -60041,7 +60117,7 @@ function removeMatchUpSideParticipant(_a) {
 
 function replaceTieMatchUpParticipantId(params) {
     var e_1, _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     var matchUpContext = getTieMatchUpContext(params);
     if (matchUpContext.error)
         return matchUpContext;
@@ -60079,36 +60155,26 @@ function replaceTieMatchUpParticipantId(params) {
         drawDefinition: drawDefinition,
         event: event,
     }).appliedPolicies;
-    var matchUpActionsPolicy = (appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) ||
-        POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var matchUpActionsPolicy = (_g = (_f = (_e = params.policyDefinitions) === null || _e === void 0 ? void 0 : _e[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _f !== void 0 ? _f : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _g !== void 0 ? _g : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
     var newParticipant = targetParticipants.find(function (_a) {
         var participantId = _a.participantId;
         return participantId === newParticipantId;
     });
-    if (((_e = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _e === void 0 ? void 0 : _e.enforceGender) &&
+    var genderEnforced = ((_h = params.enforceGender) !== null && _h !== void 0 ? _h : (_j = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _j === void 0 ? void 0 : _j.enforceGender) !== false;
+    if (genderEnforced &&
         [MALE, FEMALE].includes(inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) &&
-        (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) !== ((_f = newParticipant === null || newParticipant === void 0 ? void 0 : newParticipant.person) === null || _f === void 0 ? void 0 : _f.sex)) {
+        (inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.gender) !== ((_k = newParticipant === null || newParticipant === void 0 ? void 0 : newParticipant.person) === null || _k === void 0 ? void 0 : _k.sex)) {
         return { error: INVALID_PARTICIPANT, info: 'Gender mismatch' };
     }
-    var substitutionProcessCodes = (_g = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.processCodes) === null || _g === void 0 ? void 0 : _g.substitution;
-    var extension = findExtension$2({
-        element: drawDefinition,
-        name: LINEUPS,
-    }).extension;
-    var lineUps = (extension === null || extension === void 0 ? void 0 : extension.value) || {};
-    if (!((_h = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _h === void 0 ? void 0 : _h.length)) {
-        var extractSideDetail_1 = function (_a) {
-            var displaySideNumber = _a.displaySideNumber, drawPosition = _a.drawPosition, sideNumber = _a.sideNumber;
-            return ({ drawPosition: drawPosition, sideNumber: sideNumber, displaySideNumber: displaySideNumber });
-        };
-        if (dualMatchUp) {
-            dualMatchUp.sides = (_j = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _j === void 0 ? void 0 : _j.map(function (side) {
-                var participantId = side.participantId;
-                return __assign(__assign({}, extractSideDetail_1(side)), { lineUp: (participantId && lineUps[participantId]) || [] });
-            });
-        }
-    }
-    var dualMatchUpSide = (_k = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _k === void 0 ? void 0 : _k.find(function (_a) {
+    var substitutionProcessCodes = (_l = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.processCodes) === null || _l === void 0 ? void 0 : _l.substitution;
+    ensureSideLineUps({
+        tournamentId: tournamentRecord.tournamentId,
+        eventId: event.eventId,
+        inContextDualMatchUp: inContextDualMatchUp,
+        drawDefinition: drawDefinition,
+        dualMatchUp: dualMatchUp,
+    });
+    var dualMatchUpSide = (_m = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _m === void 0 ? void 0 : _m.find(function (_a) {
         var sideNumber = _a.sideNumber;
         return sideNumber === side.sideNumber;
     });
@@ -60122,7 +60188,7 @@ function replaceTieMatchUpParticipantId(params) {
             stack: stack,
         });
     }
-    var allTieIndividualParticipantIds = (_l = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _l === void 0 ? void 0 : _l.flatMap(function (side) {
+    var allTieIndividualParticipantIds = (_o = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _o === void 0 ? void 0 : _o.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) ||
@@ -60131,10 +60197,10 @@ function replaceTieMatchUpParticipantId(params) {
     if (allTieIndividualParticipantIds === null || allTieIndividualParticipantIds === void 0 ? void 0 : allTieIndividualParticipantIds.includes(newParticipantId)) {
         return decorateResult({ result: { error: EXISTING_PARTICIPANT }, stack: stack });
     }
-    var teamParticipantId = (_o = (_m = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _m === void 0 ? void 0 : _m.find(function (_a) {
+    var teamParticipantId = (_q = (_p = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _p === void 0 ? void 0 : _p.find(function (_a) {
         var sideNumber = _a.sideNumber;
         return sideNumber === side.sideNumber;
-    })) === null || _o === void 0 ? void 0 : _o.participantId;
+    })) === null || _q === void 0 ? void 0 : _q.participantId;
     var teamLineUp = dualMatchUpSide.lineUp;
     var newParticipantIdInLineUp = teamLineUp === null || teamLineUp === void 0 ? void 0 : teamLineUp.find(function (_a) {
         var participantId = _a.participantId;
@@ -60145,7 +60211,7 @@ function replaceTieMatchUpParticipantId(params) {
             ? teamCompetitor.substitutionOrder
             : order;
     }, 0);
-    var modifiedLineUp = (teamLineUp === null || teamLineUp === void 0 ? void 0 : teamLineUp.map(function (teamCompetitor) {
+    var modifiedLineUp = (_r = teamLineUp === null || teamLineUp === void 0 ? void 0 : teamLineUp.map(function (teamCompetitor) {
         var _a;
         var modifiedCompetitor = makeDeepCopy(teamCompetitor, false, true);
         // if the current competitor is not either id, return as is
@@ -60180,16 +60246,16 @@ function replaceTieMatchUpParticipantId(params) {
             var assignment = { collectionId: collectionId, collectionPosition: collectionPosition };
             if (substitution) {
                 assignment.previousParticipantId = existingParticipantId;
-                assignment.substitutionOrder = (substitutionOrder || 0) + 1;
+                assignment.substitutionOrder = (substitutionOrder !== null && substitutionOrder !== void 0 ? substitutionOrder : 0) + 1;
             }
             modifiedCompetitor.collectionAssignments.push(assignment);
         }
         return modifiedCompetitor;
-    })) || [];
+    })) !== null && _r !== void 0 ? _r : [];
     if (!newParticipantIdInLineUp) {
         var collectionAssignment = { collectionId: collectionId, collectionPosition: collectionPosition };
         if (substitution) {
-            collectionAssignment.substitutionOrder = (substitutionOrder || 0) + 1;
+            collectionAssignment.substitutionOrder = (substitutionOrder !== null && substitutionOrder !== void 0 ? substitutionOrder : 0) + 1;
             collectionAssignment.previousParticipantId = existingParticipantId;
         }
         var assignment = {
@@ -60245,14 +60311,14 @@ function replaceTieMatchUpParticipantId(params) {
             });
             if (result_1.error)
                 return decorateResult({ result: result_1, stack: stack });
-            participantAdded = (_p = result_1.participant) === null || _p === void 0 ? void 0 : _p.participantId;
+            participantAdded = (_s = result_1.participant) === null || _s === void 0 ? void 0 : _s.participantId;
         }
         // now attempt to cleanup/delete previous pairParticipant
         result = getPairedParticipant({
             participantIds: existingIndividualParticipantIds,
             tournamentRecord: tournamentRecord_1,
         });
-        var existingPairParticipantId = (_q = result.participant) === null || _q === void 0 ? void 0 : _q.participantId;
+        var existingPairParticipantId = (_t = result.participant) === null || _t === void 0 ? void 0 : _t.participantId;
         if (existingPairParticipantId) {
             var result_2 = deleteParticipants({
                 participantIds: [existingPairParticipantId],
@@ -60262,9 +60328,9 @@ function replaceTieMatchUpParticipantId(params) {
                 participantRemoved = existingPairParticipantId;
         }
     }
-    if (substitution || ((_r = side.substitutions) === null || _r === void 0 ? void 0 : _r.length) === 1) {
+    if (substitution || ((_u = side.substitutions) === null || _u === void 0 ? void 0 : _u.length) === 1) {
         if (substitution) {
-            var processCodes = (tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) || [];
+            var processCodes = (_v = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) !== null && _v !== void 0 ? _v : [];
             if (substitutionProcessCodes)
                 processCodes.push.apply(processCodes, __spreadArray([], __read(substitutionProcessCodes), false));
             if (tieMatchUp)
@@ -60273,18 +60339,18 @@ function replaceTieMatchUpParticipantId(params) {
         else {
             try {
                 // if there was only one substitution, remove processCode(s)
-                for (var _u = __values(substitutionProcessCodes || []), _v = _u.next(); !_v.done; _v = _u.next()) {
-                    var substitutionProcessCode = _v.value;
-                    var codeIndex = (_s = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _s === void 0 ? void 0 : _s.lastIndexOf(substitutionProcessCode);
+                for (var _y = __values(substitutionProcessCodes || []), _z = _y.next(); !_z.done; _z = _y.next()) {
+                    var substitutionProcessCode = _z.value;
+                    var codeIndex = (_w = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _w === void 0 ? void 0 : _w.lastIndexOf(substitutionProcessCode);
                     // remove only one instance of substitutionProcessCode
                     codeIndex !== undefined &&
-                        ((_t = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _t === void 0 ? void 0 : _t.splice(codeIndex, 1));
+                        ((_x = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _x === void 0 ? void 0 : _x.splice(codeIndex, 1));
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_v && !_v.done && (_a = _u.return)) _a.call(_u);
+                    if (_z && !_z.done && (_a = _y.return)) _a.call(_y);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -60311,7 +60377,7 @@ function replaceTieMatchUpParticipantId(params) {
 
 function removeTieMatchUpParticipantId(params) {
     var e_1, _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     var tournamentRecord = params.tournamentRecord, drawDefinition = params.drawDefinition, participantId = params.participantId, event = params.event;
     var stack = 'removeTieMatchUpParticiapantId';
     if (!participantId)
@@ -60324,33 +60390,32 @@ function removeTieMatchUpParticipantId(params) {
         drawDefinition: drawDefinition,
         event: event,
     }).appliedPolicies;
-    var matchUpActionsPolicy = (appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) ||
-        POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
-    var substitutionProcessCodes = (_b = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.processCodes) === null || _b === void 0 ? void 0 : _b.substitution;
+    var matchUpActionsPolicy = (_d = (_c = (_b = params.policyDefinitions) === null || _b === void 0 ? void 0 : _b[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _c !== void 0 ? _c : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _d !== void 0 ? _d : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var substitutionProcessCodes = (_e = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.processCodes) === null || _e === void 0 ? void 0 : _e.substitution;
     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, tieMatchUp = matchUpContext.tieMatchUp, tieFormat = matchUpContext.tieFormat;
     if (!dualMatchUp)
         return decorateResult({ result: { error: MISSING_MATCHUP }, stack: stack });
-    var side = (_c = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _c === void 0 ? void 0 : _c.find(function (side) {
+    var side = (_f = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _f === void 0 ? void 0 : _f.find(function (side) {
         var _a, _b, _c;
         return ((_a = side.participant) === null || _a === void 0 ? void 0 : _a.participantId) === participantId ||
             ((_c = (_b = side.participant) === null || _b === void 0 ? void 0 : _b.individualParticipantIds) === null || _c === void 0 ? void 0 : _c.includes(participantId));
     });
     if (!side)
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
-    if (!((_d = side.substitutions) === null || _d === void 0 ? void 0 : _d.length) &&
+    if (!((_g = side.substitutions) === null || _g === void 0 ? void 0 : _g.length) &&
         (scoreHasValue({ 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 = (_f = (_e = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _e === void 0 ? void 0 : _e.find(function (_a) {
+    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;
         return sideNumber === side.sideNumber;
-    })) === null || _f === void 0 ? void 0 : _f.participantId;
+    })) === null || _j === void 0 ? void 0 : _j.participantId;
     if (!teamParticipantId)
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
-    var participantToRemove = (_h = (_g = getParticipants$1({
+    var participantToRemove = (_l = (_k = getParticipants$1({
         participantFilters: { participantIds: [participantId] },
         tournamentRecord: tournamentRecord,
-    })) === null || _g === void 0 ? void 0 : _g.participants) === null || _h === void 0 ? void 0 : _h[0];
+    })) === null || _k === void 0 ? void 0 : _k.participants) === null || _l === void 0 ? void 0 : _l[0];
     if (!participantToRemove) {
         return decorateResult({ result: { error: PARTICIPANT_NOT_FOUND }, stack: stack });
     }
@@ -60360,27 +60425,19 @@ function removeTieMatchUpParticipantId(params) {
     var participantIds = participantToRemove.participantType === INDIVIDUAL
         ? [participantId]
         : participantToRemove.individualParticipantIds;
-    if (!((_j = dualMatchUp === null || dualMatchUp === void 0 ? void 0 : dualMatchUp.sides) === null || _j === void 0 ? void 0 : _j.length)) {
-        var extension = findExtension$2({
-            element: drawDefinition,
-            name: LINEUPS,
-        }).extension;
-        var lineUps_1 = (extension === null || extension === void 0 ? void 0 : extension.value) || {};
-        var extractSideDetail_1 = function (_a) {
-            var displaySideNumber = _a.displaySideNumber, drawPosition = _a.drawPosition, sideNumber = _a.sideNumber;
-            return ({ drawPosition: drawPosition, sideNumber: sideNumber, displaySideNumber: displaySideNumber });
-        };
-        dualMatchUp.sides = (_k = inContextDualMatchUp === null || inContextDualMatchUp === void 0 ? void 0 : inContextDualMatchUp.sides) === null || _k === void 0 ? void 0 : _k.map(function (side) {
-            var participantId = side.participantId;
-            return __assign(__assign({}, extractSideDetail_1(side)), { lineUp: (participantId && lineUps_1[participantId]) || [] });
-        });
-    }
-    var dualMatchUpSide = (_l = dualMatchUp.sides) === null || _l === void 0 ? void 0 : _l.find(function (_a) {
+    ensureSideLineUps({
+        tournamentId: tournamentRecord.tournamentId,
+        eventId: event.eventId,
+        inContextDualMatchUp: inContextDualMatchUp,
+        drawDefinition: drawDefinition,
+        dualMatchUp: dualMatchUp,
+    });
+    var dualMatchUpSide = (_m = dualMatchUp.sides) === null || _m === void 0 ? void 0 : _m.find(function (_a) {
         var sideNumber = _a.sideNumber;
         return sideNumber === side.sideNumber;
     });
     if (!dualMatchUpSide &&
-        (((_m = dualMatchUp.sides) === null || _m === void 0 ? void 0 : _m.filter(function (_a) {
+        (((_o = dualMatchUp.sides) === null || _o === void 0 ? void 0 : _o.filter(function (_a) {
             var lineUp = _a.lineUp;
             return !lineUp;
         }).length) || 0) < 2) {
@@ -60392,7 +60449,7 @@ function removeTieMatchUpParticipantId(params) {
                 teamParticipantId: teamParticipantId,
             });
         });
-        dualMatchUpSide = (_o = dualMatchUp.sides) === null || _o === void 0 ? void 0 : _o.find(function (side) {
+        dualMatchUpSide = (_p = dualMatchUp.sides) === null || _p === void 0 ? void 0 : _p.find(function (side) {
             var _a;
             return ((_a = drawPositionMap_1 === null || drawPositionMap_1 === void 0 ? void 0 : drawPositionMap_1.find(function (_a) {
                 var drawPosition = _a.drawPosition;
@@ -60401,17 +60458,18 @@ function removeTieMatchUpParticipantId(params) {
         });
     }
     if (!dualMatchUpSide) {
-        console.log({ teamParticipantId: teamParticipantId, teamParticipants: teamParticipants });
-        return { error: PARTICIPANT_NOT_FOUND, participantId: participantId };
+        return decorateResult({
+            result: { error: PARTICIPANT_NOT_FOUND, context: { participantId: participantId } },
+        });
     }
-    var _z = removeCollectionAssignments({
+    var _0 = removeCollectionAssignments({
         collectionPosition: collectionPosition,
         teamParticipantId: teamParticipantId,
         dualMatchUpSide: dualMatchUpSide,
         participantIds: participantIds,
         drawDefinition: drawDefinition,
         collectionId: collectionId,
-    }), modifiedLineUp = _z.modifiedLineUp, previousParticipantIds = _z.previousParticipantIds;
+    }), modifiedLineUp = _0.modifiedLineUp, previousParticipantIds = _0.previousParticipantIds;
     dualMatchUpSide.lineUp = modifiedLineUp;
     teamParticipantId &&
         tieFormat &&
@@ -60425,16 +60483,16 @@ function removeTieMatchUpParticipantId(params) {
     // ...then the PAIR participant may need to be modified
     if (matchUpType === DOUBLES$1 &&
         participantToRemove.participantType === INDIVIDUAL) {
-        var tieMatchUpSide = (_p = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _p === void 0 ? void 0 : _p.find(function (side) { return side.sideNumber === (dualMatchUpSide === null || dualMatchUpSide === void 0 ? void 0 : dualMatchUpSide.sideNumber); });
+        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 || {}).participantId;
         var pairParticipant = pairParticipantId &&
-            ((_r = (_q = getParticipants$1({
+            ((_s = (_r = getParticipants$1({
                 participantFilters: { participantIds: [pairParticipantId] },
                 tournamentRecord: tournamentRecord,
                 withDraws: true,
-            })) === null || _q === void 0 ? void 0 : _q.participants) === null || _r === void 0 ? void 0 : _r[0]);
+            })) === null || _r === void 0 ? void 0 : _r.participants) === null || _s === void 0 ? void 0 : _s[0]);
         if (pairParticipant) {
-            var individualParticipantIds = (_t = (_s = pairParticipant === null || pairParticipant === void 0 ? void 0 : pairParticipant.individualParticipantIds) === null || _s === void 0 ? void 0 : _s.filter(function (currentId) { return currentId !== participantId; })) !== null && _t !== void 0 ? _t : [];
+            var individualParticipantIds = (_u = (_t = pairParticipant === null || pairParticipant === void 0 ? void 0 : pairParticipant.individualParticipantIds) === null || _t === void 0 ? void 0 : _t.filter(function (currentId) { return currentId !== participantId; })) !== null && _u !== void 0 ? _u : [];
             if (previousParticipantIds)
                 individualParticipantIds.push.apply(individualParticipantIds, __spreadArray([], __read(previousParticipantIds), false));
             if (individualParticipantIds.length > 2) {
@@ -60444,7 +60502,7 @@ function removeTieMatchUpParticipantId(params) {
                 });
             }
             // don't modify pair participant that is part of other events/draws
-            if (!((_u = pairParticipant.draws) === null || _u === void 0 ? void 0 : _u.length)) {
+            if (!((_v = pairParticipant.draws) === null || _v === void 0 ? void 0 : _v.length)) {
                 if (individualParticipantIds.length) {
                     pairParticipant.individualParticipantIds = individualParticipantIds;
                     var result = modifyParticipant({
@@ -60495,13 +60553,13 @@ function removeTieMatchUpParticipantId(params) {
         }
     }
     // if there was only one subsitution on target side and there are no substiutions on other side
-    if (((_v = side.substitutions) === null || _v === void 0 ? void 0 : _v.length) === 1) {
-        var otherSide = (_w = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _w === void 0 ? void 0 : _w.find(function (s) { return s.sideNumber !== side.sideNumber; });
-        if (!((_x = otherSide === null || otherSide === void 0 ? void 0 : otherSide.substitutions) === null || _x === void 0 ? void 0 : _x.length) && ((_y = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _y === void 0 ? void 0 : _y.length)) {
+    if (((_w = side.substitutions) === null || _w === void 0 ? void 0 : _w.length) === 1) {
+        var otherSide = (_x = inContextTieMatchUp === null || inContextTieMatchUp === void 0 ? void 0 : inContextTieMatchUp.sides) === null || _x === void 0 ? void 0 : _x.find(function (s) { return s.sideNumber !== side.sideNumber; });
+        if (!((_y = otherSide === null || otherSide === void 0 ? void 0 : otherSide.substitutions) === null || _y === void 0 ? void 0 : _y.length) && ((_z = tieMatchUp === null || tieMatchUp === void 0 ? void 0 : tieMatchUp.processCodes) === null || _z === void 0 ? void 0 : _z.length)) {
             try {
                 // remove processCode(s)
-                for (var _0 = __values(substitutionProcessCodes || []), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-                    var substitutionProcessCode = _1.value;
+                for (var _1 = __values(substitutionProcessCodes || []), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+                    var substitutionProcessCode = _2.value;
                     var codeIndex = tieMatchUp.processCodes.lastIndexOf(substitutionProcessCode);
                     // remove only one instance of substitutionProcessCode
                     tieMatchUp.processCodes.splice(codeIndex, 1);
@@ -60510,7 +60568,7 @@ function removeTieMatchUpParticipantId(params) {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_1 && !_1.done && (_a = _0.return)) _a.call(_0);
+                    if (_2 && !_2.done && (_a = _1.return)) _a.call(_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -60964,19 +61022,27 @@ function addEventEntryPairs(_a) {
 }
 
 function checkValidEntries(_a) {
-    var _b = _a.enforceGender, enforceGender = _b === void 0 ? true : _b, consideredEntries = _a.consideredEntries, tournamentRecord = _a.tournamentRecord, participants = _a.participants, event = _a.event;
-    participants = participants || (tournamentRecord === null || tournamentRecord === void 0 ? void 0 : tournamentRecord.participants);
+    var _b;
+    var _c, _d, _e, _f;
+    var consideredEntries = _a.consideredEntries, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, appliedPolicies = _a.appliedPolicies, participantMap = _a.participantMap, enforceGender = _a.enforceGender, participants = _a.participants, event = _a.event;
+    if ((!participants || !participantMap) && tournamentRecord) {
+        (_b = getParticipants$1({
+            tournamentRecord: tournamentRecord,
+        }), participants = _b.participants, participantMap = _b.participantMap);
+    }
     if (!participants)
         return { error: MISSING_PARTICIPANTS };
     if (!Array.isArray(participants))
         return { error: INVALID_VALUES };
     if (!event)
         return { error: MISSING_EVENT };
+    var matchUpActionsPolicy = (_d = (_c = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _c !== void 0 ? _c : appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) !== null && _d !== void 0 ? _d : POLICY_MATCHUP_ACTIONS_DEFAULT[POLICY_TYPE_MATCHUP_ACTIONS];
+    var genderEnforced = (enforceGender !== null && enforceGender !== void 0 ? enforceGender : (_e = matchUpActionsPolicy === null || matchUpActionsPolicy === void 0 ? void 0 : matchUpActionsPolicy.participants) === null || _e === void 0 ? void 0 : _e.enforceGender) !==
+        false;
     var eventType = event.eventType, eventGender = event.gender;
-    var participantType = (eventType === TEAM_EVENT && TEAM) ||
-        (eventType === DOUBLES_EVENT && PAIR) ||
-        INDIVIDUAL;
-    var entryStatusMap = Object.assign.apply(Object, __spreadArray([{}], __read((consideredEntries || event.entries || []).map(function (entry) {
+    var isDoubles = eventType === DOUBLES_EVENT;
+    var participantType = (eventType === TEAM_EVENT && TEAM) || (isDoubles && PAIR) || INDIVIDUAL;
+    var entryStatusMap = Object.assign.apply(Object, __spreadArray([{}], __read(((_f = consideredEntries !== null && consideredEntries !== void 0 ? consideredEntries : event.entries) !== null && _f !== void 0 ? _f : []).map(function (entry) {
         var _a;
         return (_a = {},
             _a[entry.participantId] = entry.entryStatus,
@@ -60987,27 +61053,39 @@ function checkValidEntries(_a) {
         return enteredParticipantIds.includes(participant.participantId);
     });
     var invalidEntries = enteredParticipants.filter(function (participant) {
-        var _a;
+        var _a, _b, _c, _d;
         var entryStatus = entryStatusMap[participant.participantId];
         var ungroupedParticipant = eventType &&
             [TypeEnum.Doubles, TypeEnum.Team].includes(eventType) &&
             participant.participantType === INDIVIDUAL &&
             (isUngrouped(entryStatus) || entryStatus === WITHDRAWN);
         var mismatch = participant.participantType !== participantType && !ungroupedParticipant;
-        // TODO: implement gender checking for teams & pairs
-        var personGender = (_a = participant === null || participant === void 0 ? void 0 : participant.person) === null || _a === void 0 ? void 0 : _a.sex;
-        var wrongGender = enforceGender &&
-            eventGender &&
-            eventType === TypeEnum.Singles &&
-            [GenderEnum.Male, GenderEnum.Female].includes(eventGender) &&
-            personGender !== eventGender;
-        return mismatch || wrongGender;
+        var pairGender = !mismatch &&
+            isDoubles &&
+            unique((_b = (_a = participant === null || participant === void 0 ? void 0 : participant.individualParticipantIds) === null || _a === void 0 ? void 0 : _a.map(function (id) { var _a, _b, _c; return (_c = (_b = (_a = participantMap === null || participantMap === void 0 ? void 0 : participantMap[id]) === null || _a === void 0 ? void 0 : _a.participant) === null || _b === void 0 ? void 0 : _b.person) === null || _c === void 0 ? void 0 : _c.sex; }).filter(Boolean)) !== null && _b !== void 0 ? _b : []);
+        var validPairGender = !eventGender ||
+            !(pairGender === null || pairGender === void 0 ? void 0 : pairGender.length) ||
+            GenderEnum.Any === eventGender ||
+            ([GenderEnum.Male, GenderEnum.Female].includes(eventGender) &&
+                pairGender[0] === eventGender) ||
+            (GenderEnum.Mixed === eventGender &&
+                ((pairGender.length == 1 &&
+                    ((_c = participant.individualParticipantIds) === null || _c === void 0 ? void 0 : _c.length) === 1) ||
+                    pairGender.length === 2));
+        var personGender = (_d = participant === null || participant === void 0 ? void 0 : participant.person) === null || _d === void 0 ? void 0 : _d.sex;
+        var validPersonGender = !(participant === null || participant === void 0 ? void 0 : participant.person) ||
+            !eventGender ||
+            [GenderEnum.Any, GenderEnum.Mixed].includes(eventGender) ||
+            ([GenderEnum.Male, GenderEnum.Female].includes(eventGender) &&
+                personGender === eventGender);
+        var validGender = !genderEnforced || (validPairGender && validPersonGender);
+        return mismatch || !validGender;
     });
     if (invalidEntries.length) {
         var invalidParticipantIds = invalidEntries.map(function (participant) { return participant.participantId; });
         return { error: INVALID_ENTRIES, invalidParticipantIds: invalidParticipantIds };
     }
-    return __assign({}, SUCCESS);
+    return __assign(__assign({}, SUCCESS), { valid: true });
 }
 
 function assignSeedPositions(params) {
@@ -62744,7 +62822,7 @@ function substituteParticipant$1(_a) {
         return { error: MISSING_MATCHUP_ID };
     if (!existingParticipantId || !substituteParticipantId)
         return decorateResult({ result: { error: MISSING_PARTICIPANT_ID }, stack: stack });
-    var matchUp = findMatchUp$1({
+    var matchUp = findDrawMatchUp({
         drawDefinition: drawDefinition,
         matchUpId: matchUpId,
         event: event,
@@ -63384,7 +63462,7 @@ function applyLineUps(_a) {
         return { error: INVALID_VALUES, lineUps: lineUps };
     var stack = 'applyLineUps';
     var tournamentParticipants = tournamentRecord.participants || [];
-    var result = findMatchUp$1({
+    var result = findDrawMatchUp({
         tournamentParticipants: tournamentParticipants,
         inContext: true,
         drawDefinition: drawDefinition,
@@ -63549,7 +63627,7 @@ function applyLineUps(_a) {
     }
     if (!Object.keys(sideAssignments).length)
         return { error: VALUE_UNCHANGED };
-    result = findMatchUp$1({ drawDefinition: drawDefinition, matchUpId: matchUpId });
+    result = findDrawMatchUp({ drawDefinition: drawDefinition, matchUpId: matchUpId });
     if (result.error)
         return result;
     if (!result.matchUp)
@@ -63881,10 +63959,10 @@ function generateDrawDefinition(params) {
         DrawTypeEnum.SingleElimination;
     // get participants both for entry validation and for automated placement
     // automated placement requires them to be "inContext" for avoidance policies to work
-    var participants = getParticipants$1({
+    var _26 = getParticipants$1({
         withIndividualParticipants: true,
         tournamentRecord: tournamentRecord,
-    }).participants;
+    }), participants = _26.participants, participantMap = _26.participantMap;
     var enforceGender = (_r = (_o = params.enforceGender) !== null && _o !== void 0 ? _o : (_q = (_p = policyDefinitions === null || policyDefinitions === void 0 ? void 0 : policyDefinitions[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _p === void 0 ? void 0 : _p.participants) === null || _q === void 0 ? void 0 : _q.enforceGender) !== null && _r !== void 0 ? _r : (_t = (_s = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_MATCHUP_ACTIONS]) === null || _s === void 0 ? void 0 : _s.participants) === null || _t === void 0 ? void 0 : _t.enforceGender;
     // if tournamentRecord is provided, and unless instructed to ignore valid types,
     // check for restrictions on allowed drawTypes
@@ -63914,6 +63992,8 @@ function generateDrawDefinition(params) {
         participants &&
         checkValidEntries({
             consideredEntries: consideredEntries,
+            appliedPolicies: appliedPolicies,
+            participantMap: participantMap,
             enforceGender: enforceGender,
             participants: participants,
             event: event,
@@ -64052,8 +64132,8 @@ function generateDrawDefinition(params) {
         else {
             var policiesToAttach = {};
             try {
-                for (var _26 = __values(Object.keys(policyDefinitions)), _27 = _26.next(); !_27.done; _27 = _26.next()) {
-                    var key = _27.value;
+                for (var _27 = __values(Object.keys(policyDefinitions)), _28 = _27.next(); !_28.done; _28 = _27.next()) {
+                    var key = _28.value;
                     if (JSON.stringify(appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[key]) !==
                         JSON.stringify(policyDefinitions[key])) {
                         policiesToAttach[key] = policyDefinitions[key];
@@ -64063,7 +64143,7 @@ function generateDrawDefinition(params) {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_27 && !_27.done && (_a = _26.return)) _a.call(_26);
+                    if (_28 && !_28.done && (_a = _27.return)) _a.call(_27);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -64115,7 +64195,7 @@ function generateDrawDefinition(params) {
             var source = _a.source;
             return source.structureId !== existingQualifyingPlaceholderStructureId;
         });
-        var _28 = qualifyingResult !== null && qualifyingResult !== void 0 ? qualifyingResult : {}, qualifiersCount = _28.qualifiersCount, qualifyingDrawPositionsCount = _28.qualifyingDrawPositionsCount, qualifyingDetails = _28.qualifyingDetails;
+        var _29 = qualifyingResult !== null && qualifyingResult !== void 0 ? qualifyingResult : {}, qualifiersCount = _29.qualifiersCount, qualifyingDrawPositionsCount = _29.qualifyingDrawPositionsCount, qualifyingDetails = _29.qualifyingDetails;
         if (qualifyingDrawPositionsCount) {
             if (qualifyingResult === null || qualifyingResult === void 0 ? void 0 : qualifyingResult.structures) {
                 (_13 = drawDefinition.structures) === null || _13 === void 0 ? void 0 : _13.push.apply(_13, __spreadArray([], __read(qualifyingResult.structures), false));
@@ -64150,11 +64230,11 @@ function generateDrawDefinition(params) {
         if (result.error)
             return result;
         try {
-            for (var _29 = __values((drawEntries !== null && drawEntries !== void 0 ? drawEntries : []).filter(function (_a) {
+            for (var _30 = __values((drawEntries !== null && drawEntries !== void 0 ? drawEntries : []).filter(function (_a) {
                 var entryStage = _a.entryStage;
                 return entryStage === StageTypeEnum.Qualifying;
-            })), _30 = _29.next(); !_30.done; _30 = _29.next()) {
-                var entry = _30.value;
+            })), _31 = _30.next(); !_31.done; _31 = _30.next()) {
+                var entry = _31.value;
                 var entryData = __assign(__assign({}, entry), { entryStage: (_16 = entry.entryStage) !== null && _16 !== void 0 ? _16 : StageTypeEnum.Main, drawDefinition: drawDefinition });
                 // ignore errors (EXITING_PARTICIPANT)
                 addDrawEntry(entryData);
@@ -64163,13 +64243,13 @@ function generateDrawDefinition(params) {
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (_30 && !_30.done && (_b = _29.return)) _b.call(_29);
+                if (_31 && !_31.done && (_b = _30.return)) _b.call(_30);
             }
             finally { if (e_2) throw e_2.error; }
         }
         try {
-            for (var _31 = __values(qualifyingDetails || []), _32 = _31.next(); !_32.done; _32 = _31.next()) {
-                var qualifyingDetail = _32.value;
+            for (var _32 = __values(qualifyingDetails || []), _33 = _32.next(); !_33.done; _33 = _32.next()) {
+                var qualifyingDetail = _33.value;
                 var qualifyingRoundNumber = qualifyingDetail.finalQualifyingRoundNumber, qualifyingStructureId = qualifyingDetail.finalQualifyingStructureId, targetEntryRound = qualifyingDetail.roundTarget, finishingPositions = qualifyingDetail.finishingPositions, linkType = qualifyingDetail.linkType;
                 var link = mainStructure &&
                     ((_17 = generateQualifyingLink({
@@ -64192,7 +64272,7 @@ function generateDrawDefinition(params) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_32 && !_32.done && (_c = _31.return)) _c.call(_31);
+                if (_33 && !_33.done && (_c = _32.return)) _c.call(_32);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -64290,8 +64370,8 @@ function generateDrawDefinition(params) {
         var roundTarget = 1;
         params.qualifyingProfiles.sort(roundTargetSort);
         try {
-            for (var _33 = __values(params.qualifyingProfiles), _34 = _33.next(); !_34.done; _34 = _33.next()) {
-                var roundTargetProfile = _34.value;
+            for (var _34 = __values(params.qualifyingProfiles), _35 = _34.next(); !_35.done; _35 = _34.next()) {
+                var roundTargetProfile = _35.value;
                 if (!Array.isArray(roundTargetProfile.structureProfiles))
                     return decorateResult({
                         info: mustBeAnArray('structureProfiles'),
@@ -64304,7 +64384,7 @@ function generateDrawDefinition(params) {
                 try {
                     for (var sortedStructureProfiles_1 = (e_6 = void 0, __values(sortedStructureProfiles)), sortedStructureProfiles_1_1 = sortedStructureProfiles_1.next(); !sortedStructureProfiles_1_1.done; sortedStructureProfiles_1_1 = sortedStructureProfiles_1.next()) {
                         var structureProfile = sortedStructureProfiles_1_1.value;
-                        var qualifyingRoundNumber = structureProfile.qualifyingRoundNumber, qualifyingPositions = structureProfile.qualifyingPositions, seededParticipants = structureProfile.seededParticipants, seedingScaleName = structureProfile.seedingScaleName, _35 = structureProfile.seedsCount, seedsCount_1 = _35 === void 0 ? 0 : _35, seedingProfile = structureProfile.seedingProfile, seedByRanking = structureProfile.seedByRanking, placeByes_1 = structureProfile.placeByes, drawSize_1 = structureProfile.drawSize;
+                        var qualifyingRoundNumber = structureProfile.qualifyingRoundNumber, qualifyingPositions = structureProfile.qualifyingPositions, seededParticipants = structureProfile.seededParticipants, seedingScaleName = structureProfile.seedingScaleName, _36 = structureProfile.seedsCount, seedsCount_1 = _36 === void 0 ? 0 : _36, seedingProfile = structureProfile.seedingProfile, seedByRanking = structureProfile.seedByRanking, placeByes_1 = structureProfile.placeByes, drawSize_1 = structureProfile.drawSize;
                         var qualifyingStageResult = prepareStage(__assign(__assign(__assign({}, drawTypeResult), params), { stageSequence: sequence, qualifyingRoundNumber: qualifyingRoundNumber, preparedStructureIds: preparedStructureIds, qualifyingPositions: qualifyingPositions, seededParticipants: seededParticipants, stage: QUALIFYING, seedingScaleName: seedingScaleName, appliedPolicies: appliedPolicies, drawDefinition: drawDefinition, qualifyingOnly: qualifyingOnly, seedingProfile: seedingProfile, seedByRanking: seedByRanking, participants: participants, roundTarget: roundTarget, seedsCount: seedsCount_1, placeByes: placeByes_1, drawSize: drawSize_1, entries: entries }));
                         if (qualifyingStageResult.error) {
                             return qualifyingStageResult;
@@ -64334,7 +64414,7 @@ function generateDrawDefinition(params) {
         catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
-                if (_34 && !_34.done && (_f = _33.return)) _f.call(_33);
+                if (_35 && !_35.done && (_f = _34.return)) _f.call(_34);
             }
             finally { if (e_5) throw e_5.error; }
         }
@@ -70675,6 +70755,7 @@ var utilities = {
     unique: unique,
     UUID: UUID,
     UUIDS: UUIDS,
+    validateCategory: validateCategory,
     validateTieFormat: validateTieFormat,
     visualizeScheduledMatchUps: visualizeScheduledMatchUps,
 };